Changeset 216 for ruby/branches/0.5/lib/open_ehr/rm/data_types/basic.rb

Timestamp:

Aug 20, 2009, 8:16:53 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

move from Test:Unit to RSpec

File:

• ruby/branches/0.5/lib/open_ehr/rm/data_types/basic.rb (modified) (5 diffs)

ruby/branches/0.5/lib/open_ehr/rm/data_types/basic.rb

@@ -2 +2 @@
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109067591791_562382_3151Report.html
 # Ticket refs #52
-module OpenEhr
+module OpenEHR
   module RM
     module DataTypes
@@ -10 +10 @@
 
         class DataValue
-          include OpenEhr::RM::Support::Definition::BasicDefinition
+          include OpenEHR::RM::Support::Definition::BasicDefinition
+          attr_accessor :value
+          alias :v :value
+
+          def initialize(args = {})
+            self.value = args[:value]
+          end
+
           def ==(other)
             return self.value == other.value
@@ -17 +24 @@
 
         class DvBoolean < DataValue
-          def initialize(value)
-            self.value = value
+          def initialize(args)
+            super(args)
           end
+
           def value=(value)
             raise ArgumentError, "value must not be nil" if value.nil?
@@ -35 +43 @@
 
         class DvState < DataValue
-          attr_reader :value
+          attr_reader :is_terminal
 
-          def initialize(value, is_terminal)
-            self.value=value
-            self.is_terminal=is_terminal
+          def initialize(args)            
+            super(args)
+            self.is_terminal = args[:is_terminal]
           end
+
           def value=(v)
             raise ArgumentError, "value should not be nil" if v.nil?
             @value = v
           end
+
           def is_terminal?
             @is_terminal
           end
+
           def is_terminal=(s)
             raise ArgumentError, "terminal should not be nil" if s.nil?
@@ -55 +66 @@
 
         class DvIdentifier
-          attr_accessor :issuer, :assigner, :id, :type
-          def initialize(assigner, id, issuer, type)
+          attr_reader :issuer, :assigner, :id, :type
+
+          def initialize(args = {})
             if assigner.nil? or assigner.empty?\
               or id.nil? or id.empty? or issuer.nil? or issuer.empty?\