measured 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf930ad9ebd6fd8480349ba1c78f893aa6d45003
-  data.tar.gz: ccc86704e031efe9d3bb5b01078d0e7093750364
+  metadata.gz: d74ec88793dcfb465b93c16742ee24010aa23d1f
+  data.tar.gz: fc3b21627102730af5282ed7385263ce858d0edf
 SHA512:
-  metadata.gz: 37afaff5fef0534f3687c717894f42f043b4896e3ac7de13e245a9a69372cf659153f77825fbc3afa0281b12b1d0b02af48374e0197a016db6f7dfcef721a43d
-  data.tar.gz: 7668e545f8c31b50c44ee41de0f5cb516d0a0752fe6fec6d10813964633012852d9f0c4806ebb88345a921c07334865ccba75f0b45d03d193df888a5814b127f
+  metadata.gz: 1223687fb266b9451f2d5008993e2464fed49da053d78a058dc16d74420c08f545fc15627cfe6197e2d99511ccb764be6e2ba74c0a8a27970c3bcdda5fbca37b
+  data.tar.gz: 5f71c822cd8c11ac4d73b47b6cd36689c8373f536ca2638af07dee05679cdb54c9a2a82c3ee7ac956ed2caf701cd10d546dfc5b3fe85804d490d6bf72a9c6be0

data/lib/measured/conversion.rb

@@ -1,4 +1,5 @@
 class Measured::Conversion
+  ARBITRARY_CONVERSION_PRECISION = 20
   def initialize
     @base_unit = nil
     @units = []
@@ -43,7 +44,7 @@ class Measured::Conversion
 
     raise Measured::UnitError, "Cannot find conversion entry from #{ from } to #{ to }" unless conversion = conversion_table[from][to]
 
-    value * conversion
+    BigDecimal(value.to_r * conversion,ARBITRARY_CONVERSION_PRECISION)
   end
 
   def conversion_table

data/lib/measured/conversion_table.rb

@@ -44,7 +44,7 @@ class Measured::ConversionTable
   end
 
   def find_tree_traversal_conversion(to:, from:)
-    traverse(from: from, to: to, unit_names: @units.map{|u| u.name }, amount: BigDecimal("1"))
+    traverse(from: from, to: to, unit_names: @units.map{|u| u.name }, amount: Rational(1))
   end
 
   def traverse(from:, to:, unit_names:, amount:)
@@ -52,10 +52,11 @@ class Measured::ConversionTable
 
     unit_names.each do |name|
       if conversion = find_direct_conversion(from: from, to: name)
+        new_amount = amount * conversion.to_r
         if name == to
-          return amount * conversion
+          return new_amount
         else
-          result = traverse(from: name, to: to, unit_names: unit_names, amount: amount * conversion)
+          result = traverse(from: name, to: to, unit_names: unit_names, amount: new_amount)
           return result if result
         end
       end

data/lib/measured/unit.rb

@@ -35,11 +35,7 @@ class Measured::Unit
   end
 
   def inverse_conversion_amount
-    if conversion_amount.is_a?(Rational)
-      Rational(conversion_amount.denominator, conversion_amount.numerator)
-    else
-      BigDecimal(1) /  conversion_amount
-    end
+    1 / conversion_amount.to_r
   end
 
   private

data/lib/measured/version.rb

@@ -1,3 +1,3 @@
 module Measured
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/test/test_helper.rb

@@ -11,10 +11,25 @@ class ActiveSupport::TestCase
 
   protected
 
+  def assert_close_bigdecimal exp, act, delta = BigDecimal('0.000001')
+    n = (exp - act).abs
+    msg = message(msg) {
+      "Expected #{act.inspect} to be\nclose to #{exp.inspect} within #{delta} but was within #{n}"
+    }
+    assert delta >= n, msg
+  end
+
   def assert_conversion(klass, from, to)
     from_amount, from_unit = from.split(" ")
     to_amount, to_unit = to.split(" ")
 
+    assert_close_bigdecimal BigDecimal(to_amount), klass.new(from_amount, from_unit).convert_to(to_unit).value
+  end
+
+  def assert_exact_conversion(klass, from, to)
+    from_amount, from_unit = from.split(" ")
+    to_amount, to_unit = to.split(" ")
+
     assert_equal BigDecimal(to_amount), klass.new(from_amount, from_unit).convert_to(to_unit).value
   end
 end

data/test/units/length_test.rb

@@ -19,29 +19,26 @@ class Measured::LengthTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from cm to cm" do
-    assert_conversion Measured::Length, "2000 cm", "2000 cm"
+    assert_exact_conversion Measured::Length, "2000 cm", "2000 cm"
   end
 
   test ".convert_to from cm to ft" do
-    skip
     assert_conversion Measured::Length, "2000 cm", "0.656167979E2 ft"
   end
 
   test ".convert_to from cm to in" do
-    skip
     assert_conversion Measured::Length, "2000 cm", "0.7874015748E3 in"
   end
 
   test ".convert_to from cm to m" do
-    assert_conversion Measured::Length, "2000 cm", "20 m"
+    assert_exact_conversion Measured::Length, "2000 cm", "20 m"
   end
 
   test ".convert_to from cm to mm" do
-    assert_conversion Measured::Length, "2000 cm", "20000 mm"
+    assert_exact_conversion Measured::Length, "2000 cm", "20000 mm"
   end
 
   test ".convert_to from cm to yd" do
-    skip
     assert_conversion Measured::Length, "2000 cm", "0.2187226596E2 yd"
   end
 
@@ -50,16 +47,15 @@ class Measured::LengthTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from ft to ft" do
-    assert_conversion Measured::Length, "2000 ft", "2000 ft"
+    assert_exact_conversion Measured::Length, "2000 ft", "2000 ft"
   end
 
   test ".convert_to from ft to in" do
-    skip "returns 0.23999999999904E5"
-    assert_conversion Measured::Length, "2000 ft", "24000 in"
+    assert_exact_conversion Measured::Length, "2000 ft", "24000 in"
   end
 
   test ".convert_to from ft to m" do
-    assert_conversion Measured::Length, "2000 ft", "609.6 m"
+    assert_exact_conversion Measured::Length, "2000 ft", "609.6 m"
   end
 
   test ".convert_to from ft to mm" do
@@ -67,7 +63,6 @@ class Measured::LengthTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from ft to yd" do
-    skip "returns 0.6666666664608E3"
     assert_conversion Measured::Length, "2000 ft", "0.666666667E3 yd"
   end
 
@@ -76,12 +71,11 @@ class Measured::LengthTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from in to ft" do
-    skip
     assert_conversion Measured::Length, "2000 in", "0.166666666666E3 ft"
   end
 
   test ".convert_to from in to in" do
-    assert_conversion Measured::Length, "2000 in", "2000 in"
+    assert_exact_conversion Measured::Length, "2000 in", "2000 in"
   end
 
   test ".convert_to from in to m" do
@@ -93,7 +87,6 @@ class Measured::LengthTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from in to yd" do
-    skip
     assert_conversion Measured::Length, "2000 in", "0.555555555384E2 yd"
   end
 
@@ -102,68 +95,59 @@ class Measured::LengthTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from m to ft" do
-    skip
     assert_conversion Measured::Length, "2000 m", "0.656167979E4 ft"
   end
 
   test ".convert_to from m to in" do
-    skip
     assert_conversion Measured::Length, "2000 m", "0.7874015748E5 in"
   end
 
   test ".convert_to from m to m" do
-    assert_conversion Measured::Length, "2000 m", "2000 m"
+    assert_exact_conversion Measured::Length, "2000 m", "2000 m"
   end
 
   test ".convert_to from m to mm" do
-    assert_conversion Measured::Length, "2000 m", "2000000 mm"
+    assert_exact_conversion Measured::Length, "2000 m", "2000000 mm"
   end
 
   test ".convert_to from m to yd" do
-    skip
     assert_conversion Measured::Length, "2000 m", "0.2187226596E4 yd"
   end
 
   test ".convert_to from mm to cm" do
-    assert_conversion Measured::Length, "2000 mm", "200 cm"
+    assert_exact_conversion Measured::Length, "2000 mm", "200 cm"
   end
 
   test ".convert_to from mm to ft" do
-    skip
     assert_conversion Measured::Length, "2000 mm", "0.656167979E1 ft"
   end
 
   test ".convert_to from mm to in" do
-    skip
     assert_conversion Measured::Length, "2000 mm", "0.7874015748E2 in"
   end
 
   test ".convert_to from mm to m" do
-    assert_conversion Measured::Length, "2000 mm", "2 m"
+    assert_exact_conversion Measured::Length, "2000 mm", "2 m"
   end
 
   test ".convert_to from mm to mm" do
-    assert_conversion Measured::Length, "2000 mm", "2000 mm"
+    assert_exact_conversion Measured::Length, "2000 mm", "2000 mm"
   end
 
   test ".convert_to from mm to yd" do
-    skip
     assert_conversion Measured::Length, "2000 mm", "0.2187226596E1 yd"
   end
 
   test ".convert_to from yd to cm" do
-    skip
     assert_conversion Measured::Length, "2000 yd", "0.18288E6 cm"
   end
 
   test ".convert_to from yd to ft" do
-    skip "returns 0.5999999999976E4"
-    assert_conversion Measured::Length, "2000 yd", "6000 ft"
+    assert_exact_conversion Measured::Length, "2000 yd", "6000 ft"
   end
 
   test ".convert_to from yd to in" do
-    skip "returns 0.71999999999712E5"
-    assert_conversion Measured::Length, "2000 yd", "72000 in"
+    assert_exact_conversion Measured::Length, "2000 yd", "72000 in"
   end
 
   test ".convert_to from yd to m" do
@@ -175,7 +159,7 @@ class Measured::LengthTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from yd to yd" do
-    assert_conversion Measured::Length, "2000 yd", "2000 yd"
+    assert_exact_conversion Measured::Length, "2000 yd", "2000 yd"
   end
 
 end

data/test/units/weight_test.rb

@@ -24,74 +24,67 @@ class Measured::WeightTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from g to g" do
-    assert_conversion Measured::Weight, "2000 g", "2000 g"
+    assert_exact_conversion Measured::Weight, "2000 g", "2000 g"
   end
 
   test ".convert_to from g to kg" do
-    assert_conversion Measured::Weight, "2000 g", "2 kg"
+    assert_exact_conversion Measured::Weight, "2000 g", "2 kg"
   end
 
   test ".convert_to from g to lb" do
-    skip
     assert_conversion Measured::Weight, "2000 g", "4.40924524 lb"
   end
 
   test ".convert_to from g to oz" do
-    skip
     assert_conversion Measured::Weight, "2000 g", "70.54792384 oz"
   end
 
   test ".convert_to from kg to g" do
-    assert_conversion Measured::Weight, "2000 kg", "2000000 g"
+    assert_exact_conversion Measured::Weight, "2000 kg", "2000000 g"
   end
 
   test ".convert_to from kg to kg" do
-    assert_conversion Measured::Weight, "2000 kg", "2000 kg"
+    assert_exact_conversion Measured::Weight, "2000 kg", "2000 kg"
   end
 
   test ".convert_to from kg to lb" do
-    skip
-    assert_conversion Measured::Weight, "2000 kg", "4409.24524 lb"
+    assert_conversion Measured::Weight, "2000 kg", "4409.245243 lb"
   end
 
   test ".convert_to from kg to oz" do
-    skip
-    assert_conversion Measured::Weight, "2000 kg", "70547.92384 oz"
+    assert_conversion Measured::Weight, "2000 kg", "70547.92390 oz"
   end
 
   test ".convert_to from lb to g" do
-    assert_conversion Measured::Weight, "2000 lb", "907184.74 g"
+    assert_exact_conversion Measured::Weight, "2000 lb", "907184.74 g"
   end
 
   test ".convert_to from lb to kg" do
-    skip
-    assert_conversion Measured::Weight, "2000 lb", "907.18474 kg"
+    assert_exact_conversion Measured::Weight, "2000 lb", "907.18474 kg"
   end
 
   test ".convert_to from lb to lb" do
-    assert_conversion Measured::Weight, "2000 lb", "2000 lb"
+    assert_exact_conversion Measured::Weight, "2000 lb", "2000 lb"
   end
 
   test ".convert_to from lb to oz" do
-    assert_conversion Measured::Weight, "2000 lb", "32000 oz"
+    assert_exact_conversion Measured::Weight, "2000 lb", "32000 oz"
   end
 
   test ".convert_to from oz to g" do
-    skip
     assert_conversion Measured::Weight, "2000 oz", "56699.04625 g"
   end
 
   test ".convert_to from oz to kg" do
-    skip
     assert_conversion Measured::Weight, "2000 oz", "56.69904625 kg"
   end
 
   test ".convert_to from oz to lb" do
-    assert_conversion Measured::Weight, "2000 oz", "125 lb"
+    assert_exact_conversion Measured::Weight, "2000 oz", "125 lb"
   end
 
   test ".convert_to from oz to oz" do
-    assert_conversion Measured::Weight, "2000 oz", "2000 oz"
+    assert_exact_conversion Measured::Weight, "2000 oz", "2000 oz"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport