ruby-units 1.2.0 → 1.3.0.a

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'rspec/core'
+require File.dirname(__FILE__) + "/../lib/ruby-units"

data/test/test_cache.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'test/unit'
+require 'ruby-units'
+
+class TestCache < Test::Unit::TestCase
+  def setup
+    Unit::Cache.clear
+  end
+  
+  def test_clear
+    Unit::Cache.set("m", "m".unit)
+    Unit::Cache.clear
+    assert_nil(Unit::Cache.get('m'))
+  end
+  
+  def test_set_cache
+    assert_nothing_raised { Unit::Cache.set("m", "m".unit) }
+    assert Unit::Cache.get.keys.include?('m')
+  end
+  
+  def test_get_cache
+    Unit::Cache.set("m", "m".unit)
+    assert_equal("m".unit, Unit::Cache.get['m'])
+  end
+  
+end

data/test/test_ruby-units.rb

@@ -86,7 +86,12 @@ class TestRubyUnits < Test::Unit::TestCase
   
   def test_to_yaml
     unit = "1 mm".u
-    assert_equal "--- !ruby/object:Unit \nscalar: 1.0\nnumerator: \n- <milli>\n- <meter>\ndenominator: \n- <1>\nsignature: 1\nbase_scalar: 0.001\n", unit.to_yaml    
+    if RUBY_PLATFORM == "java"
+      # apparently jruby's implementation of yaml has some white space differences
+      assert_equal "--- !ruby/object:Unit \nscalar: 1\nnumerator: \n  - <milli>\n  - <meter>\ndenominator: \n  - <1>\nsignature: 1\nbase_scalar: !ruby/object:Rational \n  denominator: 1000\n  numerator: 1\n", unit.to_yaml
+    else
+      assert_equal "--- !ruby/object:Unit \nscalar: 1\nnumerator: \n- <milli>\n- <meter>\ndenominator: \n- <1>\nsignature: 1\nbase_scalar: !ruby/object:Rational \n  denominator: 1000\n  numerator: 1\n", unit.to_yaml
+    end
   end
 
   def test_time
@@ -96,9 +101,8 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_equal a - 3600, a - "1 h".unit
     assert_in_delta Time.now - "1 h".unit, "1 h".ago, 1
     assert_in_delta Time.now + 3600, "1 h".from_now, 1
-    assert_in_delta "1 h".unit + Time.now, "1 h".from_now, 1
+    assert_in_delta Time.now + "1 h".unit, "1 h".from_now, 1
     assert_in_delta Time.now - 3600, "1 h".before_now, 1
-    assert_in_delta((Time.now.unit - Time.now).unit.scalar, 0, 1)
     assert_equal "60 min", "min".until(Time.now + 3600).to_s
     assert_equal "01:00", "min".since(Time.now - 3600).to_s("%H:%M")
     assert_in_delta Time.now, "now".time, 1
@@ -546,7 +550,7 @@ class TestRubyUnits < Test::Unit::TestCase
   
   def test_abs
     unit1 = Unit.new("-1 mm")
-    assert_equal 1, unit1.abs
+    assert_equal "1 mm".unit, unit1.abs
   end
   
   def test_ceil
@@ -629,8 +633,7 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_equal b+a, '118 tempF'.unit
     assert_equal a-b, '82 tempF'.unit
     assert_in_delta((a-c).scalar, '50 degF'.unit.scalar, 0.01)
-    assert_equal b+d, '20 degC'.unit
-    
+    assert_in_delta '20 degC'.unit.scalar, (b+d).scalar, 0.01
     assert_raises(ArgumentError) { a * b }
     assert_raises(ArgumentError) { a / b }
     assert_raises(ArgumentError) { a ** 2 }
@@ -676,7 +679,7 @@ class TestRubyUnits < Test::Unit::TestCase
     unit2 = Unit.new("mm")
     assert_equal "1 mm", unit2.to_s
     assert_equal "0.04 in", unit2.to_s("%0.2f in")
-    assert_equal "0.1 cm", unit2.to_s("cm")
+    assert_equal "1/10 cm", unit2.to_s("cm")
     unit3 = Unit.new("1 mm")
     assert_equal "1 mm", unit3.to_s
     assert_equal "0.04 in", unit3.to_s("%0.2f in")
@@ -823,6 +826,16 @@ class TestRubyUnits < Test::Unit::TestCase
     assert_raises(ArgumentError) { "3 s**2 4s s**2".unit }
     assert_raises(ArgumentError) { "3 s 5^6".unit }
     assert_raises(ArgumentError) { "".unit }
+    assert_raises(ArgumentError) { " ".unit }
+    assert_raises(ArgumentError) { "\t".unit }
+    assert_raises(ArgumentError) { "\t\t".unit }
+    assert_raises(ArgumentError) { "\n".unit }
+  end
+  
+  def test_inline_conversions
+    assert_equal "60 s".unit, Unit.parse("1 min to seconds")
+    assert_equal "60 s".unit, Unit.parse("1 min as seconds")
+    assert_equal "60 s".unit, Unit.parse("1 min in seconds")
   end
   
   def test_time_conversions
@@ -914,7 +927,7 @@ class TestRubyUnits < Test::Unit::TestCase
   def test_atan2
     assert_equal Math.atan2('1 mm'.unit,'1 mm'.unit), Math.atan2(1,1)
     assert_raises(ArgumentError) {Math.atan2('1 mm'.unit, '1 lb'.unit)}
-    assert_raises(ArgumentError) {Math.atan2('1 mm'.unit, 1)}
+    assert_raises(RuntimeError) {Math.atan2('1 mm'.unit, 1)}
   end
 
   def test_rational_units
@@ -953,12 +966,12 @@ class TestRubyUnits < Test::Unit::TestCase
     a.to_s                # cache the conversion to itself
     b = Unit.new('2 mm')
     assert_equal('2 mm', b.to_s)
-    assert_equal('0.001 m', a.to_s('m'))
-    assert_equal('0.001 m', a.output['m'])
+    assert_equal('1/1000 m', a.to_s('m'))
+    assert_equal('1/1000 m', a.output['m'])
   end
     
   def test_version
-    assert_equal('1.2.0.b', Unit::VERSION)
+    assert_equal('1.3.0.a', Unit::VERSION)
   end
   
   def test_negation
@@ -978,5 +991,21 @@ class TestRubyUnits < Test::Unit::TestCase
     assert !"1 mm".unit.temperature?    
   end
   
+  def test_parse_into_numbers_and_units
+    assert_equal([1,"m"], Unit.parse_into_numbers_and_units("1 m"))
+    assert_equal([1.0,"m"], Unit.parse_into_numbers_and_units("1.0 m"))
+    assert_equal([0.1,"m"], Unit.parse_into_numbers_and_units("0.1 m"))
+    assert_equal([0.1,"m"], Unit.parse_into_numbers_and_units(".1 m"))
+    assert_equal([-1.23E-3,"m"], Unit.parse_into_numbers_and_units("-1.23E-3 m"))
+    assert_equal([1/4,"m"], Unit.parse_into_numbers_and_units("1/4 m"))
+    assert_equal([-1/4,"m"], Unit.parse_into_numbers_and_units("-1/4 m"))
+    assert_equal([1,"m"], Unit.parse_into_numbers_and_units("1   m"))
+    assert_equal([1,"m"], Unit.parse_into_numbers_and_units("m"))
+    assert_equal([10,""], Unit.parse_into_numbers_and_units("10"))
+    assert_equal([10.0,""], Unit.parse_into_numbers_and_units("10.0"))
+    assert_equal([(1/4),""], Unit.parse_into_numbers_and_units("1/4"))
+    assert_equal([Complex(1,1),""], Unit.parse_into_numbers_and_units("1+1i"))
+  end
+
 end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-units
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
+  prerelease: 6
+  version: 1.3.0.a
 platform: ruby
 authors: 
 - Kevin Olbrich, Ph.D.
@@ -15,52 +10,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -04:00
-default_executable: 
+date: 2011-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: bundler
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  requirement: *id003
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.5"
+  type: :development
+  prerelease: false
+  version_requirements: *id004
 description: Provides classes and methods to perform unit math and conversions
 email: 
 - kevin.olbrich+ruby_units@gmail.com
@@ -73,31 +68,21 @@ extra_rdoc_files:
 - README.md
 - TODO
 files: 
-- CHANGELOG.txt
-- Gemfile
 - LICENSE.txt
-- Manifest.txt
 - README.md
-- RakeFile
 - TODO
-- VERSION
-- lib/ruby-units.rb
-- lib/ruby_units.rb
-- lib/ruby_units/array.rb
-- lib/ruby_units/cmath.rb
-- lib/ruby_units/complex.rb
-- lib/ruby_units/date.rb
-- lib/ruby_units/math.rb
-- lib/ruby_units/numeric.rb
-- lib/ruby_units/object.rb
-- lib/ruby_units/ruby-units.rb
-- lib/ruby_units/string.rb
-- lib/ruby_units/time.rb
-- lib/ruby_units/units.rb
-- lib/ruby_units/version.rb
-- ruby-units.gemspec
+- spec/ruby-units/array_spec.rb
+- spec/ruby-units/complex_spec.rb
+- spec/ruby-units/date_spec.rb
+- spec/ruby-units/math_spec.rb
+- spec/ruby-units/numeric_spec.rb
+- spec/ruby-units/object_spec.rb
+- spec/ruby-units/string_spec.rb
+- spec/ruby-units/time_spec.rb
+- spec/ruby-units/unit_spec.rb
+- spec/spec_helper.rb
+- test/test_cache.rb
 - test/test_ruby-units.rb
-has_rdoc: true
 homepage: https://github.com/olbrich/ruby-units
 licenses: []
 
@@ -111,25 +96,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A class that performs unit conversions and unit math
 test_files: 
+- spec/ruby-units/array_spec.rb
+- spec/ruby-units/complex_spec.rb
+- spec/ruby-units/date_spec.rb
+- spec/ruby-units/math_spec.rb
+- spec/ruby-units/numeric_spec.rb
+- spec/ruby-units/object_spec.rb
+- spec/ruby-units/string_spec.rb
+- spec/ruby-units/time_spec.rb
+- spec/ruby-units/unit_spec.rb
+- spec/spec_helper.rb
+- test/test_cache.rb
 - test/test_ruby-units.rb

data/CHANGELOG.txt

@@ -1,206 +0,0 @@
-Change Log for Ruby-units
-=========================
-2010-11-07  1.2.0.a * a bunch of fixes to make ruby-units ruby 1.9 compatible
-                      (ruby 1.9.3dev (2010-11-07 trunk 29711) [i386-darwin9.8.0])
-2010-03-16  1.1.5   * another bugfix, and update url to point to github
-2010-03-15  1.1.4   * fixed a couple of outstanding bugs
-2007-12-13  1.1.3   * fixed a minor bug with string %
-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'
-
-2007-01-24  1.0.2   * Minor changes in the way powers are calculated to support Uncertain 
-                      numbers better.
-                    * Fixed parsing bug with Uncertain Numbers
-                    * added resolution / typography units (pixels, points, pica)
-                      Note that 'pt' means 'pints' and not 'points'
-                    * added some pressure units ('inHg' & 'inH2O')
-                    * changed default abbreviation of 'knots' to 'kt'
-                    * Changed directory layout
-                    * fixed a minor bug with Time.to_date so comparisons work properly
-
-2007-01-17  1.0.1   * Force units are now defined correctly.
-
-2007-01-12  1.0.0   * Improved handling of complex numbers.  Now you can specify
-                      '1+1i mm'.unit to get a complex unit.
-                    * Taking the root of a negative unit will give you a complex unit
-                    * fixed unary minus to work again
-                    * Math.hypot now takes units.  Both parameters must be the compatible 
-                      units or it will assert.  Units will be converted to a common base 
-                      before use.
-                    * Can now specify units in rational numbers, i.e., '1/4 cup'.unit  
-                    * Seems like a good time to move to 1.0 status
-                    
-2006-12-15  0.3.9   * forgot to increment the version in the gem file..ooops.
-
-2006-12-15  0.3.8   * Any object that supports a 'to_unit' method will now be 
-                      automatically coerced to a unit during math operations.
-                      
-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"
-
-2006-12-05  0.3.6   * Fixed bug where (unit/unit).ceil would fail
-
-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-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.
-
-2006-10-03  0.3.3   * Apparently I can't do math late at night.  
-                      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-03  0.3.2   * More minor bug fixes 
-                      (now fixes a minor name collision with rails)
-
-2006-10-02  0.3.1   * minor bug fixes
-
-2006-10-02  0.3.0   * Performance enhanced by caching results of many
-                      functions (Thanks to Kurt Stephens for pushing this.)
-                    * Throws an exception if the unit is not recognized
-                    * units can now identify what 'kind' they are 
-                      (:length, :mass, etc..)
-                    * New constructors:  
-                      Unit(1,"mm") 
-                      Unit(1,"mm/s")
-                      Unit(1,"mm","s")
-
-2006-09-22  0.2.3   * added support for date/time parsing with the Chronic gem
-                      parsing will use Chronic if it is loaded
-                    * allows Date / Time / DateTime conversions
-                    * better test coverage
-                    * The 'string'.to_time returns a Time object
-                    * 'string'.to_datetime returns a DateTime object
-                    * 'string'.time returns a Time object or a DateTime if the
-                      Time object fails
-                    * 'string'.datetime returns a DateTime or a Time if the
-                      DateTime fails                    
-                      
-2006-09-19  0.2.2   * tweaked temperature handling a bit.  Now enter
-                      temperatures like this:
-                      '0 tempC'.unit #=> 273.15 degK
-                      They will always be converted to kelvin to avoid
-                      problems when temperatures are used in equations.
-                    * added Time.in("5 min")
-                    * added Unit.to_unit to simplify some calls
-                      
-2006-09-18  0.2.1   * Trig math functions (sin, cos, tan, sinh, cosh, tanh)
-                      accept units that can be converted to radians
-                      Math.sin("90 deg".unit) => 1.0
-                    * Date and DateTime can be offset by a time unit
-                      (Date.today + "1 day".unit) => 2006-09-19
-                      Does not work with months since they aren't a consistent
-                      size
-                    * Tweaked time usage a bit
-                      Time.now + "1 hr".unit => Mon Sep 18 11:51:29 EDT 2006
-                    * can output time in 'hh:mm:ss' format by using
-                     'unit.to_s(:time)'
-                    * added time helper methods 
-                      ago, 
-                      since(Time/DateTime), 
-                      until(Time/DateTime), 
-                      from(Time/DateTime), 
-                      before(Time/DateTime), and
-                      after(Time/DateTime)
-                    * Time helpers also work on strings.  In this case they 
-                      are first converted to units
-                      '5 min'.from_now
-                      '1 week'.ago
-                      'min'.since(time)
-                      'min'.until(time)
-                      '1 day'.from()
-                    * Can pass Strings to time helpers and they will be parsed
-                      with ParseDate
-                    * Fixed most parsing bugs (I think)
-                    * Can pass a strftime format string to to_s to format time
-                      output
-                    * can use U'1 mm' or '1 mm'.u to specify units now
-
-2006-09-17          * can now use the '%' format specifier like 
-                      '%0.2f' % '1 mm'.unit #=> '1.00 mm'
-                    * works nicely with time now.
-                      '1 week'.unit + Time.now => 1.159e+09 s
-                      Time.at('1.159e+09 s'.unit) 
-                        => Sat Sep 23 04:26:40 EDT 2006
-                      "1.159e9 s".unit.time 
-                        => Sat Sep 23 04:26:40 EDT 2006
-                    * Time.now.unit => 1.159e9 s
-                    * works well with 'Uncertain' numerics
-                      (www.rubyforge.org/projects/uncertain)
-                    * Improved parsing
-                      
-2006-08-28  0.2.0   * Added 'ruby_unit.rb' file so that requires will still
-                      work if the wrong name is used
-                    * Added 'to' as an alias to '>>' so conversions can be
-                      done as '1 m'.unit.to('1 cm')
-                    * Added ability to convert temperatures to absolute values
-                      using the following syntax:
-                        '37 degC'.unit.to('tempF')  #=> '98.6 degF'.unit
-                    * Tweaked abbreviations a bit.  'ton' is now 'tn' instead
-                      of 't'.  It was causing parse collisions with 'atm'.
-                    * fixed a bug in term elimination routine
-                    * fixed a bug in parsing of powers, and added support for
-                      'm**2' format
-                    * Added support for taking roots of units.  Just
-                      exponentiate with a fraction (0.5, 1.0/3, 0.25)
-                    * renamed 'quantity' to 'scalar'
-                    * any type of Numeric can be used to initialize a Unit,
-                      although this can't really be done with a string
-                    * Units can not be forced to a float using to_f unless
-                      they are unitless.  This prevents some math functions
-                      from forcing the conversion.  To get the scalar, just
-                      use 'unit.scalar'
-                    * 'inspect' returns string representation
-                    * better edge-case detection with math functions.  
-                      "0 mm".unit**-1 now throws a ZeroDivisionError exception
-                    * Ranges can make a series of units, so long as the end 
-                      points have integer scalars.
-                    * Fixed a parsing bug with feet/pounds and scientific
-                      numbers
-                    
-2006-08-22  0.1.1   * Added new format option "1 mm".to_unit("in") now
-                      converts the result to the indicated units
-                    * Fixed some naming issues so that the gem name matches
-                      the require name.
-                    * Added CHANGELOG
-                    * Improved test coverage (100% code coverage via RCov)
-                    * fixed a bug that prevented units with a prefix in the
-                      denominator from converting properly
-                    * can use .unit method on a string to create a new unit
-                      object
-                    * can now coerce or define units from arrays, strings,
-                      numerics.
-                        "1 mm".unit + [1, 'mm'] === "2 mm".unit
-                        [1,'mm','s'].unit === "1 mm/s".unit
-                        2.5.unit === "2.5".unit
-                    * Added instructions on how to add custom units
-                      
-2006-08-22  0.1.0   * Initial Release
-
-
-
-
-
-
-