ruby-units 0.3.4 → 0.3.5

data/{CHANGELOG → CHANGELOG.txt}

@@ -138,4 +138,6 @@ Change Log for Ruby-units
                     * 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.
+                      range.
+                      
+2006-11-20  0.3.5   * Minor bug fixes

data/Manifest.txt

@@ -0,0 +1,9 @@
+CHANGELOG.txt
+Manifest.txt
+README.txt
+LICENSE.txt
+Rakefile
+lib/ruby-units.rb
+lib/ruby_units.rb
+lib/units.rb
+test/test_ruby-units.rb

data/{README → README.txt}

@@ -1,8 +1,9 @@
 =Ruby Units
 
-Version: 0.2.3
+Version: 0.3.5
 
 Kevin C. Olbrich, Ph.D. 
+kevin.olbrich@gmail.com
 
 http://www.sciwerks.com
 

data/Rakefile

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'hoe'
+require './lib/ruby-units.rb'
+require 'rcov/rcovtask'
+
+Rcov::RcovTask.new do |t|
+  t.test_files = FileList['test/test*.rb']
+  #t.verbose = true     # uncomment to see the executed command
+end
+
+Hoe.new('ruby-units', Unit::VERSION) do |p|
+  p.rubyforge_name = 'ruby-units'
+  p.summary = %q{A model that performs unit conversions and unit math}
+  p.email = 'kevin.olbrich+ruby_units@gmail.com'
+  p.url = 'http://rubyforge.org/projects/ruby-units'
+  p.description = "This library handles unit conversions and unit math"
+  p.changes = p.paragraphs_of('CHANGELOG.txt', 0..1).join("\n\n")
+  p.author = 'Kevin Olbrich, Ph.D'
+end
+
+# vim: syntax=Ruby

data/lib/ruby-units.rb

@@ -2,7 +2,7 @@ require 'mathn'
 require 'rational'
 require 'date'
 require 'parsedate'
-# = Ruby Units 0.3.3
+# = Ruby Units 0.3.5
 #
 # 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.3'
+  VERSION = '0.3.5'
   @@USER_DEFINITIONS = {}
   @@PREFIX_VALUES = {}
   @@PREFIX_MAP = {}
@@ -130,6 +130,7 @@ class Unit < Numeric
     @@PREFIX_REGEX = @@PREFIX_MAP.keys.sort_by {|prefix| prefix.length}.reverse.join('|')
     @@UNIT_REGEX = @@UNIT_MAP.keys.sort_by {|unit| unit.length}.reverse.join('|')
     @@UNIT_MATCH_REGEX = /(#{@@PREFIX_REGEX})*?(#{@@UNIT_REGEX})\b/    
+    Unit.new(1)
   end
   
   
@@ -176,6 +177,11 @@ class Unit < Numeric
   #  8 lbs 8 oz -- recognized as 8 lbs + 8 ounces
   #
   def initialize(*options)
+    @scalar = nil
+    @base_scalar = nil
+    @unit_name = nil
+    @signature = nil
+    @output = nil
     if options.size == 2
       begin
         cached = @@cached_units[options[1]] * options[0] 
@@ -197,8 +203,6 @@ class Unit < Numeric
     
     
     case 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
@@ -218,6 +222,8 @@ class Unit < Numeric
       @scalar = options[0].ajd
       @numerator = ['<day>']
       @denominator = UNITY_ARRAY
+    when "": raise ArgumentError, "No Unit Specified"
+    when String: parse(options[0])   
     else
       raise ArgumentError, "Invalid Unit Format"
     end
@@ -232,12 +238,7 @@ class Unit < Numeric
     unless @@cached_units.keys.include?(unary_unit) || (unary_unit =~ /(temp|deg)(C|K|R|F)/) then
       @@cached_units[unary_unit] = (self.scalar == 1 ? self : unary_unit.unit)
     end
-    @scalar.freeze
-    @numerator.freeze
-    @denominator.freeze
-    @base_scalar.freeze
-    @signature.freeze
-    @is_base.freeze
+    [@scalar, @numerator, @denominator, @base_scalar, @signature, @is_base].each {|x| x.freeze}
     self
   end
 
@@ -248,7 +249,12 @@ class Unit < Numeric
   def self.cached
     return @@cached_units
   end
-
+  
+  def self.clear_cache
+    @@cached_units = {}
+    @@base_unit_cache = {}
+  end
+    
   def self.base_unit_cache
     return @@base_unit_cache
   end
@@ -325,10 +331,10 @@ class Unit < Numeric
     else
       case target_units
       when :ft:
-        inches = self.to("in").scalar
+        inches = self.to("in").scalar.to_int
         out = "#{(inches / 12).truncate}\'#{(inches % 12).round}\""
       when :lbs:
-        ounces = self.to("oz").scalar
+        ounces = self.to("oz").scalar.to_int
         out = "#{(ounces / 16).truncate} lbs, #{(ounces % 16).round} oz"
       when String
         begin #first try a standard format string
@@ -698,11 +704,10 @@ class Unit < Numeric
     Unit.new(@scalar.floor, @numerator, @denominator)    
   end
 
-  # changes internal scalar to an integer, but retains the units
   # if unitless, returns an int
   def to_int
-    return @scalar.to_int if unitless?
-    Unit.new(@scalar.to_int, @numerator, @denominator)    
+    return @scalar.to_int if self.unitless?
+    raise RuntimeError, 'Cannot convert to Integer, use Unit#scalar'
   end
   
   # Tries to make a Time object from current unit
@@ -711,7 +716,10 @@ class Unit < Numeric
   end
   alias :time :to_time
   alias :to_i :to_int
-  alias :truncate :to_int
+
+  def truncate
+    Unit.new(@scalar.truncate, @numerator, @denominator)    
+  end
 
   def to_datetime
     DateTime.new(self.to('d').scalar)

data/test/test_ruby-units.rb

@@ -50,6 +50,7 @@ class TestRubyUnits < Test::Unit::TestCase
     @april_fools_datetime = DateTime.parse('2006-4-1 12:00')
     Time.forced_now = @april_fools
     DateTime.forced_now = @april_fools_datetime 
+    #Unit.clear_cache
   end
   
   def teardown
@@ -361,7 +362,7 @@ class TestRubyUnits < Test::Unit::TestCase
     unit2 = Unit.new("1 in")
     assert_nothing_raised {
       unit3 = unit1 - unit2
-      assert_in_delta -1.54, unit3.scalar, 0.01
+      assert_in_delta(-1.54, unit3.scalar, 0.01)
       }
   end
   
@@ -421,7 +422,7 @@ class TestRubyUnits < Test::Unit::TestCase
     unit1 = Unit.new("1 mm")
     unit2 = Unit.new("2 mm")
     assert_nothing_raised {
-      assert_equal -1, (unit1-unit2).scalar
+      assert_equal(-1, (unit1-unit2).scalar)
       }
   end
   
@@ -517,9 +518,8 @@ class TestRubyUnits < Test::Unit::TestCase
   end
   
   def test_to_int
-    unit1 = Unit.new("1.1 mm")
-    unit2 = Unit.new("1 mm")
-    assert_equal unit2, unit1.to_int
+    assert_raises(RuntimeError)  {Unit.new("1.1 mm").to_i}
+    assert_nothing_raised {Unit.new(10.5).to_i}
   end
   
   def test_truncate
@@ -795,6 +795,20 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_equal today,@april_fools
     last_century = today - '150 years'.unit
     assert_equal last_century.to_date, '1856-04-01'.to_date
-    
   end
-end
+  
+  def test_coercion
+    assert_nothing_raised { 1.0 * '1 mm'.unit}
+    assert_nothing_raised { '1 mm'.unit * 1.0}
+  end
+  
+  def test_zero
+        assert_nothing_raised { Unit.new(0) }
+  end
+  
+  def test_divide_results_in_unitless
+    a = '10 mg/ml'.unit
+    b = '10 mg/ml'.unit
+    assert_equal a/b, 1
+  end
+end

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-units
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
-date: 2006-10-27 00:00:00 -04:00
+  version: 0.3.5
+date: 2006-11-30 00:00:00 -05:00
 summary: A model that performs unit conversions and unit math
 require_paths: 
 - lib
-email: kevin.olbrich+ruby-units@gmail.com
-homepage: http://rubyforge.com/projects/ruby-units/
+email: kevin.olbrich+ruby_units@gmail.com
+homepage: http://rubyforge.org/projects/ruby-units
 rubyforge_project: ruby-units
-description: 
+description: This library handles unit conversions and unit math
 autorequire: 
 default_executable: 
 bindir: bin
@@ -27,13 +27,15 @@ signing_key:
 cert_chain: 
 post_install_message: 
 authors: 
-- Kevin Olbrich
+- Kevin Olbrich, Ph.D
 files: 
-- LICENSE
-- README
-- CHANGELOG
-- lib/ruby_units.rb
+- CHANGELOG.txt
+- Manifest.txt
+- README.txt
+- LICENSE.txt
+- Rakefile
 - lib/ruby-units.rb
+- lib/ruby_units.rb
 - lib/units.rb
 - test/test_ruby-units.rb
 test_files: 
@@ -48,5 +50,13 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.6
+    version: