Changeset 86 for ruby/trunk

Timestamp:

Jul 20, 2008, 8:46:23 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #45

Location:

ruby/trunk/lib/models

Files:

• rm/demographic.rb (modified) (4 diffs)
• tests/test_reference_model.rb (modified) (2 diffs)

ruby/trunk/lib/models/rm/demographic.rb

@@ +1 @@
+# This module is based on the UML,
+# http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_76d0249_1118674798473_6021_0Report.html
+# Ticket refs #45
 module OpenEHR
   module RM
     module Demogrphic
-      # this class is based on the UML,
-      # http://www.openehr.org/svn/specification/TAGS/Release-1.0.1/publishing/architecture/computable/UML/uml_start_view.html
-      class PARTY < OpenEHR::RM::Common::Archetyped::Locatable
+      class Party < OpenEHR::RM::Common::Archetyped::Locatable
         attr_reader :details, :reverse_relationships, :uid
         attr_reader :idetities, :contacts, :relationships
@@ -56 +57 @@
         end
       end
-      class ACTOR < PARTY
+      class Actor < Party
         LEAGAL_IDENTITY = 'leagal identity'
         attr_reader :languages, :rules
@@ -101 +102 @@
           @values = values
       end
-      class CONTACT < OpenEHR::RM::Common::Archetyped::Locatable
+      class Contact < OpenEHR::RM::Common::Archetyped::Locatable
         attr_accessor :time_validity
         attr_reader :addresses
@@ -131 +132 @@
         end
       end
+
+      class Agent < Actor
+
+      end
+
+      class Organisation < Actor
+
+      end
+
+      class Person < Actor
+
+      end
+
+      class Group < Actor
+
+      end
     end # of Demographic
   end # of RM

ruby/trunk/lib/models/tests/test_reference_model.rb

@@ -18 +18 @@
     @dv_coded_text = OpenEHR::RM::Data_Types::Text::DV_Coded_Text.new("valid value", "AT1000")
     @dv_paragraph = OpenEHR::RM::Data_Types::Text::DV_Paragraph.new(Set.new(["test1", "test2"]))
+    @agent = OpenEHR::RM::Demogrphic::Agent.new
+    @organisation = OpenEHR::RM::Demogrphic::Organisation.new
+    @person = OpenEHR::RM::Demogrphic::Person.new
+    @group = OpenEHR::RM::Demogrphic::Group.new
   end
   
@@ -30 +34 @@
     assert_instance_of OpenEHR::RM::Data_Types::Text::DV_Text, @dv_text
     assert_instance_of OpenEHR::RM::Data_Types::Text::DV_Coded_Text, @dv_coded_text
+    assert_instance_of OpenEHR::RM::Demogrphic::Agent, @agent
+    assert_instance_of OpenEHR::RM::Demogrphic::Organisation, @organisation
+    assert_instance_of OpenEHR::RM::Demogrphic::Person, @person
+    assert_instance_of OpenEHR::RM::Demogrphic::Group, @group
   end