Changeset 297 for ruby/trunk/lib/open_ehr/rm/common/archetyped.rb

Timestamp:

Sep 25, 2009, 12:15:59 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

hand merge

File:

• ruby/trunk/lib/open_ehr/rm/common/archetyped.rb (modified) (4 diffs)

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

@@ -2 +2 @@
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109318114715_211173_0Report.html
 # Ticket refs #65
-module OpenEhr
+module OpenEHR
   module RM
     module Common
@@ -17 +17 @@
           attr_accessor :parent
 
-          def initialize(parent = nil)
-            @parent = parent
+          def initialize(args = { })
+            self.parent = args[:parent]
           end
 
           def item_at_path(path)
-            raise NotImplementError, "item_at_path must be implemented"
+            raise NotImplementedError, "item_at_path must be implemented"
           end
 
           def items_at_path(path)
-            raise NotImplementError, "items_at_path must be implemented"
+            raise NotImplementedError, "items_at_path must be implemented"
           end
 
           def path_exists?(path)
-            raise NotImplementError, "path_exists? must be implemented"
+            raise NotImplementedError, "path_exists? must be implemented"
           end
 
           def path_of_item(item)
-            raise NotImplementError, "path_of_item must be implemented"
+            raise NotImplementedError, "path_of_item must be implemented"
           end
 
-          def path_unique(path)
-            raise NotImplementError, "path_unique must be implemented"
+          def path_unique?(path)
+            raise NotImplementedError, "path_unique? must be implemented"
           end
         end
@@ -48 +48 @@
 
           def initialize(args = { })
-            super(args[:parent])
+            super(args)
             self.archetype_node_id = args[:archetype_node_id]
             self.name = args[:name]
@@ -58 +58 @@
           
           def archetype_node_id=(archetype_node_id)
-            raise ArgumentError, 'archetype_node_id should not be nil' if archetype_node_id.nil?
+            if archetype_node_id.nil? or archetype_node_id.empty?
+              raise ArgumentError, 'archetype_node_id should not be nil'
+            end
             @archetype_node_id = archetype_node_id
           end