ruby-units 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 52d0abf6dc2d186c597aa3543dfb64a2e4e58437
-  data.tar.gz: bc9f92f2eaf3eeefb1df33699785d21a2ff9fcf8
+SHA256:
+  metadata.gz: 1a7f0ef586984958760da336474f343c66b598b063991b55c7b1cbedda49d630
+  data.tar.gz: 71831000f4bcdd187ea834ca7e227c40eb2e143f8ccdddef4c0b3e4c0d3c385d
 SHA512:
-  metadata.gz: cf20400a8552f515beb913042d5d8736402ac244736718fe515058b5556b4f13b3b04fc8091f65fde2adcdb5da8af48af5f32a54b7bdf51f1824ba1371df9f3b
-  data.tar.gz: '066711448923f74c7f9995bfd3f1c700495018ffe142ea48e1dbe1158e3842f3d19a363268ecd38546fc35768196334f8fbd05cf3aae693335217e43b3c70d83'
+  metadata.gz: bdab6e591cc0aaa668382d49d9e8a01846da31f46f2a3330f66a7b66445b5f649287d21943b1bd75648de3cce44b64e7f06070e00a070f50e8f1794451675511
+  data.tar.gz: 55723037f57f90d181643792f47452a8bd4c5150ae6ddc4038d998a4f30b9331aa73e331d3fc090776fdf3a0424032975cd0a5fb56c85d289b545f0c2ff682af

data/CHANGELOG.txt

@@ -1,5 +1,8 @@
 Change Log for Ruby-units
 =========================
+2018-03-06  2.3.0   * Fix add (+) and subtract (-) for BigDecimal scalars. (see #167)
+                    * Update ruby versions (#163)
+                    * fix: temperature converting rational issue (#164)
 2017-12-07  2.2.1   * fix an issue with formatting of rational scalars (see #159)
 2017-08-07  2.2.0   * add support for ruby 2.4.1
                     * drop support for ruby 2.1.0

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.3.0

data/lib/ruby_units/unit.rb

@@ -847,14 +847,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 ||= begin
-                     begin
-                      Rational(@@cached_units[units].scalar, @@cached_units[units].base_scalar)
-                    rescue
-                      units.to_unit.to_base.scalar
-                    end
-                   end
-            RubyUnits::Unit.new(scalar: (base_scalar + other.base_scalar) * @q, numerator: @numerator, denominator: @denominator, signature: @signature)
+            RubyUnits::Unit.new(scalar: (base_scalar + other.base_scalar), numerator: base.numerator, denominator: base.denominator, signature: @signature).to(units)
           end
         else
           raise ArgumentError, "Incompatible Units ('#{self}' not compatible with '#{other}')"
@@ -890,14 +883,7 @@ module RubyUnits
           elsif other.temperature?
             raise ArgumentError, 'Cannot subtract a temperature from a differential degree unit'
           else
-            @q ||= begin
-                     begin
-                      Rational(@@cached_units[units].scalar, @@cached_units[units].base_scalar)
-                    rescue
-                      Rational(units.to_unit.scalar, units.to_unit.to_base.scalar)
-                    end
-                   end
-            RubyUnits::Unit.new(scalar: (base_scalar - other.base_scalar) * @q, numerator: @numerator, denominator: @denominator, signature: @signature)
+            RubyUnits::Unit.new(scalar: (base_scalar - other.base_scalar), numerator: base.numerator, denominator: base.denominator, signature: @signature).to(units)
           end
         else
           raise ArgumentError, "Incompatible Units ('#{self}' not compatible with '#{other}')"
@@ -1104,19 +1090,19 @@ module RubyUnits
                          when '<tempK>'
                            @scalar
                          when '<tempF>'
-                           (@scalar + 459.67) * Rational(5, 9)
+                           (@scalar + 459.67).to_r * Rational(5, 9)
                          when '<tempR>'
-                           @scalar * Rational(5, 9)
+                           @scalar.to_r * Rational(5, 9)
                          end
         q = case @@unit_map[target_unit]
             when '<tempC>'
-              @base_scalar - 273.15
+              @base_scalar - 273.15r
             when '<tempK>'
               @base_scalar
             when '<tempF>'
-              @base_scalar * Rational(9, 5) - 459.67
+              @base_scalar.to_r * Rational(9, 5) - 459.67r
             when '<tempR>'
-              @base_scalar * Rational(9, 5)
+              @base_scalar.to_r * Rational(9, 5)
             end
         return RubyUnits::Unit.new("#{q} #{target_unit}")
       else

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.2.1 ruby lib
+# stub: ruby-units 2.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby-units".freeze
-  s.version = "2.2.1"
+  s.version = "2.3.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 = "2017-12-07"
+  s.date = "2018-03-06"
   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 = [
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/olbrich/ruby-units".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.13".freeze
+  s.rubygems_version = "2.7.4".freeze
   s.summary = "A class that performs unit conversions and unit math".freeze
 
   if s.respond_to? :specification_version then
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
       s.add_development_dependency(%q<pry>.freeze, [">= 0"])
       s.add_development_dependency(%q<pry-byebug>.freeze, [">= 0"])
+      s.add_development_dependency(%q<ruby-prof>.freeze, [">= 0"])
       s.add_development_dependency(%q<terminal-notifier>.freeze, [">= 0"])
       s.add_development_dependency(%q<terminal-notifier-guard>.freeze, [">= 0"])
     else
@@ -66,6 +67,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>.freeze, [">= 0"])
       s.add_dependency(%q<pry>.freeze, [">= 0"])
       s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
+      s.add_dependency(%q<ruby-prof>.freeze, [">= 0"])
       s.add_dependency(%q<terminal-notifier>.freeze, [">= 0"])
       s.add_dependency(%q<terminal-notifier-guard>.freeze, [">= 0"])
     end
@@ -75,6 +77,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>.freeze, [">= 0"])
     s.add_dependency(%q<pry>.freeze, [">= 0"])
     s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
+    s.add_dependency(%q<ruby-prof>.freeze, [">= 0"])
     s.add_dependency(%q<terminal-notifier>.freeze, [">= 0"])
     s.add_dependency(%q<terminal-notifier-guard>.freeze, [">= 0"])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-units
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Kevin Olbrich, Ph.D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A class that performs unit conversions and unit math