measured 2.5.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cc64e96e1ca065fbd9bdbe43bc80d9ae99fb2ffc52ddcba131180e439bfa462
-  data.tar.gz: d7bd0237fb1dfb6f9c38a86ae32f0cc0d499b547aca8a7b2ddcc531ba7daabd8
+  metadata.gz: 2641c37b73279794a9877f2c22d4fc40ed49e3fb66ec879863d631251befec60
+  data.tar.gz: d065ce4bd8cc5dd3b75844aa08a2bbd931ca83bf214ea3eb5fb7db1e67c08a23
 SHA512:
-  metadata.gz: c017c759124694968bb8c283c5f6a5f33af3f25544d9fe9fa190dcaeac59ce7e0a708019158604219fa3b332f9f2f022fe44bfbfa963682a65e50f63f583f5ec
-  data.tar.gz: 6096418c372b51a8229148618a268711956e3bc3bcbbef0e07597a60b5ef52d0ed1fc314f433ee94968231fb633efad657d281258f12313220226824320875e5
+  metadata.gz: 8b7b34fd57b3bff6c467ba62156d21a89fadcd32e009cecb3c1ca36b609134ed4abd1950ac7513ba5ced802627a723086ba44ee563286e1294759dee1a0eeeb1
+  data.tar.gz: 9e2d5a86949c31b44c810c186d46b080bbc599d3f87a276676eb249b6b0841b41dc7964b4c071c98c21be3ab071f8db0085d9cf50d9134b1e377e62b545aae41

data/.github/workflows/ci.yml

@@ -0,0 +1,32 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    strategy:
+      matrix:
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+        gemfile:
+          - Gemfile
+          - gemfiles/activesupport-5.2.gemfile
+          - gemfiles/activesupport-6.0.gemfile
+          - gemfiles/activesupport-6.1.gemfile
+    name: Ruby ${{ matrix.ruby }} ${{ matrix.gemfile }}
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: |
+          bundle exec rake

data/CHANGELOG.md

@@ -0,0 +1,40 @@
+Unreleased
+-----
+
+2.7.1
+-----
+
+* Fix Ruby 3.0 compatibility
+
+2.7.0
+-----
+
+* Raises an exception on cyclic conversions. (@arturopie)
+* Deduplicate strings loaded from the cache.
+* Deduplicate parsed units.
+
+2.6.0
+-----
+
+* Add `Measured::MissingConversionPath` and `Measured::UnitAlreadyAdded` as subclasses of `Measured::UnitError` to handle specific error cases. (@arturopie)
+* Support only ActiveSupport 5.2 and above.
+
+
+2.5.2
+-----
+
+* Allow unit values to be declared in the unit system through aliases and not just the base unit name.
+* Fix some deprecations in tests and CI.
+
+2.5.1
+----
+
+* Get rid of most memoizations in favor of eager computations.
+
+2.5.0
+-----
+
+* Add `CHANGELOG.md`.
+* Fix some deprecations and warnings.
+* Support Rails 6 and Ruby 2.6.
+* Cache conversion table in JSON file for first load performance.

data/README.md

@@ -1,4 +1,4 @@
-# Measured [![Build Status](https://travis-ci.org/Shopify/measured.svg)](https://travis-ci.org/Shopify/measured) [![Gem Version](https://badge.fury.io/rb/measured.svg)](http://badge.fury.io/rb/measured)
+# Measured [![Build Status](https://github.com/Shopify/measured/workflows/CI/badge.svg)](https://github.com/Shopify/measured/actions?query=workflow%3ACI)
 
 Encapsulates measurements with their units. Provides easy conversion between units. Built in support for weight, length, and volume.
 
@@ -273,12 +273,13 @@ Existing alternatives which were considered:
 
 ### Gem: [unitwise](https://github.com/joshwlewis/unitwise)
 * **Pros**
-  * Well written and maintained.
+  * Well written.
   * Conversions done with Unified Code for Units of Measure (UCUM) so highly accurate and reliable.
 * **Cons**
   * Lots of code. Good code, but lots of it.
   * Many modifications to core types.
   * ActiveRecord adapter exists but is written and maintained by a different person/org.
+  * Not actively maintained.
 
 ## Contributing
 

data/gemfiles/{activesupport-5.0.gemfile → activesupport-5.2.gemfile}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'activesupport', '~> 5.0'
+gem 'activesupport', '~> 5.2'

data/gemfiles/activesupport-6.0.gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'activesupport', '~> 6.0.0.rc1'
+gem 'activesupport', '~> 6.0'

data/gemfiles/{activesupport-5.1.gemfile → activesupport-6.1.gemfile}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'activesupport', '~> 5.1'
+gem 'activesupport', '~> 6.1'

data/lib/measured.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "measured/base"
 
 require "measured/units/length"

data/lib/measured/arithmetic.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Measured::Arithmetic
   def +(other)
     arithmetic_operation(other, :+)

data/lib/measured/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "forwardable"
 require "measured/version"
 require "active_support/all"
@@ -5,8 +6,6 @@ require "bigdecimal"
 require "json"
 
 module Measured
-  class UnitError < StandardError ; end
-
   class << self
     def build(&block)
       builder = UnitSystemBuilder.new
@@ -23,10 +22,9 @@ module Measured
 
     def method_missing(method, *args)
       class_name = "Measured::#{ method }"
+      klass = class_name.safe_constantize
 
-      if Measurable.subclasses.map(&:to_s).include?(class_name)
-        klass = class_name.constantize
-
+      if klass && klass < Measurable
         Measured.define_singleton_method(method) do |value, unit|
           klass.new(value, unit)
         end
@@ -39,6 +37,10 @@ module Measured
   end
 end
 
+require "measured/unit_error"
+require "measured/cycle_detected"
+require "measured/unit_already_added"
+require "measured/missing_conversion_path"
 require "measured/arithmetic"
 require "measured/parser"
 require "measured/unit"

data/lib/measured/cache/json.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Measured::Cache
   class Json
     attr_reader :filename, :path
@@ -13,7 +14,7 @@ module Measured::Cache
 
     def read
       return unless exist?
-      decode(JSON.load(File.read(@path)))
+      decode(JSON.load(File.read(@path), nil, freeze: true))
     end
 
     def write(table)
@@ -36,11 +37,17 @@ module Measured::Cache
     end
 
     def decode(table)
-      table.each_with_object(table.dup) do |(k1, v1), accu|
-        v1.each do |k2, v2|
-          if v2.is_a?(Hash)
-            accu[k1][k2] = Rational(v2["numerator"], v2["denominator"])
+      table.transform_values do |value1|
+        if value1.is_a?(Hash)
+          value1.transform_values do |value2|
+            if value2.is_a?(Hash)
+              Rational(value2["numerator"], value2["denominator"])
+            else
+              value2
+            end
           end
+        else
+          value1
         end
       end
     end

data/lib/measured/cache/json_writer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Measured::Cache::JsonWriter
   def write(table)
     File.open(@path, "w") do |f|

data/lib/measured/cache/null.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Measured::Cache
   class Null
     def exist?

data/lib/measured/conversion_table_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Measured::ConversionTableBuilder
   attr_reader :units
 
@@ -23,6 +24,8 @@ class Measured::ConversionTableBuilder
   private
 
   def generate_table
+    validate_no_cycles
+
     units.map(&:name).each_with_object({}) do |to_unit, table|
       to_table = {to_unit => Rational(1, 1)}
 
@@ -36,10 +39,27 @@ class Measured::ConversionTableBuilder
     end
   end
 
+  def validate_no_cycles
+    graph = units.select { |unit| unit.conversion_unit.present? }.group_by { |unit| unit.name }
+    validate_acyclic_graph(graph, from: graph.keys[0])
+  end
+
+  # This uses a depth-first search algorithm: https://en.wikipedia.org/wiki/Depth-first_search
+  def validate_acyclic_graph(graph, from:, visited: [])
+    graph[from]&.each do |edge|
+      adjacent_node = edge.conversion_unit
+      if visited.include?(adjacent_node)
+        raise Measured::CycleDetected.new(edge)
+      else
+        validate_acyclic_graph(graph, from: adjacent_node, visited: visited + [adjacent_node])
+      end
+    end
+  end
+
   def find_conversion(to:, from:)
     conversion = find_direct_conversion_cached(to: to, from: from) || find_tree_traversal_conversion(to: to, from: from)
 
-    raise Measured::UnitError, "Cannot find conversion path from #{ from } to #{ to }." unless conversion
+    raise Measured::MissingConversionPath.new(from, to) unless conversion
 
     conversion
   end
@@ -87,5 +107,4 @@ class Measured::ConversionTableBuilder
 
     nil
   end
-
 end

data/lib/measured/cycle_detected.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+module Measured
+  class CycleDetected < UnitError
+    attr_reader :unit
+
+    def initialize(unit)
+      super("The following conversion introduces cycles in the unit system: #{unit}. Remove the conversion or fix the cycle.")
+      @unit = unit
+    end
+  end
+end

data/lib/measured/measurable.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 class Measured::Measurable < Numeric
-  DEFAULT_FORMAT_STRING = '%.2<value>f %<unit>s'
+  DEFAULT_FORMAT_STRING = "%.2<value>f %<unit>s"
 
   include Measured::Arithmetic
 
@@ -19,6 +20,18 @@ class Measured::Measurable < Numeric
     else
       BigDecimal(value)
     end
+
+    @value_string = begin
+      str = case value
+      when Rational
+        value.denominator == 1 ? value.numerator.to_s : value.to_f.to_s
+      when BigDecimal
+        value.to_s("F")
+      else
+        value.to_f.to_s
+      end
+      str.gsub(/\.0*\Z/, "")
+    end.freeze
   end
 
   def convert_to(new_unit)
@@ -39,18 +52,16 @@ class Measured::Measurable < Numeric
   end
 
   def to_s
-    @to_s ||= "#{value_string} #{unit.name}"
+    "#{@value_string} #{unit.name}"
   end
 
   def humanize
-    @humanize ||= begin
-      unit_string = value == 1 ? unit.name : ActiveSupport::Inflector.pluralize(unit.name)
-      "#{value_string} #{unit_string}"
-    end
+    unit_string = value == 1 ? unit.name : ActiveSupport::Inflector.pluralize(unit.name)
+    "#{@value_string} #{unit_string}"
   end
 
   def inspect
-    @inspect ||= "#<#{self.class}: #{value_string} #{unit.inspect}>"
+    "#<#{self.class}: #{@value_string} #{unit.inspect}>"
   end
 
   def <=>(other)
@@ -86,18 +97,4 @@ class Measured::Measurable < Numeric
   def unit_from_unit_or_name!(value)
     value.is_a?(Measured::Unit) ? value : self.class.unit_system.unit_for!(value)
   end
-
-  def value_string
-    @value_string ||= begin
-      str = case value
-      when Rational
-        value.denominator == 1 ? value.numerator.to_s : value.to_f.to_s
-      when BigDecimal
-        value.to_s("F")
-      else
-        value.to_f.to_s
-      end
-      str.gsub(/\.0*\Z/, "")
-    end
-  end
 end

data/lib/measured/missing_conversion_path.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Measured
+  class MissingConversionPath < UnitError
+    attr_reader :from, :to
+
+    def initialize(from, to)
+      super("Cannot find conversion path from #{from} to #{to}.")
+      @from = from
+      @to = to
+    end
+  end
+end

data/lib/measured/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Measured::Parser
   extend self
 
@@ -32,6 +33,6 @@ module Measured::Parser
 
     raise Measured::UnitError, "Cannot parse measurement from '#{string}'" unless result
 
-    [result.captures[0].to_r, result.captures[1]]
+    [result.captures[0].to_r, -result.captures[1]]
   end
 end

data/lib/measured/unit.rb

@@ -1,43 +1,41 @@
+# frozen_string_literal: true
 class Measured::Unit
   include Comparable
 
-  attr_reader :name, :aliases, :conversion_amount, :conversion_unit, :unit_system
+  attr_reader :name, :names, :aliases, :conversion_amount, :conversion_unit, :unit_system, :inverse_conversion_amount
 
   def initialize(name, aliases: [], value: nil, unit_system: nil)
     @name = name.to_s.freeze
     @aliases = aliases.map(&:to_s).map(&:freeze).freeze
+    @names = ([@name] + @aliases).sort!.freeze
     @conversion_amount, @conversion_unit = parse_value(value) if value
+    @inverse_conversion_amount = (1 / conversion_amount if conversion_amount)
+    @conversion_string = ("#{conversion_amount} #{conversion_unit}" if conversion_amount || conversion_unit)
     @unit_system = unit_system
   end
 
-  def with_unit_system(unit_system)
+  def with(name: nil, unit_system: nil, aliases: nil, value: nil)
     self.class.new(
-      name,
-      aliases: aliases,
-      value: conversion_string,
-      unit_system: unit_system
+      name || self.name,
+      aliases: aliases || self.aliases,
+      value: value || @conversion_string,
+      unit_system: unit_system || self.unit_system
     )
   end
 
-  def names
-    @names ||= ([name] + aliases).sort!.freeze
-  end
-
   def to_s
-    @to_s ||= if conversion_string
-      "#{name} (#{conversion_string})".freeze
+    if @conversion_string
+      "#{name} (#{@conversion_string})".freeze
     else
       name
     end
   end
 
   def inspect
-    @inspect ||= begin
-      pieces = [name]
-      pieces << "(#{aliases.join(", ")})" if aliases.any?
-      pieces << conversion_string if conversion_string
-      "#<#{self.class.name}: #{pieces.join(" ")}>".freeze
-    end
+    pieces = [name]
+    pieces << "(#{aliases.join(", ")})" if aliases.any?
+    pieces << @conversion_string if @conversion_string
+    "#<#{self.class.name}: #{pieces.join(" ")}>".freeze
   end
 
   def <=>(other)
@@ -53,16 +51,8 @@ class Measured::Unit
     end
   end
 
-  def inverse_conversion_amount
-    @inverse_conversion_amount ||= 1 / conversion_amount if conversion_amount
-  end
-
   private
 
-  def conversion_string
-    @conversion_string ||= ("#{conversion_amount} #{conversion_unit}" if conversion_amount || conversion_unit)
-  end
-
   def parse_value(tokens)
     case tokens
     when String

data/lib/measured/unit_already_added.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+module Measured
+  class UnitAlreadyAdded < UnitError
+    attr_reader :unit_name
+
+    def initialize(unit_name)
+      super("Unit #{unit_name} has already been added.")
+      @unit_name = unit_name
+    end
+  end
+end

data/lib/measured/unit_error.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+module Measured
+  class UnitError < StandardError ; end
+end

data/lib/measured/unit_system.rb

@@ -1,17 +1,22 @@
+# frozen_string_literal: true
 class Measured::UnitSystem
-  attr_reader :units
+  attr_reader :units, :unit_names, :unit_names_with_aliases
 
   def initialize(units, cache: nil)
-    @units = units.map { |unit| unit.with_unit_system(self) }
+    @units = units.map { |unit| unit.with(unit_system: self) }
+    @units = @units.map do |unit|
+      next unit unless unit.conversion_unit
+      conversion_unit = @units.find { |u| u.names.include?(unit.conversion_unit) }
+      next unit unless conversion_unit
+      unit.with(value: [unit.conversion_amount, conversion_unit.name])
+    end
+    @unit_names = @units.map(&:name).sort.freeze
+    @unit_names_with_aliases = @units.flat_map(&:names).sort.freeze
+    @unit_name_to_unit = @units.each_with_object({}) do |unit, hash|
+      unit.names.each { |name| hash[name.to_s] = unit }
+    end
     @conversion_table_builder = Measured::ConversionTableBuilder.new(@units, cache: cache)
-  end
-
-  def unit_names_with_aliases
-    @unit_names_with_aliases ||= @units.flat_map(&:names).sort
-  end
-
-  def unit_names
-    @unit_names ||= @units.map(&:name).sort
+    @conversion_table = @conversion_table_builder.to_h.freeze
   end
 
   def unit_or_alias?(name)
@@ -51,14 +56,5 @@ class Measured::UnitSystem
 
   protected
 
-  def conversion_table
-    @conversion_table ||= @conversion_table_builder.to_h
-  end
-
-  def unit_name_to_unit
-    @unit_name_to_unit ||= @units.inject({}) do |hash, unit|
-      unit.names.each { |name| hash[name.to_s] = unit }
-      hash
-    end
-  end
+  attr_reader :unit_name_to_unit, :conversion_table
 end

data/lib/measured/unit_system_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Measured::UnitSystemBuilder
   def initialize
     @units = []
@@ -45,8 +46,8 @@ class Measured::UnitSystemBuilder
     ["P", "peta", 15],
     ["E", "exa", 18],
     ["Z", "zetta", 21],
-    ["Y", "yotta", 24]
-  ]
+    ["Y", "yotta", 24],
+  ].map(&:freeze).freeze
 
   def build_si_units(name, aliases: [], value: nil)
     si_units = [build_unit(name, aliases: aliases, value: value)]
@@ -66,7 +67,7 @@ class Measured::UnitSystemBuilder
   def check_for_duplicate_unit_names!(unit)
     names = @units.flat_map(&:names)
     if names.any? { |name| unit.names.include?(name) }
-      raise Measured::UnitError, "Unit #{unit.name} has already been added."
+      raise Measured::UnitAlreadyAdded.new(unit.name)
     end
   end
 end

data/lib/measured/units/length.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Measured::Length = Measured.build do
   si_unit :m, aliases: [:meter, :metre, :meters, :metres]
 

data/lib/measured/units/volume.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Measured::Volume = Measured.build do
   si_unit :l, aliases: [:liter, :litre, :liters, :litres]
 

data/lib/measured/units/weight.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Measured::Weight = Measured.build do
   si_unit :g, aliases: [:gram, :grams]
 

data/lib/measured/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Measured
-  VERSION = "2.5.0"
+  VERSION = "2.7.1"
 end

data/measured.gemspec

@@ -13,16 +13,24 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/Shopify/measured"
   spec.license       = "MIT"
 
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  end
+
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", ">= 5.0"
+  spec.add_runtime_dependency "activesupport", ">= 5.2"
 
   spec.add_development_dependency "rake", "> 10.0"
   spec.add_development_dependency "minitest", "> 5.5.1"
   spec.add_development_dependency "minitest-reporters"
-  spec.add_development_dependency "mocha", "> 1.1.0"
+  spec.add_development_dependency "mocha", ">= 1.4.0"
   spec.add_development_dependency "pry"
 end

data/test/arithmetic_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::ArithmeticTest < ActiveSupport::TestCase

data/test/cache/json_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::Cache::JsonTest < ActiveSupport::TestCase

data/test/cache/json_writer_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::Cache::JsonWriterTest < ActiveSupport::TestCase

data/test/cache/null_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::Cache::NullTest < ActiveSupport::TestCase

data/test/cache_consistency_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 # In general we do not want to expose the inner workings of the caching and unit systems as part of the API.

data/test/conversion_table_builder_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::ConversionTableBuilderTest < ActiveSupport::TestCase
@@ -116,6 +117,16 @@ class Measured::ConversionTableBuilderTest < ActiveSupport::TestCase
     end
   end
 
+  test "#to_h raises exception when there are cycles" do
+    unit1 = Measured::Unit.new(:pallets, value: "1 liters")
+    unit2 = Measured::Unit.new(:liters, value: "0.1 cases")
+    unit3 = Measured::Unit.new(:cases, value: "0.1 pallets")
+
+    assert_raises(Measured::CycleDetected) do
+      Measured::ConversionTableBuilder.new([unit1, unit2, unit3]).to_h
+    end
+  end
+
   test "#cached? returns true if there's a cache" do
     builder = Measured::ConversionTableBuilder.new([Measured::Unit.new(:test)], cache: { class: AlwaysTrueCache })
     assert_predicate builder, :cached?

data/test/measurable_test.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::MeasurableTest < ActiveSupport::TestCase
-
   setup do
     @arcane = Magic.unit_system.unit_for!(:arcane)
     @fireball = Magic.unit_system.unit_for!(:fireball)

data/test/parser_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::ParserTest < ActiveSupport::TestCase

data/test/support/always_true_cache.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class AlwaysTrueCache
   def exist?
     true

data/test/support/fake_system.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Magic = Measured.build do
   unit :magic_missile, aliases: [:magic_missiles, "magic missile"]
   unit :fireball, value: "2/3 magic_missile", aliases: [:fire, :fireballs]

data/test/support/subclasses.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Extract the subclasses that exist early on because other classes will get added by tests
 #   later on in execution and in an unpredictable order.
 class ActiveSupport::TestCase

data/test/test_helper.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 require "pry" unless ENV["CI"]
 require "measured"
 require "minitest/reporters"
 require "minitest/autorun"
-require "mocha/setup"
+require "mocha/minitest"
 
 ActiveSupport.test_order = :random
 

data/test/unit_error_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::UnitErrorTest < ActiveSupport::TestCase

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
@@ -38,6 +54,16 @@ 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

data/test/unit_system_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::UnitSystemTest < ActiveSupport::TestCase

data/test/unit_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::UnitTest < ActiveSupport::TestCase

data/test/units/length_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::LengthTest < ActiveSupport::TestCase
@@ -142,7 +143,7 @@ class Measured::LengthTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from km to mi" do
-    assert_conversion Measured::Length, "2000 km", "0.1242742384475E4 mi" 
+    assert_conversion Measured::Length, "2000 km", "0.1242742384475E4 mi"
   end
 
   test ".convert_to from km to mm" do
@@ -150,7 +151,7 @@ class Measured::LengthTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from km to yd" do
-    assert_conversion Measured::Length, "2000 km", "0.218722659667542E7 yd" 
+    assert_conversion Measured::Length, "2000 km", "0.218722659667542E7 yd"
   end
 
   test ".convert_to from m to cm" do
@@ -206,7 +207,7 @@ class Measured::LengthTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from mi to mi" do
-    assert_exact_conversion Measured::Length, "2000 mi", "2000 mi" 
+    assert_exact_conversion Measured::Length, "2000 mi", "2000 mi"
   end
 
   test ".convert_to from mi to mm" do
@@ -214,7 +215,7 @@ class Measured::LengthTest < ActiveSupport::TestCase
   end
 
   test ".convert_to from mi to yd" do
-    assert_exact_conversion Measured::Length, "2000 mi", "3520000 yd" 
+    assert_exact_conversion Measured::Length, "2000 mi", "3520000 yd"
   end
 
   test ".convert_to from mm to cm" do

data/test/units/volume_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::VolumeTest < ActiveSupport::TestCase
@@ -68,7 +69,7 @@ class Measured::VolumeTest < ActiveSupport::TestCase
   test ".unit_names should be the list of base unit names" do
     expected_units = %w(l m3 ft3 in3 gal us_gal qt us_qt pt us_pt oz us_oz)
     expected_units += Measured::UnitSystemBuilder::SI_PREFIXES.map { |short, _, _| "#{short}l" }
-    assert_equal expected_units.sort, Measured::Volume.unit_names 
+    assert_equal expected_units.sort, Measured::Volume.unit_names
   end
 
   test ".name" do
@@ -95,7 +96,7 @@ class Measured::VolumeTest < ActiveSupport::TestCase
   test ".convert_to from gal to gal" do
     assert_conversion Measured::Volume, "2000 gal", "2000 gal"
   end
-  
+
   test ".convert_to from us_gal to us_gal" do
     assert_conversion Measured::Volume, "2000 us_gal", "2000 us_gal"
   end
@@ -123,7 +124,7 @@ class Measured::VolumeTest < ActiveSupport::TestCase
   test ".convert_to from us_oz to us_oz" do
     assert_conversion Measured::Volume, "2000 us_oz", "2000 us_oz"
   end
-  
+
   test ".convert_to from ml to m3" do
     assert_conversion Measured::Volume, "2000 ml", "0.002 m3"
   end
@@ -303,7 +304,7 @@ class Measured::VolumeTest < ActiveSupport::TestCase
   test ".convert_to from gal to us_oz" do
     assert_conversion Measured::Volume, "2 gal", "307.4431809292 us_oz"
   end
-  
+
   test ".convert_to from us_gal to qt" do
     assert_conversion Measured::Volume, "2 us_gal", "6.661393477 qt"
   end
@@ -387,4 +388,4 @@ class Measured::VolumeTest < ActiveSupport::TestCase
   test ".convert_to from oz to us_oz" do
     assert_conversion Measured::Volume, "2 oz", "1.9215207864 us_oz"
   end
-end
+end

data/test/units/weight_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "test_helper"
 
 class Measured::WeightTest < ActiveSupport::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: measured
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Kevin McPhillips
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,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
@@ -104,8 +104,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -115,9 +116,9 @@ files:
 - cache/volume.json
 - cache/weight.json
 - dev.yml
-- gemfiles/activesupport-5.0.gemfile
-- gemfiles/activesupport-5.1.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
@@ -125,9 +126,13 @@ files:
 - 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
@@ -158,7 +163,8 @@ files:
 homepage: https://github.com/Shopify/measured
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -174,8 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Encapsulate measurements with their units in Ruby

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.5
-  - 2.6.3
-gemfile:
-  - Gemfile
-  - gemfiles/activesupport-5.0.gemfile
-  - gemfiles/activesupport-5.1.gemfile
-  - gemfiles/activesupport-6.0.gemfile
-before_script:
-  - gem update --system
-matrix:
-  exclude:
-    - gemfile: gemfiles/activesupport-6.0.gemfile
-      rvm: 2.3.8
-    - gemfile: gemfiles/activesupport-6.0.gemfile
-      rvm: 2.4.5