Changeset 297 for ruby/trunk/lib/open_ehr/rm/data_types/basic.rb

Timestamp:

Sep 25, 2009, 12:15:59 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

hand merge

File:

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

ruby/trunk/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
+          end
         end
 
         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?
@@ -25 +36 @@
             end
           end
+
           def value?
             @value == true
@@ -31 +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?
@@ -50 +65 @@
         end # end of DvState
 
-        class DvIdentifier
-          attr_accessor :issuer, :assigner, :id, :type
-          def initialize(assigner, id, issuer, type)
-            if assigner.nil? or assigner.empty?\
-              or id.nil? or id.empty? or issuer.nil? or issuer.empty?\
-              or type.nil? or type.empty?
-              raise ArgumentError, "invalid argument"
+        class DvIdentifier < DataValue
+          attr_reader :issuer, :assigner, :id, :type
+
+          def initialize(args = {})
+            self.issuer = args[:issuer]
+            self.assigner = args[:assigner]
+            self.id = args[:id]
+            self.type = args[:type]
+          end
+
+          def issuer=(issuer)
+            if issuer.nil? or issuer.empty?
+              raise ArgumentError, 'issuer is mandatory'
             end
             @issuer = issuer
+          end
+
+          def assigner=(assigner)
+            if assigner.nil? or assigner.empty?
+              raise ArgumentError, 'assigner is mandatory'
+            end
             @assigner = assigner
+          end
+
+          def id=(id)
+            if id.nil? or id.empty?
+              raise ArgumentError, 'id is manadtory'
+            end
             @id = id
+          end
+
+          def type=(type)
+            if type.nil? or type.empty?
+              raise ArgumentError, 'type is mandatory'
+            end
             @type = type
           end