Changeset 252 for ruby

Timestamp:

Sep 7, 2009, 8:16:48 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

DvProportion moved test/unit to rspec

File:

• ruby/branches/0.5/lib/open_ehr/rm/data_types/quantity.rb (modified) (4 diffs)

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

@@ -313 +313 @@
           attr_reader :numerator, :denominator, :type, :precision
 
-          def initialize(numerator, denominator, type, precision=nil,
-                         magnitude_status=nil, accuracy=nil,
-                         accuracy_percent=nil, normal_range=nil,
-                         normal_status = nil, other_reference_ranges=nil)
-            self.type = type
-            self.numerator = numerator
-            self.denominator = denominator
-            self.precision = precision
-            self.magnitude_status = magnitude_status
-            unless accuracy.nil?
-              set_accuracy(accuracy, accuracy_percent)
+          def initialize(args = {})
+            self.type = args[:type]
+            self.numerator = args[:numerator]
+            self.denominator = args[:denominator]
+            self.precision = args[:precision]
+            self.magnitude_status =args[:magnitude_status]
+            unless args[:accuracy].nil?
+              set_accuracy(args[:accuracy], args[:accuracy_percent])
             else
               @accuracy, @accuracy_percent = nil, nil
             end
-            self.normal_range = normal_range
-            self.normal_status = normal_status
-            self.other_reference_ranges = other_reference_ranges
+            self.normal_range = args[:normal_range]
+            self.normal_status = args[:normal_status]
+            self.other_reference_ranges = args[:other_reference_ranges]
           end
 
@@ -342 +339 @@
 
           def denominator=(denominator)
-            if denominator.nil? or denominator == PK_RATIO
-              raise ArgumentError, 'denominator invalid'
-            end
-            if (@type == PK_FRACTION || @type == PK_INTEGER_FRACTION) &&
-                !denominator.integer?
-              raise ArgumentError, 'denominator invalid for type'
-            end
-            if @type == PK_UNITARY && denominator != 1
-              raise ArgumentError, 'denominator invalid for type'
-            end
-            if @type == PK_PERCENT && denominator != 100
-              raise ArgumentError, 'denominator invaild for type'
+            case @type
+            when PK_UNITARY
+              unless denominator == 1
+                raise ArgumentError, 'Unitary denominator must be 1'
+              end
+            when PK_PERCENT
+              unless denominator == 100
+                raise ArgumentError, 'Percent denominator must be 100'
+              end
+            when PK_FRACTION, PK_INTEGER_FRACTION
+              unless denominator.integer? and @numerator.integer?
+                raise ArgumentError, 'Fraction numerator/denominator must be integer'
+              end
             end
             @denominator = denominator
@@ -372 +370 @@
           def precision=(precision)
             unless precision.nil?
-              unless precision == 0 || self.is_integral?
-                @precision = precision
-              else
+              if (self.is_integral? && precision !=0)
                 raise ArgumentError, 'precision invalid'
               end
             end
+            @precision = precision
           end
 
@@ -385 +382 @@
 
           def is_strictly_comparable_to?(other)
-            unless other.instance_of?(DvProportion)
+            unless super(other)
               return false
             end