Changeset 363

Timestamp:

Nov 20, 2009, 1:31:18 AM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #45 Actor, Person, Organisation, Group, Agent

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/demographic.rb (modified) (3 diffs)
• spec/lib/open_ehr/rm/demographic/actor_spec.rb (added)
• spec/lib/open_ehr/rm/demographic/party_identity_spec.rb (modified) (1 diff)
• spec/lib/open_ehr/rm/demographic/party_spec.rb (modified) (3 diffs)

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

@@ -7 +7 @@
   module RM
     module Demographic
-      class Address < Locatable
-        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 type
-          return @name
-        end
-      end
-
-      class Capability < Locatable
-        attr_reader :credentials, :time_validity
-
-      end
-
       class Party < Locatable
         attr_reader :uid, :identities, :contacts, :relationships,
@@ -115 +90 @@
       end
 
-      class PartyRelationship < Locatable
-
-      end
-
-      class VersionedParty < Locatable
-
-      end
-
-      class Role < Party
-
-      end
-
-      class Actor < Party
-        LEAGAL_IDENTITY = 'leagal identity'
-        attr_reader :languages, :rules
-
-        def initialize(uid, archetype_node_id, name, archetype_details,
-                       feeder_audit, links, identities, contacts,
-                       relationships, reverse_relationships, details,
-                       languages, rules)
-          super(uid, archetype_node_id, name, archetype_details,
-                feeder_audit, links, relationships, reverse_relationships,
-                details)
-          has_legal_identity?
-          set_languages(languages)
-          set_rules(rules)
-        end
-
-        def has_legal_identity?
-          @identities.each {|identity|
-            if (identity.purpose.value == LEAGAL_IDENTITY)
-              return true
-            end
-          }
-          false
-        end
-
-        def languages=(languages)
-          set_languages(languages)
-        end
-
-        def values=(values)
-          set_values(values)
-        end
-        private
-        def set_languages(languages)
-          if languages.nil?
-            raise ArgumentError, "languages should not be nil."
-          elsif languages.empty?
-            raise ArgumentError, "languages shouldnot be empty."
-          end
-          @languages = languages
-        end
-
-        def set_values(values)
-          if values.nil?
-            raise ArgumentError, "values should not be nil."
-          elsif values.empty?
-            raise ArgumentError, "values should not be nil."
-          end
-          @values = values
-        end
-      end
-
       class Contact < Locatable
         attr_accessor :time_validity
@@ -201 +112 @@
       end
 
+      class Address < Locatable
+        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 type
+          return @name
+        end
+      end
+
+      class Actor < Party
+        LEAGAL_IDENTITY = 'legal identity'
+        attr_reader :languages, :roles
+
+        def initialize(args = { })
+          super(args)
+          self.roles = args[:roles]
+          self.languages = args[:languages]
+        end
+
+        def roles=(roles)
+          if !roles.nil? && roles.empty?
+            raise ArgumentError, 'roles should not be empty'
+          end
+          @roles = roles
+        end
+
+        def has_legal_identity?
+          @identities.each do |identity|
+            if identity.purpose.value == LEAGAL_IDENTITY
+              return true
+            end
+          end
+          return false
+        end
+
+        def languages=(languages)
+          if !languages.nil? && languages.empty?
+            raise ArgumentError, 'languages should not be empty.'
+          end
+          @languages = languages
+        end
+      end
+
+      class Person < Actor
+
+      end
+
+      class Organisation < Actor
+
+      end
+
+      class Group < Actor
+
+      end
+
       class Agent < Actor
 
       end
 
-      class Organisation < Actor
-
-      end
-
-      class Person < Actor
-
-      end
-
-      class Group < Actor
+      class Role < Party
+
+      end
+
+      class Capability < Locatable
+        attr_reader :credentials, :time_validity
+
+      end
+
+      class PartyRelationship < Locatable
+
+      end
+
+      class VersionedParty < Locatable
 
       end

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

@@ -21 +21 @@
   end
 
+  it 'should raise ArgumentError with nil details' do
+    lambda {
+      @party_identity.details = nil
+    }.should raise_error ArgumentError
+  end
+
   it 'purpose should return as same as name' do
     @party_identity.purpose.value.should == 'test'

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

@@ -58 +58 @@
   it 'identities should be assigned properly' do
     @party.identities.size.should be_equal 2
-p  end
+  end
 
   it 'should raise ArgumentError when nil identities are assigned' do
@@ -80 +80 @@
   end
 
+  it 'should raise ArgumentError with empty contacts' do
+    lambda {
+      @party.contacts = Set.new
+    }.should raise_error ArgumentError
+  end
+
   it 'relationships should be assigned properly' do
     target_ids = Set.new
@@ -99 +105 @@
     }.should raise_error ArgumentError
   end
-  
+
+  it 'invaild relationship raise ArgumentError' do
+    invalid_id = stub(ObjectID, :value => '10')
+    invalid_source = stub(PartyRef, :id => invalid_id)
+    invalid_rel = stub(PartyRelationship, :source => invalid_source)
+    lambda {
+      @party.relationships = [invalid_rel].to_set
+    }.should raise_error ArgumentError
+  end
 
   it 'reverse relationship should be assigned properly' do