unitwise 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9050a8b1974209dc285b85f896030daed2e6319
-  data.tar.gz: 239e8d8949dfadf97acd2b5d431d7c9722d93b9e
+  metadata.gz: c58fcab5f459dabf82d61393506c52f9ee2f8b6a
+  data.tar.gz: f899cd92c24b5cddcc24d10fb178c73c13e00a34
 SHA512:
-  metadata.gz: 3ebf1ae8eaa28fbff80dadf844629f74e36593c094ee1b8a82aee615e1989b1d995a5512e573405422814c8bb581b5e44bad928372f91dccf40eff3584b6d854
-  data.tar.gz: b8290d0f28ab189333ed4b16efdf5d5ea42f9d0d0b3d65d4822cda9e33ee234ee1da2ed544487b4be9814a4d4cd07aba2480d1ab714262e1c75dfee5812d99b7
+  metadata.gz: eb35817f7d71e8d69759ce1f4f2e74fc15b1e56a2ec1c106c70b55752687803637b1eec6a3c8e96f7faaae9bcf110ed7fd0de2788b4d672c2cb7eed9603b9616
+  data.tar.gz: 54fb82569099f421c32123cdcd2c5eb6f5bcc0c950709144b9ce362064ec6509720ee85024a7147377337add6f078316239cc0026da9bac92cc2fe2050a67e02

data/lib/unitwise.rb

@@ -3,6 +3,7 @@ require 'memoizable'
 require 'parslet'
 require 'signed_multiset'
 require 'yaml'
+require 'bigdecimal'
 
 require 'unitwise/version'
 require 'unitwise/base'

data/lib/unitwise/atom.rb

@@ -103,11 +103,11 @@ module Unitwise
     # @return [Numeric]
     # @api public
     def scalar(magnitude = 1)
-      base? ? magnitude : scale.scalar(magnitude)
+      base? ? BigDecimal(magnitude.to_s) : scale.scalar(magnitude)
     end
 
     def magnitude(scalar = scalar)
-      special? ? scale.magnitude(scalar) : 1
+      special? ? scale.magnitude(scalar) : BigDecimal('1')
     end
 
     # An atom may have a complex scale with several base atoms at various

data/lib/unitwise/functional.rb

@@ -19,7 +19,7 @@ module Unitwise
     end
 
     def self.from_degf(x)
-      5.0 / 9 * (x + 459.67)
+      5.0 / 9.0 * (x + 459.67)
     end
 
     def self.to_hpX(x)
@@ -27,23 +27,23 @@ module Unitwise
     end
 
     def self.from_hpX(x)
-      10 ** -x
+      10.0 ** -x
     end
 
     def self.to_hpC(x)
-      -log(x) / log(100)
+      -log(x) / log(100.0)
     end
 
     def self.from_hpC(x)
-      100 ** -x
+      100.0 ** -x
     end
 
     def self.to_tan100(x)
-      100 * tan(x)
+      100.0 * tan(x)
     end
 
     def self.from_tan100(x)
-      atan(x / 100)
+      atan(x / 100.0)
     end
 
     def self.to_ph(x)
@@ -55,11 +55,11 @@ module Unitwise
     end
 
     def self.to_ld(x)
-      Math.log(x) / Math.log(2)  
+      Math.log(x) / Math.log(2.0)
     end
 
     def self.from_ld(x)
-      2 ** x
+      2.0 ** x
     end
 
     def self.to_ln(x)
@@ -75,15 +75,15 @@ module Unitwise
     end
 
     def self.from_lg(x)
-      10 ** x
+      10.0 ** x
     end
 
     def self.to_2lg(x)
-      2 * log10(x)
+      2.0 * log10(x)
     end
 
     def self.from_2lg(x)
-      10 ** (x / 2)
+      10.0 ** (x / 2.0)
     end
 
     attr_reader :function_name

data/lib/unitwise/measurement.rb

@@ -149,6 +149,10 @@ module Unitwise
       self.class.new(*args)
     end
 
+    def value=(value)
+      @value = value
+    end
+
     # Determine value of the unit after conversion to another unit
     # @api private
     def converted_value(other_unit)

data/lib/unitwise/prefix.rb

@@ -15,10 +15,10 @@ module Unitwise
       Unitwise.data_file 'prefix'
     end
 
-    # Set the scalar value for the prefix, always as a Fixnum
+    # Set the scalar value for the prefix, always as a BigDecimal
     # @api semipublic
     def scalar=(value)
-      @scalar = value.to_f
+      @scalar = BigDecimal(value.to_s)
     end
   end
 end

data/lib/unitwise/scale.rb

@@ -20,6 +20,10 @@ module Unitwise
       unit.atoms
     end
 
+    def value=(value)
+      @value = BigDecimal(value.to_s)
+    end
+
     # List the terms associated with this scale's unit.
     # @return [Array]
     # @api public

data/lib/unitwise/term.rb

@@ -59,8 +59,8 @@ module Unitwise
     # @param magnitude [Numeric] The magnitude to calculate the scalar for.
     # @return [Numeric] The unitless linear scalar value.
     # @api public
-    def scalar(magnitude = 1)
-      calculate(atom ? atom.scalar(magnitude) : 1)
+    def scalar(magnitude = 1.0)
+      calculate(atom ? atom.scalar(magnitude) : magnitude)
     end
 
     # Calculate the magnitude for this term
@@ -68,7 +68,7 @@ module Unitwise
     # @return [Numeric] The magnitude on this scale.
     # @api public
     def magnitude(scalar = scalar)
-      calculate(atom ? atom.magnitude(scalar) : 1)
+      calculate(atom ? atom.magnitude(scalar) : 1.0)
     end
 
     # The base units this term is derived from

data/lib/unitwise/unit.rb

@@ -46,14 +46,14 @@ module Unitwise
     end
     memoize :root_terms
 
-    def scalar(magnitude = 1)
-      terms.reduce(1) do |prod, term|
+    def scalar(magnitude = 1.0)
+      terms.reduce(1.0) do |prod, term|
         prod * term.scalar(magnitude)
       end
     end
 
     def magnitude(scalar = scalar)
-      terms.reduce(1) do |prod, term|
+      terms.reduce(1.0) do |prod, term|
         prod * term.magnitude(scalar)
       end
     end

data/lib/unitwise/version.rb

@@ -1,3 +1,3 @@
 module Unitwise
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
 end

data/test/support/scale_tests.rb

@@ -53,7 +53,7 @@ module ScaleTests
       describe "#scalar" do
         it "must return value relative to terminal atoms" do
           subject.scalar.must_equal 4000
-          mph.scalar.must_equal 26.8224
+          mph.scalar.must_almost_equal 26.8224
           cel.scalar.must_equal 295.15
         end
       end

data/test/test_helper.rb

@@ -6,4 +6,14 @@ end
 require 'minitest/autorun'
 require 'minitest/pride'
 
-require 'unitwise'
+require 'unitwise'
+
+module Minitest::Assertions
+  def assert_almost_equal(expected, actual)
+    message = "Expected #{actual} to be almost equal to #{expected}"
+    range   = 0.00001
+    assert expected + range > actual && expected - range < actual, message
+  end
+end
+
+Numeric.infect_an_assertion :assert_almost_equal, :must_almost_equal

data/test/unitwise/atom_test.rb

@@ -102,8 +102,8 @@ describe Unitwise::Atom do
   describe "#scalar" do
     it "must return scalar relative to terminal atom" do
       second.scalar.must_equal 1
-      yard.scalar.must_equal 0.9144000000000001
-      pi.scalar.must_equal 3.141592653589793
+      yard.scalar.must_almost_equal 0.9144
+      pi.scalar.must_almost_equal 3.141592653589793
     end
   end
 

data/test/unitwise/measurement_test.rb

@@ -13,7 +13,7 @@ describe Unitwise::Measurement do
 
   describe "#convert_to" do
     it "must convert to a similar unit code" do
-      mph.convert_to('km/h').value.must_equal 96.56063999999999
+      mph.convert_to('km/h').value.must_almost_equal 96.56063
     end
     it "must raise an error if the units aren't similar" do
       lambda { mph.convert_to('N') }.must_raise Unitwise::ConversionError
@@ -25,13 +25,13 @@ describe Unitwise::Measurement do
       k.convert_to('Cel').value.must_equal 100
     end
     it "must convert special units to special units" do
-      f.convert_to('Cel').value.must_equal 37
+      f.convert_to('Cel').value.must_almost_equal 37
     end
     it "must convert special units to non-special units" do
-      cel.convert_to("[degR]").value.must_equal 531.27
+      cel.convert_to("[degR]").value.must_almost_equal(531.27)
     end
     it "must convert derived units to special units" do
-      r.convert_to("Cel").value.round.must_equal 0
+      r.convert_to("Cel").value.must_almost_equal(0)
     end
   end
 
@@ -43,7 +43,7 @@ describe Unitwise::Measurement do
     end
     it "must multiply similar units" do
       mult = mph * kmh
-      mult.value.must_equal 3728.227153424004
+      mult.value.must_almost_equal 3728.22715342
       mult.unit.must_equal Unitwise::Unit.new("([mi_i]/h).([mi_i]/h)")
     end
     it "must multiply unsimilar units" do
@@ -66,7 +66,7 @@ describe Unitwise::Measurement do
     end
     it "must divide by the value of similar units" do
       div = kmh / mph
-      div.value.must_equal 1.03561865372889
+      div.value.must_almost_equal 1.03561865
       div.unit.to_s.must_equal '1'
     end
     it "must divide dissimilar units" do
@@ -79,7 +79,7 @@ describe Unitwise::Measurement do
   describe "#+" do
     it "must add values when units are similar" do
       added = mph + kmh
-      added.value.must_equal 122.13711922373341
+      added.value.must_almost_equal 122.13711922
       added.unit.must_equal mph.unit
     end
     it "must raise an error when units are not similar" do
@@ -90,7 +90,7 @@ describe Unitwise::Measurement do
   describe "#-" do
     it "must add values when units are similar" do
       added = mph - kmh
-      added.value.must_equal -2.1371192237334
+      added.value.must_almost_equal(-2.1371192)
       added.unit.must_equal mph.unit
     end
     it "must raise an error when units are not similar" do
@@ -126,6 +126,7 @@ describe Unitwise::Measurement do
 
   describe "equality" do
     let(:m)    { Unitwise::Measurement.new(1,'m') }
+    let(:feet) { Unitwise::Measurement.new(20, 'foot') }
     let(:mm)   { Unitwise::Measurement.new(1000,'mm') }
     let(:foot) { Unitwise::Measurement.new(1,'foot') }
     let(:g)    { Unitwise::Measurement.new(1,'gram') }
@@ -166,7 +167,7 @@ describe Unitwise::Measurement do
     it "must convert 'to_foot'" do
       convert = meter.to_foot
       convert.must_be_instance_of Unitwise::Measurement
-      convert.value.must_equal 3.280839895013123
+      convert.value.must_almost_equal 3.280839895
     end
 
     it "must not convert 'foo'" do

data/test/unitwise/unit_test.rb

@@ -28,8 +28,8 @@ describe Unitwise::Unit do
     it "must return value relative to terminal atoms" do
       ms2.must_respond_to :scalar
       ms2.scalar.must_equal 1
-      psi.scalar.must_equal 6894757.293168359
-      deg.scalar.must_equal 0.017453292519943295
+      psi.scalar.must_almost_equal 6894757.293168361
+      deg.scalar.must_almost_equal 0.0174532925199433
     end
   end
 

data/unitwise.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency               'memoizable',      '~> 0.4'
 
   if RUBY_VERSION > '1.8.7'
+    gem.add_dependency             'bigdecimal',      '~> 1.2' unless RUBY_PLATFORM == 'java'
     gem.add_dependency             'parslet',         '~> 1.5'
     gem.add_development_dependency 'nokogiri',        '~> 1.5'
     gem.add_development_dependency 'coveralls',       '~> 0.6'
@@ -32,7 +33,6 @@ Gem::Specification.new do |gem|
     gem.add_dependency             'parslet',         '~> 1.5.0'
     gem.add_development_dependency 'nokogiri',        '~> 1.5.10'
   end
-
   gem.add_development_dependency   'pry',             '~> 0.9'
   gem.add_development_dependency   'minitest',        '~> 5.0'
   gem.add_development_dependency   'rake',            '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitwise
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Josh Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liner
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement