Changeset 240

Timestamp:

Aug 28, 2009, 11:58:05 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

completed uri package

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/data_types/uri.rb (modified) (6 diffs)
• spec/lib/open_ehr/rm/data_types/encapsulated/dv_parsable_spec.rb (modified) (2 diffs)
• spec/lib/open_ehr/rm/data_types/uri/dv_ehr_uri_spec.rb (modified) (1 diff)

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

@@ -6 +6 @@
 
 module URI
-  class Ehr < ::URI::Generic
+  class EHR < ::URI::Generic
     COMPONENT = [
       :scheme, :path, :fragment, :query
@@ -24 +24 @@
     end
   end
-  @@schemes['EHR'] = Ehr
+  @@schemes['EHR'] = EHR
 end
 
@@ -32 +32 @@
       module Uri
         class DvUri < OpenEHR::RM::DataTypes::Basic::DataValue
-          attr_reader :value
-
-          def initialize(args ={})
+          def initialize(args = {})
             self.value = args[:value]
           end
 
+          def value
+            @value.to_s
+          end
+
           def fragment_id
-            @uri.fragment
+            @value.fragment
           end
 
           def path
-            @uri.path
+            @value.path
           end
 
           def query
-            @uri.query
+            @value.query
           end
 
           def scheme
-            @uri.scheme
+            @value.scheme
           end
 
@@ -57 +59 @@
             raise ArgumentError, "value is empty" if value.nil?
             parse(value)
-            @value = value
           end
 
@@ -63 +64 @@
 
           def parse(value)
-            @uri = ::URI.parse(value)
+            @value = ::URI.parse(value)
           end
         end
@@ -74 +75 @@
           def value=(value)
             raise ArgumentError, "scheme must be ehr" if !(value =~ /^ehr/i)
-            super(value)
+            @value = parse(value)
           end
         end # of DV_EHR_URI

ruby/branches/0.5/spec/lib/open_ehr/rm/data_types/encapsulated/dv_parsable_spec.rb

@@ -7 +7 @@
     @dv_parsable = DvParsable.new(:value => 'test',
                                   :formalism => 'plain/text')
+  end
+
+  it 'should be an instance of DvParsable' do
+    @dv_parsable.should be_an_instance_of DvParsable
   end
 
@@ -24 +28 @@
     lambda {@dv_parsable.formalism = nil}.should raise_error(ArgumentError)
   end
+
+  it 'should raise ArgumentError formalism empty' do
+    lambda {@dv_parsable.formalism = ''}.should raise_error(ArgumentError)
+  end
 end

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

@@ -4 +4 @@
 describe DvEhrUri do
   before(:each) do
-    @dv_ehr_uri = DvEhrUri.new(:value => 'ehr://1234567/87284370-2D4B-4e3d-A3F3-F303D2F4F34B@2005-08-02T04:30:00')
+    @dv_ehr_uri = DvEhrUri.new(:value => 'ehr://test/87284370-2D4B-4e3d-A3F3-F303D2F4F34B@2005-08-02T04:30:00')
+  end
+
+  it 'should be an instance of EhrUri' do
+    @dv_ehr_uri.should be_an_instance_of DvEhrUri
   end
 
   it 's value should be valid' do
     @dv_ehr_uri.value.should == 
-      'ehr://1234567/87284370-2D4B-4e3d-A3F3-F303D2F4F34B@2005-08-02T04:30:00'
+      'ehr://test/87284370-2D4B-4e3d-A3F3-F303D2F4F34B@2005-08-02T04:30:00'
   end