Changeset 335 for ruby/branches

Timestamp:

Nov 10, 2009, 12:27:19 AM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

Versioning system is complexed

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/common/change_control.rb (modified) (2 diffs)
• lib/open_ehr/rm/data_types/quantity.rb (modified) (1 diff)
• lib/open_ehr/rm/data_types/quantity/date_time.rb (modified) (1 diff)
• spec/lib/open_ehr/rm/common/change_control/versioned_object_spec.rb (added)
• spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_date_time_spec.rb (modified) (1 diff)

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

@@ -279 +279 @@
                                           :version_id => ver.uid)
             end
-            return RevisionHistory.new(revision_history_items)
+            return RevisionHistory.new(:items => revision_history_items)
           end
 
           def commit_original_version(args={ })
-            @all_versions << OriginalVersion.new(:uid => args[:uid],
-                                                  :preceding_version_uid => args[:preceding_version_uid],
-                                                  :contribution => args[:contribution],
-                                                  :commit_audit => args[:commit_audit],
-                                                  :lifecycle_state => args[:lifecycle_state],
-                                                  :data => args[:data],
-                                                  :attestations => args[:attestations],
-                                                  :signature => args[:signature])
-          end
-
+            if has_version_id?(args[:preceding_version_uid]) or self.version_count == 0
+              @all_versions << OriginalVersion.new(:uid => args[:uid],
+                                                   :preceding_version_uid => args[:preceding_version_uid],
+                                                   :contribution => args[:contribution],
+                                                   :commit_audit => args[:commit_audit],
+                                                   :lifecycle_state => args[:lifecycle_state],
+                                                   :data => args[:data],
+                                                   :attestations => args[:attestations],
+                                                   :signature => args[:signature])
+            else
+              raise ArgumentError, 'invalid preceding uid'
+            end
+          end
+            
           def commit_original_merged_version(args = { })
             @all_versions << OriginalVersion.new(:uid => args[:uid],
@@ -307 +311 @@
           def commit_imported_version(args = { })
             @all_versions << ImportedVersion.new(:item => args[:item],
-                                                  :contribution => args[:contribution],
-                                                  :commit_audit => args[:commit_audit])
+                                                 :contribution => args[:contribution],
+                                                 :commit_audit => args[:commit_audit])
           end
 

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

@@ -66 +66 @@
 
           def <=>(others)
-            @magnitude <=> others.magnitude
+            self.magnitude <=> others.magnitude
           end
 

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

@@ -13 +13 @@
         module DateTime
           class DvTemporal < DvAbsoluteQuantity
-            include Comparable
             def initialize(args = {})
               self.value = args[:value]

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

@@ -14 +14 @@
     @dv_date_time.magnitude.should be_close 63423697018.3, 0.001
   end
+
+  it 'should be equal when magnitude is same' do
+    @dv_date_time.should == DvDateTime.new(:value => '2009-09-29T15:03:22.3')
+  end
 end