unitwise 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82ae868ed2165ed093704cc1f78b10a126f7175d
-  data.tar.gz: 66e83646464ceaa4959281bae35020218095264b
+  metadata.gz: 8f22030e678a95cdbdb00f3c6218ffbae3c224c7
+  data.tar.gz: 14bbf7d6ca9cc4d60a099f307a3c52b29c37d1f5
 SHA512:
-  metadata.gz: caadc0c5a1fa7ad383aa2fddd71e0dd4adc14b5abb3b27494f82a61d01ba0390bf0f8f589e2583f8044821b1e977caab865efff3b2c19ba8e6b1492ae4b537c2
-  data.tar.gz: 706990981938b4c56ef73272e4617c3350dbcb06a23fa93947443dbc24b7da34bda2df7b6b816da04132efb7f300389e994c587e5ed11ec3204526b2ad593388
+  metadata.gz: b5884072087cb9a0261b2e22a7906ef2d27546bf30cb7c8a84fa8d8cc006fea840122bde7020e5ef23ea923afdf6c9c201f51b9c298315a900a32b3c9fad07dc
+  data.tar.gz: 2ef4a1a779b20492b8497bca65acbec5a0d24bba1bac0208c1784d0d366672b21ac16d07e28314ed605ac969607ad55492860210a88a4a5238021c484774f0ce

data/README.md

@@ -17,7 +17,7 @@ distance = 0.25.mile # => #<Unitwise::Measurement value=0.25 unit=mile>
 time = 10.second # => #<Unitwise::Measurement value=10 unit=second>
 mass = 2800.pound # => #<Unitwise::Measurement value=2800 unit=pound>
 
-acceleration = 2 * distance / time ** 2
+acceleration = 2.0 * distance / time ** 2
 # => #<Unitwise::Measurement value=0.005 unit=[mi_us]/s2>
 
 force = (mass * acceleration).to_lbf
@@ -26,7 +26,7 @@ force = (mass * acceleration).to_lbf
 power = (force * distance / time).to_horsepower
 # => #<Unitwise::Measurement value=551.4031264140402 unit=horsepower>
 
-speed = ((2 * acceleration * distance) ** 0.5).convert_to("mile/hour")
+speed = ((2.0 * acceleration * distance) ** 0.5).convert_to("mile/hour")
 # => #<Unitwise::Measurement value=180.0 unit=mile/hour>
 ```
 
@@ -85,7 +85,7 @@ Unitwise is able to convert any unit within the UCUM spec to any other
 compatible unit.
 
 ```ruby
-5.kilometer.convert_to('mile')
+5.0.kilometer.convert_to('mile')
 # => #<Unitwise::Measurement value=3.106849747474748 unit=mile>
 ```
 
@@ -143,7 +143,7 @@ Unitwise(1000, 'kg.s-1.(m/s)2').to_kilowatt
 You can add or subtract compatible measurements.
 
 ```ruby
-2.meter + 3.inch - 1.yard
+2.0.meter + 3.0.inch - 1.0.yard
 # => #<Unitwise::Measurement value=1.1618 unit=meter>
 ```
 
@@ -166,7 +166,7 @@ Exponentiation is also supported.
 
 ```ruby
 (10.cm ** 3).to_liter
-# => #<Unitwise::Measurement value=1.0 unit=liter>
+# => #<Unitwise::Measurement value=1 unit=liter>
 ```
 
 ### Unit Names and Atom Codes
@@ -180,7 +180,7 @@ figure out most of the units by their name or symbol. If you find you need to
 (or just want to be explicit) you use the UCUM atom codes without any
 modification.
 
-Just as an example, you can see here that there are actually a few versions of inch
+Just for example, you can see here that there are actually a few versions of inch
 and foot:
 
 ```ruby

data/lib/unitwise.rb

@@ -7,8 +7,8 @@ require 'bigdecimal'
 
 require 'unitwise/version'
 require 'unitwise/base'
-require 'unitwise/expression'
 require 'unitwise/compatible'
+require 'unitwise/expression'
 require 'unitwise/scale'
 require 'unitwise/functional'
 require 'unitwise/measurement'

data/lib/unitwise/measurement.rb

@@ -149,6 +149,8 @@ module Unitwise
       self.class.new(*args)
     end
 
+    # Set the value for the measurement.
+    # @api private
     def value=(value)
       @value = value
     end

data/lib/unitwise/scale.rb

@@ -79,14 +79,29 @@ module Unitwise
     end
     memoize :depth
 
+    def simplified_value
+      if value.is_a?(Integer)
+        value
+      elsif (i = Integer(value)) == value
+        i
+      elsif value.is_a?(Float)
+        value
+      elsif (f = Float(value)) == value
+        f
+      else
+        value
+      end
+    end
+    memoize :simplified_value
+
     # Convert to a simple string representing the scale.
     # @api public
     def to_s
-      "#{value} #{unit}"
+      "#{simplified_value} #{unit}"
     end
 
     def inspect
-      "#<#{self.class} value=#{value} unit=#{unit}>"
+      "#<#{self.class} value=#{simplified_value} unit=#{unit}>"
     end
 
     # Redefine hash for apropriate hash/key lookup

data/lib/unitwise/version.rb

@@ -1,3 +1,3 @@
 module Unitwise
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/test/support/scale_tests.rb

@@ -85,6 +85,27 @@ module ScaleTests
         end
       end
 
+      describe "#simplified_value" do
+        describe "when the value is equivalent to an Integer" do
+          it "should convert from a Rational" do
+            result = described_class.new(Rational(20,2), 'foot').simplified_value
+            result.must_equal 10
+            result.must_be_kind_of(Integer)
+          end
+          it "should convert from a Float" do
+            result = described_class.new(4.0, 'foot').simplified_value
+            result.must_equal 4
+            result.must_be_kind_of(Integer)
+          end
+        end
+        describe "when the value is equivalent to a Float" do
+          it "should convert from a BigDecimal" do
+            result = described_class.new(BigDecimal("1.5"), 'foot').simplified_value
+            result.must_equal 1.5
+            result.must_be_kind_of(Float)
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitwise
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Josh Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liner
@@ -270,4 +270,3 @@ test_files:
 - test/unitwise/term_test.rb
 - test/unitwise/unit_test.rb
 - test/unitwise_test.rb
-has_rdoc: