Changeset 297 for ruby/trunk/lib/open_ehr/rm/data_types/uri.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/data_types/uri.rb (modified) (2 diffs)

ruby/trunk/lib/open_ehr/rm/data_types/uri.rb

@@ -4 +4 @@
 
 require 'uri'
-#require 'uri/generic'
-module Uri
-  class Ehr < ::URI::Generic
+
+module URI
+  class EHR < ::URI::Generic
     COMPONENT = [
       :scheme, :path, :fragment, :query
     ].freeze
+
     def self.build(args)
       tmp = Util::make_components_hash(self, args)
       super(tmp)
     end
+
     def initialize(*arg)
       super(*arg)
     end
+
     def self.use_registry
       true
     end
   end
-  @@schemes['EHR'] = Ehr
+  @@schemes['EHR'] = EHR
 end
 
-module OpenEhr
+module OpenEHR
   module RM
     module DataTypes
       module Uri
-        class DvUri < OpenEhr::RM::DataTypes::Basic::DataValue
-          def initialize(value)
-            self.value = value
+        class DvUri < OpenEHR::RM::DataTypes::Basic::DataValue
+          def initialize(args = {})
+            self.value = args[:value]
           end
+
+          def value
+            @value.to_s
+          end
+
           def fragment_id
             @value.fragment
           end
+
           def path
             @value.path
           end
+
           def query
             @value.query
           end
+
           def scheme
             @value.scheme
           end
+
           def value=(value)
             raise ArgumentError, "value is empty" if value.nil?
             parse(value)
           end
-          def value
-            @value.to_s
-          end
+
           private
+
           def parse(value)
             @value = ::URI.parse(value)
@@ -61 +72 @@
             super(value)
           end
+
           def value=(value)
             raise ArgumentError, "scheme must be ehr" if !(value =~ /^ehr/i)
-            parse(value)
+            @value = parse(value)
           end
         end # of DV_EHR_URI