measured 2.0.0 → 2.8.2

data/test/unit_system_builder_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::UnitSystemBuilderTest < ActiveSupport::TestCase
@@ -11,15 +12,17 @@ class Measured::UnitSystemBuilderTest < ActiveSupport::TestCase
   end
 
   test "#unit cannot add duplicate unit names" do
-    assert_raises Measured::UnitError do
+    error = assert_raises Measured::UnitAlreadyAdded do
       Measured.build do
         unit :m
         unit :in, aliases: [:inch], value: "0.0254 m"
         unit :in, aliases: [:thing], value: "123 m"
       end
     end
+    assert_equal("in", error.unit_name)
+    assert_equal("Unit in has already been added.", error.message)
 
-    assert_raises Measured::UnitError do
+    assert_raises Measured::UnitAlreadyAdded do
       Measured.build do
         unit :m
         unit :in, aliases: [:inch], value: "0.0254 m"
@@ -28,6 +31,19 @@ class Measured::UnitSystemBuilderTest < ActiveSupport::TestCase
     end
   end
 
+  test "#unit raises when cannot find conversion path" do
+    error = assert_raises Measured::MissingConversionPath do
+      Measured.build do
+        unit :m
+        unit :in, value: "0.0254 m"
+        unit :pallets, value: "5 cases"
+      end
+    end
+    assert_equal("pallets", error.from)
+    assert_equal("m", error.to)
+    assert_equal("Cannot find conversion path from pallets to m.", error.message)
+  end
+
   test "#unit is case sensitive" do
     measurable = Measured.build do
       unit :normal
@@ -37,4 +53,106 @@ class Measured::UnitSystemBuilderTest < ActiveSupport::TestCase
 
     assert_equal 'BOLD', measurable.unit_system.unit_for!(:BOLD).name
   end
+
+  test "#unit traverses aliases" do
+    measurable = Measured.build do
+      unit :piece, aliases: [:pieces]
+      unit :dozen, aliases: [:dz], value: "12 pieces"
+    end
+
+    assert_equal 12, measurable.unit_system.units.last.conversion_amount
+    assert_equal "piece", measurable.unit_system.units.last.conversion_unit
+  end
+
+  test "#si_unit adds 21 new units" do
+    measurable = Measured.build do
+      unit :ft
+      si_unit :in, value: "12 ft", aliases: [:ins]
+    end
+
+    assert_equal 22, measurable.unit_names.count
+  end
+
+  test "#si_unit creates units with si prefixes" do
+    measurable = Measured.build do
+      unit :in
+      si_unit :ft, value: "12 in", aliases: [:fts]
+    end
+
+    prefixes = Measured::UnitSystemBuilder::SI_PREFIXES.map { |short, _, _| "#{short}ft" }
+    prefixes += %w(in ft)
+    assert_equal prefixes.sort, measurable.unit_names
+  end
+
+  test "#si_unit cannot add duplicate unit names" do
+    assert_raises Measured::UnitError do
+      Measured.build do
+        unit :m
+        si_unit :in, aliases: [:inch], value: "0.0254 m"
+        si_unit :in, aliases: [:thing], value: "123 m"
+      end
+    end
+
+    assert_raises Measured::UnitError do
+      Measured.build do
+        unit :m
+        si_unit :in, aliases: [:inch], value: "0.0254 m"
+        si_unit :inch, aliases: [:thing], value: "123 m"
+      end
+    end
+  end
+
+  test "#si_unit is case sensitive" do
+    measurable = Measured.build do
+      unit :normal
+      si_unit :bold, value: "10 normal"
+      si_unit :BOLD, value: "100 normal"
+    end
+
+    assert_equal "yBOLD", measurable.unit_system.unit_for!(:yBOLD).name
+    assert_equal "YBOLD", measurable.unit_system.unit_for!(:YBOLD).name
+    assert_equal "BOLD", measurable.unit_system.unit_for!(:BOLD).name
+  end
+
+  test "#si_unit generates working units when given base unit" do
+    measurable = Measured.build do
+      si_unit :g, aliases: [:gram, :grams]
+      unit :bigg, value: "1000 g"
+    end
+
+    assert_equal 1000, measurable.unit_system.unit_for!(:bigg).conversion_amount
+    assert_equal "g", measurable.unit_system.unit_for!(:bigg).conversion_unit
+    assert_equal 1000, measurable.unit_system.unit_for!(:kg).conversion_amount
+    assert_equal "g", measurable.unit_system.unit_for!(:kg).conversion_unit
+  end
+
+  test "#si_unit generates working units when given non base unit" do
+    measurable = Measured.build do
+      unit :lb
+      si_unit :long_ton, value: "2240 lb", aliases: ["long ton", "long tons"]
+    end
+
+    assert_equal (2240), measurable.unit_system.unit_for!(:long_ton).conversion_amount
+    assert_equal "lb", measurable.unit_system.unit_for!(:long_ton).conversion_unit
+  end
+
+  test "#cache sets no cache by default" do
+    measurable = Measured.build do
+      unit :m
+      unit :km, value: "1000 m"
+    end
+
+    refute_predicate measurable.unit_system, :cached?
+  end
+
+  test "#cache sets the class and args" do
+    measurable = Measured.build do
+      unit :m
+      unit :km, value: "1000 m"
+
+      cache AlwaysTrueCache
+    end
+
+    assert_predicate measurable.unit_system, :cached?
+  end
 end

data/test/unit_system_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::UnitSystemTest < ActiveSupport::TestCase
@@ -99,4 +100,18 @@ class Measured::UnitSystemTest < ActiveSupport::TestCase
   test "#convert handles the same unit" do
     assert_equal 2, @conversion.convert(2, from: @unit_in, to: @unit_in)
   end
+
+  test "#update_cache calls the builder" do
+    Measured::ConversionTableBuilder.any_instance.expects(:update_cache)
+    @conversion.update_cache
+  end
+
+  test "#cached? calls the builder and is false" do
+    refute_predicate @conversion, :cached?
+  end
+
+  test "#cached? calls the builder and is true" do
+    conversion = Measured::UnitSystem.new([@unit_m, @unit_in, @unit_ft], cache: { class: AlwaysTrueCache })
+    assert_predicate conversion, :cached?
+  end
 end

data/test/unit_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::UnitTest < ActiveSupport::TestCase
@@ -42,6 +43,10 @@ class Measured::UnitTest < ActiveSupport::TestCase
     assert_equal "pie (1/2 sweet)", Measured::Unit.new(:pie, aliases: ["cake"], value: "0.5 sweet").to_s
   end
 
+  test "#to_s can drop the conversion amount" do
+    assert_equal "pie", Measured::Unit.new(:pie).to_s(with_conversion_string: false)
+  end
+
   test "#inspect returns an expected string" do
     assert_equal "#<Measured::Unit: pie>", Measured::Unit.new(:pie).inspect
     assert_equal "#<Measured::Unit: pie (cake, semi-sweet)>", Measured::Unit.new(:pie, aliases: ["cake", "semi-sweet"]).inspect
@@ -55,7 +60,7 @@ class Measured::UnitTest < ActiveSupport::TestCase
 
   test "#<=> compares non-Unit classes against name" do
     assert_equal 1, @unit <=> "Pap"
-    assert_equal -1, @unit <=> "Pop"
+    assert_equal (-1), @unit <=> "Pop"
   end
 
   test "#<=> is 0 for Unit instances that should be equivalent" do
@@ -65,12 +70,12 @@ class Measured::UnitTest < ActiveSupport::TestCase
   end
 
   test "#<=> is -1 for units with names that come after Pie lexicographically" do
-    assert_equal -1, @unit <=> Measured::Unit.new(:Pigs, value: "10 bacon")
-    assert_equal -1, @unit <=> Measured::Unit.new("Pig", aliases: %w(Pigs), value: "10 bacon")
+    assert_equal (-1), @unit <=> Measured::Unit.new(:Pigs, value: "10 bacon")
+    assert_equal (-1), @unit <=> Measured::Unit.new("Pig", aliases: %w(Pigs), value: "10 bacon")
   end
-  
+
   test "#<=> compares #conversion_amount when unit names the same" do
-    assert_equal -1, @unit <=> Measured::Unit.new(:Pie, value: [11, :pancake])
+    assert_equal (-1), @unit <=> Measured::Unit.new(:Pie, value: [11, :pancake])
     assert_equal 0, @unit <=> Measured::Unit.new(:Pie, value: [10, :foo])
     assert_equal 1, @unit <=> Measured::Unit.new(:Pie, value: [9, :pancake])
   end
@@ -78,4 +83,8 @@ class Measured::UnitTest < ActiveSupport::TestCase
   test "#inverse_conversion_amount returns 1/amount" do
     assert_equal Rational(1, 10), @unit.inverse_conversion_amount
   end
+
+  test "#inverse_conversion_amount handles nil for base unit" do
+    assert_nil Measured::Unit.new(:pie).inverse_conversion_amount
+  end
 end

data/test/units/length_test.rb

@@ -1,19 +1,20 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::LengthTest < ActiveSupport::TestCase
   test ".unit_names_with_aliases should be the expected list of valid units" do
-    assert_equal(
-      %w(
-        centimeter centimeters centimetre centimetres cm feet foot ft
-        in inch inches m meter meters metre metres millimeter
-        millimeters millimetre millimetres mm yard yards yd
-      ),
-      Measured::Length.unit_names_with_aliases
-    )
+    expected_units = %w(m meter metre meters metres feet foot ft in inch inches mi mile miles yard yards yd)
+    expected_units += Measured::UnitSystemBuilder::SI_PREFIXES.flat_map do |short, long, _|
+      ["#{short}m", "#{long}meter", "#{long}metre", "#{long}meters", "#{long}metres"]
+    end
+
+    assert_equal expected_units.sort, Measured::Length.unit_names_with_aliases
   end
 
   test ".unit_names should be the list of base unit names" do
-    assert_equal %w(cm ft in m mm yd), Measured::Length.unit_names
+    expected_units = %w(m ft in mi yd)
+    expected_units += Measured::UnitSystemBuilder::SI_PREFIXES.map { |short, _, _| "#{short}m" }
+    assert_equal expected_units.sort, Measured::Length.unit_names
   end
 
   test ".name" do
@@ -37,10 +38,18 @@ class Measured::LengthTest < ActiveSupport::TestCase
     assert_conversion Measured::Length, "2000 cm", "0.7874015748E3 in"
   end
 
+  test ".convert_to from cm to km" do
+    assert_exact_conversion Measured::Length, "2000 cm", "0.02 km"
+  end
+
   test ".convert_to from cm to m" do
     assert_exact_conversion Measured::Length, "2000 cm", "20 m"
   end
 
+  test ".convert_to from cm to mi" do
+    assert_conversion Measured::Length, "2000 cm", "0.1242742E-1 mi"
+  end
+
   test ".convert_to from cm to mm" do
     assert_exact_conversion Measured::Length, "2000 cm", "20000 mm"
   end
@@ -61,10 +70,18 @@ class Measured::LengthTest < ActiveSupport::TestCase
     assert_exact_conversion Measured::Length, "2000 ft", "24000 in"
   end
 
+  test ".convert_to from ft to km" do
+    assert_conversion Measured::Length, "2000 ft", "0.6096 km"
+  end
+
   test ".convert_to from ft to m" do
     assert_exact_conversion Measured::Length, "2000 ft", "609.6 m"
   end
 
+  test ".convert_to from ft to mi" do
+    assert_conversion Measured::Length, "2000 ft", "0.3787879 mi"
+  end
+
   test ".convert_to from ft to mm" do
     assert_conversion Measured::Length, "2000 ft", "609600 mm"
   end
@@ -85,10 +102,18 @@ class Measured::LengthTest < ActiveSupport::TestCase
     assert_exact_conversion Measured::Length, "2000 in", "2000 in"
   end
 
+  test ".convert_to from in to km" do
+    assert_conversion Measured::Length, "2000 in", "0.508E-1 km"
+  end
+
   test ".convert_to from in to m" do
     assert_conversion Measured::Length, "2000 in", "50.8 m"
   end
 
+  test ".convert_to from in to mi" do
+    assert_conversion Measured::Length, "2000 in", "0.31565658E-1 mi"
+  end
+
   test ".convert_to from in to mm" do
     assert_conversion Measured::Length, "2000 in", "50800 mm"
   end
@@ -97,8 +122,40 @@ class Measured::LengthTest < ActiveSupport::TestCase
     assert_conversion Measured::Length, "2000 in", "0.555555555384E2 yd"
   end
 
+  test ".convert_to from km to cm" do
+    assert_exact_conversion Measured::Length, "2000 km", "2.0E8 cm"
+  end
+
+  test ".convert_to from km to ft" do
+    assert_conversion Measured::Length, "2000 km", "0.6561679790026247E7 ft"
+  end
+
+  test ".convert_to from km to in" do
+    assert_conversion Measured::Length, "2000 km", "0.78740157480315E8 in"
+  end
+
+  test ".convert_to from km to km" do
+    assert_exact_conversion Measured::Length, "2000 km", "2000 km"
+  end
+
+  test ".convert_to from km to m" do
+    assert_exact_conversion Measured::Length, "2000 km", "2.0E6 m"
+  end
+
+  test ".convert_to from km to mi" do
+    assert_conversion Measured::Length, "2000 km", "0.1242742384475E4 mi"
+  end
+
+  test ".convert_to from km to mm" do
+    assert_exact_conversion Measured::Length, "2000 km", "2.0E9 mm"
+  end
+
+  test ".convert_to from km to yd" do
+    assert_conversion Measured::Length, "2000 km", "0.218722659667542E7 yd"
+  end
+
   test ".convert_to from m to cm" do
-    assert_conversion Measured::Length, "2000 m", "200000 cm"
+    assert_exact_conversion Measured::Length, "2000 m", "200000 cm"
   end
 
   test ".convert_to from m to ft" do
@@ -109,10 +166,18 @@ class Measured::LengthTest < ActiveSupport::TestCase
     assert_conversion Measured::Length, "2000 m", "0.7874015748E5 in"
   end
 
+  test ".convert_to from m to km" do
+    assert_exact_conversion Measured::Length, "2000 m", "2 km"
+  end
+
   test ".convert_to from m to m" do
     assert_exact_conversion Measured::Length, "2000 m", "2000 m"
   end
 
+  test ".convert_to from m to mi" do
+    assert_conversion Measured::Length, "2000 m", "0.1242742E1 mi"
+  end
+
   test ".convert_to from m to mm" do
     assert_exact_conversion Measured::Length, "2000 m", "2000000 mm"
   end
@@ -121,6 +186,38 @@ class Measured::LengthTest < ActiveSupport::TestCase
     assert_conversion Measured::Length, "2000 m", "0.2187226596E4 yd"
   end
 
+  test ".convert_to from mi to cm" do
+    assert_conversion Measured::Length, "2000 mi", "0.3218688E9 cm"
+  end
+
+  test ".convert_to from mi to ft" do
+    assert_exact_conversion Measured::Length, "2000 mi", "0.1056E8 ft"
+  end
+
+  test ".convert_to from mi to in" do
+    assert_exact_conversion Measured::Length, "2000 mi", "0.12672E9 in"
+  end
+
+  test ".convert_to from mi to km" do
+    assert_conversion Measured::Length, "2000 mi", "0.3218688E4 km"
+  end
+
+  test ".convert_to from mi to m" do
+    assert_conversion Measured::Length, "2000 mi", "0.3218688E7 m"
+  end
+
+  test ".convert_to from mi to mi" do
+    assert_exact_conversion Measured::Length, "2000 mi", "2000 mi"
+  end
+
+  test ".convert_to from mi to mm" do
+    assert_conversion Measured::Length, "2000 mi", "0.3218688E10 mm"
+  end
+
+  test ".convert_to from mi to yd" do
+    assert_exact_conversion Measured::Length, "2000 mi", "3520000 yd"
+  end
+
   test ".convert_to from mm to cm" do
     assert_exact_conversion Measured::Length, "2000 mm", "200 cm"
   end
@@ -133,10 +230,18 @@ class Measured::LengthTest < ActiveSupport::TestCase
     assert_conversion Measured::Length, "2000 mm", "0.7874015748E2 in"
   end
 
+  test ".convert_to from mm to km" do
+    assert_exact_conversion Measured::Length, "2000 mm", "0.002 km"
+  end
+
   test ".convert_to from mm to m" do
     assert_exact_conversion Measured::Length, "2000 mm", "2 m"
   end
 
+  test ".convert_to from mm to mi" do
+    assert_conversion Measured::Length, "2000 mm", "0.1242742E-2 mi"
+  end
+
   test ".convert_to from mm to mm" do
     assert_exact_conversion Measured::Length, "2000 mm", "2000 mm"
   end
@@ -157,10 +262,18 @@ class Measured::LengthTest < ActiveSupport::TestCase
     assert_exact_conversion Measured::Length, "2000 yd", "72000 in"
   end
 
+  test ".convert_to from yd to km" do
+    assert_conversion Measured::Length, "2000 yd", "0.18288E1 km"
+  end
+
   test ".convert_to from yd to m" do
     assert_conversion Measured::Length, "2000 yd", "1828.8 m"
   end
 
+  test ".convert_to from yd to mi" do
+    assert_conversion Measured::Length, "2000 yd", "1.136364 mi"
+  end
+
   test ".convert_to from yd to mm" do
     assert_conversion Measured::Length, "2000 yd", "1828800 mm"
   end