ruby-units 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e6acf899cc64a4b47d9bed66ea695ee59e3d26b
-  data.tar.gz: 6c04d8f9069b6944cb0ca0f32adf74a722b9036d
+  metadata.gz: 448201b21f6913329bfbd81fff22ea949e74ba81
+  data.tar.gz: 1021947fecb0fbd41a2cda3dcce5d1a16a31cf61
 SHA512:
-  metadata.gz: 594ca11e51bcd2090f715ff431059045ec981cf758f9b72771faa8978d1dee8ac3677dc4b78b3552dc9786ffa3c62ee7f377569213dd6b43b5245a4b8ffc3f36
-  data.tar.gz: 8ce5144320bb529a3b4c6eea632e17a424997f458a1efd18b4a6fa6ec5ceb9c7dd2fbf4f93ce349e528cb745327c118690518370cda3327aa3ecabb50b7c4e5d
+  metadata.gz: 73e1a0a5ff0bf2c7cad7313296f1be2cf666394be7697e82ef0daf8c0d15ce8973ba2a9c4a40589d7bbdf381d5665fc71f237547ef6e10e19303e45fb36457c1
+  data.tar.gz: 5a41f0e985f8cc118674a29e64fc8b66b9c0cebd81bc622f4986469b0c5fe994c7276204fe1fcd87c81d63ce1e681d8a12f46ded7057f0f127b94ed56f185879

data/README.md

@@ -7,6 +7,13 @@ Kevin C. Olbrich, Ph.D.
 
 Project page: [http://github.com/olbrich/ruby-units](http://github.com/olbrich/ruby-units)
 
+Notes
+-----
+
+This version removes 'mathn' as a dependency.  Mathn alters the behavior of some mathematical operators, which
+frequently causes unexpected behavior and can be a source of difficult to diagnose bugs.  Mathn is also scheduled to be removed from
+the Ruby standard library.
+
 Introduction
 ------------
 
@@ -276,16 +283,6 @@ Currently there is only one configuration you can set:
 
 ### NOTES
 
-#### Mathn
-
-Note that the current implementation of ruby-units requires 'mathn' from the ruby standard library.
-This tends to change the behavior of integer math in ways that many people do not expect, and can be the source
-of numerous bugs and odd behaviors.  If you encounter what appears to be a bug in your code that seems to be related
-
-to the use of ruby-units, try to reproduce the bug by just including 'mathn' by itself.
-
-If you identify a bug in a gem or code that uses mathn, please file a bug report or create a pull request to fix it.
-
 #### Performance vs. Accuracy
 
 Ruby units was originally intended to provide a robust and accurate way to do arbitrary unit conversions.  

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/lib/ruby_units/math.rb

@@ -1,5 +1,3 @@
-require 'mathn'
-
 # Math will convert unit objects to radians and then attempt to use the value for
 # trigonometric functions.
 module Math
@@ -100,7 +98,7 @@ module Math
   # @return [Numeric]
   def hypot(x, y)
     if RubyUnits::Unit === x && RubyUnits::Unit === y
-      (x**2 + y**2)**(1 / 2)
+      (x**2 + y**2)**Rational(1, 2)
     else
       unit_hypot(x, y)
     end

data/lib/ruby_units/unit.rb

@@ -587,23 +587,23 @@ module RubyUnits
 
       num = []
       den = []
-      q   = 1
-      @numerator.compact.each do |unit|
-        if @@prefix_values[unit]
-          q *= @@prefix_values[unit]
+      q   = Rational(1)
+      @numerator.compact.each do |num_unit|
+        if @@prefix_values[num_unit]
+          q *= @@prefix_values[num_unit]
         else
-          q *= @@unit_values[unit][:scalar] if @@unit_values[unit]
-          num << @@unit_values[unit][:numerator] if @@unit_values[unit] && @@unit_values[unit][:numerator]
-          den << @@unit_values[unit][:denominator] if @@unit_values[unit] && @@unit_values[unit][:denominator]
+          q *= @@unit_values[num_unit][:scalar] if @@unit_values[num_unit]
+          num << @@unit_values[num_unit][:numerator] if @@unit_values[num_unit] && @@unit_values[num_unit][:numerator]
+          den << @@unit_values[num_unit][:denominator] if @@unit_values[num_unit] && @@unit_values[num_unit][:denominator]
         end
       end
-      @denominator.compact.each do |unit|
-        if @@prefix_values[unit]
-          q /= @@prefix_values[unit]
+      @denominator.compact.each do |num_unit|
+        if @@prefix_values[num_unit]
+          q /= @@prefix_values[num_unit]
         else
-          q /= @@unit_values[unit][:scalar] if @@unit_values[unit]
-          den << @@unit_values[unit][:numerator] if @@unit_values[unit] && @@unit_values[unit][:numerator]
-          num << @@unit_values[unit][:denominator] if @@unit_values[unit] && @@unit_values[unit][:denominator]
+          q /= @@unit_values[num_unit][:scalar] if @@unit_values[num_unit]
+          den << @@unit_values[num_unit][:numerator] if @@unit_values[num_unit] && @@unit_values[num_unit][:numerator]
+          num << @@unit_values[num_unit][:denominator] if @@unit_values[num_unit] && @@unit_values[num_unit][:denominator]
         end
       end
 
@@ -833,7 +833,7 @@ module RubyUnits
               RubyUnits::Unit.new(scalar: (other.scalar + convert_to(other.temperature_scale).scalar), numerator: other.numerator, denominator: other.denominator, signature: other.signature)
             end
           else
-            @q ||= ((@@cached_units[units].scalar / @@cached_units[units].base_scalar) rescue units.to_unit.to_base.scalar)
+            @q ||= (Rational(@@cached_units[units].scalar, @@cached_units[units].base_scalar) rescue units.to_unit.to_base.scalar)
             RubyUnits::Unit.new(scalar: (base_scalar + other.base_scalar) * @q, numerator: @numerator, denominator: @denominator, signature: @signature)
           end
         else
@@ -870,7 +870,7 @@ module RubyUnits
           elsif other.temperature?
             raise ArgumentError, 'Cannot subtract a temperature from a differential degree unit'
           else
-            @q ||= ((@@cached_units[units].scalar / @@cached_units[units].base_scalar) rescue (units.to_unit.scalar / units.to_unit.to_base.scalar))
+            @q ||= (Rational(@@cached_units[units].scalar, @@cached_units[units].base_scalar) rescue Rational(units.to_unit.scalar, units.to_unit.to_base.scalar))
             RubyUnits::Unit.new(scalar: (base_scalar - other.base_scalar) * @q, numerator: @numerator, denominator: @denominator, signature: @signature)
           end
         else
@@ -914,12 +914,16 @@ module RubyUnits
       when Unit
         raise ZeroDivisionError if other.zero?
         raise ArgumentError, 'Cannot divide with temperatures' if [other, self].any?(&:temperature?)
-        opts = RubyUnits::Unit.eliminate_terms(@scalar / other.scalar, @numerator + other.denominator, @denominator + other.numerator)
+        sc = Rational(@scalar, other.scalar)
+        sc = sc.numerator if sc.denominator == 1
+        opts = RubyUnits::Unit.eliminate_terms(sc, @numerator + other.denominator, @denominator + other.numerator)
         opts[:signature] = @signature - other.signature
         RubyUnits::Unit.new(opts)
       when Numeric
         raise ZeroDivisionError if other.zero?
-        RubyUnits::Unit.new(scalar: @scalar / other, numerator: @numerator, denominator: @denominator, signature: @signature)
+        sc = Rational(@scalar, other)
+        sc = sc.numerator if sc.denominator == 1
+        RubyUnits::Unit.new(scalar: sc, numerator: @numerator, denominator: @denominator, signature: @signature)
       else
         x, y = coerce(other)
         y / x
@@ -972,11 +976,11 @@ module RubyUnits
         return power(other)
       when Float
         return self**other.to_i if other == other.to_i
-        valid = (1..9).map { |x| 1 / x }
+        valid = (1..9).map { |n| Rational(1, n) }
         raise ArgumentError, 'Not a n-th root (1..9), use 1/n' unless valid.include? other.abs
-        return root((1 / other).to_int)
+        return root(Rational(1, other).to_int)
       when Complex
-        raise ArgumentError, 'exponentiation of complex numbers is not yet supported.'
+        raise ArgumentError, 'exponentiation of complex numbers is not supported.'
       else
         raise ArgumentError, 'Invalid Exponent'
       end

data/ruby-units.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ruby-units 2.1.0 ruby lib
+# stub: ruby-units 2.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby-units".freeze
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Kevin Olbrich, Ph.D.".freeze]
-  s.date = "2016-12-30"
+  s.date = "2017-08-07"
   s.description = "Provides classes and methods to perform unit math and conversions".freeze
   s.email = ["kevin.olbrich+ruby_units@gmail.com".freeze]
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/olbrich/ruby-units".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.8".freeze
+  s.rubygems_version = "2.6.11".freeze
   s.summary = "A class that performs unit conversions and unit math".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-units
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Kevin Olbrich, Ph.D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A class that performs unit conversions and unit math