ruby-units 1.1.5 → 1.2.0.a

data/CHANGELOG.txt

@@ -1,5 +1,7 @@
 Change Log for Ruby-units
 =========================
+2010-11-07  1.2.0.a * a bunch of fixes to make ruby-units ruby 1.9 compatible
+                      (ruby 1.9.3dev (2010-11-07 trunk 29711) [i386-darwin9.8.0])
 2010-03-16  1.1.5   * another bugfix, and update url to point to github
 2010-03-15  1.1.4   * fixed a couple of outstanding bugs
 2007-12-13  1.1.3   * fixed a minor bug with string %

data/lib/ruby-units.rb

@@ -2,10 +2,10 @@ require 'ruby_units/array'
 require 'ruby_units/date'
 require 'ruby_units/time'
 require 'ruby_units/math'
+require 'ruby_units/complex'
 require 'ruby_units/numeric'
 require 'ruby_units/object'
 require 'ruby_units/string'
-require 'ruby_units/complex'
 require 'ruby_units/units'
 require 'ruby_units/ruby-units'
 

data/lib/ruby_units.rb

@@ -2,10 +2,10 @@ require 'ruby_units/array'
 require 'ruby_units/date'
 require 'ruby_units/time'
 require 'ruby_units/math'
+require 'ruby_units/complex'
 require 'ruby_units/numeric'
 require 'ruby_units/object'
 require 'ruby_units/string'
-require 'ruby_units/complex'
 require 'ruby_units/units'
 require 'ruby_units/ruby-units'
 

data/lib/ruby_units/complex.rb

@@ -1,7 +1,7 @@
 class Complex < Numeric
   def to_unit(other = nil)
     real_unit = self.real.to_unit
-    image_unit = self.image.to_unit
+    image_unit = self.imaginary.to_unit
     raise ArgumentError, 'Units on real and imaginary parts are incompatible' unless real_unit =~ image_unit 
     final_unit = (real_unit.units.empty? ? image_unit.units : real_unit.units).to_unit
     final_unit * Complex(real_unit.to(final_unit).scalar, image_unit.to(final_unit).scalar)

data/lib/ruby_units/date.rb

@@ -7,10 +7,11 @@ class Date
   alias :unit_date_add :+
   def +(unit)
     case unit
-    when Unit:
+    when Unit
       unit = unit.to('d').round if ['y', 'decade', 'century'].include? unit.units 
       unit_date_add(unit.to('day').scalar)
-    when Time: unit_date_add(unit.to_datetime)
+    when Time
+      unit_date_add(unit.to_datetime)
     else
       unit_date_add(unit)
     end
@@ -20,10 +21,11 @@ class Date
   alias :unit_date_sub :-    
   def -(unit)
     case unit
-    when Unit: 
+    when Unit 
       unit = unit.to('d').round if ['y', 'decade', 'century'].include? unit.units 
       unit_date_sub(unit.to('day').scalar)
-    when Time: unit_date_sub(unit.to_datetime)
+    when Time
+      unit_date_sub(unit.to_datetime)
     else
       unit_date_sub(unit)
     end
@@ -34,8 +36,10 @@ class Date
   end
   alias :unit :to_unit
   
-  def to_time
-    Time.local(*ParseDate.parsedate(self.to_s))
+  unless Date.instance_methods.include?(:to_time)
+    def to_time
+      Time.local(*ParseDate.parsedate(self.to_s))
+    end
   end
   
   alias :units_datetime_inspect :inspect
@@ -44,8 +48,10 @@ class Date
     self.to_s
   end
   
-  def to_date
-    Date.civil(self.year, self.month, self.day)
+  unless Date.instance_methods.include?(:to_date)
+    def to_date
+      Date.civil(self.year, self.month, self.day)
+    end
   end
   
 end

data/lib/ruby_units/math.rb

@@ -1,47 +1,76 @@
 # Math will convert unit objects to radians and then attempt to use the value for 
 # trigonometric functions.  
+require 'mathn'
 
 module Math
-  alias unit_sqrt sqrt
+
+  alias :unit_sqrt :sqrt
   def sqrt(n)
     if Unit === n
-      (n**(1/2)).to_unit 
+      (n**(Rational(1,2))).to_unit 
     else
       unit_sqrt(n)
     end
   end
+  module_function :unit_sqrt
+  module_function :sqrt
+
+  if self.respond_to?(:cbrt)
+    alias :unit_cbrt :cbrt
+    def cbrt(n)
+      if Unit === n
+        (n**(Rational(1,3))).to_unit 
+      else
+        unit_cbrt(n)
+      end
+    end
+    module_function :unit_cbrt
+    module_function :cbrt
+  end
   
-  alias unit_sin sin
+  alias :unit_sin :sin
   def sin(n)
    Unit === n ? unit_sin(n.to('radian').scalar) : unit_sin(n)
   end
+  module_function :unit_sin
+  module_function :sin
 
-  alias unit_cos cos
+  alias :unit_cos :cos
   def cos(n)
     Unit === n ? unit_cos(n.to('radian').scalar) : unit_cos(n)
   end
+  module_function :unit_cos
+  module_function :cos
     
-  alias unit_sinh sinh
+  alias :unit_sinh :sinh
   def sinh(n)
     Unit === n ? unit_sinh(n.to('radian').scalar) : unit_sinh(n)
   end
+  module_function :unit_sinh
+  module_function :sinh
 
-  alias unit_cosh cosh
+  alias :unit_cosh :cosh
   def cosh(n)
     Unit === n ? unit_cosh(n.to('radian').scalar) : unit_cosh(n)
   end
+  module_function :unit_cosh
+  module_function :cosh
 
-  alias unit_tan tan
+  alias :unit_tan :tan
   def tan(n)
    Unit === n ? unit_tan(n.to('radian').scalar) : unit_tan(n)
   end
+  module_function :tan
+  module_function :unit_tan
 
-  alias unit_tanh tanh
+  alias :unit_tanh :tanh
   def tanh(n)
     Unit === n ? unit_tanh(n.to('radian').scalar) : unit_tanh(n)
   end
+  module_function :unit_tanh
+  module_function :tanh
 
-  alias unit_hypot hypot
+  alias :unit_hypot :hypot
   # Convert parameters to consistent units and perform the function
   def hypot(x,y)
     if Unit === x && Unit === y
@@ -50,38 +79,23 @@ module Math
       unit_hypot(x,y)
     end
   end
+  module_function :unit_hypot
+  module_function :hypot
   
-  alias unit_atan2 atan2
+  alias :unit_atan2 :atan2
   def atan2(x,y)
     case
     when (Unit === x && Unit === y) && (x !~ y)
       raise ArgumentError, "Incompatible Units"
     when (Unit === x && Unit === y) && (x =~ y)
-      unit_atan2(x.base_scalar, y.base_scalar)
+      Math::unit_atan2(x.base_scalar, y.base_scalar)
     when (Unit === x || Unit === y)
       raise ArgumentError, "Incompatible Units"
     else
-      unit_atan2(x,y)
+      Math::unit_atan2(x,y)
     end
   end
-
-   module_function :unit_hypot
-   module_function :hypot
-   module_function :unit_sqrt
-   module_function :sqrt
-   module_function :unit_sin
-   module_function :sin
-   module_function :unit_cos
-   module_function :cos
-   module_function :unit_sinh
-   module_function :sinh
-   module_function :unit_cosh
-   module_function :cosh
-   module_function :unit_tan
-   module_function :tan
-   module_function :unit_tanh
-   module_function :tanh
-   module_function :unit_atan2
-   module_function :atan2
+  module_function :unit_atan2
+  module_function :atan2
    
-end
+end

data/lib/ruby_units/ruby-units.rb

@@ -1,11 +1,11 @@
-require 'mathn'
-require 'rational'
 require 'date'
-require 'parsedate'
-
+if RUBY_VERSION < "1.9"
+  require 'parsedate'
+  require 'rational'
+end
 # = Ruby Units
 #
-# Copyright 2006 by Kevin C. Olbrich, Ph.D.
+# Copyright 2006-2010 by Kevin C. Olbrich, Ph.D.
 # 
 # See http://rubyforge.org/ruby-units/
 #
@@ -40,7 +40,7 @@ require 'parsedate'
 #  Unit.setup
 class Unit < Numeric
   # pre-generate hashes from unit definitions for performance.  
-  VERSION = '1.1.5'
+  VERSION = '1.2.0.a'
   @@USER_DEFINITIONS = {}
   @@PREFIX_VALUES = {}
   @@PREFIX_MAP = {}
@@ -133,12 +133,11 @@ class Unit < Numeric
       @@OUTPUT_MAP[key]=value[0][0]        
     end
     @@PREFIX_REGEX = @@PREFIX_MAP.keys.sort_by {|prefix| [prefix.length, prefix]}.reverse.join('|')
-    @@UNIT_REGEX = @@UNIT_MAP.keys.sort_by {|unit| [unit.length, unit]}.reverse.join('|')
+    @@UNIT_REGEX = @@UNIT_MAP.keys.sort_by {|unit_name| [unit_name.length, unit]}.reverse.join('|')
     @@UNIT_MATCH_REGEX = /(#{@@PREFIX_REGEX})*?(#{@@UNIT_REGEX})\b/    
     Unit.new(1)
   end
   
-  
   include Comparable
   attr_accessor :scalar, :numerator, :denominator, :signature, :base_scalar, :base_numerator, :base_denominator, :output, :unit_name
 
@@ -164,11 +163,13 @@ class Unit < Numeric
   
   # basically a copy of the basic to_yaml.  Needed because otherwise it ends up coercing the object to a string
   # before YAML'izing it.
-  def to_yaml( opts = {} )
-    YAML::quick_emit( object_id, opts ) do |out|
-      out.map( taguri, to_yaml_style ) do |map|
-        for m in to_yaml_properties do 
-          map.add( m[1..-1], instance_variable_get( m ) )
+  if RUBY_VERSION < "1.9"
+    def to_yaml( opts = {} )
+      YAML::quick_emit( object_id, opts ) do |out|
+        out.map( taguri, to_yaml_style ) do |map|
+          for m in to_yaml_properties do 
+            map.add( m[1..-1], instance_variable_get( m ) )
+          end
         end
       end
     end
@@ -202,6 +203,8 @@ class Unit < Numeric
       return
     end
     if options.size == 3
+      options[1] = options[1].join if options[1].kind_of?(Array)
+      options[2] = options[2].join if options[2].kind_of?(Array)
       begin
         cached = @@cached_units["#{options[1]}/#{options[2]}"] * options[0] 
         copy(cached)
@@ -212,28 +215,28 @@ class Unit < Numeric
     end
     
     case options[0]
-    when Hash:
+    when Hash
       @scalar = options[0][:scalar] || 1
       @numerator = options[0][:numerator] || UNITY_ARRAY
       @denominator = options[0][:denominator] || UNITY_ARRAY
       @signature = options[0][:signature]
-    when Array:
+    when Array
       initialize(*options[0])
       return
-    when Numeric:
+    when Numeric
       @scalar = options[0]
       @numerator = @denominator = UNITY_ARRAY
-    when Time:
+    when Time
       @scalar = options[0].to_f
       @numerator = ['<second>']
       @denominator = UNITY_ARRAY
-    when DateTime:
+    when DateTime
       @scalar = options[0].ajd
       @numerator = ['<day>']
       @denominator = UNITY_ARRAY
-    when "": 
+    when ""
       raise ArgumentError, "No Unit Specified"
-    when String: 
+    when String
       parse(options[0])   
     else
       raise ArgumentError, "Invalid Unit Format"
@@ -284,7 +287,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 && self.numerator.size == 1 && self.denominator == UNITY_ARRAY && self.units =~ /(deg|temp)K/
+    return @is_base=true if self.degree? && 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)))
@@ -296,40 +299,42 @@ 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?
-     if self.units =~ /\A(deg|temp)(C|F|K|C)\Z/
+    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')
+      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
     for unit in @numerator.compact do
-        if @@PREFIX_VALUES[unit]
-          q *= @@PREFIX_VALUES[unit]
-        else
-          q *= @@UNIT_VALUES[unit][:scalar] if @@UNIT_VALUES[unit]
-          num << @@UNIT_VALUES[unit][:numerator] if @@UNIT_VALUES[unit] && @@UNIT_VALUES[unit][:numerator]
-          den << @@UNIT_VALUES[unit][:denominator] if @@UNIT_VALUES[unit] && @@UNIT_VALUES[unit][:denominator]
-        end
+      if @@PREFIX_VALUES[unit]
+        q *= @@PREFIX_VALUES[unit]
+      else
+        q *= @@UNIT_VALUES[unit][:scalar] if @@UNIT_VALUES[unit]
+        num << @@UNIT_VALUES[unit][:numerator] if @@UNIT_VALUES[unit] && @@UNIT_VALUES[unit][:numerator]
+        den << @@UNIT_VALUES[unit][:denominator] if @@UNIT_VALUES[unit] && @@UNIT_VALUES[unit][:denominator]
+      end
     end
     for unit in @denominator.compact do
-        if @@PREFIX_VALUES[unit]
-          q /= @@PREFIX_VALUES[unit]
-        else
-          q /= @@UNIT_VALUES[unit][:scalar] if @@UNIT_VALUES[unit]
-          den << @@UNIT_VALUES[unit][:numerator] if @@UNIT_VALUES[unit] && @@UNIT_VALUES[unit][:numerator]
-          num << @@UNIT_VALUES[unit][:denominator] if @@UNIT_VALUES[unit] && @@UNIT_VALUES[unit][:denominator]
-        end
+      if @@PREFIX_VALUES[unit]
+        q /= @@PREFIX_VALUES[unit]
+      else
+        q /= @@UNIT_VALUES[unit][:scalar] if @@UNIT_VALUES[unit]
+        den << @@UNIT_VALUES[unit][:numerator] if @@UNIT_VALUES[unit] && @@UNIT_VALUES[unit][:numerator]
+        num << @@UNIT_VALUES[unit][:denominator] if @@UNIT_VALUES[unit] && @@UNIT_VALUES[unit][:denominator]
+      end
     end
-    
+
     num = num.flatten.compact
     den = den.flatten.compact
     num = UNITY_ARRAY if num.empty?
@@ -356,15 +361,15 @@ class Unit < Numeric
       return out
     else
       case target_units
-      when :ft :
+      when :ft
         inches = self.to("in").scalar.to_int
         out = "#{(inches / 12).truncate}\'#{(inches % 12).round}\""
-      when :lbs :
+      when :lbs
         ounces = self.to("oz").scalar.to_int
         out = "#{(ounces / 16).truncate} lbs, #{(ounces % 16).round} oz"
       when String
         out = case target_units
-        when /(%[-+\.\w\d#]+)\s*(.+)*/       #format string like '%0.2f in'
+        when /(%[\-+\.\w#]+)\s*(.+)*/       #format string like '%0.2f in'
           begin
             if $2 #unit specified, need to convert
               self.to($2).to_s($1)
@@ -381,7 +386,7 @@ class Unit < Numeric
         end
       else
         out = case @scalar
-        when Rational : 
+        when Rational
           "#{@scalar} #{self.units}"
         else
           "#{'%g' % @scalar} #{self.units}"
@@ -400,8 +405,15 @@ class Unit < Numeric
   
   # true if unit is a 'temperature', false if a 'degree' or anything else
   def is_temperature?
-    return true if self.signature == 400 && self.units =~ /temp/
+    self.is_degree? && self.units =~ /temp/
+  end
+  alias :temperature? :is_temperature?
+  
+  # true if a degree unit or equivalent.
+  def is_degree?
+    self.kind == :temperature
   end
+  alias :degree? :is_degree?
   
   # returns the 'degree' unit associated with a temperature unit
   # '100 tempC'.unit.temperature_scale #=> 'degC'
@@ -420,14 +432,15 @@ class Unit < Numeric
   # Compare two Unit objects. Throws an exception if they are not of compatible types.
   # Comparisons are done based on the value of the unit in base SI units.
   def <=>(other)
-    case other
-    when 0: self.base_scalar <=> 0
-    when Unit:
+    case  
+    when other.zero? && !self.is_temperature?
+      return self.base_scalar <=> 0
+    when Unit === other
       raise ArgumentError, "Incompatible Units" unless self =~ other
-      self.base_scalar <=> other.base_scalar
+      return self.base_scalar <=> other.base_scalar
     else
       x,y = coerce(other)
-      x <=> y
+      return x <=> y
     end
   end
   
@@ -441,7 +454,8 @@ class Unit < Numeric
   def =~(other)
     return true if self == 0 || other == 0
     case other
-    when Unit : self.signature == other.signature
+    when Unit
+      self.signature == other.signature
     else
       x,y = coerce(other)
       x =~ y
@@ -457,7 +471,8 @@ class Unit < Numeric
   # Unit("100 cm") === Unit("1 m")      # => false
   def ===(other)
     case other
-    when Unit: (self.scalar == other.scalar) && (self.units == other.units)
+    when Unit
+      (self.scalar == other.scalar) && (self.units == other.units)
     else
       x,y = coerce(other)
       x === y
@@ -473,12 +488,12 @@ class Unit < Numeric
   def +(other)   
     if Unit === other 
       case
-      when self.zero? : other.dup
-      when self =~ other :
+      when self.zero?
+        other.dup
+      when self =~ other
         raise ArgumentError, "Cannot add two temperatures" if ([self, other].all? {|x| x.is_temperature?})
         if [self, other].any? {|x| x.is_temperature?}
-          case self.is_temperature?
-          when true:
+          if self.is_temperature?
             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)
@@ -488,13 +503,13 @@ class Unit < Numeric
           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}')"
+        raise ArgumentError,  "Incompatible Units ('#{self}' not compatible with '#{other}')"
       end
     elsif Time === other
       other + self
     else
-        x,y = coerce(other)
-        y + x
+      x,y = coerce(other)
+      y + x
     end
   end
   
@@ -502,15 +517,16 @@ class Unit < Numeric
   # throws an exception if the units are not compatible.
   def -(other)
     if Unit === other 
-    case
-      when self.zero? : -other.dup
-      when self =~ other :
+      case
+      when self.zero?
+        -other.dup
+      when self =~ other
         case
-          when [self, other].all? {|x| x.is_temperature?} : 
+          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? :
+          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? :
+          when other.is_temperature?
             raise ArgumentError, "Cannot subtract a temperature from a differential degree 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))
@@ -561,6 +577,18 @@ class Unit < Numeric
       y / x
     end
   end
+
+  # divide two units and return quotient and remainder
+  # when both units are in the same units we just use divmod on the raw scalars
+  # otherwise we use the scalar of the base unit which will be a float
+  def divmod(other)
+    raise ArgumentError, "Incompatible Units" unless self =~ other
+    if self.units == other.units
+      return self.scalar.divmod(other.scalar)
+    else
+      return self.to_base.scalar.divmod(other.to_base.scalar)
+    end
+  end
     
   # Exponentiate.  Only takes integer powers. 
   # Note that anything raised to the power of 0 results in a Unit object with a scalar of 1, and no units.
@@ -578,11 +606,11 @@ class Unit < Numeric
       return self.inverse if other == -1
     end
     case other
-    when Rational:
+    when Rational
       self.power(other.numerator).root(other.denominator)
-    when Integer:
+    when Integer
       self.power(other)
-    when Float:
+    when Float
       return self**(other.to_i) if other == other.to_i
       valid = (1..9).map {|x| 1/x}
       raise ArgumentError, "Not a n-th root (1..9), use 1/n" unless valid.include? other.abs
@@ -624,13 +652,13 @@ class Unit < Numeric
     for item in @numerator.uniq do
       x = num.find_all {|i| i==item}.size
       r = ((x/n)*(n-1)).to_int
-      r.times {|x| num.delete_at(num.index(item))}
+      r.times {|y| num.delete_at(num.index(item))}
     end
     
     for item in @denominator.uniq do 
       x = den.find_all {|i| i==item}.size
       r = ((x/n)*(n-1)).to_int
-      r.times {|x| den.delete_at(den.index(item))}
+      r.times {|y| den.delete_at(den.index(item))}
     end
     q = @scalar < 0 ? (-1)**Rational(1,n) * (@scalar.abs)**Rational(1,n) : @scalar**Rational(1,n)
     Unit.new(:scalar=>q,:numerator=>num,:denominator=>den)    
@@ -652,7 +680,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, fahrenheit, and Rankine scales.
+  # Supports Kelvin, Celsius, 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.
@@ -661,34 +689,43 @@ class Unit < Numeric
     return self if TrueClass === other
     return self if FalseClass === other
     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 
+      raise ArgumentError, "Receiver is not a temperature unit" unless self.degree?
       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)
+        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
-        
+      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
+
       Unit.new("#{q} #{target_unit}")
     else
-       case other
-          when Unit: 
-            return self if other.units == self.units
-            target = other
-          when String: target = Unit.new(other)
-          else
-            raise ArgumentError, "Unknown target units"
-        end
+      case other
+      when Unit
+        return self if other.units == self.units
+        target = other
+      when String
+        target = Unit.new(other)
+      else
+        raise ArgumentError, "Unknown target units"
+      end
       raise ArgumentError,  "Incompatible Units" unless self =~ target
       one = @numerator.map {|x| @@PREFIX_VALUES[x] ? @@PREFIX_VALUES[x] : x}.map {|i| i.kind_of?(Numeric) ? i : @@UNIT_VALUES[i][:scalar] }.compact
       two = @denominator.map {|x| @@PREFIX_VALUES[x] ? @@PREFIX_VALUES[x] : x}.map {|i| i.kind_of?(Numeric) ? i : @@UNIT_VALUES[i][:scalar] }.compact
@@ -706,7 +743,7 @@ class Unit < Numeric
   # converts the unit back to a float if it is unitless.  Otherwise raises an exception
   def to_f
     return @scalar.to_f if self.unitless?
-    raise RuntimeError, "Can't convert to Float unless unitless.  Use Unit#scalar"
+    raise RuntimeError, "Can't convert to Float unless unitless (#{self.to_s}).  Use Unit#scalar"
   end
   
   # converts the unit back to a complex if it is unitless.  Otherwise raises an exception
@@ -740,13 +777,13 @@ class Unit < Numeric
       output_d = ['1']
     else
       den.each_with_index do |token,index|
-          if token && @@PREFIX_VALUES[token] then
-            output_d << "#{@@OUTPUT_MAP[token]}#{@@OUTPUT_MAP[den[index+1]]}"
-            den[index+1]=nil
-          else
-            output_d << "#{@@OUTPUT_MAP[token]}" if token
-          end
+        if token && @@PREFIX_VALUES[token] then
+          output_d << "#{@@OUTPUT_MAP[token]}#{@@OUTPUT_MAP[den[index+1]]}"
+          den[index+1]=nil
+        else
+          output_d << "#{@@OUTPUT_MAP[token]}" if token
         end
+      end
     end
     on = output_n.reject {|x| x.empty?}.map {|x| [x, output_n.find_all {|z| z==x}.size]}.uniq.map {|x| ("#{x[0]}".strip+ (x[1] > 1 ? "^#{x[1]}" : ''))}
     od = output_d.reject {|x| x.empty?}.map {|x| [x, output_d.find_all {|z| z==x}.size]}.uniq.map {|x| ("#{x[0]}".strip+ (x[1] > 1 ? "^#{x[1]}" : ''))}
@@ -811,7 +848,7 @@ class Unit < Numeric
    
   # true if scalar is zero
   def zero?
-    return @scalar.zero?
+    return self.to_base.scalar.zero?
   end
   
   # '5 min'.unit.ago 
@@ -833,10 +870,12 @@ class Unit < Numeric
   # 'min'.since(time)
   def since(time_point = ::Time.now)
     case time_point
-    when Time:      (Time.now - time_point).unit('s').to(self)
-    when DateTime, Date:  (DateTime.now - time_point).unit('d').to(self)
-    when String:    
-      (DateTime.now - time_point.time(:context=>:past)).unit('d').to(self)
+    when Time
+      (Time.now - time_point).unit('s').to(self)
+    when DateTime, Date
+      (DateTime.now - time_point).unit('d').to(self)
+    when String    
+      (DateTime.now - time_point.to_datetime(:context=>:past)).unit('d').to(self)
     else
       raise ArgumentError, "Must specify a Time, DateTime, or String" 
     end
@@ -845,11 +884,12 @@ class Unit < Numeric
   # 'min'.until(time)
   def until(time_point = ::Time.now)
     case time_point
-    when Time:      (time_point - Time.now).unit('s').to(self)
-    when DateTime, Date:  (time_point - DateTime.now).unit('d').to(self)
-    when String:
-      r = (time_point.time(:context=>:future) - DateTime.now)
-      Time === time_point.time ? r.unit('s').to(self) : r.unit('d').to(self)
+    when Time
+      (time_point - Time.now).unit('s').to(self)
+    when DateTime, Date
+      (time_point - DateTime.now).unit('d').to(self)
+    when String
+      (time_point.to_datetime(:context=>:future) - DateTime.now).unit('d').to(self)
     else
       raise ArgumentError, "Must specify a Time, DateTime, or String" 
     end
@@ -882,7 +922,8 @@ class Unit < Numeric
       return [other.to_unit, self]
     end
     case other
-    when Unit : [other, self]
+    when Unit
+      [other, self]
     else 
       [Unit.new(other), self]
     end
@@ -906,22 +947,21 @@ class Unit < Numeric
   
   # calculates the unit signature vector used by unit_signature
   def unit_signature_vector
-      return self.to_base.unit_signature_vector unless self.is_base?
-      result = self
-      vector = Array.new(SIGNATURE_VECTOR.size,0)
-      for element in @numerator
-        if r=@@ALL_UNIT_DEFINITIONS[element]
-            n = SIGNATURE_VECTOR.index(r[2])
-           vector[n] = vector[n] + 1 if n
-        end
+    return self.to_base.unit_signature_vector unless self.is_base?
+    vector = Array.new(SIGNATURE_VECTOR.size,0)
+    for element in @numerator
+      if r=@@ALL_UNIT_DEFINITIONS[element]
+        n = SIGNATURE_VECTOR.index(r[2])
+        vector[n] = vector[n] + 1 if n
       end
-      for element in @denominator
-        if r=@@ALL_UNIT_DEFINITIONS[element]
-          n = SIGNATURE_VECTOR.index(r[2])
-          vector[n] = vector[n] - 1 if n
-        end
+    end
+    for element in @denominator
+      if r=@@ALL_UNIT_DEFINITIONS[element]
+        n = SIGNATURE_VECTOR.index(r[2])
+        vector[n] = vector[n] - 1 if n
       end
-      vector
+    end
+    vector
   end
     
   private
@@ -984,8 +1024,10 @@ class Unit < Numeric
     den = []
     for key, value in combined do 
       case 
-      when value > 0 : value.times {num << key}
-      when value < 0 : value.abs.times {den << key}
+      when value > 0
+        value.times {num << key}
+      when value < 0
+        value.abs.times {den << key}
       end
     end
     num = UNITY_ARRAY if num.empty?
@@ -1083,8 +1125,10 @@ class Unit < Numeric
       n = item[1].to_i
       x = "#{item[0]} "
       case 
-        when n>=0 : top.gsub!(/#{item[0]}(\^|\*\*)#{n}/) {|s| x * n}
-        when n<0 : bottom = "#{bottom} #{x * -n}"; top.gsub!(/#{item[0]}(\^|\*\*)#{n}/,"")
+        when n>=0
+          top.gsub!(/#{item[0]}(\^|\*\*)#{n}/) {|s| x * n}
+        when n<0
+          bottom = "#{bottom} #{x * -n}"; top.gsub!(/#{item[0]}(\^|\*\*)#{n}/,"")
       end
     end 
     bottom.gsub!(BOTTOM_REGEX) {|s| "#{$1} " * $2.to_i} if bottom

data/lib/ruby_units/string.rb

@@ -1,3 +1,4 @@
+require 'time'
 # make a string into a unit
 class String
   def to_unit(other = nil)
@@ -9,10 +10,14 @@ class String
   
   # format unit output using formating codes '%0.2f' % '1 mm'.unit => '1.00 mm'
   def %(*args)
+		return if self.empty?
     case 
-    when Unit === args[0]: args[0].to_s(self)
-    when (!defined?(Uncertain).nil? && (Uncertain === args[0])): args[0].to_s(self)
-    when Complex === args[0]: args[0].to_s
+    when Unit === args[0]
+      args[0].to_s(self)
+    when (!defined?(Uncertain).nil? && (Uncertain === args[0]))
+      args[0].to_s(self)
+    when Complex === args[0]
+      args[0].to_s
     else
       unit_format(*args)
     end
@@ -63,18 +68,30 @@ class String
       raise(ArgumentError, 'Invalid Time String') unless r
       return r
     rescue
-      Time.local(*ParseDate.parsedate(self))
+      case
+      when self == "now"
+        Time.now
+      when Time.respond_to?(:parse)
+        Time.parse(self)
+      else
+        Time.local(*ParseDate.parsedate(self))
+      end
     end
   end
   
   def to_datetime(options = {})
     begin
       # raises an exception if Chronic.parse = nil or if Chronic not defined
-      r = Chronic.parse(self,options).to_datetime
-    rescue
-      r=DateTime.civil(*ParseDate.parsedate(self)[0..5].compact)
+      r = Chronic.parse(self,options).send(:to_datetime)
+    rescue Exception  => e
+      r = case
+      when self.to_s == "now"
+        DateTime.now
+      else
+        DateTime.parse(self)
+      end
     end
-    raise RuntimeError, "Invalid Time String" if r == DateTime.new      
+    raise RuntimeError, "Invalid Time String (#{self.to_s})" if r == DateTime.new      
     return r
   end
   
@@ -82,7 +99,14 @@ class String
     begin
       r = Chronic.parse(self,options).to_date
     rescue
-      r = Date.civil(*ParseDate.parsedate(self)[0..5].compact)
+      r = case
+      when self == "today" 
+        Date.today
+      when RUBY_VERSION < "1.9"
+        Date.civil(*ParseDate.parsedate(self)[0..5].compact)
+      else
+        Date.parse(self)
+      end
     end
     raise RuntimeError, 'Invalid Date String' if r == Date.new
     return r

data/lib/ruby_units/time.rb

@@ -24,28 +24,24 @@ class Time
   alias :u :to_unit
   alias :unit_add :+
   
-  def to_datetime
-    DateTime.civil(1970,1,1)+(self.to_f+self.gmt_offset)/86400
-  end
-  
-  # ruby 1.8.6 has a reasonable implementation of this that works well, so let's use it.
-  if VERSION == "1.8.4"
+  unless Time.instance_methods.include?(:to_date)
     def to_date
       x=(Date.civil(1970,1,1)+((self.to_f+self.gmt_offset)/86400.0)-0.5)
-      Date.civil(x.year, x.month, x.day )
+      Date.civil(x.year, x.month, x.day)
     end
   end
   
   def +(other)
     case other
-    when Unit:
+    when Unit
       other = other.to('d').round.to('s') if ['y', 'decade', 'century'].include? other.units  
       begin
         unit_add(other.to('s').scalar)
       rescue RangeError
         self.to_datetime + other
       end
-    when DateTime: unit_add(other.to_time)
+    when DateTime
+      unit_add(other.to_time)
     else
       unit_add(other)
     end
@@ -60,15 +56,16 @@ class Time
   
   def -(other)
     case other
-    when Unit: 
+    when Unit
       other = other.to('d').round.to('s') if ['y', 'decade', 'century'].include? other.units  
       begin
         unit_sub(other.to('s').scalar)
       rescue RangeError
-        self.to_datetime - other
+        self.send(:to_datetime) - other
       end
       
-    when DateTime: unit_sub(other.to_time)
+    when DateTime
+      unit_sub(other.to_time)
     else
       unit_sub(other)
     end

data/test/test_ruby-units.rb

@@ -1,13 +1,22 @@
+require 'rubygems'
 require 'test/unit'
 require 'ruby-units'
-require 'rubygems'
-require 'uncertain' if Gem::GemPathSearcher.new.find('uncertain')
 require 'yaml'
-require 'chronic' if Gem::GemPathSearcher.new.find('chronic')
+begin
+	require 'chronic'
+rescue LoadError
+	warn "Can't test Chronic integration unless gem 'chronic' is installed"
+end
+begin 
+	require 'uncertain'
+rescue LoadError
+	warn "Can't test Uncertain Units unless 'Uncertain' gem is installed"
+end
+
 
 class Unit < Numeric
   @@USER_DEFINITIONS = {'<inchworm>' =>  [%w{inworm inchworm}, 0.0254, :length, %w{<meter>} ],
-                        '<habenero>'   => [%{degH}, 100, :temperature, %w{<celsius>}]}
+                        '<habenero>'   => [%w{degH}, 100, :temperature, %w{<celsius>}]}
   Unit.setup
 end
 
@@ -17,7 +26,7 @@ class Time
   class << self
     alias :unforced_now :now
     def forced_now
-      return @@forced_now ? @@forced_now : unforced_now
+      @@forced_now.nil? ? unforced_now : @@forced_now
     end
     alias :now :forced_now
     
@@ -28,7 +37,7 @@ class Time
     
   alias :unforced_gmt :gmt_offset
   def forced_gmt
-    return @@forced_gmt ? @@forced_gmt : unforced_gmt
+    @@forced_gmt.nil? ? unforced_gmt : @@forced_gmt
   end
   alias :gmt_offset :forced_gmt
 
@@ -64,7 +73,7 @@ class TestRubyUnits < Test::Unit::TestCase
  
   def setup
     @april_fools = Time.at 1143910800
-    @april_fools_datetime = DateTime.parse('2006-4-1 12:00')
+    @april_fools_datetime = DateTime.parse('2006-04-01T12:00:00-05:00')
     Time.forced_now = @april_fools
     DateTime.forced_now = @april_fools_datetime 
     #Unit.clear_cache
@@ -85,7 +94,6 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_equal "s", a.to_unit.units
     assert_equal a + 3600, a + "1 h".unit
     assert_equal a - 3600, a - "1 h".unit
-    b = Unit(a) + "1 h".unit
     assert_in_delta Time.now - "1 h".unit, "1 h".ago, 1
     assert_in_delta Time.now + 3600, "1 h".from_now, 1
     assert_in_delta "1 h".unit + Time.now, "1 h".from_now, 1
@@ -96,42 +104,60 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_in_delta Time.now, "now".time, 1
   end
   
-  def test_time_helpers
-    assert_equal @april_fools, Time.now
-    assert_equal "1 day".from_now, @april_fools + 86400
-    assert_equal "1 day".from("now"), @april_fools + 86400
-    assert_equal "1 day".ago, @april_fools - 86400
-    assert_equal "1 day".before_now, @april_fools - 86400
-    assert_equal '1 days'.before('now'), @april_fools - 86400
+	def test_from_now
+		assert_equal "1 day".from_now, @april_fools + 86400
+	end
+	
+	def test_from
+		assert_equal "1 day".from("now"), @april_fools + 86400
+	end
+
+	def test_ago
+		assert_equal "1 day".ago, @april_fools - 86400
+	end
+	
+	def test_before_now
+		assert_equal "1 day".before_now, @april_fools - 86400
+	end
+	
+	def test_before
+		assert_equal '1 days'.before('now'), @april_fools - 86400
+	end
+
+	def test_since
     assert_equal 'days'.since(@april_fools - 86400), "1 day".unit
-    assert_equal 'days'.since('3/31/06 12:00'), "1 day".unit
-    assert_equal 'days'.since(DateTime.parse('2006-3-31 12:00')), "1 day".unit
-    assert_equal 'days'.until('4/2/2006'), '1 day'.unit
-    assert_equal 'now'.time, Time.now
-    assert_equal 'now'.datetime, DateTime.now
-    assert_raises(ArgumentError) { 'days'.until(1) }
+    assert_equal 'days'.since('2006-3-31 12:00:00 -5:00'), "1 day".unit
+    assert_equal 'days'.since(DateTime.parse('2006-3-31 12:00 -5:00')), "1 day".unit		
     assert_raises(ArgumentError) { 'days'.since(1) }
-    assert_equal Unit.new(Time.now).scalar,  1143910800
+	end
+
+	def test_until
+    assert_equal 'days'.until('2006-04-2 12:00:00 -5:00'), '1 day'.unit		
+    assert_raises(ArgumentError) { 'days'.until(1) }
+	end
+
+  def test_time_helpers
+    assert_equal @april_fools, Time.now
+    assert_equal @april_fools_datetime, DateTime.now
+    assert_equal Time.now, 'now'.time
+    assert_equal DateTime.now, 'now'.datetime
+    assert_equal 1143910800, Unit.new(Time.now).scalar
     assert_equal @april_fools.unit.to_time, @april_fools
     assert_equal Time.in('1 day'), @april_fools + 86400
-    assert_equal "2006-04-01T12:00:00+00:00", @april_fools_datetime.inspect
+    assert_equal "2006-04-01T12:00:00-05:00", @april_fools_datetime.inspect
     assert_equal "2006-04-01T00:00:00+00:00", '2453826.5 days'.unit.to_datetime.to_s 
   end
   
   def test_string_helpers
     assert_equal '1 mm'.to('in'), Unit('1 mm').to('in')
   end
-  
-  def test_math
-    pi = Math::PI
-    assert_equal Math.sin(pi), Math.sin("180 deg".unit)
-    assert_equal Math.cos(pi), Math.cos("180 deg".unit)
-    assert_equal Math.tan(pi), Math.tan("180 deg".unit)
-    assert_equal Math.sinh(pi), Math.sinh("180 deg".unit)
-    assert_equal Math.cosh(pi), Math.cosh("180 deg".unit)
-    assert_equal Math.tanh(pi), Math.tanh("180 deg".unit)
-  end
 
+  [:sin, :cos, :tan, :sinh, :cosh, :tanh].each do |trig|
+		define_method("test_#{trig}") do
+			assert_equal Math.send(trig, Math::PI), Math.send(trig, "180 deg".unit)
+		end
+	end
+	
   def test_clone
     unit1= "1 mm".unit
     unit2 = unit1.clone
@@ -312,7 +338,7 @@ class TestRubyUnits < Test::Unit::TestCase
       assert_equal ['<foot>'], unit3.numerator
       assert_equal ['<1>'],unit3.denominator
     }
-    assert_raises(ArgumentError) { unit3= unit1 >> 5.0}
+    assert_raises(ArgumentError) { unit1 >> 5.0}
     assert_equal unit1, unit1.to(true)
     assert_equal unit1, unit1.to(false)
     assert_equal unit1, unit1.to(nil)
@@ -405,7 +431,7 @@ class TestRubyUnits < Test::Unit::TestCase
       assert_equal "2".unit, unit2
     }
     assert_raises(ArgumentError) {
-      unit2 = "1".unit + nil
+      "1".unit + nil
     }
   end
 
@@ -505,7 +531,7 @@ class TestRubyUnits < Test::Unit::TestCase
       assert_equal unit2, unit1**-2
       }
     assert_raises(ZeroDivisionError) {
-      unit="0 mm".unit**-1
+      "0 mm".unit**-1
     }
   end
 
@@ -581,8 +607,9 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_raises(ArgumentError) { '-1000 tempC'.unit}
     assert_raises(ArgumentError) { '-1000 tempF'.unit}
     
-    assert_equal '0 tempC'.unit, '32 tempF'.unit
-    assert_equal '0 tempC'.unit, '273.15 tempK'.unit
+    assert_in_delta '32 tempF'.unit.base_scalar, '0 tempC'.unit.base_scalar, 0.01
+    assert_in_delta '0 tempC'.unit.base_scalar, '32 tempF'.unit.base_scalar, 0.01
+    assert_in_delta '0 tempC'.unit.base_scalar, '273.15 tempK'.unit.base_scalar, 0.01
     assert_in_delta '0 tempC'.unit.base_scalar, '491.67 tempR'.unit.base_scalar, 0.01
     
     a = '10 degC'.unit
@@ -592,14 +619,13 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_equal a >> 'tempF', '-441.67 tempF'.unit
     
     unit1 = '37 tempC'.unit
-    unit2 = unit1 >> "tempF" >> 'tempK' >> 'tempR' >> 'tempC'
     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('118 tempF'.unit,a+b)
     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)
@@ -752,14 +778,12 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_equal "cells", a.units
   end
   
-  def test_uncertain
-    if defined?(Uncertain)
-      a = '1 +/- 1 mm'.unit
-      assert_equal a.to_s, '1 +/- 1 mm' 
-    else
-      warn "Can't test Uncertain Units unless 'Uncertain' gem is installed"
-    end  
-  end
+	if defined?(Uncertain)
+		def test_uncertain
+			a = '1 +/- 1 mm'.unit
+			assert_equal a.to_s, '1 +/- 1 mm' 
+		end  
+	end
   
   def test_format
     assert_equal "%0.2f" % "1 mm".unit, "1.00 mm" 
@@ -771,7 +795,7 @@ class TestRubyUnits < Test::Unit::TestCase
   end
   
   def test_currency
-    assert_nothing_raised {a = "$1".unit}
+    assert_nothing_raised {"$1".unit}
   end
   
   def test_kind
@@ -781,9 +805,9 @@ class TestRubyUnits < Test::Unit::TestCase
   
   def test_percent
       assert_nothing_raised {
-       z = "1 percent".unit
-        a = "1%".unit
-        b = "0.01%".unit
+      	"1 percent".unit
+        "1%".unit
+        "0.01%".unit
       }
       a = '100 ml'.unit
       b = '50%'.unit
@@ -852,9 +876,29 @@ class TestRubyUnits < Test::Unit::TestCase
     a = '-9 mm^2'.unit
     b = a**(0.5)
     assert_in_delta Math.sqrt(a).to_unit.scalar.real, b.scalar.real, 0.00001
-    assert_in_delta Math.sqrt(a).to_unit.scalar.image, b.scalar.image, 0.00001
-    
+		# ruby 1.8.x uses .image while 1.9.x uses .imaginary
+		if Complex.instance_methods.include?(:imaginary)
+    	assert_in_delta Math.sqrt(a).to_unit.scalar.imaginary, b.scalar.imaginary, 0.00001
+		else
+			assert_in_delta Math.sqrt(a).to_unit.scalar.image, b.scalar.image, 0.00001
+		end
   end
+
+	def test_div
+		assert_equal 11,"23 m".unit.div('2 m'.unit)
+	end
+	
+	def test_divmod
+		assert_equal [277,1], 555.unit('mm').divmod(2.unit('mm'))
+		assert_equal [277, 0.0010000000000000373], '0.555 m'.unit.divmod('2 mm'.unit)
+		assert_raises(ArgumentError) { '1 m'.unit.divmod('1 kg'.unit) }
+	end
+
+	if Math.respond_to?(:cbrt)
+		def test_cbrt
+			assert_in_delta '2 mm'.to_unit, Math.cbrt('8 mm^3'.to_unit), 0.0001
+		end
+	end
   
   def test_hypot
     assert_equal Math.hypot('3 mm'.unit,'4 mm'.unit), '5 mm'.unit
@@ -914,7 +958,7 @@ class TestRubyUnits < Test::Unit::TestCase
   end
     
   def test_version
-    assert_equal('1.1.5', Unit::VERSION)
+    assert_equal('1.2.0.a', Unit::VERSION)
   end
   
   def test_negation
@@ -922,5 +966,17 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_equal(a.class, (1-a).class)
   end
   
+  def test_degree
+    assert "100 tempF".unit.degree?
+    assert "100 degC".unit.degree?
+    assert !"1 mm".unit.degree?
+  end
+
+  def test_temperature
+    assert "100 tempF".unit.temperature?
+    assert !"100 degC".unit.temperature?
+    assert !"1 mm".unit.temperature?    
+  end
+  
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-units
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
-  - 1
-  - 5
-  version: 1.1.5
+  - 2
+  - 0
+  - a
+  version: 1.2.0.a
 platform: ruby
 authors: 
 - Kevin Olbrich, Ph.D
@@ -14,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -04:00
+date: 2010-11-07 01:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -31,24 +33,11 @@ dependencies:
         version: 2.0.4
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe-yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -58,21 +47,22 @@ dependencies:
         - 2
         version: 0.1.2
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 5
-        - 0
-        version: 2.5.0
+        - 6
+        - 1
+        version: 2.6.1
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: This library handles unit conversions and unit math
 email: kevin.olbrich+ruby_units@gmail.com
 executables: []
@@ -116,6 +106,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -123,16 +114,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: ruby-units
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A class that performs unit conversions and unit math