Changeset 110

Timestamp:

Oct 14, 2008, 1:02:57 AM (16 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #63, #64

Location:

ruby/trunk/lib/models

Files:

• rm.rb (modified) (1 diff)
• rm/common/archetyped.rb (modified) (3 diffs)
• rm/common/direcotory.rb.rb (added)
• tests/test_reference_model.rb (modified) (1 diff)

ruby/trunk/lib/models/rm.rb

@@ -17 +17 @@
       autoload :Archetyped, "rm/common/archetyped.rb"
       autoload :Generic, "rm/common/generic.rb"
+      autoload :Directory, "rm/common/directory.rb"
     end
 

ruby/trunk/lib/models/rm/common/archetyped.rb

@@ -38 +38 @@
         class Locatable < Pathable
           include Locater_Constants
-          attr_accessor :uid, :archetype_node_id, :archetype_details
-          attr_accessor :feeder_audit, :links, :parent
-          def initialize(uid, archetype_node_id, name, archetype_details,
-                         feeder_audit, links, parent)
+          attr_reader :archetype_node_id, :name, :links
+          attr_accessor :uid, :archetype_details, :feeder_audit
+          def initialize(archetype_node_id, name, links, parent=nil, uid=nil, archetype_details=nil, feeder_audit=nil)
             super(parent)
-            if archetype_node_id.nil?
-              raise ArgumentError, "null archetype_node_id"
-            end
-            if name.nil?
-              raise ArgumentError, "name is empty"
-            end
-            if links.nil?
-              raise ArgumentError, "links is empty"
-            end
-            @uid = uid
+            self.archetype_node_id = archetype_node_id
+            self.name = name
+            self.links = links
+            self.uid = uid
+            self.archetype_details = archetype_details
+            self.feeder_audit = feeder_audit
+            self.parent = parent
+          end
+          
+          def archetype_node_id=(archetype_node_id)
+            raise ArgumentError, 'archetype_node_id should not be nil' if archetype_node_id.nil?
             @archetype_node_id = archetype_node_id
-            @archetype_details = archetype_details
-            @feeder_audit = feeder_audit
+          end
+
+          def name=(name)
+            raise ArgumentError, 'name should not be empty' if name.nil? or name.empty?
+            @name = name
+          end
+          def links=(links)
+            raise ArgumentError, "links shoud not be nil" if links.nil?
             @links = links
-            @parent = parent
           end
           def item_at_path(path)
@@ -88 +93 @@
             self.archetype_id = archetype_id
             self.rm_version = rm_version
-            @template_id = template_id
+            self.template_id = template_id
           end
           def archetype_id=(archetype_id)
@@ -119 +124 @@
             @type = type
           end
-        end
-      end # end of Archetyped
-    end # end of Common
-  end # end of RM
-end # end of OpenEHR
+        end # of Link
+      end # of Archetyped
+    end # of Common
+  end # of RM
+end # OpenEHR

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

@@ -509 +509 @@
   end
 end
+
+class RM_Common_Directory_Test < Test::Unit::TestCase
+  def setup
+    dv_text = OpenEHR::RM::Data_Types::Text::DV_Text.new('root')
+    assert_nothing_raised(Exception){@folder = OpenEHR::RM::Common::Directory::Folder.new('at0000', dv_text)}
+  end
+  
+  def test_init
+    assert_instance_of OpenEHR::RM::Common::Directory::Folder, @folder
+  end
+
+  def test_folder
+    assert_equal 'root', @folder.archetype_node_id
+    assert_equal 'name', @folder.name.value
+  end
+end