Changeset 97 for ruby/trunk

Timestamp:

Aug 16, 2008, 6:46:52 PM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #39
locatable_ref class finished

Location:

ruby/trunk/lib/models

Files:

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

ruby/trunk/lib/models/rm/support/identification.rb

@@ -47 +47 @@
           end
         end
-        
+
         class Archetype_ID < Object_ID
           attr_reader :domain_concept, :rm_name, :rm_entity, :rm_originator, :specialisation, :version_id
@@ -129 +129 @@
             super(value)
           end
+
           def extension
             if self.has_extension?
@@ -136 +137 @@
             end
           end
+
           def has_extension?
             @value.include? '::'
           end
+
           def root
             if self.has_extension?
@@ -145 +148 @@
               @value
             end
+          end
+        end
+
+        class Locatable_Ref < Object_Ref
+          attr_reader :namespace, :type, :id, :path
+
+          def initialize(namespace, type, id, path)
+            super(namespace, type, id)
+            self.path = path
+          end
+
+          def path=(path)
+            raise ArgumentError if path.nil? or path.empty?
+            @path = path
+          end
+
+          def as_uri
+            'ehr://' + @id.value + '/' + @path
           end
         end

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

@@ -153 +153 @@
     assert_nothing_raised(Exception){@uid_based_id = OpenEHR::RM::Support::Identification::UID_Based_ID.new('rrip::0.0.3')}
     assert_nothing_raised(Exception){@hier_object_id = OpenEHR::RM::Support::Identification::Hier_Object_ID.new('0.0.4')}
-    assert_nothing_raised(Exception){@locatable_ref = OpenEHR::RM::Support::Identification::Locatable_Ref.new('unknown', 'PERSON', @uid_based_id, '/data/event[at0001, standing]')}
+    assert_nothing_raised(Exception){@locatable_ref = OpenEHR::RM::Support::Identification::Locatable_Ref.new('unknown', 'PERSON', @uid_based_id, 'data/event[at0001, standing]')}
   end
   
@@ -349 +349 @@
 # test constructor function
     assert_equal 'unknown', @locatable_ref.namespace
-    assert_equal 'PARTY', @locatable_ref.type
+    assert_equal 'PERSON', @locatable_ref.type
     assert_equal @uid_based_id, @locatable_ref.id
-    assert_equal '/data/event[at0001, standing]', @locatable_ref.path
-    assert_equal 'ehr://rrip/data/event[at0001, standing]', @locatable_ref.as_uri
-
-
+    assert_equal 'data/event[at0001, standing]', @locatable_ref.path
+    assert_equal 'ehr://rrip::0.0.3/data/event[at0001, standing]', @locatable_ref.as_uri
+#test path
+    assert_nothing_raised(Exception){@locatable_ref.path = 'data/event[at0002, tilting]'}
+    assert_equal 'data/event[at0002, tilting]', @locatable_ref.path
+    assert_equal 'ehr://rrip::0.0.3/data/event[at0002, tilting]', @locatable_ref.as_uri
   end
 end