ruby-units 1.1.0 → 1.1.2

data/CHANGELOG.txt

@@ -1,5 +1,13 @@
 Change Log for Ruby-units
 =========================
+2007-12-12  1.1.2   * fixed a bug with format strings
+                    * detect if ruby 1.8.6 is installed and use its' to_date function
+                    
+2007-07-14  1.1.1   * fixed bug that would prevent creating '<pound-mass>' units, which
+                      prevented rounding from working
+                    * tests do not fail if Uncertain gem is not installed, you just get an
+                      annoying warning message
+                      
 2007-01-28  1.1.0   * completely revamped the temperature handling system (see README)
                     * fixed some spelling errors in some units
                     * fixed to_datetime and to_date to convert durations to datetimes and dates'

data/README.txt

@@ -1,11 +1,12 @@
 =Ruby Units
 
 Kevin C. Olbrich, Ph.D. 
+
 kevin.olbrich@gmail.com
 
 http://www.sciwerks.com
 
-Project page: http://rubyforge.org/projects/ruby-units
+Project page: http://ruby-units.rubyforge.org/ruby-units
 
 ==Introduction
 Many technical applications make use of specialized calculations at some point.  
@@ -111,26 +112,26 @@ 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')
-'days'.until('1/1/07')
-'5 min'.from(Time.now)
-'5 min'.from_now
-'5 min'.before_now
-'5 min'.before(Time.now)
-'10 min'.ago
+ 'min'.since('9/18/06 3:00pm')
+ 'min'.before('9/18/08 3:00pm')
+ 'days'.until('1/1/07')
+ '5 min'.from(Time.now)
+ '5 min'.from_now
+ '5 min'.before_now
+ '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
+ '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}
+ [U('0 h')..U('10 h')].each {|x| p x}
 works so long as the starting point has an integer scalar
 
 ==Math functions
@@ -145,29 +146,29 @@ Temperature units (i.e., 'tempK') can be converted back and forth, and will take
 the differences in the zero points of the various scales. Differential temperature (e.g., '100 degC'.unit) 
 units behave like most other units.
 
-'37 tempC'.unit >> 'tempF' #=> 98.6 tempF
+ '37 tempC'.unit >> 'tempF' #=> 98.6 tempF
 
 Ruby-units will raise an exception if you attempt to create a temperature unit that would 
 fall below absolute zero.
 
 Unit math on temperatures is fairly limited.  
 
-'100 tempC'.unit + '10 degC'.unit   #=> '110 tempC'.unit
-'100 tempC'.unit - '10 degC'.unit   #=> '90 tempC'.unit
-'100 tempC'.unit + '50 tempC'.unit  #=> exception 
-'100 tempC'.unit - '50 tempC'.unit  #=> '50 degC'.unit
-'50 tempC'.unit - '100 tempC'.unit  #=> '-50 degC'.unit
-'100 tempC'.unit * [scalar]         #=> '100*scalar tempC'.unit
-'100 tempC'.unit / [scalar]         #=> '100/scalar tempC'.unit
-'100 tempC'.unit * [unit]           #=> exception
-'100 tempC'.unit / [unit]           #=> exception
-'100 tempC'.unit ** N               #=> exception
-
-'100 tempC'.unit >> 'degC'          #=> '100 degC'.unit   
-    This conversion references the 0 point on the scale of the temperature unit 
-
-'100 degC'.unit >> 'tempC'          #=> '-173 tempC'.unit
-    These conversions are always interpreted as being relative to absolute zero.
-    Conversions are probably better done like this...
-    '0 tempC'.unit + '100 degC'.unit #=> '100 tempC'.unit
+ '100 tempC'.unit + '10 degC'.unit   #=> '110 tempC'.unit
+ '100 tempC'.unit - '10 degC'.unit   #=> '90 tempC'.unit
+ '100 tempC'.unit + '50 tempC'.unit  #=> exception  
+ '100 tempC'.unit - '50 tempC'.unit  #=> '50 degC'.unit
+ '50 tempC'.unit - '100 tempC'.unit  #=> '-50 degC'.unit
+ '100 tempC'.unit * [scalar]         #=> '100*scalar tempC'.unit
+ '100 tempC'.unit / [scalar]         #=> '100/scalar tempC'.unit
+ '100 tempC'.unit * [unit]           #=> exception
+ '100 tempC'.unit / [unit]           #=> exception
+ '100 tempC'.unit ** N               #=> exception
+
+ '100 tempC'.unit >> 'degC'          #=> '100 degC'.unit   
+This conversion references the 0 point on the scale of the temperature unit 
+
+ '100 degC'.unit >> 'tempC'          #=> '-173 tempC'.unit
+These conversions are always interpreted as being relative to absolute zero.
+Conversions are probably better done like this...
+ '0 tempC'.unit + '100 degC'.unit #=> '100 tempC'.unit
 

data/Rakefile

@@ -2,11 +2,14 @@ require 'rubygems'
 require 'hoe'
 require './lib/ruby_units/units'
 require './lib/ruby_units/ruby-units'
-require 'rcov/rcovtask'
 
-Rcov::RcovTask.new do |t|
-  t.test_files = FileList['test/test*.rb']
-  #t.verbose = true     # uncomment to see the executed command
+begin
+  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
+rescue
 end
 
 Hoe.new('ruby-units', Unit::VERSION) do |p|

data/lib/ruby_units/ruby-units.rb

@@ -40,7 +40,7 @@ require 'parsedate'
 #  Unit.setup
 class Unit < Numeric
   # pre-generate hashes from unit definitions for performance.  
-  VERSION = '1.1.0'
+  VERSION = '1.1.2'
   @@USER_DEFINITIONS = {}
   @@PREFIX_VALUES = {}
   @@PREFIX_MAP = {}
@@ -52,7 +52,7 @@ class Unit < Numeric
   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)/
+  LBS_OZ_REGEX = /(\d+)\s*(?:#|lbs|pounds|pound-mass)+[\s,]*(\d+)\s*(?:oz|ounces)/
   SCI_NUMBER = %r{([+-]?\d*[.]?\d+(?:[Ee][+-]?)?\d*)}
   RATIONAL_NUMBER = /(\d+)\/(\d+)/
   COMPLEX_NUMBER = /#{SCI_NUMBER}?#{SCI_NUMBER}i\b/
@@ -240,7 +240,6 @@ class Unit < Numeric
     self.update_base_scalar
     raise ArgumentError, "Temperature out of range" if self.is_temperature? &&  self.base_scalar < 0
   
-
     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)|%|(#{TIME_REGEX})|i\s?(.+)?|&plusmn;|\+\/-/)
@@ -270,6 +269,11 @@ class Unit < Numeric
     return @@base_unit_cache
   end
   
+  def self.parse(input)
+    first, second = input.scan(/(.+)\s(?:in|to|as)\s(.+)/i).first
+    second.nil? ? first.unit : first.unit.to(second)
+  end
+  
   def to_unit
     self
   end
@@ -382,10 +386,13 @@ class Unit < Numeric
     self.to_s
   end
   
+  # 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/
   end
   
+  # returns the 'degree' unit associated with a temperature unit
+  # '100 tempC'.unit.temperature_scale #=> 'degC'
   def temperature_scale
     return nil unless self.is_temperature?
     self.units =~ /temp(C|F|R|K)/
@@ -456,7 +463,7 @@ class Unit < Numeric
       case
       when self.zero? : other.dup
       when self =~ other :
-        raise ArgumentError, "Cannot add two temperatures" if (self.is_temperature? && other.is_temperature?)
+        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:
@@ -492,7 +499,7 @@ class Unit < Numeric
           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? :
-            raise ArgumentError, "Cannot subtract a temperature from a differential unit"
+            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))
             Unit.new(:scalar=>(self.base_scalar - other.base_scalar)*@q, :numerator=>@numerator, :denominator=>@denominator, :signature=>@signature)            
@@ -552,7 +559,7 @@ class Unit < Numeric
   #
   # For now, if a rational is passed in, it will be used, otherwise we are stuck with integers and certain floats < 1
   def **(other)
-    raise ArgumentError, "Cannot exponentiate a temperature" if self.is_temperature?
+    raise ArgumentError, "Cannot raise a temperature to a power" if self.is_temperature?
     if Numeric === other
       return Unit("1") if other.zero?
       return self if other == 1
@@ -660,43 +667,6 @@ class Unit < Numeric
             when 'tempR'  : @base_scalar * (9.0/5.0) 
           end
         
-=begin
-      q=case start_unit
-         when /\A(temp|deg)C\Z/:
-          case target_unit
-            when 'tempC'  : @scalar
-            when 'tempK'  : @scalar + 273.15
-            when 'tempF'  : @scalar * (9.0/5.0) + 32.0
-            when 'tempR'  : @scalar * (9.0/5.0) + 491.67
-          end
-        when /\A(temp|deg)K\Z/:
-          case target_unit
-            when 'tempC'  : @scalar - 273.15
-            when 'tempK'  : @scalar 
-            when 'tempF'  : @scalar * (9.0/5.0) - 459.67
-            when 'tempR'  : @scalar * (9.0/5.0) 
-          end
-        when /\A(temp|deg)F\Z/:
-          case target_unit
-            when 'tempC'  : (@scalar-32)*(5.0/9.0)
-            when 'tempK'  : (@scalar+459.67)*(5.0/9.0)
-            when 'tempF'  : @scalar 
-            when 'tempR'  : @scalar  + 459.67
-          end
-        when /\A(temp|deg)R\Z/:
-          case target_unit
-            when 'tempC'  : @scalar*(5.0/9.0) -273.15
-            when 'tempK'  : @scalar*(5.0/9.0)
-            when 'tempF'  : @scalar - 459.67
-            when 'tempR'  : @scalar
-          end
-
-        else
-          return self.to_base.to(other) unless self.is_base?
-          #raise ArgumentError, "Unknown temperature conversion requested #{self.numerator}"
-      end
-=end
-      #target_unit =~ /temp(C|K|F|R)/
       Unit.new("#{q} #{target_unit}")
     else
        case other
@@ -775,7 +745,6 @@ class Unit < Numeric
   
   # negates the scalar of the Unit
   def -@
-    #raise ArgumentError, "Cannot negate an absolute temperature" if self.is_temperature? && ['degK','degR'].include?(self.temperature_scale)
     return -@scalar if self.unitless?
     self.dup * -1
   end
@@ -923,9 +892,6 @@ class Unit < Numeric
     end
   end
   
-  
-  
-  
   # calculates the unit signature vector used by unit_signature
   def unit_signature_vector
       return self.to_base.unit_signature_vector unless self.is_base?
@@ -950,8 +916,7 @@ class Unit < Numeric
   
   def initialize_copy(other)
     @numerator = other.numerator.dup
-    @denominator = other.denominator.dup
-    
+    @denominator = other.denominator.dup    
   end
   
   # calculates the unit signature id for use in comparing compatible units and simplification
@@ -1033,8 +998,6 @@ class Unit < Numeric
     if unit_string =~ /\$\s*(#{NUMBER_REGEX})/
       unit_string = "#{$1} USD"
     end
-    
-
     unit_string.gsub!(/%/,'percent')
     unit_string.gsub!(/'/,'feet')
     unit_string.gsub!(/"/,'inch')
@@ -1123,7 +1086,6 @@ 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") unless us.empty?
 
     @numerator = @numerator.map do |item|

data/lib/ruby_units/string.rb

@@ -11,7 +11,7 @@ class String
   def %(*args)
     case args[0]
     when Unit: args[0].to_s(self)
-    when defined?(Uncertain) && Uncertain === args[0]: args[0].to_s(self)
+    when (Object.const_defined?('Uncertain') && (Uncertain === args[0])): args[0].to_s(self)
     when Complex: args[0].to_s
     else
       unit_format(*args)

data/lib/ruby_units/time.rb

@@ -28,9 +28,12 @@ class Time
     DateTime.civil(1970,1,1)+(self.to_f+self.gmt_offset)/86400
   end
   
-  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)
+  # ruby 1.8.6 has a reasonable implementation of this that works well, so let's use it.
+  if VERSION == "1.8.4"
+    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 )
+    end
   end
   
   def +(other)

data/lib/ruby_units/units.rb

@@ -64,7 +64,7 @@ UNIT_DEFINITIONS = {
   '<short-ton>' => [%w{tn ton}, 907.18474, :mass, %w{<kilogram>}],
   '<metric-ton>'=>[%w{tonne}, 1000, :mass, %w{<kilogram>}],
   '<carat>' => [%w{ct carat carats}, 0.0002, :mass, %w{<kilogram>}],
-  '<pound-mass>' => [%w{lbs lb pound pounds #}, 0.45359237, :mass, %w{<kilogram>}],
+  '<pound>' => [%w{lbs lb pound pounds #}, 0.45359237, :mass, %w{<kilogram>}],
   '<ounce>' => [%w{oz ounce ounces}, 0.0283495231, :mass, %w{<kilogram>}],
   '<gram>'    =>  [%w{g gram grams gramme grammes},1e-3,:mass, %w{<kilogram>}],
 

data/test/test_ruby-units.rb

@@ -1,11 +1,9 @@
 require 'test/unit'
 require 'ruby-units'
 require 'rubygems'
-require 'uncertain'
+require 'uncertain' if Gem::GemPathSearcher.new.find('uncertain')
 require 'yaml'
-require 'chronic'
-
-
+require 'chronic' if Gem::GemPathSearcher.new.find('chronic')
 
 class Unit < Numeric
   @@USER_DEFINITIONS = {'<inchworm>' =>  [%w{inworm inchworm}, 0.0254, :length, %w{<meter>} ],
@@ -15,6 +13,7 @@ end
 
 class Time
   @@forced_now = nil
+  @@forced_gmt = nil
   class << self
     alias :unforced_now :now
     def forced_now
@@ -25,8 +24,18 @@ class Time
     def forced_now=(now)
       @@forced_now = now
     end
+  end
     
+  alias :unforced_gmt :gmt_offset
+  def forced_gmt
+    return @@forced_gmt ? @@forced_gmt : unforced_gmt
+  end
+  alias :gmt_offset :forced_gmt
+
+  def forced_gmt=(gmt)
+    @@forced_gmt = now
   end
+    
 end
 
 class DateTime
@@ -746,7 +755,7 @@ class TestRubyUnits < Test::Unit::TestCase
       a = '1 +/- 1 mm'.unit
       assert_equal a.to_s, '1 +/- 1 mm' 
     else
-      fail "Can't test Uncertain Units unless 'Uncertain' gem is installed"
+      puts "Can't test Uncertain Units unless 'Uncertain' gem is installed"
     end  
   end
   
@@ -869,7 +878,25 @@ class TestRubyUnits < Test::Unit::TestCase
   
   def test_to_date
     a = Time.now
-    assert_equal a.to_date, Date.today
+    assert_equal a.send(:to_date), Date.today
+  end
+  
+  def test_natural_language
+    assert_equal Unit.parse("10 mm in cm"), '10 mm'.unit.to('cm')
   end
+  
+  def test_round_pounds
+    assert_equal '1 lbs'.unit, '1.1 lbs'.unit.round
+  end
+
+  def test_explicit_init
+    assert_equal '1 lbf'.unit, '1 <pound-force>'.unit
+    assert_equal '1 lbs'.unit, '1 <pound>'.unit    
+  end
+  
+  def test_format_nil_string
+    assert_nothing_raised {"" % nil}
+  end
+    
 end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
+rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-units
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2007-01-28 00:00:00 -05:00
+  version: 1.1.2
+date: 2007-12-13 00:00:00 -05:00
 summary: A model that performs unit conversions and unit math
 require_paths: 
 - lib
@@ -49,10 +49,14 @@ files:
 - test/test_ruby-units.rb
 test_files: 
 - test/test_ruby-units.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- CHANGELOG.txt
+- Manifest.txt
+- README.txt
+- LICENSE.txt
 executables: []
 
 extensions: []
@@ -67,5 +71,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.7
+        version: 1.3.0
     version: