Changeset 362 for ruby/branches

Timestamp:

Nov 20, 2009, 12:35:52 AM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #45 PartyIdentity, Contact, Address

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/demographic.rb (modified) (3 diffs)
• spec/lib/open_ehr/rm/demographic/address_spec.rb (added)
• spec/lib/open_ehr/rm/demographic/contact_spec.rb (added)
• spec/lib/open_ehr/rm/demographic/party_identity_spec.rb (added)
• spec/lib/open_ehr/rm/demographic/party_spec.rb (added)

ruby/branches/0.5/lib/open_ehr/rm/demographic.rb

@@ -10 +10 @@
         attr_reader :details
 
-        def as_string
-
+        def initialize(args = { })
+          super(args)
+          self.details = args[:details]
+        end
+
+        def details=(details)
+          if details.nil?
+            raise ArgumentError, 'details are mandatory'
+          end
+          @details = details
         end
 
         def type
-
+          return @name
         end
       end
@@ -90 +98 @@
         attr_reader :details
 
+        def initialize(args = { })
+          super(args)
+          self.details = args[:details]
+        end
+
+        def details=(details)
+          if details.nil?
+            raise ArgumentError, 'details are mandatory'
+          end
+          @details = details
+        end
+
+        def purpose
+          return @name
+        end
       end
 
@@ -159 +182 @@
         attr_accessor :time_validity
         attr_reader :addresses
-        def initialize(uid, archetype_node_id, name, archetype_details,
-                       feeder_audit, links, parent, time_validity, addresses)
-          super(uid, archetype_node_id, name, archetype_details,
-                feeder_audit, links, parent)
-          address_exists?(addresses)
+
+        def initialize(args = { })
+          super(args)
+          self.addresses = args[:addresses]
+          self.time_validity = args[:time_validity]
+        end
+
+        def purpose
+          return @name
+        end
+
+        def addresses=(addresses)
+          if addresses.nil? || addresses.empty?
+            raise ArgumentError, 'address is mandatory'
+          end
           @addresses = addresses
-          @time_validity = time_validity
-        end
-
-        def purpose
-          @name
-        end
-
-        def purpose=(purpose)
-          @name = purpose
-        end
-
-        def addresses=(addresses)
-          address_exists?(addresses)
-          @addresses = addresses
-        end
-        private
-
-        def address_exists?(addresses)
-          if addresses.nil?
-            raise ArgumentError, "address must not be nil"
-          elsif addresses.empty?
-            raise ArgumentError, "address must not be empty"
-          end
         end
       end