Changeset 232 for ruby/branches/0.5/lib

Timestamp:

Aug 28, 2009, 12:18:05 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

move from test to rspec

File:

• ruby/branches/0.5/lib/open_ehr/rm/data_types/uri.rb (modified) (4 diffs)

ruby/branches/0.5/lib/open_ehr/rm/data_types/uri.rb

@@ -4 +4 @@
 
 require 'uri'
-#require 'uri/generic'
+
 module URI
   class Ehr < ::URI::Generic
@@ -10 +10 @@
       :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
@@ -29 +32 @@
       module Uri
         class DvUri < OpenEHR::RM::DataTypes::Basic::DataValue
+          attr_reader :value
+
           def initialize(args ={})
             self.value = args[:value]
           end
+
           def fragment_id
-            @value.fragment
+            @uri.fragment
           end
+
           def path
-            @value.path
+            @uri.path
           end
+
           def query
-            @value.query
+            @uri.query
           end
+
           def scheme
-            @value.scheme
+            @uri.scheme
           end
+
           def value=(value)
             raise ArgumentError, "value is empty" if value.nil?
             parse(value)
+            @value = value
           end
-          def value
-            @value.to_s
-          end
+
           private
+
           def parse(value)
-            @value = ::URI.parse(value)
+            @uri = ::URI.parse(value)
           end
         end
@@ -61 +71 @@
             super(value)
           end
+
           def value=(value)
             raise ArgumentError, "scheme must be ehr" if !(value =~ /^ehr/i)
-            parse(value)
+            super(value)
           end
         end # of DV_EHR_URI