ruby-units 0.3.6 → 0.3.7

data/CHANGELOG.txt

@@ -145,3 +145,10 @@ Change Log for Ruby-units
                       but only works properly for unitless Units.
 
 2006-12-05  0.3.6   * Fixed bug where (unit/unit).ceil would fail
+
+2006-12-14  0.3.7   * improved handling of percents and added a 'wt%' unit
+                      equivalent to 1 g/dl.
+                    * Improved handling for units with non-alphanumeric names
+                      (like ' for feet, # for pound)
+                    * Now you can enter durations as "HH:MM:SS, usec" or
+                      "HH:MM:SS:usec"

data/README.txt

@@ -1,6 +1,6 @@
 =Ruby Units
 
-Version: 0.3.6
+Version: 0.3.7
 
 Kevin C. Olbrich, Ph.D. 
 kevin.olbrich@gmail.com
@@ -115,6 +115,14 @@ Note: If you include the 'Chronic' gem, you can specify times in natural
 '5 min'.before(Time.now)
 '10 min'.ago
 
+Durations may be entered as 'HH:MM:SS, usec' and will be returned in 'hours'.
+
+'1:00'.unit #=> 1 h
+'0:30'.unit #=> 0.5 h
+'0:30:30'.unit #=> 0.5 h + 30 sec
+
+If only one ":" is present, it is interpreted as the separator between hours and minutes.
+
 ==Ranges
 
 [U('0 h')..U('10 h')].each {|x| p x}

data/lib/ruby-units.rb

@@ -2,7 +2,7 @@ require 'mathn'
 require 'rational'
 require 'date'
 require 'parsedate'
-# = Ruby Units 0.3.6
+# = Ruby Units 0.3.7
 #
 # Copyright 2006 by Kevin C. Olbrich, Ph.D.
 # 
@@ -40,7 +40,7 @@ require 'parsedate'
 class Unit < Numeric
   require 'units'
   # pre-generate hashes from unit definitions for performance.  
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
   @@USER_DEFINITIONS = {}
   @@PREFIX_VALUES = {}
   @@PREFIX_MAP = {}
@@ -51,6 +51,7 @@ class Unit < Numeric
   UNITY = '<1>'
   UNITY_ARRAY= [UNITY]
   FEET_INCH_REGEX = /(\d+)\s*(?:'|ft|feet)\s*(\d+)\s*(?:"|in|inches)/
+  TIME_REGEX = /(\d+)*:(\d+)*:*(\d+)*[:,]*(\d+)*/
   LBS_OZ_REGEX = /(\d+)\s*(?:#|lbs|pounds)+[\s,]*(\d+)\s*(?:oz|ounces)/
   SCI_NUMBER = %r{([+-]?\d*[.]?\d+(?:[Ee][+-]?)?\d*)}
   NUMBER_REGEX = /#{SCI_NUMBER}*\s*(.+)?/
@@ -232,7 +233,7 @@ class Unit < Numeric
 
     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))|(pounds|lbs[ ,]\d+ ounces|oz)|('\d+")|(ft|feet[ ,]\d+ in|inch|inches)|%/)
+    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)|%|(#{TIME_REGEX})/)
       @@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
@@ -946,9 +947,11 @@ class Unit < Numeric
     if unit_string =~ /\$\s*(#{NUMBER_REGEX})/
       unit_string = "#{$1} USD"
     end
-    if unit_string =~ /(.+)%/
-      unit_string = "#{$1.to_f * 0.01}"
-    end
+    
+    unit_string.gsub!(/%/,'percent')
+    unit_string.gsub!(/'/,'feet')
+    unit_string.gsub!(/"/,'inch')
+    unit_string.gsub!(/#/,'pound')
 
     unit_string =~ NUMBER_REGEX
     unit = @@cached_units[$2] 
@@ -962,13 +965,25 @@ class Unit < Numeric
   
     unit_string.gsub!(/[<>]/,"")
     
+    if unit_string =~ /:/
+      hours, minutes, seconds, microseconds = unit_string.scan(TIME_REGEX)[0]
+      raise ArgumentError, "Invalid Duration" if [hours, minutes, seconds, microseconds].all? {|x| x.nil?}
+      result = "#{hours || 0} h".unit + 
+               "#{minutes || 0} minutes".unit + 
+               "#{seconds || 0} seconds".unit +
+               "#{microseconds || 0} usec".unit
+      copy(result)
+      return
+    end
+    
+    
     # 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 
     end
 
     # weight -- 8 lbs 12 oz    
@@ -976,7 +991,7 @@ class Unit < Numeric
     if (pounds && oz)
       result = Unit.new("#{pounds} lbs") + Unit.new("#{oz} oz")
       copy(result)
-      return #self
+      return 
     end
     
     raise( ArgumentError, "'#{passed_unit_string}' Unit not recognized") if unit_string.count('/') > 1
@@ -1002,7 +1017,7 @@ class Unit < Numeric
     @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") unless us.empty?
+    raise( ArgumentError, "'#{passed_unit_string}' Unit not recognized ('#{us}' left '#{top =~ @@UNIT_MATCH_REGEX}')") unless us.empty?
 
     @numerator = @numerator.map do |item|
        @@PREFIX_MAP[item[0]] ? [@@PREFIX_MAP[item[0]], @@UNIT_MAP[item[1]]] : [@@UNIT_MAP[item[1]]]

data/lib/units.rb

@@ -132,6 +132,7 @@ UNIT_DEFINITIONS = {
 
   #concentration
   '<molar>' => [%w{M molar}, 1000, :concentration, %w{<mole>}, %w{<meter> <meter> <meter>}],
+  '<wtpercent>'  => [%w{wt% wtpercent}, 10, :concentration, %w{<kilogram>}, %w{<meter> <meter> <meter>}],
 
   #activity
   '<katal>' =>  [%w{kat katal Katal}, 1.0, :activity, %w{<mole>}, %w{<second>}],

data/test/test_ruby-units.rb

@@ -141,9 +141,9 @@ class TestRubyUnits < Test::Unit::TestCase
   
   def test_to_base
     unit1 = Unit.new("100 cm")
-    assert_in_delta 1, 0.001, unit1.to_base.scalar
+    assert_in_delta 1, unit1.to_base.scalar, 0.001
     unit2 = Unit("1 mm^2 ms^-2")
-    assert_in_delta 1, 0.001, unit2.to_base.scalar
+    assert_in_delta 1,  unit2.to_base.scalar, 0.001 
   end
   
   def test_to_unit
@@ -154,16 +154,16 @@ class TestRubyUnits < Test::Unit::TestCase
     assert Unit === unit1
     assert unit1 == unit2
     unit1 = "2.54 cm".to_unit("in")
-    assert_in_delta 1, 0.001, unit1.scalar
+    assert_in_delta 1, unit1.scalar, 0.001 
     assert_equal ['<inch>'], unit1.numerator
     unit1 = "2.54 cm".unit("in")
-    assert_in_delta 1, 0.001, unit1.scalar
+    assert_in_delta 1, unit1.scalar, 0.001
     assert_equal ['<inch>'], unit1.numerator
     unit1 = 1.unit
-    assert_in_delta 1, 0.001, unit1.scalar
+    assert_in_delta 1, unit1.scalar, 0.001
     assert_equal ['<1>'], unit1.numerator
     unit1 = [1,'mm'].unit
-    assert_in_delta 1, 0.001, unit1.scalar
+    assert_in_delta 1, unit1.scalar, 0.001
     assert_equal ['<milli>','<meter>'], unit1.numerator
   end
   
@@ -259,7 +259,7 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_equal (a+b).units, 'mm'
     assert_equal (b+a).scalar, 10
     assert_equal (b+a).units, 'cm'
-    assert_in_delta 0.01, (b+c).scalar, 12.54
+    assert_in_delta (b+c).scalar, 12.54, 0.01
     assert_equal (b+c).units, 'cm'
     assert_raises(ArgumentError) {
       a + d
@@ -276,7 +276,7 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_equal (a-b).units, 'mm'
     assert_equal (b-a).scalar, 10
     assert_equal (b-a).units, 'cm'
-    assert_in_delta 0.01, (b-c).scalar, 7.46
+    assert_in_delta (b-c).scalar, 7.46, 0.01
     assert_equal (b-c).units, 'cm'
     assert_raises(ArgumentError) {
       a - d
@@ -616,11 +616,17 @@ class TestRubyUnits < Test::Unit::TestCase
   def test_feet
     unit1 = Unit.new("6'6\"")
     assert_in_delta 6.5, unit1.scalar, 0.01
+    unit2 = "6'".unit
+    assert_equal unit2, '6 feet'.unit
+    unit3 = '6"'.unit
+    assert_equal unit3, '6 inch'.unit
+
   end
   
   def test_pounds
     unit1 = Unit.new("8 pounds, 8 ounces")
     assert_in_delta 8.5, unit1.scalar, 0.01
+    assert_equal '150#'.unit, '150 lbs'.unit
   end
   
   # these units are 'ambiguous' and could be mis-parsed
@@ -782,8 +788,9 @@ class TestRubyUnits < Test::Unit::TestCase
       }
       a = '100 ml'.unit
       b = '50%'.unit
-      c = a*b
-      assert_equal '50 ml'.unit, c
+      c = a*b >> 'ml'
+      assert c =~ a
+      assert_in_delta '50 ml'.unit.scalar, c.scalar, 0.0001
   end
   
   def test_parse
@@ -815,5 +822,17 @@ class TestRubyUnits < Test::Unit::TestCase
     b = '10 mg/ml'.unit
     assert_equal a/b, 1
   end
+
+  def test_wt_percent
+    a = '1 wt%'.unit
+    b = '1 g/dl'.unit
+    assert_equal a,b
+  end
   
+  def test_parse_durations
+    assert_equal "1:00".unit, '1 hour'.unit
+    assert_equal "1:30".unit, "1.5 hour".unit
+    assert_equal "1:30:30".unit, "1.5 hour".unit + '30 sec'.unit
+    assert_equal "1:30:30,200".unit, "1.5 hour".unit + '30 sec'.unit + '200 usec'.unit
+  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.6
-date: 2006-12-05 00:00:00 -05:00
+  version: 0.3.7
+date: 2006-12-14 00:00:00 -05:00
 summary: A model that performs unit conversions and unit math
 require_paths: 
 - lib