Changeset 273 for ruby/branches

Timestamp:

Sep 17, 2009, 1:34:07 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

uid_based_id family changed test/unit to rspec

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/support/identification.rb (modified) (1 diff)
• spec/lib/open_ehr/rm/support/identification/hier_object_id_spec.rb (added)
• spec/lib/open_ehr/rm/support/identification/uid_based_id_spec.rb (added)
• spec/lib/open_ehr/rm/support/identification/uid_spec.rb (modified) (1 diff)

ruby/branches/0.5/lib/open_ehr/rm/support/identification.rb

@@ -213 +213 @@
 
         class UIDBasedID < ObjectID
-          def initialize(value)
+          attr_reader :root, :extension
+
+          def initialize(args = {})
+            super(args)
+          end
+
+          def value=(value)
             super(value)
-          end
-
-          def extension
-            if self.has_extension?
-              @value[/::.*/][2..-1]
-            else
-              ''
+            if /(\S+)::(\S+)/ =~ value
+              @root = UID.new(:value => $1)
+              @extension = $2
+            else
+              @root = UID.new(:value => value)
+              @extension = ''
             end
           end
 
           def has_extension?
-            @value.include? '::'
-          end
-
-          def root
-            if self.has_extension?
-              @value[/.*::/][0..-3]
-            else
-              @value
-            end
+            return !@extension.empty?
           end
         end

ruby/branches/0.5/spec/lib/open_ehr/rm/support/identification/uid_spec.rb

@@ -4 +4 @@
 describe UID do
   before(:each) do
-    @uid = UID.new('1001')
+    @uid = UID.new(:value => '1001')
   end