ruby-units 0.3.5 → 0.3.6

data/CHANGELOG.txt

@@ -140,4 +140,8 @@ Change Log for Ruby-units
                     * Time math will now return a DateTime if it goes out of
                       range.
                       
-2006-11-20  0.3.5   * Minor bug fixes
+2006-11-20  0.3.5   * Minor bug fixes
+                    * to_int now coerces the result to an actual Integer,
+                      but only works properly for unitless Units.
+
+2006-12-05  0.3.6   * Fixed bug where (unit/unit).ceil would fail

data/README.txt

@@ -1,6 +1,6 @@
 =Ruby Units
 
-Version: 0.3.5
+Version: 0.3.6
 
 Kevin C. Olbrich, Ph.D. 
 kevin.olbrich@gmail.com
@@ -80,6 +80,8 @@ Units can be converted to other units in a couple of ways.
  unit1 === unit2        # => true if units and quantity are the same, even if
                           'equivalent' by <=>
  unit.to('ft')          # convert
+ unit1 + unit2 >> "ft"  # converts result of math to 'ft'
+ (unit1 + unit2).to('ft') # converts result to 'ft'
  
 ==Text Output
 Units will display themselves nicely based on the preferred abbreviation for the units and prefixes.
@@ -98,9 +100,11 @@ The to_s also accepts some options.
 
 Time, Date, and DateTime objects can have time units added or subtracted.
 
-Time.now + "10 min".u 
+Time.now + "10 min".unit 
 
 Several helpers have also been defined.
+Note: If you include the 'Chronic' gem, you can specify times in natural
+      language.
 
 'min'.since('9/18/06 3:00pm')
 'min'.before('9/18/08 3:00pm')

data/lib/ruby-units.rb

@@ -2,7 +2,7 @@ require 'mathn'
 require 'rational'
 require 'date'
 require 'parsedate'
-# = Ruby Units 0.3.5
+# = Ruby Units 0.3.6
 #
 # 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.5'
+  VERSION = '0.3.6'
   @@USER_DEFINITIONS = {}
   @@PREFIX_VALUES = {}
   @@PREFIX_MAP = {}
@@ -688,6 +688,7 @@ class Unit < Numeric
   
   # negates the scalar of the Unit
   def -@
+    return -@scalar if self.unitless?
     Unit.new(-@scalar,@numerator,@denominator)    
   end
   
@@ -697,10 +698,12 @@ class Unit < Numeric
   end
   
   def ceil
+    return @scalar.ceil if self.unitless?
     Unit.new(@scalar.ceil, @numerator, @denominator)    
   end
   
   def floor
+    return @scalar.floor if self.unitless?
     Unit.new(@scalar.floor, @numerator, @denominator)    
   end
 
@@ -718,6 +721,7 @@ class Unit < Numeric
   alias :to_i :to_int
 
   def truncate
+    return @scalar.truncate if self.unitless?
     Unit.new(@scalar.truncate, @numerator, @denominator)    
   end
 
@@ -726,6 +730,7 @@ class Unit < Numeric
   end
   
   def round
+    return @scalar.round if self.unitless?
     Unit.new(@scalar.round, @numerator, @denominator)    
   end
    

data/test/test_ruby-units.rb

@@ -509,12 +509,14 @@ class TestRubyUnits < Test::Unit::TestCase
     unit1 = Unit.new("1.1 mm")
     unit2 = Unit.new("2 mm")
     assert_equal unit2, unit1.ceil
+    assert_equal ('1 mm'.unit / '1 mm'.unit).ceil, 1
   end
   
   def test_floor
     unit1 = Unit.new("1.1 mm")
     unit2 = Unit.new("1 mm")
     assert_equal unit2, unit1.floor
+    assert_equal ('1 mm'.unit / '1 mm'.unit).floor, 1
   end
   
   def test_to_int
@@ -526,12 +528,14 @@ class TestRubyUnits < Test::Unit::TestCase
     unit1 = Unit.new("1.1 mm")
     unit2 = Unit.new("1 mm")
     assert_equal unit2, unit1.truncate
+    assert_equal (unit1/unit2).truncate, 1
   end
   
   def test_round
     unit1 = Unit.new("1.1 mm")
     unit2 = Unit.new("1 mm")
     assert_equal unit2, unit1.round
+    assert_equal (unit1/unit2).round, 1
   end
   
   def test_zero?
@@ -803,7 +807,7 @@ class TestRubyUnits < Test::Unit::TestCase
   end
   
   def test_zero
-        assert_nothing_raised { Unit.new(0) }
+    assert_nothing_raised { Unit.new(0) }
   end
   
   def test_divide_results_in_unitless
@@ -811,4 +815,5 @@ class TestRubyUnits < Test::Unit::TestCase
     b = '10 mg/ml'.unit
     assert_equal a/b, 1
   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.5
-date: 2006-11-30 00:00:00 -05:00
+  version: 0.3.6
+date: 2006-12-05 00:00:00 -05:00
 summary: A model that performs unit conversions and unit math
 require_paths: 
 - lib