Changeset 322 for ruby

Timestamp:

Oct 18, 2009, 8:14:21 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

common/generic near completed

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/common/generic.rb (modified) (2 diffs)
• lib/open_ehr/rm/data_types/quantity/date_time.rb (modified) (7 diffs)
• spec/lib/open_ehr/rm/common/generic/audit_details_spec.rb (modified) (1 diff)
• spec/lib/open_ehr/rm/common/generic/party_identified_spec.rb (modified) (1 diff)
• spec/lib/open_ehr/rm/common/generic/party_related_spec.rb (modified) (1 diff)
• spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_date_time_spec.rb (added)
• spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_time_spec.rb (added)
• test/unit/open_ehr/rm/data_types/quantity/date_time_test.rb (modified) (1 diff)

ruby/branches/0.5/lib/open_ehr/rm/common/generic.rb

@@ -109 +109 @@
               raise ArgumentError, 'cannot identified'
             end
-            super(:external_ref => args[:external_ref])
             self.name = args[:name]
             self.identifier = args[:identifier]
+            super(args)
           end
 
@@ -126 +126 @@
               raise ArgumentError, 'cannot identified'
             end
-            unless identifier.nil? || !identifier.empty?
+            if !identifier.nil? && identifier.empty?
               raise ArgumentError, 'invaild identifier'
             end
             @identifier = identifier
+          end
+
+          def external_ref=(external_ref)
+            if @name.nil? && @identifier.nil? && external_ref.nil?
+              raise ArgumentError, 'invalid external_ref'
+            end
+            @external_ref = external_ref
           end
         end

ruby/branches/0.5/lib/open_ehr/rm/data_types/quantity/date_time.rb

@@ -29 +29 @@
               @value = value
             end
+
+            undef magnitude=
           end
 
@@ -43 +45 @@
               @day = iso8601_date.day
             end
-
-            undef magnitude=
 
             def magnitude
@@ -89 +89 @@
           
           class DvTime < DvTemporal
-            include OpenEHR::AssumedLibraryTypes::ISO8601TimeModule
-            def initialize(value, magnitude_status=nil, accuracy=nil,
-                           normal_range=nil, normal_status=nil,
-                           other_reference_range=nil)
-              super(value, magnitude_status, accuracy, normal_range,
-                    normal_status, other_reference_range)
-            end
+            include ISO8601TimeModule
 
             def value=(value)
               super(value)
-              iso8601_time = AssumedLibraryTypes::ISO8601Time.new(value)
+              iso8601_time = ISO8601Time.new(value)
               @hour = iso8601_time.hour
               @minute = iso8601_time.minute
@@ -124 +118 @@
           class DvDateTime < DvTemporal
             include OpenEHR::AssumedLibraryTypes::ISO8601DateTimeModule
-            attr_reader :value
-
-            def initialize(value, magnitude_status=nil, accuracy=nil,
-                           normal_range=nil, normal_status=nil,
-                           other_reference_range=nil)
-              super(value, magnitude_status, accuracy, normal_range,
-                    normal_status, other_reference_range)
-            end
 
             def value=(value)              
@@ -147 +133 @@
 
             def magnitude
-              seconds = ::DateTime.new(@year,@month,@day,@hour,@minute,@second) - 
-                ::DateTime.new(0000,1,1,0,0,0)
+              seconds = (((@year * 365.24 +
+                           @month * 30.42 +
+                           @day) * 24 + @hour) * 60 +
+                         @minute) * 60 + @second
               if @fractional_second.nil?
                 return seconds
@@ -155 +143 @@
               end
             end
-
-            undef magnitude=
 
             def diff(other)
@@ -175 +161 @@
               minute = ((time_diff - hour*60*60)/60).to_i
               second = (time_diff - hour * 60 *60 - minute * 60).to_i
-              fractional_second = ((time_diff - time_diff.to_i)*1000000.0).to_i/1000000.0
-
+              fractional_second = 
+                ((time_diff - time_diff.to_i)*1000000.0).to_i/1000000.0
               return DvDuration.new(date_duration.value + 'T' +
                         hour.to_s + 'H' +
                         minute.to_s + 'M' +
                         second.to_s + fractional_second.to_s[1..-1] + 'S')
-                                   
             end
 

ruby/branches/0.5/spec/lib/open_ehr/rm/common/generic/audit_details_spec.rb

@@ -37 +37 @@
     @audit_details.description.value.should == 'test environment'
   end
+
+  it 'should raise ArgumentError when system_id was assigned nil' do
+    lambda {
+      @audit_details.system_id = nil
+    }.should raise_error ArgumentError
+  end
+
+  it 'should raise ArgumentError when time_commited is nil' do
+    lambda {
+      @audit_details.time_committed = nil
+    }.should raise_error ArgumentError
+  end
 end

ruby/branches/0.5/spec/lib/open_ehr/rm/common/generic/party_identified_spec.rb

@@ -26 +26 @@
     @party_identified.identifier.size.should be_equal 5
   end
+
+  it 'should raise ArgumentError with all nil' do
+    lambda {
+      PartyIdentified.new
+    }.should raise_error ArgumentError
+  end
+
+  it 'should raise ArgumentError with nil name when ex_r and id nil' do
+    @party_identified.identifier = nil
+    @party_identified.external_ref = nil
+    lambda {
+      @party_identified.name = nil
+    }.should raise_error ArgumentError
+  end
+
+  it 'should raise ArgumentError with nil external_ref when name and id nil' do
+    @party_identified.name = nil
+    @party_identified.identifier = nil
+    lambda {
+      @party_identified.external_ref = nil
+    }.should raise_error ArgumentError
+  end
+
+  it 'should raise ArgumentError with nil identifier when name and ex_r nil' do
+    @party_identified.name = nil
+    @party_identified.external_ref = nil
+    lambda {
+      @party_identified.identifier = nil
+    }.should raise_error ArgumentError
+  end
+
+  it 'should raise ArgumentError with empty identifier' do
+    lambda {
+      @party_identified.identifier = Array.new
+    }.should raise_error ArgumentError
+  end
 end

ruby/branches/0.5/spec/lib/open_ehr/rm/common/generic/party_related_spec.rb

@@ -1 +1 @@
 require File.dirname(__FILE__) + '/../../../../../spec_helper'
 include OpenEHR::RM::Common::Generic
-
+include OpenEHR::RM::DataTypes::Text
 describe PartyRelated do
   before(:each) do

ruby/branches/0.5/test/unit/open_ehr/rm/data_types/quantity/date_time_test.rb

@@ -34 +34 @@
     assert_equal 6, @dv_date.month
     assert_equal 29, @dv_date.day
-    assert_equal 733954, @dv_date.magnitude
+    assert_equal b733954, @dv_date.magnitude
     date2 = OpenEhr::RM::DataTypes::Quantity::DateTime::DvDate.new('2009-07-08')
     assert_equal 'P0Y0M1W9D',@dv_date.diff(date2).value