Changeset 275 for ruby/branches/0.5/lib/open_ehr/rm/support/identification.rb

Timestamp:

Sep 17, 2009, 3:56:00 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

object_ref test/unit move to rspec

File:

• ruby/branches/0.5/lib/open_ehr/rm/support/identification.rb (modified) (1 diff)

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

@@ -26 +26 @@
           attr_reader :namespace, :type, :id
 
-          def initialize(namespace, type, id)
-            self.namespace = namespace
-            self.type = type
-            self.id = id
+          def initialize(args = {})
+            self.namespace = args[:namespace]
+            self.type = args[:type]
+            self.id = args[:id]
           end
 
           def namespace=(namespace)
-            raise ArgumentError if namespace.nil? or namespace.empty? or !(/([a-z]|[A-Z]).*/ =~ namespace) # error original is =~ #([a-z][A-Z])([a-z]|[A-Z]|\s|[v0-9]|[_-\:\/\&\+\?])*/
+            if namespace.nil? or namespace.empty? or 
+                !(/^[a-zA-Z][a-zA-Z0-9_\-\:\/\&\+\?]*$/ =~ namespace)
+              raise ArgumentError
+            end
             @namespace = namespace
           end