dimensional 2.0.1 → 2.0.2

data/CHANGELOG

@@ -4,4 +4,5 @@
 1.0.0	Production Release 1.
 1.0.1	Use Rationals for default values and avoid the dreaded integer division = 0 problem.
 1.1.1	Add Metric.load constructor, improve docs and enhance scanner.
-2.0.0	Introduce Dimensional::Locale
+2.0.0	Introduce Dimensional::Locale
+2.0.2	Allow loading of non-positive metrics, particularly in Ruby 1.8.6 where Math.log10

data/TODO

@@ -1,4 +1,6 @@
 1. Fix parsing units like "6m3" for six cubic meters.
 2. Allow locale-specific formatters and detectors.
 3. Default format per dimension/system/metric.
-4. Auto generation of metric prefix units.
+4. Auto generation of metric prefix units.
+5. Change Metric representation into a subclass of BasicObject instead of DelegateClasss
+   (http://codeidol.com/other/rubyckbk/Numbers/Simulating-a-Subclass-of-Fixnum/)

data/lib/dimensional/metric.rb

@@ -76,6 +76,7 @@ module Dimensional
 
       # Create a new instance with the given value (assumed to be in the base unit) and convert it to the preferred unit.
       def load(v)
+        raise "No base unit defined" unless base
         new(v, base).preferred
       end
     end
@@ -104,8 +105,8 @@ module Dimensional
     # Convert into the best unit for the given Locale.  The first system of the given locale with units is elected the preferred system,
     # and within the preferred system, preference is given to units yielding a metric whose order of magnitude is close to zero.
     def localize(locale = Locale.default)
-      target_oom = Math.log10(self) + Math.log10(self.unit.factor)
       preferred_system = self.class.systems(locale).detect{ |s| self.class.units[s].any? }
+      target_oom = Math.log10(self.abs) + Math.log10(self.unit.factor) rescue -(1.0/0.0) # Ruby 1.8.6 raises an exception on log10(0) instead of -Infinity
       bu = self.class.best_fit(target_oom, preferred_system)
       convert(bu)
     end

data/lib/dimensional/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Dimensional
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/test/demo.rb

@@ -127,29 +127,29 @@ Configurator.start do
 
   dimension(:A) do
     system(:SI) do
-      combine('square meter', 'm2', {Unit[:L, :SI, :meter] => 2}, :detector => /\A(sq\.?\s?met(er|re)s?|m2)\Z/) do
+      combine('square meter', 'm2', {Unit[:L, :SI, :meter] => 2}, :detector => /\A(sq(uare|\.)?\s+met(er|re)s?|m2)\Z/) do
         derive('hectare', 'ha', 10000, :format => "%.4f%U") do
         end
       end
     end
     system(:US) do # All measures below are approximations due to the difference between a survey foot and an international foot.
-      combine('square yard', 'yd2', {Unit[:L, :US, :yard] => 2}, :detector => /yd2/) do
+      combine('square yard', 'yd2', {Unit[:L, :US, :yard] => 2}, :detector => /\A(sq(uare|\.)?\s+y(ar)?d|yd2)\Z/) do
         derive('acre', nil, 4840)
       end
-      combine('square mile', nil, {Unit[:L, :US, :mile] => 2}, :detector => /\A(sq(uare|\.)?\s?miles?)\Z/) do
+      combine('square mile', nil, {Unit[:L, :US, :mile] => 2}, :detector => /\A(sq(uare|\.)?\s+mi(le)?s?|mi(le)?2)\Z/) do
         self.alias('section', nil, :detector => /\Asections?\Z/) do
           derive('township', 'twp', 36, :detector => /\Atownships?\Z/)
         end
       end
-      combine('square foot', 'ft2', {Unit[:L, :US, :ft] => 2}, :detector => /ft2/)
-      combine('square inch', 'in2', {Unit[:L, :US, :in] => 2}, :detector => /in2/)
+      combine('square foot', 'ft2', {Unit[:L, :US, :ft] => 2}, :detector => /\A(sq(uare|\.)?\s+f(oo|ee)?t|ft2)\Z/)
+      combine('square inch', 'in2', {Unit[:L, :US, :in] => 2}, :detector => /\A(sq(uare|\.)?\s+(ch(es)?)?|in2)\Z/)
     end
   end
 
   dimension(:V) do
     system(:SI) do
-      combine('cubic meter', 'm3', {Unit[:L, :SI, :meter] => 3}, :detector => /\A(cubic met(er|re)s?|m3)\Z/, :preference => -2) do
-        derive('cubic decimeter', 'dm3', Rational(1, 1000), :detector => /\A(cubic decimet(er|re)s?|dm3)\Z/, :preference => -3) do
+      combine('cubic meter', 'm3', {Unit[:L, :SI, :meter] => 3}, :detector => /\A(cubic\s+met(er|re)s?|m3)\Z/, :preference => -3) do
+        derive('cubic decimeter', 'dm3', Rational(1, 1000), :detector => /\A(cubic\s+decimet(er|re)s?|dm3)\Z/, :preference => -4) do
           self.alias('liter', 'l', :detector => /\A(lit(er|re)s?|l|L)\Z/) do
             derive('milliliter', 'ml', Rational(1, 1000), :detector => /\A(millilit(er|re)s?|ml|mL)\Z/)
           end
@@ -157,12 +157,12 @@ Configurator.start do
       end
     end
     system(:Imp) do
-      reference('ounce', 'fl oz', Unit[:V, :SI, 'milliliter'], 28.4130625, :detector => /\A((fluid )?ounces?|oz)\Z/) do
+      reference('ounce', 'fl oz', Unit[:V, :SI, 'milliliter'], 28.4130625, :detector => /\A((fluid\s+)?ounces?|oz)\Z/) do
         derive('gill', 'gi', 5, :detector => /\A(gills?|gis?)\Z/) do
           derive('cup', 'cp', 2, :detector => /\A(cups?|cps?)\Z/) do
             derive('pint', 'pt', 2, :detector => /\A(pints?|pts?)\Z/) do
               derive('quart', 'qt', 2, :detector => /\A(quarts?|qts?)\Z/) do
-                derive('gallon', 'gal', 4, :detector => /\A(gallons?|gals?)\Z/)
+                derive('gallon', 'gal', 4, :detector => /\A(gallons?|gal)\Z/)
               end
             end
           end
@@ -170,14 +170,14 @@ Configurator.start do
       end
     end
     system(:US) do
-      combine('cubic inch', 'in3', {Unit[:L, :US, :inch] => 3}, :detector => /\A(cubic inch(es)?|in3)\Z/ ) do
-        derive('gallon', 'gal', 231, :detector => /\A(gallons?|gals?)\Z/) do
+      combine('cubic inch', 'in3', {Unit[:L, :US, :inch] => 3}, :detector => /\A(cubic\s+in(ch(es)?)?|in3)\Z/ ) do
+        derive('gallon', 'gal', 231, :detector => /\A(gallons?|gal)\Z/) do
           derive('quart', 'qt', Rational(1,4), :detector => /\A(quarts?|qts?)\Z/) do
             derive('pint', 'pt', Rational(1,2), :detector => /\A(pints?|pts?)\Z/) do
               derive('cup', nil, Rational(1,2), :detector => /\Acups?\Z/) do
                 derive('gill', 'gi', Rational(1,2), :detector => /\A(gills?|gis?)\Z/) do
-                  derive('fluid ounce', 'fl oz', Rational(1, 4), :detector => /\A((fluid )?ounces?|oz)\Z/) do
-                    derive('dram', 'dr', Rational(1, 8), :detector => /\A((fluid )?dra(ch)?ms?|(fl )?drs?)\Z/) do
+                  derive('fluid ounce', 'fl oz', Rational(1, 4), :detector => /\A((fluid\s+)?ounces?|oz)\Z/) do
+                    derive('dram', 'dr', Rational(1, 8), :detector => /\A((fluid\s+)?dra(ch)?ms?|(fl\s+)?drs?)\Z/) do
                       derive('minim', '♏', Rational(1, 60))
                     end
                   end

data/test/metric_test.rb

@@ -306,4 +306,19 @@ class MetricTest < Test::Unit::TestCase
     assert_equal "1.8600nm", distance.parse('1.8565454 nm', Locale::BA).strfmeasure("%.4f%U")
     assert_equal "1.86", distance.parse('1.8565454 nm', Locale::BA).strfmeasure("%s")
   end
+
+  # A "true" metric (for some values of true) with negative magnitude has dubious semantics, but we try to support it.
+  def test_load_negative
+    distance = Class.new(Metric)
+    distance.dimension = Dimension::L
+    distance.base = @meter
+    assert_equal distance.new(-1, @meter), distance.load(-1)
+  end
+
+  def test_load_zero
+    distance = Class.new(Metric)
+    distance.dimension = Dimension::L
+    distance.base = @meter
+    assert_equal distance.new(0, @meter), distance.load(0)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dimensional
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Chris Hapgood
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 -05:00
+date: 2010-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: []