Changeset 308 for ruby/branches

Timestamp:

Sep 28, 2009, 8:16:41 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

feeder_audit_details completed

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/common/archetyped.rb (modified) (2 diffs)
• lib/open_ehr/rm/data_types/quantity.rb (modified) (3 diffs)
• lib/open_ehr/rm/data_types/quantity/date_time.rb (modified) (8 diffs)
• spec/lib/open_ehr/rm/common/archetyped/feeder_audit_details_spec.rb (added)

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

@@ -161 +161 @@
           attr_accessor :provider, :location, :time, :subject, :version_id
 
-          def initialize(args ={ })
+          def initialize(args = { })
             self.system_id = args[:system_id]
             self.provider = args[:provider]
@@ -171 +171 @@
 
           def system_id=(system_id)
-            raise ArgumentError, 'system_id invalid' if system_id.nil? or system_id.empty?
+            if system_id.nil? or system_id.empty?
+              raise ArgumentError, 'system_id invalid'
+            end
             @system_id = system_id
           end

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

@@ -151 +151 @@
           def add(a_diff)
             type_check(a_diff)
-            return result_builder(DvAbsoluteQuantity,
+            return result_builder(self.class,
                                   @magnitude+a_diff.magnitude)
           end
@@ -157 +157 @@
           def diff(other)
             type_check(other)
-            return result_builder(DvAmount,
+            return result_builder(self.class,
                                   (@magnitude-other.magnitude).abs)
           end
@@ -163 +163 @@
           def subtract(a_diff)
             type_check(a_diff)
-            return result_builder(DvAbsoluteQuantity,
+            return result_builder(self.class,
                                   @magnitude-a_diff.magnitude)
           end

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

@@ -4 +4 @@
 #require 'assumed_library_types'
 require 'date'
-
-module OpenEhr
+include OpenEHR::RM::DataTypes::Quantity
+
+module OpenEHR
   module RM
     module DataTypes
       module Quantity
         module DateTime
-          class DvTemporal < OpenEhr::RM::DataTypes::Quantity::DvAbsoluteQuantity
+          class DvTemporal < DvAbsoluteQuantity
             include Comparable
-            attr_reader :value
-
-            def initialize(value, magnitude_status=nil, accuracy=nil,
-                         normal_range=nil, normal_status=nil,
-                         other_reference_ranges=nil)
-              self.value = value
-              self.magnitude_status = magnitude_status
-              self.accuracy = accuracy
-              self.normal_range = normal_range
-              self.normal_status = normal_status
-              self.other_reference_ranges = other_reference_ranges
-            end
 
             def value=(value)
@@ -31 +20 @@
               @value = value
             end
-
-            def <=>(other)
-              self.magnitude <=> other.magnitude
-            end
           end
 
           class DvDate < DvTemporal
-            include OpenEhr::AssumedLibraryTypes::ISO8601_DATE_MODULE
+            include OpenEHR::AssumedLibraryTypes::ISO8601DateModule
 
             DAYS_IN_MONTH = [0,31,28,31,30,31,30,31,31,30,31,30,31]
@@ -98 +83 @@
           
           class DvTime < DvTemporal
-            include OpenEhr::AssumedLibraryTypes::ISO8601_TIME_MODULE
+            include OpenEHR::AssumedLibraryTypes::ISO8601TimeModule
             def initialize(value, magnitude_status=nil, accuracy=nil,
                            normal_range=nil, normal_status=nil,
@@ -108 +93 @@
             def value=(value)
               super(value)
-              iso8601_time = AssumedLibraryTypes::ISO8601_TIME.new(value)
+              iso8601_time = AssumedLibraryTypes::ISO8601Time.new(value)
               @hour = iso8601_time.hour
               @minute = iso8601_time.minute
@@ -132 +117 @@
 
           class DvDateTime < DvTemporal
-            include OpenEhr::AssumedLibraryTypes::ISO8601_DATE_TIME_MODULE
+            include OpenEHR::AssumedLibraryTypes::ISO8601DateTimeModule
             attr_reader :value
 
@@ -144 +129 @@
             def value=(value)              
               super(value)
-              iso8601date_time = AssumedLibraryTypes::ISO8601_DATE_TIME.new(value)
+              iso8601date_time = AssumedLibraryTypes::ISO8601DateTime.new(value)
               self.year = iso8601date_time.year
               self.month = iso8601date_time.month
@@ -202 +187 @@
 
           class DvDuration < DvAmount
-            include AssumedLibraryTypes::ISO8601_DURATION_MODULE
+            include AssumedLibraryTypes::ISO8601DurationModule
             attr_reader :value
             
@@ -214 +199 @@
               raise ArgumentError, 'value must be not nil' if value.nil?
               @value = value
-              iso8601_duration = AssumedLibraryTypes::ISO8601_DURATION.new(value)
+              iso8601_duration = AssumedLibraryTypes::ISO8601Duration.new(value)
               self.years = iso8601_duration.years
               self.months = iso8601_duration.months