measured 2.0.0 → 2.8.2

data/test/units/weight_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::WeightTest < ActiveSupport::TestCase
@@ -6,17 +7,50 @@ class Measured::WeightTest < ActiveSupport::TestCase
   end
 
   test ".unit_names_with_aliases should be the expected list of valid units" do
-    assert_equal(
-      %w(g gram grams kg kilogram kilograms lb lbs ounce ounces oz pound pounds),
-      Measured::Weight.unit_names_with_aliases
+    expected_units = %w(
+      N
+      W/T
+      displacement_ton
+      displacement_tons
+      g
+      gram
+      grams
+      imperial_ton
+      imperial_tons
+      lb
+      lbs
+      long_ton
+      long_tons
+      metric_ton
+      metric_tons
+      newton
+      newtons
+      ounce
+      ounces
+      oz
+      pound
+      pounds
+      short_ton
+      short_tons
+      slug
+      slugs
+      t
+      weight_ton
+      weight_tons
     )
+    expected_units += Measured::UnitSystemBuilder::SI_PREFIXES.flat_map do |short, long, _|
+      ["#{short}g", "#{long}gram", "#{long}grams"]
+    end
+
+    assert_equal expected_units.sort, Measured::Weight.unit_names_with_aliases
   end
 
   test ".unit_names should be the list of base unit names" do
-    assert_equal %w(g kg lb oz), Measured::Weight.unit_names
+    expected_units = %w(N g lb long_ton oz short_ton slug t)
+    expected_units += Measured::UnitSystemBuilder::SI_PREFIXES.map { |short, _, _| "#{short}g" }
+    assert_equal expected_units.sort, Measured::Weight.unit_names
   end
 
-
   test "Measured::Weight() delegates automatically to .new" do
     assert_equal Measured::Weight.new(1, :lb), Measured::Weight(1, :lb)
     assert_equal Measured::Weight.new(2000, :g), Measured::Weight(2, :kg)
@@ -42,6 +76,26 @@ class Measured::WeightTest < ActiveSupport::TestCase
     assert_conversion Measured::Weight, "2000 g", "70.54792384 oz"
   end
 
+  test ".convert_to from g to slug" do
+    assert_conversion Measured::Weight, "2000 g", "0.1370435 slug"
+  end
+
+  test ".convert_to from g to N" do
+    assert_conversion Measured::Weight, "2000 g", "19.6133 N"
+  end
+
+  test ".convert_to from g to short_ton" do
+    assert_conversion Measured::Weight, "2000 g", "0.002204623 short_ton"
+  end
+
+  test ".convert_to from g to long_ton" do
+    assert_conversion Measured::Weight, "2000 g", "0.001968413055222 long_ton"
+  end
+
+  test ".convert_to from g to t" do
+    assert_exact_conversion Measured::Weight, "2000 g", "0.002 t"
+  end
+
   test ".convert_to from kg to g" do
     assert_exact_conversion Measured::Weight, "2000 kg", "2000000 g"
   end
@@ -58,6 +112,26 @@ class Measured::WeightTest < ActiveSupport::TestCase
     assert_conversion Measured::Weight, "2000 kg", "70547.92390 oz"
   end
 
+  test ".convert_to from kg to slug" do
+    assert_conversion Measured::Weight, "2000 kg", "137.0435311239221 slug"
+  end
+
+  test ".convert_to from kg to N" do
+    assert_conversion Measured::Weight, "2000 kg", "19613.3 N"
+  end
+
+  test ".convert_to from kg to short_ton" do
+    assert_conversion Measured::Weight, "2000 kg", "2.204622621848 short_ton"
+  end
+
+  test ".convert_to from kg to long_ton" do
+    assert_conversion Measured::Weight, "2000 kg", "1.9684130552220003 long_ton"
+  end
+
+  test ".convert_to from kg to t" do
+    assert_exact_conversion Measured::Weight, "2000 kg", "2 t"
+  end
+
   test ".convert_to from lb to g" do
     assert_exact_conversion Measured::Weight, "2000 lb", "907184.74 g"
   end
@@ -74,6 +148,26 @@ class Measured::WeightTest < ActiveSupport::TestCase
     assert_exact_conversion Measured::Weight, "2000 lb", "32000 oz"
   end
 
+  test ".convert_to from lb to slug" do
+    assert_conversion Measured::Weight, "2000 lb", "62.16190007566859 slug"
+  end
+
+  test ".convert_to from lb to N" do
+    assert_conversion Measured::Weight, "2000 lb", "8896.443230521 N"
+  end
+
+  test ".convert_to from lb to short_ton" do
+    assert_exact_conversion Measured::Weight, "2000 lb", "1 short_ton"
+  end
+
+  test ".convert_to from lb to long_ton" do
+    assert_conversion Measured::Weight, "2000 lb", "0.892857142857088 long_ton"
+  end
+
+  test ".convert_to from lb to t" do
+    assert_conversion Measured::Weight, "2000 lb", "0.90718474 t"
+  end
+
   test ".convert_to from oz to g" do
     assert_conversion Measured::Weight, "2000 oz", "56699.04625 g"
   end
@@ -90,4 +184,195 @@ class Measured::WeightTest < ActiveSupport::TestCase
     assert_exact_conversion Measured::Weight, "2000 oz", "2000 oz"
   end
 
+  test ".convert_to from oz to slug" do
+    assert_conversion Measured::Weight, "2000 oz", "3.885119 slug"
+  end
+
+  test ".convert_to from oz to N" do
+    assert_conversion Measured::Weight, "2000 oz", "556.0277019075625 N"
+  end
+
+  test ".convert_to from oz to short_ton" do
+    assert_conversion Measured::Weight, "2000 oz", "0.06249999999997801 short_ton"
+  end
+
+  test ".convert_to from oz to long_ton" do
+    assert_conversion Measured::Weight, "2000 oz", "0.055803571428568 long_ton"
+  end
+
+  test ".convert_to from oz to t" do
+    assert_conversion Measured::Weight, "2000 oz", "0.05669904625 t"
+  end
+
+  test ".convert_to from slug to g" do
+    assert_conversion Measured::Weight, "2000 slug", "29187806 g"
+  end
+
+  test ".convert_to from slug to kg" do
+    assert_conversion Measured::Weight, "2000 slug", "29187.805999999997 kg"
+  end
+
+  test ".convert_to from slug to lb" do
+    assert_conversion Measured::Weight, "2000 slug", "64348.09738973343 lb"
+  end
+
+  test ".convert_to from slug to oz" do
+    assert_conversion Measured::Weight, "2000 slug", "1029569.5582357347 oz"
+  end
+
+  test ".convert_to from slug to slug" do
+    assert_exact_conversion Measured::Weight, "2000 slug", "2000 slug"
+  end
+
+  test ".convert_to from slug to N" do
+    assert_conversion Measured::Weight, "2000 slug", "286234.59770989994 N"
+  end
+
+  test ".convert_to from slug to short_ton" do
+    assert_conversion Measured::Weight, "2000 slug", "32.17404869485539 short_ton"
+  end
+
+  test ".convert_to from slug to long_ton" do
+    assert_conversion Measured::Weight, "2000 slug", "28.726829191843514 long_ton"
+  end
+
+  test ".convert_to from slug to t" do
+    assert_conversion Measured::Weight, "2000 slug", "29.187806 t"
+  end
+
+  test ".convert_to from short_ton to g" do
+    assert_conversion Measured::Weight, "2000 short_ton", "1814369480 g"
+  end
+
+  test ".convert_to from short_ton to kg" do
+    assert_conversion Measured::Weight, "2000 short_ton", "1814369.48 kg"
+  end
+
+  test ".convert_to from short_ton to lb" do
+    assert_exact_conversion Measured::Weight, "2000 short_ton", "4000000 lb"
+  end
+
+  test ".convert_to from short_ton to oz" do
+    assert_exact_conversion Measured::Weight, "2000 short_ton", "64000000 oz"
+  end
+
+  test ".convert_to from short_ton to slug" do
+    assert_conversion Measured::Weight, "2000 short_ton", "124323.80015133717 slug"
+  end
+
+  test ".convert_to from short_ton to N" do
+    assert_conversion Measured::Weight, "2000 short_ton", "17792886.461041998 N"
+  end
+
+  test ".convert_to from short_ton to short_ton" do
+    assert_exact_conversion Measured::Weight, "2000 short_ton", "2000 short_ton"
+  end
+
+  test ".convert_to from short_ton to long_ton" do
+    assert_conversion Measured::Weight, "2000 short_ton", "1785.714285714176 long_ton"
+  end
+
+  test ".convert_to from short_ton to t" do
+    assert_conversion Measured::Weight, "2000 short_ton", "1814.36948 t"
+  end
+
+  test ".convert_to from long_ton to g" do
+    assert_conversion Measured::Weight, "2000 long_ton", "2032093817.6 g"
+  end
+
+  test ".convert_to from long_ton to kg" do
+    assert_conversion Measured::Weight, "2000 long_ton", "2032093.8176 kg"
+  end
+
+  test ".convert_to from long_ton to lb" do
+    assert_exact_conversion Measured::Weight, "2000 long_ton", "4480000 lb"
+  end
+
+  test ".convert_to from long_ton to oz" do
+    assert_exact_conversion Measured::Weight, "2000 long_ton", "71680000 oz"
+  end
+
+  test ".convert_to from long_ton to slug" do
+    assert_conversion Measured::Weight, "2000 long_ton", "139242.65616949764 slug"
+  end
+
+  test ".convert_to from long_ton to N" do
+    assert_conversion Measured::Weight, "2000 long_ton", "19928032.836367033 N"
+  end
+
+  test ".convert_to from long_ton to short_ton" do
+    assert_exact_conversion Measured::Weight, "2000 long_ton", "2240 short_ton"
+  end
+
+  test ".convert_to from long_ton to long_ton" do
+    assert_conversion Measured::Weight, "2000 long_ton", "2000 long_ton"
+  end
+
+  test ".convert_to from long_ton to t" do
+    assert_conversion Measured::Weight, "2000 long_ton", "2032.0938176 t"
+  end
+
+  test ".convert_to from N to g" do
+    assert_conversion Measured::Weight, "2000 N", "203943.24259558567 g"
+  end
+
+  test ".convert_to from N to kg" do
+    assert_conversion Measured::Weight, "2000 N", "203.9432425955857 kg"
+  end
+
+  test ".convert_to from N to lb" do
+    assert_conversion Measured::Weight, "2000 N", "449.6178861994211 lb"
+  end
+
+  test ".convert_to from N to oz" do
+    assert_conversion Measured::Weight, "2000 N", "7193.886179190737 oz"
+  end
+
+  test ".convert_to from N to slug" do
+    assert_conversion Measured::Weight, "2000 N", "13.974551057080868 slug"
+  end
+
+  test ".convert_to from N to N" do
+    assert_exact_conversion Measured::Weight, "2000 N", "2000 N"
+  end
+
+  test ".convert_to from N to short_ton" do
+    assert_conversion Measured::Weight, "2000 N", "0.2248089430996314 short_ton"
+  end
+
+  test ".convert_to from N to long_ton" do
+    assert_conversion Measured::Weight, "2000 N", "0.20072227062472917 long_ton"
+  end
+
+  test ".convert_to from N to t" do
+    assert_conversion Measured::Weight, "2000 N", "0.2039432425955857 t"
+  end
+
+  test ".convert_to from t to g" do
+    assert_exact_conversion Measured::Weight, "2000 t", "2000000000 g"
+  end
+
+  test ".convert_to from t to kg" do
+    assert_exact_conversion Measured::Weight, "2000 t", "2000000 kg"
+  end
+
+  test ".convert_to from t to lb" do
+    assert_conversion Measured::Weight, "2000 t", "4409245.243697552 lb"
+  end
+
+  test ".convert_to from t to oz" do
+    assert_conversion Measured::Weight, "2000 t", "70547923.89916082 oz"
+  end
+
+  test ".convert_to from t to slug" do
+    assert_conversion Measured::Weight, "2000 t", "137043.5311239221 slug"
+  end
+
+  test ".convert_to from t to short_ton" do
+    assert_conversion Measured::Weight, "2000 t", "2204.622621848 short_ton"
+  end
+
+  test ".convert_to from t to t" do
+    assert_conversion Measured::Weight, "2000 t", "2000 t"
+  end
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: measured
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.8.2
 platform: ruby
 authors:
 - Kevin McPhillips
+- Jason Gedge
+- Javier Honduvilla Coto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +72,16 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -94,52 +96,75 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Wrapper objects which encapsulate measurments and their associated units
+description: Wrapper objects which encapsulate measurements and their associated units
   in Ruby.
 email:
-- github@kevinmcphillips.ca
+- gems@shopify.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- cache/.keep
+- cache/length.json
+- cache/volume.json
+- cache/weight.json
 - dev.yml
-- gemfiles/activesupport-4.2.gemfile
+- gemfiles/activesupport-5.2.gemfile
+- gemfiles/activesupport-6.0.gemfile
+- gemfiles/activesupport-6.1.gemfile
 - lib/measured.rb
 - lib/measured/arithmetic.rb
 - lib/measured/base.rb
-- lib/measured/conversion_table.rb
+- lib/measured/cache/json.rb
+- lib/measured/cache/json_writer.rb
+- lib/measured/cache/null.rb
+- lib/measured/conversion_table_builder.rb
+- lib/measured/cycle_detected.rb
 - lib/measured/measurable.rb
+- lib/measured/missing_conversion_path.rb
 - lib/measured/parser.rb
 - lib/measured/unit.rb
+- lib/measured/unit_already_added.rb
+- lib/measured/unit_error.rb
 - lib/measured/unit_system.rb
 - lib/measured/unit_system_builder.rb
 - lib/measured/units/length.rb
+- lib/measured/units/volume.rb
 - lib/measured/units/weight.rb
 - lib/measured/version.rb
 - measured.gemspec
 - shipit.rubygems.yml
 - test/arithmetic_test.rb
-- test/conversion_table_test.rb
+- test/cache/json_test.rb
+- test/cache/json_writer_test.rb
+- test/cache/null_test.rb
+- test/cache_consistency_test.rb
+- test/conversion_table_builder_test.rb
 - test/measurable_test.rb
 - test/parser_test.rb
+- test/support/always_true_cache.rb
 - test/support/fake_system.rb
+- test/support/subclasses.rb
 - test/test_helper.rb
 - test/unit_error_test.rb
 - test/unit_system_builder_test.rb
 - test/unit_system_test.rb
 - test/unit_test.rb
 - test/units/length_test.rb
+- test/units/volume_test.rb
 - test/units/weight_test.rb
 homepage: https://github.com/Shopify/measured
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -155,21 +180,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: Encapsulate measurements with their units in Ruby
 test_files:
 - test/arithmetic_test.rb
-- test/conversion_table_test.rb
+- test/cache/json_test.rb
+- test/cache/json_writer_test.rb
+- test/cache/null_test.rb
+- test/cache_consistency_test.rb
+- test/conversion_table_builder_test.rb
 - test/measurable_test.rb
 - test/parser_test.rb
+- test/support/always_true_cache.rb
 - test/support/fake_system.rb
+- test/support/subclasses.rb
 - test/test_helper.rb
 - test/unit_error_test.rb
 - test/unit_system_builder_test.rb
 - test/unit_system_test.rb
 - test/unit_test.rb
 - test/units/length_test.rb
+- test/units/volume_test.rb
 - test/units/weight_test.rb

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-rvm:
-  - 2.1.8
-  - 2.2.4
-  - 2.3.1
-  - 2.4.0
-gemfile:
-  - Gemfile
-  - gemfiles/activesupport-4.2.gemfile
-matrix:
-  exclude:
-    - gemfile: Gemfile
-      rvm: 2.1.8
-    - gemfile: gemfiles/activesupport-4.2.gemfile
-      rvm: 2.4.0

data/lib/measured/conversion_table.rb

@@ -1,65 +0,0 @@
-module Measured::ConversionTable
-  extend self
-
-  def build(units)
-    table = {}
-
-    units.map{|u| u.name}.each do |to_unit|
-      to_table = {to_unit => BigDecimal("1")}
-
-      table.each do |from_unit, from_table|
-        to_table[from_unit] = find_conversion(units, to: from_unit, from: to_unit)
-        from_table[to_unit] = find_conversion(units, to: to_unit, from: from_unit)
-      end
-
-      table[to_unit] = to_table
-    end
-
-    table
-  end
-
-  private
-
-  def find_conversion(units, to:, from:)
-    conversion = find_direct_conversion(units, to: to, from: from) || find_tree_traversal_conversion(units, to: to, from: from)
-
-    raise Measured::UnitError, "Cannot find conversion path from #{ from } to #{ to }." unless conversion
-
-    conversion
-  end
-
-  def find_direct_conversion(units, to:, from:)
-    units.each do |unit|
-      return unit.conversion_amount if unit.name == from && unit.conversion_unit == to
-    end
-
-    units.each do |unit|
-      return unit.inverse_conversion_amount if unit.name == to && unit.conversion_unit == from
-    end
-
-    nil
-  end
-
-  def find_tree_traversal_conversion(units, to:, from:)
-    traverse(units, from: from, to: to, unit_names: units.map(&:name), amount: 1)
-  end
-
-  def traverse(units, from:, to:, unit_names:, amount:)
-    unit_names = unit_names - [from]
-
-    unit_names.each do |name|
-      if conversion = find_direct_conversion(units, from: from, to: name)
-        new_amount = amount * conversion
-        if name == to
-          return new_amount
-        else
-          result = traverse(units, from: name, to: to, unit_names: unit_names, amount: new_amount)
-          return result if result
-        end
-      end
-    end
-
-    nil
-  end
-
-end

data/test/conversion_table_test.rb

@@ -1,98 +0,0 @@
-require "test_helper"
-
-class Measured::ConversionTableTest < ActiveSupport::TestCase
-  test ".build should return a hash for the simple case" do
-    expected = {
-      "test" => {"test" => BigDecimal("1")}
-    }
-
-    assert_equal expected, Measured::ConversionTable.build([Measured::Unit.new(:test)])
-  end
-
-  test ".build returns expected nested hashes with BigDecimal conversion factors in a tiny data set" do
-    conversion_table = Measured::ConversionTable.build([
-      Measured::Unit.new(:m),
-      Measured::Unit.new(:cm, value: "0.01 m"),
-    ])
-
-    expected = {
-      "m" => {
-        "m" => BigDecimal("1"),
-        "cm" => BigDecimal("100"),
-      },
-      "cm" => {
-        "m" => BigDecimal("0.01"),
-        "cm" => BigDecimal("1"),
-      }
-    }
-
-    assert_equal expected, conversion_table
-  end
-
-  test ".build returns expected nested hashes with BigDecimal conversion factors" do
-    conversion_table = Measured::ConversionTable.build([
-      Measured::Unit.new(:m),
-      Measured::Unit.new(:cm, value: "0.01 m"),
-      Measured::Unit.new(:mm, value: "0.001 m"),
-    ])
-
-    expected = {
-      "m" => {
-        "m" => BigDecimal("1"),
-        "cm" => BigDecimal("100"),
-        "mm" => BigDecimal("1000"),
-      },
-      "cm" => {
-        "m" => BigDecimal("0.01"),
-        "cm" => BigDecimal("1"),
-        "mm" => BigDecimal("10"),
-      },
-      "mm" => {
-        "m" => BigDecimal("0.001"),
-        "cm" => BigDecimal("0.1"),
-        "mm" => BigDecimal("1"),
-      }
-    }
-
-    assert_equal expected, conversion_table
-  end
-
-  test ".build returns expected nested hashes with BigDecimal conversion factors in an indrect path" do
-    conversion_table = Measured::ConversionTable.build([
-      Measured::Unit.new(:mm),
-      Measured::Unit.new(:cm, value: "10 mm"),
-      Measured::Unit.new(:dm, value: "10 cm"),
-      Measured::Unit.new(:m, value: "10 dm"),
-    ])
-
-    expected = {
-      "m" => {
-        "m" => BigDecimal("1"),
-        "dm" => BigDecimal("10"),
-        "cm" => BigDecimal("100"),
-        "mm" => BigDecimal("1000"),
-      },
-      "cm" => {
-        "m" => BigDecimal("0.01"),
-        "dm" => BigDecimal("0.1"),
-        "cm" => BigDecimal("1"),
-        "mm" => BigDecimal("10"),
-      },
-      "dm" => {
-        "m" => BigDecimal("0.1"),
-        "cm" => BigDecimal("10"),
-        "dm" => BigDecimal("1"),
-        "mm" => BigDecimal("100"),
-      },
-      "mm" => {
-        "m" => BigDecimal("0.001"),
-        "dm" => BigDecimal("0.01"),
-        "cm" => BigDecimal("0.1"),
-        "mm" => BigDecimal("1"),
-      }
-    }
-
-    assert_equal expected, conversion_table
-  end
-
-end