measured 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a69b542ffb24ed97433592b86e4b9528adb4e95
-  data.tar.gz: 1a7f476e754cdb1781fda2b31c630746f91977d3
+  metadata.gz: 81c1e2494e3547676ef4d146737363a2fbd34f84
+  data.tar.gz: 13dc02fd3f8f64a2e3efe86ec6c93d4c3e6530fe
 SHA512:
-  metadata.gz: 0a864576e69e8a8df51ba081597ab43c684220c6485b1c04da07fb48cbabe0a15532055e197bfb43c3ad5a14066f8b2c949d103ffa10465fd3d068a5d7fe3cc9
-  data.tar.gz: 955237150a140886a4be19ae03de0d8745befdfa076db4f9239b01964631f4064a6de13680bb846ff5cb058987e0a42801819b32159563234afc20d1926549df
+  metadata.gz: dba3840951fee6ac5bbe8bb42ca8ae4371d722b16acd48ca03f03c06dc68094d66d78b6cd659513bec5a8fa5c11c17048ca5789df09a634c6211bf76f9437050
+  data.tar.gz: 463f44d4a37facac37d45b1382d91ac176234500a4f1fdcc1bfb3420ee4672e29b014dbe78d6f40b052e118bebffb0745a6d653238d3d33512a7bd50ce19d492

data/README.md

@@ -85,6 +85,13 @@ Measured::Weight.new(3, :g) * 2
 > #<Measured::Weight 6 g>
 ```
 
+Converts units only as needed for equality comparison:
+
+```ruby
+> Measured::Weight.new(1000, :g) == Measured::Weight.new(1, :kg)
+true
+```
+
 Extract the unit and the value:
 
 ```ruby

data/lib/measured/measurable.rb

@@ -23,6 +23,8 @@ class Measured::Measurable
 
   def convert_to(new_unit)
     new_unit_name = self.class.conversion.to_unit_name(new_unit)
+    return self if new_unit_name == self.class.conversion.to_unit_name(unit)
+
     value = self.class.conversion.convert(@value, from: @unit, to: new_unit_name)
 
     self.class.new(value, new_unit)
@@ -46,13 +48,17 @@ class Measured::Measurable
   end
 
   def <=>(other)
-    if other.is_a?(self.class) && unit == other.unit
-      value <=> other.value
+    if other.is_a?(self.class)
+      other_converted = other.convert_to(unit)
+      value <=> other_converted.value
     end
   end
 
   def ==(other)
-    !!(other.is_a?(self.class) && unit == other.unit && value == other.value)
+    return false unless other.is_a?(self.class)
+
+    other_converted = other.convert_to(unit)
+    value == other_converted.value
   end
 
   alias_method :eql?, :==
@@ -75,5 +81,9 @@ class Measured::Measurable
       conversion.unit_names_with_aliases
     end
 
+    def name
+      to_s.split("::").last.underscore.humanize.downcase
+    end
+
   end
 end

data/lib/measured/version.rb

@@ -1,3 +1,3 @@
 module Measured
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/repodb.yml

@@ -0,0 +1,3 @@
+classification: library
+ci_urls:
+  - https://travis-ci.org/Shopify/measured

data/test/measurable_test.rb

@@ -77,6 +77,16 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
     refute Magic.valid_unit?("junk")
   end
 
+  test ".name looks at the class name" do
+    module Example
+      class VeryComplexThing < Measured::Measurable ; end
+    end
+
+    assert_equal "magic", Magic.name
+    assert_equal "measurable", Measured::Measurable.name
+    assert_equal "very complex thing", Example::VeryComplexThing.name
+  end
+
   test "#convert_to raises on an invalid unit" do
     assert_raises Measured::UnitError do
       @magic.convert_to(:punch)
@@ -86,13 +96,19 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
   test "#convert_to returns a new object of the same type in the new unit" do
     converted = @magic.convert_to(:arcane)
 
-    refute_equal converted, @magic
+    assert_equal converted, @magic
+    refute_equal converted.object_id, @magic.object_id
     assert_equal BigDecimal(10), @magic.value
     assert_equal "magic_missile", @magic.unit
     assert_equal BigDecimal(1), converted.value
     assert_equal "arcane", converted.unit
   end
 
+  test "#convert_to from and to the same unit returns the same object" do
+    converted = @magic.convert_to(@magic.unit)
+    assert_equal converted.object_id, @magic.object_id
+  end
+
   test "#convert_to! replaces the existing object with a new version in the new unit" do
     converted = @magic.convert_to!(:arcane)
 
@@ -113,8 +129,8 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
     assert_equal "#<Magic: 0.1234E1 magic_missile>", Magic.new(1.234, :magic_missile).inspect
   end
 
-  test "#<=> compares only if the class and unit are the same" do
-    assert_nil @magic <=> Magic.new(10, :fire)
+  test "#<=> compares regardless of the unit" do
+    assert_equal -1, @magic <=> Magic.new(10, :fire)
     assert_equal 1, @magic <=> Magic.new(9, :magic_missile)
     assert_equal 0, @magic <=> Magic.new(10, :magic_missile)
     assert_equal -1, @magic <=> Magic.new(11, :magic_missile)
@@ -123,13 +139,29 @@ class Measured::MeasurableTest < ActiveSupport::TestCase
   test "#== should be the same if the classes, unit, and amount match" do
     assert @magic == @magic
     assert Magic.new(10, :magic_missile) == Magic.new("10", "magic_missile")
-    refute Magic.new(1, :arcane) == Magic.new(10, :magic_missile)
+    assert Magic.new(1, :arcane) == Magic.new(10, :magic_missile)
+    refute Magic.new(1, :arcane) == Magic.new(10.1, :magic_missile)
+  end
+
+  test "#== should be the same if the classes and amount match but the unit does not so they convert" do
+    assert Magic.new(2, :magic_missile) == Magic.new("1", "ice")
+  end
+
+  test "#> and #< should compare measurements" do
+    assert Magic.new(10, :magic_missile) < Magic.new(20, :magic_missile)
+    refute Magic.new(10, :magic_missile) > Magic.new(20, :magic_missile)
+  end
+
+  test "#> and #< should compare measurements of different units" do
+    assert Magic.new(10, :magic_missile) < Magic.new(100, :ice)
+    refute Magic.new(10, :magic_missile) > Magic.new(100, :ice)
   end
 
-  test "#eql? should be the same if the classes, unit, and amount match" do
+  test "#eql? should be the same if the classes and amount match, and unit is converted" do
     assert @magic == @magic
     assert Magic.new(10, :magic_missile) == Magic.new("10", "magic_missile")
-    refute Magic.new(1, :arcane) == Magic.new(10, :magic_missile)
+    assert Magic.new(1, :arcane) == Magic.new(10, :magic_missile)
+    refute Magic.new(1, :arcane) == Magic.new(10.1, :magic_missile)
   end
 
 end

data/test/units/length_test.rb

@@ -9,6 +9,10 @@ class Measured::LengthTest < ActiveSupport::TestCase
     assert_equal ["cm", "ft", "in", "m", "mm", "yd"], Measured::Length.units
   end
 
+  test ".name" do
+    assert_equal "length", Measured::Length.name
+  end
+
   test ".convert_to from cm to cm" do
     assert_conversion Measured::Length, "2000 cm", "2000 cm"
   end

data/test/units/weight_test.rb

@@ -13,6 +13,10 @@ class Measured::WeightTest < ActiveSupport::TestCase
     assert_equal ["g", "kg", "lb", "oz"], Measured::Weight.units
   end
 
+  test ".name" do
+    assert_equal "weight", Measured::Weight.name
+  end
+
   test ".convert_to from g to g" do
     assert_conversion Measured::Weight, "2000 g", "2000 g"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: measured
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,6 +119,7 @@ files:
 - lib/measured/units/weight.rb
 - lib/measured/version.rb
 - measured.gemspec
+- repodb.yml
 - test/arithmetic_test.rb
 - test/conversion_table_test.rb
 - test/conversion_test.rb