Changeset 157 for ruby/trunk/lib/models/rm

Timestamp:

Jul 5, 2009, 11:01:59 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

fixed #62
refs #49,#39

Location:

ruby/trunk/lib/models/rm

Files:

• common/generic.rb (modified) (2 diffs)
• data_types/quantity/date_time.rb (modified) (3 diffs)
• support/identification.rb (modified) (2 diffs)

ruby/trunk/lib/models/rm/common/generic.rb

@@ -46 +46 @@
 
         class Revision_History
-          
+          attr_reader :items
+
+          def initialize(items)
+            self.items = items
+          end
+
+          def items=(items)
+            if items.nil? or items.empty?
+              raise ArgumentError, 'item(s) is/are mandatory'
+            end
+            @items  = items
+          end
+
+          def most_recent_version
+            return @items.last.version_id.value
+          end
+
+          def most_recent_version_time_committed
+            return @items.last.audits.first.time_committed.value
+          end
         end # of Revision_History
 
         class Revision_History_Item
-          
+          attr_reader :version_id, :audits
+
+          def initialize(args = { })
+            self.version_id = args[:version_id]
+            self.audits = args[:audits]
+          end
+
+          def audits=(audits)
+            if audits.nil? or audits.empty?
+              raise ArgumentError, 'audits is mandatory'
+            end
+            @audits = audits
+          end
+
+          def version_id=(version_id)
+            raise ArgumentError, 'version_id is mandatory' if version_id.nil?
+            @version_id = version_id
+          end
         end # of Revision_History_Item
 
@@ -137 +173 @@
           end
         end
+
+        class Attestation < Audit_Details
+          attr_reader :reason
+          attr_accessor :proof, :items
+
+          def initialize(args = { })
+            super(args)
+            self.reason = args[:reason]
+            self.proof = args[:proof]
+            self.items = args[:items]
+          end
+
+          def reason=(reason)
+            raise ArgumentError, 'reason is mandatory' if reason.nil?
+            @reason = reason
+          end
+        end
       end # of Generic
     end # of Common

ruby/trunk/lib/models/rm/data_types/quantity/date_time.rb

@@ -11 +11 @@
         module Date_Time
           class DV_Temporal < OpenEHR::RM::Data_Types::Quantity::DV_Absolute_Quantity
+            include Comparable
             attr_reader :value
 
@@ -29 +30 @@
               end
               @value = value
+            end
+
+            def <=>(other)
+              self.magnitude <=> other.magnitude
             end
           end
@@ -151 +156 @@
 
             def magnitude
-              return DateTime.new(@year,@month,@day,@hour,@minute,@second) - 
-                DateTime.new(0000,1,1,0,0,0) + @fractional_second
+              seconds = DateTime.new(@year,@month,@day,@hour,@minute,@second) - 
+                DateTime.new(0000,1,1,0,0,0)
+              if @fractional_second.nil?
+                return seconds
+              else
+                return seconds + @fractional_second
+              end
             end
 

ruby/trunk/lib/models/rm/support/identification.rb

@@ -174 +174 @@
         end
 
+        class Object_Version_ID < UID_Based_ID
+          attr_reader :object_id, :creating_system_id, :version_tree_id
+
+          def initialize(value)
+            super(value)
+          end
+
+          def value=(value)
+            super(value)
+            if /^(\w+)::(\w+)::((\d|\.)+)$/ =~ value
+              self.object_id = UID.new($1)
+              self.creating_system_id = UID.new($2)
+              self.version_tree_id = Version_Tree_ID.new($3)
+            else
+              raise ArgumentError, 'invalid format'
+            end
+          end
+
+          def object_id=(object_id)
+            raise ArgumentError, 'object_id is mandatory' if object_id.nil?
+            @object_id = object_id
+          end
+
+          def creating_system_id=(creating_system_id)
+            if creating_system_id.nil?
+              raise ArgumentError, 'creating_system_id is mandatory'
+            end
+            @creating_system_id = creating_system_id
+          end
+
+          def version_tree_id=(version_tree_id)
+            if version_tree_id.nil?
+              raise ArgumentError, 'version_tree_id is mandatory'
+            end
+            @version_tree_id = version_tree_id
+          end
+        end
+
         class Locatable_Ref < Object_Ref
           attr_reader :namespace, :type, :id, :path
@@ -284 +322 @@
         class ISO_OID <UID
 
-        end
+        end        
       end # of Identification
     end # of Support