ruby-units 1.0.2 → 1.1.0

data/CHANGELOG.txt

@@ -1,5 +1,9 @@
 Change Log for Ruby-units
 =========================
+2007-01-28  1.1.0   * completely revamped the temperature handling system (see README)
+                    * fixed some spelling errors in some units
+                    * fixed to_datetime and to_date to convert durations to datetimes and dates'
+
 2007-01-24  1.0.2   * Minor changes in the way powers are calculated to support Uncertain 
                       numbers better.
                     * Fixed parsing bug with Uncertain Numbers

data/README.txt

@@ -1,7 +1,5 @@
 =Ruby Units
 
-Version: 1.0.1
-
 Kevin C. Olbrich, Ph.D. 
 kevin.olbrich@gmail.com
 
@@ -139,3 +137,37 @@ works so long as the starting point has an integer scalar
 All Trig math functions (sin, cos, sinh, hypot...) can take a unit as their parameter.  
 It will be converted to radians and then used if possible.
 
+==Temperatures
+Ruby-units makes a distinction between a temperature (which technically is a property) and 
+degrees of temperature (which temperatures are measured in).
+
+Temperature units (i.e., 'tempK') can be converted back and forth, and will take into account 
+the differences in the zero points of the various scales. Differential temperature (e.g., '100 degC'.unit) 
+units behave like most other units.
+
+'37 tempC'.unit >> 'tempF' #=> 98.6 tempF
+
+Ruby-units will raise an exception if you attempt to create a temperature unit that would 
+fall below absolute zero.
+
+Unit math on temperatures is fairly limited.  
+
+'100 tempC'.unit + '10 degC'.unit   #=> '110 tempC'.unit
+'100 tempC'.unit - '10 degC'.unit   #=> '90 tempC'.unit
+'100 tempC'.unit + '50 tempC'.unit  #=> exception 
+'100 tempC'.unit - '50 tempC'.unit  #=> '50 degC'.unit
+'50 tempC'.unit - '100 tempC'.unit  #=> '-50 degC'.unit
+'100 tempC'.unit * [scalar]         #=> '100*scalar tempC'.unit
+'100 tempC'.unit / [scalar]         #=> '100/scalar tempC'.unit
+'100 tempC'.unit * [unit]           #=> exception
+'100 tempC'.unit / [unit]           #=> exception
+'100 tempC'.unit ** N               #=> exception
+
+'100 tempC'.unit >> 'degC'          #=> '100 degC'.unit   
+    This conversion references the 0 point on the scale of the temperature unit 
+
+'100 degC'.unit >> 'tempC'          #=> '-173 tempC'.unit
+    These conversions are always interpreted as being relative to absolute zero.
+    Conversions are probably better done like this...
+    '0 tempC'.unit + '100 degC'.unit #=> '100 tempC'.unit
+

data/lib/ruby_units/ruby-units.rb

@@ -3,18 +3,6 @@ require 'rational'
 require 'date'
 require 'parsedate'
 
-
-=begin
-require 'math'
-
-require 'object_class'
-require 'array_class'
-require 'string_class'
-require 'date_class'
-require 'time_class'
-require 'numeric_class'
-=end
-
 # = Ruby Units
 #
 # Copyright 2006 by Kevin C. Olbrich, Ph.D.
@@ -52,14 +40,14 @@ require 'numeric_class'
 #  Unit.setup
 class Unit < Numeric
   # pre-generate hashes from unit definitions for performance.  
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
   @@USER_DEFINITIONS = {}
   @@PREFIX_VALUES = {}
   @@PREFIX_MAP = {}
   @@UNIT_MAP = {}
   @@UNIT_VALUES = {}
   @@OUTPUT_MAP = {}
-  @@BASE_UNITS = ['<meter>','<kilogram>','<second>','<mole>', '<farad>', '<ampere>','<radian>','<kelvin>','<byte>','<dollar>','<candela>','<each>','<steradian>','<decibel>']
+  @@BASE_UNITS = ['<meter>','<kilogram>','<second>','<mole>', '<farad>', '<ampere>','<radian>','<kelvin>','<temp-K>','<byte>','<dollar>','<candela>','<each>','<steradian>','<decibel>']
   UNITY = '<1>'
   UNITY_ARRAY= [UNITY]
   FEET_INCH_REGEX = /(\d+)\s*(?:'|ft|feet)\s*(\d+)\s*(?:"|in|inches)/
@@ -76,9 +64,9 @@ class Unit < Numeric
   COMPLEX_REGEX = /#{COMPLEX_NUMBER}\s?(.+)?/
   RATIONAL_REGEX = /#{RATIONAL_NUMBER}\s?(.+)?/
   KELVIN = ['<kelvin>']
-  FARENHEIT = ['<farenheit>']
+  FAHRENHEIT = ['<fahrenheit>']
   RANKINE = ['<rankine>']
-  CELCIUS = ['<celcius>']
+  CELSIUS = ['<celsius>']
 
   SIGNATURE_VECTOR = [:length, :time, :temperature, :mass, :current, :substance, :luminosity, :currency, :memory, :angle, :capacitance]
   @@KINDS = {
@@ -224,7 +212,6 @@ class Unit < Numeric
       return
     end
     
-    
     case options[0]
     when Hash:
       @scalar = options[0][:scalar] || 1
@@ -251,7 +238,8 @@ class Unit < Numeric
       raise ArgumentError, "Invalid Unit Format"
     end
     self.update_base_scalar
-    self.replace_temperature
+    raise ArgumentError, "Temperature out of range" if self.is_temperature? &&  self.base_scalar < 0
+  
 
     unary_unit = self.units || ""
     opt_units = options[0].scan(NUMBER_REGEX)[0][1] if String === options[0]
@@ -290,7 +278,7 @@ class Unit < Numeric
   # Returns 'true' if the Unit is represented in base units
   def is_base?
     return @is_base if defined? @is_base
-    return @is_base=true if @signature == 400 && @numerator.size == 1 && @numerator[0] =~ /(celcius|kelvin|farenheit|rankine)/
+    return @is_base=true if @signature == 400 && self.numerator.size == 1 && self.denominator == UNITY_ARRAY && self.units =~ /(deg|temp)K/
     n = @numerator + @denominator
     for x in n.compact do 
       return @is_base=false unless x == UNITY || (@@BASE_UNITS.include?((x)))
@@ -302,9 +290,18 @@ class Unit < Numeric
   # results of the conversion are cached so subsequent calls to this will be fast
   def to_base
     return self if self.is_base?
-    cached = @@base_unit_cache[self.units] * self.scalar rescue nil
+     if self.units =~ /\A(deg|temp)(C|F|K|C)\Z/
+      @signature = 400
+      base = case self.units
+      when /temp/ : self.to('tempK')
+      when /deg/ : self.to('degK')
+      end
+      return base
+    end
+
+    cached = ((@@base_unit_cache[self.units] * self.scalar) rescue nil)
     return cached if cached
-    
+   
     num = []
     den = []
     q = 1
@@ -385,6 +382,16 @@ class Unit < Numeric
     self.to_s
   end
   
+  def is_temperature?
+    return true if self.signature == 400 && self.units =~ /temp/
+  end
+  
+  def temperature_scale
+    return nil unless self.is_temperature?
+    self.units =~ /temp(C|F|R|K)/
+    "deg#{$1}"
+  end
+  
   # returns true if no associated units
   # false, even if the units are "unitless" like 'radians, each, etc'
   def unitless?
@@ -449,8 +456,18 @@ class Unit < Numeric
       case
       when self.zero? : other.dup
       when self =~ other :
-        @q ||= @@cached_units[self.units].scalar / @@cached_units[self.units].base_scalar
-        Unit.new(:scalar=>(self.base_scalar + other.base_scalar)*@q, :numerator=>@numerator, :denominator=>@denominator, :signature => @signature)
+        raise ArgumentError, "Cannot add two temperatures" if (self.is_temperature? && other.is_temperature?)
+        if [self, other].any? {|x| x.is_temperature?}
+          case self.is_temperature?
+          when true:
+            Unit.new(:scalar => (self.scalar + other.to(self.temperature_scale).scalar), :numerator => @numerator, :denominator=>@denominator, :signature => @signature)
+          else
+            Unit.new(:scalar => (other.scalar + self.to(other.temperature_scale).scalar), :numerator => other.numerator, :denominator=>other.denominator, :signature => other.signature)
+          end
+        else
+          @q ||= ((@@cached_units[self.units].scalar / @@cached_units[self.units].base_scalar) rescue (self.units.unit.to_base.scalar))
+          Unit.new(:scalar=>(self.base_scalar + other.base_scalar)*@q, :numerator=>@numerator, :denominator=>@denominator, :signature => @signature)
+        end
       else
          raise ArgumentError,  "Incompatible Units ('#{self}' not compatible with '#{other}')"
       end
@@ -469,8 +486,17 @@ class Unit < Numeric
     case
       when self.zero? : -other.dup
       when self =~ other :
-        @q ||= @@cached_units[self.units].scalar / @@cached_units[self.units].base_scalar
-        Unit.new(:scalar=>(self.base_scalar - other.base_scalar)*@q, :numerator=>@numerator, :denominator=>@denominator, :signature=>@signature)
+        case
+          when [self, other].all? {|x| x.is_temperature?} : 
+            Unit.new(:scalar => (self.base_scalar - other.base_scalar), :numerator  => KELVIN, :denominator => UNITY_ARRAY, :signature => @signature).to(self.temperature_scale) 
+          when self.is_temperature? :
+            Unit.new(:scalar => (self.base_scalar - other.base_scalar), :numerator  => ['<temp-K>'], :denominator => UNITY_ARRAY, :signature => @signature).to(self) 
+          when other.is_temperature? :
+            raise ArgumentError, "Cannot subtract a temperature from a differential unit"
+          else
+            @q ||= ((@@cached_units[self.units].scalar / @@cached_units[self.units].base_scalar) rescue (self.units.unit.scalar/self.units.unit.to_base.scalar))
+            Unit.new(:scalar=>(self.base_scalar - other.base_scalar)*@q, :numerator=>@numerator, :denominator=>@denominator, :signature=>@signature)            
+        end
       else
          raise ArgumentError,  "Incompatible Units ('#{self}' not compatible with '#{other}')"
       end
@@ -486,6 +512,7 @@ class Unit < Numeric
   def *(other)
     case other
     when Unit
+      raise ArgumentError, "Cannot multiply by temperatures" if [other,self].any? {|x| x.is_temperature?}
       opts = Unit.eliminate_terms(@scalar*other.scalar, @numerator + other.numerator ,@denominator + other.denominator)
       opts.merge!(:signature => @signature + other.signature)
       Unit.new(opts)      
@@ -503,6 +530,7 @@ class Unit < Numeric
     case other
     when Unit 
       raise ZeroDivisionError if other.zero?
+      raise ArgumentError, "Cannot divide with temperatures" if [other,self].any? {|x| x.is_temperature?}
       opts = Unit.eliminate_terms(@scalar/other.scalar, @numerator + other.denominator ,@denominator + other.numerator)
       opts.merge!(:signature=> @signature - other.signature)
       Unit.new(opts)      
@@ -524,6 +552,7 @@ class Unit < Numeric
   #
   # For now, if a rational is passed in, it will be used, otherwise we are stuck with integers and certain floats < 1
   def **(other)
+    raise ArgumentError, "Cannot exponentiate a temperature" if self.is_temperature?
     if Numeric === other
       return Unit("1") if other.zero?
       return self if other == 1
@@ -546,6 +575,7 @@ class Unit < Numeric
 
   # returns the unit raised to the n-th power.  Integers only
   def power(n)
+    raise ArgumentError, "Cannot raise a temperature to a power" if self.is_temperature?
     raise ArgumentError, "Can only use Integer exponenents" unless Integer === n
     return self if n == 1
     return Unit("1") if n == 0
@@ -560,6 +590,7 @@ class Unit < Numeric
   # Calculates the n-th root of a unit, where n = (1..9)
   # if n < 0, returns 1/unit^(1/n)
   def root(n)
+    raise ArgumentError, "Cannot take the root of a temperature" if self.is_temperature?
     raise ArgumentError, "Exponent must an Integer" unless Integer === n
     raise ArgumentError, "0th root undefined" if n == 0
     return self if n == 1
@@ -602,7 +633,7 @@ class Unit < Numeric
   #
   # Special handling for temperature conversions is supported.  If the Unit object is converted
   # from one temperature unit to another, the proper temperature offsets will be used.
-  # Supports Kelvin, Celcius, Farenheit, and Rankine scales.
+  # Supports Kelvin, Celcius, fahrenheit, and Rankine scales.
   #
   # Note that if temperature is part of a compound unit, the temperature will be treated as a differential
   # and the units will be scaled appropriately.
@@ -610,45 +641,63 @@ class Unit < Numeric
     return self if other.nil? 
     return self if TrueClass === other
     return self if FalseClass === other
-    if (Unit === other && other.units =~ /temp(K|C|R|F)/) || (String === other && other =~ /temp(K|C|R|F)/) 
-      raise ArgumentError, "Receiver is not a temperature unit" unless self.signature==400 
+    if (Unit === other && other.is_temperature?) || (String === other && other =~ /temp(K|C|R|F)/) 
+      raise ArgumentError, "Receiver is not a temperature unit" unless self.signature == 400 
       start_unit = self.units
       target_unit = other.units rescue other
+      unless @base_scalar
+        @base_scalar = case start_unit
+          when 'tempC' : @scalar + 273.15
+          when 'tempK' : @scalar
+          when 'tempF' : (@scalar+459.67)*(5.0/9.0)
+          when 'tempR' : @scalar*(5.0/9.0)
+        end
+      end
+      q=  case target_unit
+            when 'tempC'  : @base_scalar - 273.15
+            when 'tempK'  : @base_scalar 
+            when 'tempF'  : @base_scalar * (9.0/5.0) - 459.67
+            when 'tempR'  : @base_scalar * (9.0/5.0) 
+          end
+        
+=begin
       q=case start_unit
-         when 'degC':
+         when /\A(temp|deg)C\Z/:
           case target_unit
             when 'tempC'  : @scalar
             when 'tempK'  : @scalar + 273.15
             when 'tempF'  : @scalar * (9.0/5.0) + 32.0
             when 'tempR'  : @scalar * (9.0/5.0) + 491.67
           end
-        when 'degK':
+        when /\A(temp|deg)K\Z/:
           case target_unit
             when 'tempC'  : @scalar - 273.15
             when 'tempK'  : @scalar 
             when 'tempF'  : @scalar * (9.0/5.0) - 459.67
             when 'tempR'  : @scalar * (9.0/5.0) 
           end
-        when 'degF':
+        when /\A(temp|deg)F\Z/:
           case target_unit
             when 'tempC'  : (@scalar-32)*(5.0/9.0)
             when 'tempK'  : (@scalar+459.67)*(5.0/9.0)
             when 'tempF'  : @scalar 
             when 'tempR'  : @scalar  + 459.67
           end
-        when 'degR':
+        when /\A(temp|deg)R\Z/:
           case target_unit
             when 'tempC'  : @scalar*(5.0/9.0) -273.15
             when 'tempK'  : @scalar*(5.0/9.0)
             when 'tempF'  : @scalar - 459.67
             when 'tempR'  : @scalar
           end
+
         else
           return self.to_base.to(other) unless self.is_base?
           #raise ArgumentError, "Unknown temperature conversion requested #{self.numerator}"
       end
-      target_unit =~ /temp(C|K|F|R)/
-      Unit.new("#{q} deg#{$1}")
+=end
+      #target_unit =~ /temp(C|K|F|R)/
+      Unit.new("#{q} #{target_unit}")
     else
        case other
           when Unit: 
@@ -726,9 +775,9 @@ class Unit < Numeric
   
   # negates the scalar of the Unit
   def -@
+    #raise ArgumentError, "Cannot negate an absolute temperature" if self.is_temperature? && ['degK','degR'].include?(self.temperature_scale)
     return -@scalar if self.unitless?
-    #Unit.new(-@scalar,@numerator,@denominator)    
-    -1 * self.dup
+    self.dup * -1
   end
   
   # returns abs of scalar, without the units
@@ -767,7 +816,11 @@ class Unit < Numeric
   # convert a duration to a DateTime.  This will work so long as the duration is the duration from the zero date
   # defined by DateTime
   def to_datetime
-    DateTime.new(self.to('d').scalar)
+    DateTime.new0(self.to('d').scalar)
+  end
+  
+  def to_date
+    Date.new0(self.to('d').scalar)
   end
   
   def round
@@ -892,20 +945,6 @@ class Unit < Numeric
       end
       vector
   end
-  
-  def replace_temperature
-    return self unless self.kind == :temperature && self.units =~ /temp(R|K|F|C)/
-    un = $1
-    @numerator = case un
-      when 'R' : RANKINE
-      when 'C' : CELCIUS
-      when 'F' : FARENHEIT
-      when 'K' : KELVIN
-    end
-    @unit_name = nil
-    r= self.to("tempK")
-    copy(r)
-  end
     
   private
   

data/lib/ruby_units/units.rb

@@ -39,7 +39,7 @@ UNIT_DEFINITIONS = {
   '<inch>'  =>  [%w{in inch inches "}, 0.0254, :length, %w{<meter>}],
   '<foot>'  =>  [%w{ft foot feet '}, 0.3048, :length, %w{<meter>}],
   '<yard>'  =>  [%w{yd yard yards}, 0.9144, :length, %w{<meter>}],
-  '<mile>'  =>  [%w{mi mile miles "}, 1609.344, :length, %w{<meter>}],
+  '<mile>'  =>  [%w{mi mile miles}, 1609.344, :length, %w{<meter>}],
   '<naut-mile>' => [%w{nmi}, 1852, :length, %w{<meter>}],
   '<league>'=>  [%w{league leagues}, 4828, :length, %w{<meter>}],
   '<furlong>'=> [%w{furlong furlongs}, 201.2, :length, %w{<meter>}],
@@ -93,14 +93,14 @@ UNIT_DEFINITIONS = {
   '<gee>' => [%w{gee}, 9.80655, :acceleration, %w{<meter>}, %w{<second> <second>}],
 
   #temperature_difference
-  '<kelvin>' => [%w{degK kelvin Kelvin}, 1.0, :temperature, %w{<kelvin>}],
-  '<celcius>' => [%w{degC celcius Celcius}, 1.0, :temperature, %w{<kelvin>}],
-  '<farenheit>' => [%w{degF farenheit Farenheit}, 1.8, :temperature, %w{<kelvin>}],
-  '<rankine>' => [%w{degR rankine Rankine}, 1.8, :temperature, %w{<kelvin>}],
-  '<temp-K>'  => [%w{tempK}, 1.0, :temperature, %w{<kelvin>}],
-  '<temp-C>'  => [%w{tempC}, 1.0, :temperature, %w{<kelvin>}],
-  '<temp-F>'  => [%w{tempF}, 1.0, :temperature, %w{<kelvin>}],
-  '<temp-R>'  => [%w{tempR}, 1.0, :temperature, %w{<kelvin>}],
+  '<kelvin>' => [%w{degK kelvin}, 1.0, :temperature, %w{<kelvin>}],
+  '<celsius>' => [%w{degC celsius celsius centigrade}, 1.0, :temperature, %w{<kelvin>}],
+  '<fahrenheit>' => [%w{degF fahrenheit}, 1/1.8, :temperature, %w{<kelvin>}],
+  '<rankine>' => [%w{degR rankine}, 1/1.8, :temperature, %w{<kelvin>}],
+  '<temp-K>'  => [%w{tempK}, 1.0, :temperature, %w{<temp-K>}],
+  '<temp-C>'  => [%w{tempC}, 1.0, :temperature, %w{<temp-K>}],
+  '<temp-F>'  => [%w{tempF}, 1/1.8, :temperature, %w{<temp-K>}],
+  '<temp-R>'  => [%w{tempR}, 1/1.8, :temperature, %w{<temp-K>}],
   
   #time
   '<second>'=>  [%w{s sec second seconds}, 1.0, :time, %w{<second>}],

data/test/test_ruby-units.rb

@@ -9,7 +9,7 @@ require 'chronic'
 
 class Unit < Numeric
   @@USER_DEFINITIONS = {'<inchworm>' =>  [%w{inworm inchworm}, 0.0254, :length, %w{<meter>} ],
-                        '<habenero>'   => [%{degH}, 100, :temperature, %w{<celcius>}]}
+                        '<habenero>'   => [%{degH}, 100, :temperature, %w{<celsius>}]}
   Unit.setup
 end
 
@@ -106,6 +106,7 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_equal @april_fools.unit.to_time, @april_fools
     assert_equal Time.in('1 day'), @april_fools + 86400
     assert_equal @april_fools_datetime.inspect, "2006-04-01T12:00:00Z"
+    assert_equal '2453826.5 days'.unit.to_datetime.to_s, "2006-04-01T00:00:00Z"
   end
   
   def test_string_helpers
@@ -565,60 +566,40 @@ class TestRubyUnits < Test::Unit::TestCase
   end
   
   def test_temperature_conversions
-    assert_in_delta '0 tempC'.unit.scalar, '273.15 degK'.unit.scalar, 0.01
-    assert_in_delta '0 tempF'.unit.scalar, '255.37 degK'.unit.scalar, 0.01
-    assert_in_delta '0 tempK'.unit.scalar, '0 degK'.unit.scalar, 0.01
-    assert_in_delta '0 tempR'.unit.scalar, '0 degK'.unit.scalar, 0.01
-
-    unit1 = Unit.new("37 degC")
-    unit2 = unit1 >> "tempF"
-    assert_in_delta 98.6, unit2.scalar, 0.1
-    unit2 = unit1 >> "tempK"
-    assert_in_delta 310.15, unit2.scalar, 0.01
-    unit2 = unit1 >> "tempR"
-    assert_in_delta 558.27, unit2.scalar, 0.01
-    unit3 = Unit.new("1 J/degC")
-    assert_in_delta 1, (unit3 >> "J/degK").scalar, 0.01
-    
-    unit1 = Unit.new("98.6 degF")
-    unit2 = unit1 >> "tempC"
-    assert_in_delta 37, unit2.scalar, 0.1
-    unit2 = unit1 >> "tempK"
-    assert_in_delta 310.15, unit2.scalar, 0.01
-    unit2 = unit1 >> "tempR"
-    assert_in_delta 558.27, unit2.scalar, 0.01
-    unit3 = Unit.new("1 J/degC")
-    assert_in_delta 1, (unit3 >> "J/degK").scalar, 0.01
+    assert_raises(ArgumentError) { '-1 tempK'.unit}
+    assert_raises(ArgumentError) { '-1 tempR'.unit}
+    assert_raises(ArgumentError) { '-1000 tempC'.unit}
+    assert_raises(ArgumentError) { '-1000 tempF'.unit}
     
-    unit1 = Unit.new("310.15 degK")
-    unit2 = unit1 >> "tempF"
-    assert_in_delta 98.6, unit2.scalar, 0.1
-    unit2 = unit1 >> "tempC"
-    assert_in_delta 37, unit2.scalar, 0.01
-    unit2 = unit1 >> "tempR"
-    assert_in_delta 558.27, unit2.scalar, 0.01
-    unit3 = Unit.new("1 J/degC")
-    assert_in_delta 1, (unit3 >> "J/degK").scalar, 0.01
+    assert_equal '0 tempC'.unit, '32 tempF'.unit
+    assert_equal '0 tempC'.unit, '273.15 tempK'.unit
+    assert_in_delta '0 tempC'.unit.base_scalar, '491.67 tempR'.unit.base_scalar, 0.01
     
-    unit1 = Unit.new("558.27 degR")
-    unit2 = unit1 >> "tempC"
-    assert_in_delta 37, unit2.scalar, 0.1
-    unit2 = unit1 >> "tempK"
-    assert_in_delta 310.15, unit2.scalar, 0.01
-    unit2 = unit1 >> "tempF"
-    assert_in_delta 98.6, unit2.scalar, 0.01
-    assert_in_delta 558.27, unit1.to("tempR").scalar, 0.01
-    unit3 = Unit.new("1 J/degC")
-    assert_in_delta 1, (unit3 >> "J/degK").scalar, 0.01
+    a = '10 degC'.unit
+    assert_equal a >> 'tempC', '-263.15 tempC'.unit
+    assert_equal a >> 'tempK', '10 tempK'.unit
+    assert_equal a >> 'tempR', '18 tempR'.unit
+    assert_equal a >> 'tempF', '-441.67 tempF'.unit
     
-    # round trip conversions
-    unit1 = Unit "37 degC"
-    unit2 = unit1 >> "degF" >> 'degK' >> 'degR' >> 'degC'
-    assert_equal unit2, unit1
-
-    unit1 = Unit "37 degC"
+    unit1 = '37 tempC'.unit
     unit2 = unit1 >> "tempF" >> 'tempK' >> 'tempR' >> 'tempC'
-    assert_equal unit2, unit1
+    assert_equal unit1 >> 'tempF' >> 'tempK' >> 'tempR' >> 'tempC', unit1
+    
+    a = '100 tempF'.unit
+    b = '10 degC'.unit
+    c = '50 tempF'.unit
+    d = '18 degF'.unit
+    assert_equal a+b, '118 tempF'.unit
+    assert_equal b+a, '118 tempF'.unit
+    assert_equal a-b, '82 tempF'.unit
+    assert_in_delta (a-c).scalar, '50 degF'.unit.scalar, 0.01
+    assert_equal b+d, '20 degC'.unit
+    
+    assert_raises(ArgumentError) { a * b }
+    assert_raises(ArgumentError) { a / b }
+    assert_raises(ArgumentError) { a ** 2 }
+    assert_raises(ArgumentError) { c - '400 degK'.unit}
+    assert_equal a, a.to('tempF')
   end
   
   def test_feet
@@ -702,8 +683,8 @@ class TestRubyUnits < Test::Unit::TestCase
     v = Unit "1 m^3"
     n = Unit "1 mole"
     r = Unit "8.31451 J/mol*degK"
-    t = ((p*v)/(n*r)).to("tempF")
-    assert_in_delta 21189.2,t.scalar, 0.1
+    t = ((p*v)/(n*r)).to('tempK')
+    assert_in_delta 12027.16,t.base_scalar, 0.1
   end
   
   

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.1
 specification_version: 1
 name: ruby-units
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2007-01-24 00:00:00 -05:00
+  version: 1.1.0
+date: 2007-01-28 00:00:00 -05:00
 summary: A model that performs unit conversions and unit math
 require_paths: 
 - lib