measured 2.0.0.pre2 → 2.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10bd5a0ef33c55999eb30825b49399c3ab2ec183
-  data.tar.gz: 9307127d9fb8b0e7610919aaa18f53f4b9465e75
+  metadata.gz: 31510659ee5ef4e555a6e90c6b02ccfbb2d00762
+  data.tar.gz: 6d4098c941cfeb91a625c7b535a8e68857f91d87
 SHA512:
-  metadata.gz: 98b681bbf014999d0f328067af5d30259452deef6588b13b45d3db1afbadb117b20e19abcfb973620fe1a06984936807a9acea2a9c8433bc23e1332080f1b05e
-  data.tar.gz: 4bb6841e99399a8bc73f1063f3973f0b3e92f7273540b18393547e162b941a3d4f6fbddcd846e5fda6f7e61b8b22292112914b3dfc59879f23060fa4d4a035c0
+  metadata.gz: faf9a4f655aca4e68679da9e1220ccb1c2f44ae41f7ae5fa194b711825735d3e38056e40cf8f992abaff14d6502f438d843645824951f00bbfc9cb75b77790a2
+  data.tar.gz: cff7887f432a42af3a7e0e19c487183baed8f7c2ba251d9329211efe5c1ae950d43a54d3a4bdccda035a2f1c3585cf3a31d657a3fc639d3a2bd27be53a7ee088

data/lib/measured/case_insensitive_unit.rb

@@ -1,5 +1,17 @@
 class Measured::CaseInsensitiveUnit < Measured::Unit
   def initialize(name, aliases: [], value: nil, unit_system: nil)
-    super(name.to_s.downcase, aliases: aliases.map(&:to_s).map!(&:downcase), value: value, unit_system: unit_system)
+    super(
+      name.to_s.downcase,
+      aliases: aliases.map(&:to_s).map!(&:downcase),
+      value: value,
+      unit_system: unit_system
+    )
+  end
+
+  private
+
+  def parse_value(tokens)
+    value, unit = super
+    [value, unit.downcase]
   end
 end

data/lib/measured/measurable.rb

@@ -29,11 +29,18 @@ class Measured::Measurable < Numeric
   end
 
   def to_s
-    @to_s ||= "#{value_string} #{unit}"
+    @to_s ||= "#{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
   end
 
   def inspect
-    @inspect ||= "#<#{self.class}: #{value_string} #{unit}>"
+    @inspect ||= "#<#{self.class}: #{value_string} #{unit.inspect}>"
   end
 
   def <=>(other)

data/lib/measured/unit.rb

@@ -1,11 +1,11 @@
 class Measured::Unit
   include Comparable
 
-  attr_reader :name, :names, :conversion_amount, :conversion_unit, :unit_system
+  attr_reader :name, :aliases, :conversion_amount, :conversion_unit, :unit_system
 
   def initialize(name, aliases: [], value: nil, unit_system: nil)
-    @name = name.to_s
-    @names = ([@name] + aliases.map(&:to_s)).sort
+    @name = name.to_s.freeze
+    @aliases = aliases.map(&:to_s).map(&:freeze).freeze
     @conversion_amount, @conversion_unit = parse_value(value) if value
     @unit_system = unit_system
   end
@@ -13,52 +13,61 @@ class Measured::Unit
   def with_unit_system(unit_system)
     self.class.new(
       name,
-      aliases: names - [name],
+      aliases: aliases,
       value: conversion_string,
       unit_system: unit_system
     )
   end
 
+  def names
+    @names ||= ([name] + aliases).sort!.freeze
+  end
+
   def to_s
-    if conversion_string
-      "#{ @name } (#{ conversion_string })"
+    @to_s ||= if conversion_string
+      "#{name} (#{conversion_string})".freeze
     else
-      @name
+      name
     end
   end
 
   def inspect
-    "#<Measured::Unit: #{ @name } (#{ @names.join(", ") }) #{ conversion_string }>"
+    @inspect ||= begin
+      pieces = [name]
+      pieces << "(#{aliases.join(", ")})" if aliases.any?
+      pieces << conversion_string if conversion_string
+      "#<#{self.class.name}: #{pieces.join(" ")}>".freeze
+    end
   end
 
   def <=>(other)
     if self.class == other.class
-      names_comparison = @names <=> other.names
+      names_comparison = names <=> other.names
       if names_comparison != 0
         names_comparison
       else
-        @conversion_amount <=> other.conversion_amount
+        conversion_amount <=> other.conversion_amount
       end
     else
-      @name <=> other
+      name <=> other
     end
   end
 
   def inverse_conversion_amount
-    1 / conversion_amount.to_r
+    @inverse_conversion_amount ||= 1 / conversion_amount
   end
 
   private
 
   def conversion_string
-    "#{ conversion_amount } #{ conversion_unit }" if @conversion_amount || @conversion_unit
+    @conversion_string ||= ("#{conversion_amount} #{conversion_unit}" if conversion_amount || conversion_unit)
   end
 
   def parse_value(tokens)
-    tokens = tokens.split(" ") if tokens.is_a?(String)
+    tokens = tokens.split(" ", 2) if tokens.is_a?(String)
 
     raise Measured::UnitError, "Cannot parse 'number unit' or [number, unit] formatted tokens from #{tokens}." unless tokens.size == 2
 
-    [tokens[0].to_r, tokens[1]]
+    [tokens[0].to_r, tokens[1].freeze]
   end
 end

data/lib/measured/version.rb

@@ -1,3 +1,3 @@
 module Measured
-  VERSION = "2.0.0.pre2"
+  VERSION = "2.0.0.pre3"
 end

data/test/case_insensitive_unit_test.rb

@@ -16,11 +16,15 @@ class Measured::CaseInsensitiveUnitTest < ActiveSupport::TestCase
 
   test "#initialize parses out the unit and the number part" do
     assert_equal 10, @unit.conversion_amount
-    assert_equal "Cake", @unit.conversion_unit
+    assert_equal "cake", @unit.conversion_unit
 
     unit = Measured::CaseInsensitiveUnit.new(:pie, value: "5.5 sweets")
     assert_equal BigDecimal("5.5"), unit.conversion_amount
     assert_equal "sweets", unit.conversion_unit
+
+    unit = Measured::CaseInsensitiveUnit.new(:pie, value: "1/3 Bitter Pies")
+    assert_equal Rational(1, 3), unit.conversion_amount
+    assert_equal "bitter pies", unit.conversion_unit
   end
 
   test "#initialize raises if the format of the value is incorrect" do
@@ -28,10 +32,6 @@ class Measured::CaseInsensitiveUnitTest < ActiveSupport::TestCase
       Measured::CaseInsensitiveUnit.new(:pie, value: "hello")
     end
 
-    assert_raises Measured::UnitError do
-      Measured::CaseInsensitiveUnit.new(:pie, value: "pie is delicious")
-    end
-
     assert_raises Measured::UnitError do
       Measured::CaseInsensitiveUnit.new(:pie, value: "123456")
     end
@@ -43,8 +43,10 @@ class Measured::CaseInsensitiveUnitTest < ActiveSupport::TestCase
   end
 
   test "#inspect returns an expected string" do
-    assert_equal "#<Measured::Unit: pie (pie) >", Measured::CaseInsensitiveUnit.new(:pie).inspect
-    assert_equal "#<Measured::Unit: pie (cake, pie) 1/2 sweet>", Measured::CaseInsensitiveUnit.new(:pie, aliases: ["cake"], value: "1/2 sweet").inspect
+    assert_equal "#<Measured::CaseInsensitiveUnit: pie>", Measured::CaseInsensitiveUnit.new(:pie).inspect
+    assert_equal "#<Measured::CaseInsensitiveUnit: pie (cake)>", Measured::CaseInsensitiveUnit.new(:pie, aliases: ["CAKE"]).inspect
+    assert_equal "#<Measured::CaseInsensitiveUnit: pie 1/2 sweet>", Measured::CaseInsensitiveUnit.new(:Pie, value: "1/2 sweet").inspect
+    assert_equal "#<Measured::CaseInsensitiveUnit: pie (cake) 1/2 sweet>", Measured::CaseInsensitiveUnit.new(:pie, aliases: ["cake"], value: "1/2 sweet").inspect
   end
 
   test "includes Comparable mixin" do

data/test/measurable_test.rb

@@ -138,13 +138,26 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
   end
 
   test "#to_s outputs the number and the unit" do
-    assert_equal "10 fireball (2/3 magic_missile)", Magic.new(10, :fire).to_s
+    assert_equal "1 fireball", Magic.new("1", :fire).to_s
+    assert_equal "10 fireball", Magic.new(10, :fire).to_s
     assert_equal "1.234 magic_missile", Magic.new("1.234", :magic_missile).to_s
+    assert_equal "0.125 magic_missile", Magic.new(Rational(1, 8), :magic_missile).to_s
+    assert_equal "0.375 magic_missile", Magic.new(Rational(3, 8), :magic_missile).to_s
+    assert_equal "5 fireball", Magic.new(Rational(5, 1), :fire).to_s
+  end
+
+  test "#humanize outputs the number and the unit properly pluralized" do
+    assert_equal "1 fireball", Magic.new("1", :fire).humanize
+    assert_equal "10 fireballs", Magic.new(10, :fire).humanize
+    assert_equal "1.234 magic_missiles", Magic.new("1.234", :magic_missile).humanize
+    assert_equal "0.125 magic_missiles", Magic.new(Rational(1, 8), :magic_missile).humanize
+    assert_equal "0.375 magic_missiles", Magic.new(Rational(3, 8), :magic_missile).humanize
+    assert_equal "5 fireballs", Magic.new(Rational(5, 1), :fire).humanize
   end
 
   test "#inspect shows the number and the unit" do
-    assert_equal "#<Magic: 10 fireball (2/3 magic_missile)>", Magic.new(10, :fire).inspect
-    assert_equal "#<Magic: 1.234 magic_missile>", Magic.new(1.234, :magic_missile).inspect
+    assert_equal "#<Magic: 10 #<Measured::CaseInsensitiveUnit: fireball (fire, fireballs) 2/3 magic_missile>>", Magic.new(10, :fire).inspect
+    assert_equal "#<Magic: 1.234 #<Measured::CaseInsensitiveUnit: magic_missile (magic_missiles)>>", Magic.new(1.234, :magic_missile).inspect
   end
 
   test "#zero? always returns false" do

data/test/unit_test.rb

@@ -18,9 +18,13 @@ class Measured::UnitTest < ActiveSupport::TestCase
     assert_equal 10, @unit.conversion_amount
     assert_equal "Cake", @unit.conversion_unit
 
-    unit = Measured::Unit.new(:pie, value: "5.5 sweets")
+    unit = Measured::Unit.new(:pie, value: ["5.5", "sweets"])
     assert_equal BigDecimal("5.5"), unit.conversion_amount
     assert_equal "sweets", unit.conversion_unit
+
+    unit = Measured::Unit.new(:pie, value: "1/3 bitter pie")
+    assert_equal Rational(1, 3), unit.conversion_amount
+    assert_equal "bitter pie", unit.conversion_unit
   end
 
   test "#initialize raises if the format of the value is incorrect" do
@@ -28,10 +32,6 @@ class Measured::UnitTest < ActiveSupport::TestCase
       Measured::Unit.new(:pie, value: "hello")
     end
 
-    assert_raises Measured::UnitError do
-      Measured::Unit.new(:pie, value: "pie is delicious")
-    end
-
     assert_raises Measured::UnitError do
       Measured::Unit.new(:pie, value: "123456")
     end
@@ -43,8 +43,10 @@ class Measured::UnitTest < ActiveSupport::TestCase
   end
 
   test "#inspect returns an expected string" do
-    assert_equal "#<Measured::Unit: pie (pie) >", Measured::Unit.new(:pie).inspect
-    assert_equal "#<Measured::Unit: pie (cake, pie) 1/2 sweet>", Measured::Unit.new(:pie, aliases: ["cake"], value: "1/2 sweet").inspect
+    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
+    assert_equal "#<Measured::Unit: pie 1/2 sweet>", Measured::Unit.new(:pie, value: "1/2 sweet").inspect
+    assert_equal "#<Measured::Unit: pie (cake) 1/2 sweet>", Measured::Unit.new(:pie, aliases: ["cake"], value: "1/2 sweet").inspect
   end
 
   test "includes Comparable mixin" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre3
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport