ruby-units 0.3.3 → 0.3.4

data/CHANGELOG

@@ -130,3 +130,12 @@ Change Log for Ruby-units
                       Fixed a bug that would cause problems when adding
                       or subtracting units to a unit with a zero scalar. 
                     * Date and DateTime objects can be converted to 'units'
+                    
+2006-10-27  0.3.4   * Fixed a few more parsing bugs so that it will properly        
+                      complain about malformed units.
+                    * Fixed a bug that prevents proper use of percents
+                    * several minor tweaks 
+                    * some improved Date and DateTime handling
+                    * can convert between Date, DateTime, and Time objects
+                    * Time math will now return a DateTime if it goes out of
+                      range.

data/lib/ruby-units.rb

@@ -197,7 +197,8 @@ class Unit < Numeric
     
     
     case options[0]
-    when String: parse(options[0])
+    when "": raise ArgumentError, "No Unit Specified"
+    when String: parse(options[0]) 
     when Hash:
       @scalar = options[0][:scalar] || 1
       @numerator = options[0][:numerator] || UNITY_ARRAY
@@ -223,9 +224,9 @@ class Unit < Numeric
     self.update_base_scalar
     self.replace_temperature
 
-    unary_unit = self.units
+    unary_unit = self.units || ""
     opt_units = options[0].scan(NUMBER_REGEX)[0][1] if String === options[0]
-    unless @@cached_units.keys.include?(opt_units) || (opt_units =~ /(temp|deg)(C|K|R|F)/)
+    unless @@cached_units.keys.include?(opt_units) || (opt_units =~ /(temp|deg(C|K|R|F))|(pounds|lbs[ ,]\d+ ounces|oz)|('\d+")|(ft|feet[ ,]\d+ in|inch|inches)|%/)
       @@cached_units[opt_units] = (self.scalar == 1 ? self : opt_units.unit) if opt_units && !opt_units.empty?
     end
     unless @@cached_units.keys.include?(unary_unit) || (unary_unit =~ /(temp|deg)(C|K|R|F)/) then
@@ -783,6 +784,14 @@ class Unit < Numeric
     q = @scalar.to_i.succ
     Unit.new(q, @numerator, @denominator)
   end
+
+  def coerce(other)
+    case other
+    when Unit : [other, self]
+    else 
+      [Unit.new(other), self]
+    end
+  end
       
   # Protected and Private Functions that should only be called from this class
   protected
@@ -801,13 +810,6 @@ class Unit < Numeric
   end
   
   
-  def coerce(other)
-    case other
-    when Unit : [other, self]
-    else 
-      [Unit.new(other), self]
-    end
-  end
   
   
   # calculates the unit signature vector used by unit_signature
@@ -927,13 +929,12 @@ class Unit < Numeric
   #  6'4"  -- recognized as 6 feet + 4 inches
   #  8 lbs 8 oz -- recognized as 8 lbs + 8 ounces 
   def parse(passed_unit_string="0")
-
     unit_string = passed_unit_string.dup
     if unit_string =~ /\$\s*(#{NUMBER_REGEX})/
       unit_string = "#{$1} USD"
     end
-    if unit_string =~ /(#{SCI_NUMBER})\s*%/
-      unit_string = "#{$1} percent"
+    if unit_string =~ /(.+)%/
+      unit_string = "#{$1.to_f * 0.01}"
     end
 
     unit_string =~ NUMBER_REGEX
@@ -947,14 +948,14 @@ class Unit < Numeric
     end
   
     unit_string.gsub!(/[<>]/,"")
-     
+    
     # Special processing for unusual unit strings
     # feet -- 6'5"
     feet, inches = unit_string.scan(FEET_INCH_REGEX)[0]
     if (feet && inches)
       result = Unit.new("#{feet} ft") + Unit.new("#{inches} inches")
       copy(result)
-      return self
+      return #self
     end
 
     # weight -- 8 lbs 12 oz    
@@ -962,8 +963,12 @@ class Unit < Numeric
     if (pounds && oz)
       result = Unit.new("#{pounds} lbs") + Unit.new("#{oz} oz")
       copy(result)
-      return self
+      return #self
     end
+    
+    raise( ArgumentError, "'#{passed_unit_string}' Unit not recognized") if unit_string.count('/') > 1
+    raise( ArgumentError, "'#{passed_unit_string}' Unit not recognized") if unit_string.scan(/\s\d+\S*/).size > 0
+    
     @scalar, top, bottom = unit_string.scan(UNIT_STRING_REGEX)[0]  #parse the string into parts
     
     top.scan(TOP_REGEX).each do |item|
@@ -983,7 +988,8 @@ class Unit < Numeric
     @numerator = top.scan(@@UNIT_MATCH_REGEX).delete_if {|x| x.empty?}.compact if top
     @denominator = bottom.scan(@@UNIT_MATCH_REGEX).delete_if {|x| x.empty?}.compact if bottom
     us = "#{(top || '' + bottom || '')}".to_s.gsub(@@UNIT_MATCH_REGEX,'').gsub(/[\d\*, "'_^\/\$]/,'')
-    raise( ArgumentError, "'#{passed_unit_string}' Unit not recognized (#{us})") unless us.empty?
+    
+    raise( ArgumentError, "'#{passed_unit_string}' Unit not recognized") unless us.empty?
 
     @numerator = @numerator.map do |item|
        @@PREFIX_MAP[item[0]] ? [@@PREFIX_MAP[item[0]], @@UNIT_MAP[item[1]]] : [@@UNIT_MAP[item[1]]]
@@ -1042,6 +1048,10 @@ class Date
     self.to_s
   end
   
+  def to_date
+    Date.civil(self.year, self.month, self.day)
+  end
+  
 end
 
 class Object
@@ -1199,7 +1209,13 @@ class Time
   
   def +(other)
     case other
-    when Unit: unit_add(other.to('s').scalar)
+    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)
     else
       unit_add(other)
@@ -1214,7 +1230,14 @@ class Time
   alias :unit_sub :-
   def -(other)
     case other
-    when Unit: unit_sub(other.to('s').scalar)
+    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
+      end
+      
     when DateTime: unit_sub(other.to_time)
     else
       unit_sub(other)

data/test/test_ruby-units.rb

@@ -776,5 +776,25 @@ class TestRubyUnits < Test::Unit::TestCase
         a = "1%".unit
         b = "0.01%".unit
       }
+      a = '100 ml'.unit
+      b = '50%'.unit
+      c = a*b
+      assert_equal '50 ml'.unit, c
+  end
+  
+  def test_parse
+    assert_raises(ArgumentError) { "3 s/s/ft".unit }
+    assert_raises(ArgumentError) { "3 s**2|,s**2".unit }
+    assert_raises(ArgumentError) { "3 s**2 4s s**2".unit }
+    assert_raises(ArgumentError) { "3 s 5^6".unit }
+    assert_raises(ArgumentError) { "".unit }
+  end
+  
+  def test_time_conversions
+    today = 'now'.to_time
+    assert_equal today,@april_fools
+    last_century = today - '150 years'.unit
+    assert_equal last_century.to_date, '1856-04-01'.to_date
+    
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-units
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
-date: 2006-10-05 00:00:00 -04:00
+  version: 0.3.4
+date: 2006-10-27 00:00:00 -04:00
 summary: A model that performs unit conversions and unit math
 require_paths: 
 - lib