measured 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cc64e96e1ca065fbd9bdbe43bc80d9ae99fb2ffc52ddcba131180e439bfa462
-  data.tar.gz: d7bd0237fb1dfb6f9c38a86ae32f0cc0d499b547aca8a7b2ddcc531ba7daabd8
+  metadata.gz: ded401e32179325e80114d1a2c184a1c03599156b7e332291f6e3a114bc1c7fb
+  data.tar.gz: 680d3cf30b58647232717d4f82b5eb0120e4e95f04f8b771cf70540ee860de0e
 SHA512:
-  metadata.gz: c017c759124694968bb8c283c5f6a5f33af3f25544d9fe9fa190dcaeac59ce7e0a708019158604219fa3b332f9f2f022fe44bfbfa963682a65e50f63f583f5ec
-  data.tar.gz: 6096418c372b51a8229148618a268711956e3bc3bcbbef0e07597a60b5ef52d0ed1fc314f433ee94968231fb633efad657d281258f12313220226824320875e5
+  metadata.gz: 5827bf20fcbb6aa5380e1cb68a876629235b1abbda98b74b5d562a483f812a6b7f9579f2b581803a1f5efacccb479bd651aae08bbb863ab40201c5af73f6b995
+  data.tar.gz: af772cae9ae42e41c6f1b99a2757713a18236107ac79f97d26ca3709e1618c6956ad993900897e59ff30fd7904ec53ee35d7d98cdcd8aa1df126415b617e16f2

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+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/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"
@@ -23,10 +24,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

data/lib/measured/cache/json.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Measured::Cache
   class Json
     attr_reader :filename, :path

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
 
@@ -87,5 +88,4 @@ class Measured::ConversionTableBuilder
 
     nil
   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/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Measured::Parser
   extend self
 

data/lib/measured/unit.rb

@@ -1,12 +1,16 @@
+# 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
 
@@ -14,30 +18,24 @@ class Measured::Unit
     self.class.new(
       name,
       aliases: aliases,
-      value: conversion_string,
+      value: @conversion_string,
       unit_system: 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_system.rb

@@ -1,17 +1,16 @@
+# 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) }
+    @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 +50,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)]

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.5.1"
 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

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,3 +1,4 @@
+# frozen_string_literal: true
 require "pry" unless ENV["CI"]
 require "measured"
 require "minitest/reporters"

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

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.5.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: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,6 +106,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md