ruby-units 2.1.0 → 2.3.2

data/Rakefile

@@ -1,27 +1,6 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require './lib/ruby-units'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'ruby-units'
-    gem.summary = 'A class that performs unit conversions and unit math'
-    gem.description = 'Provides classes and methods to perform unit math and conversions'
-    gem.authors = ['Kevin Olbrich, Ph.D.']
-    gem.email = ['kevin.olbrich+ruby_units@gmail.com']
-    gem.homepage = 'https://github.com/olbrich/ruby-units'
-    gem.files.exclude('.*', 'test/**/*', 'spec/**/*', 'Gemfile', 'Guardfile')
-    gem.license = 'MIT'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
-end
-
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-desc 'Run specs'
-RSpec::Core::RakeTask.new
+
+RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec

data/lib/ruby_units/date.rb

@@ -9,7 +9,7 @@ class Date
   def +(other)
     case other
     when RubyUnits::Unit
-      other = other.convert_to('d').round if %w(y decade century).include? other.units
+      other = other.convert_to('d').round if %w[y decade century].include? other.units
       unit_date_add(other.convert_to('day').scalar)
     else
       unit_date_add(other)
@@ -22,7 +22,7 @@ class Date
   def -(other)
     case other
     when RubyUnits::Unit
-      other = other.convert_to('d').round if %w(y decade century).include? other.units
+      other = other.convert_to('d').round if %w[y decade century].include? other.units
       unit_date_sub(other.convert_to('day').scalar)
     else
       unit_date_sub(other)

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/time.rb

@@ -45,7 +45,7 @@ class Time
   def +(other)
     case other
     when RubyUnits::Unit
-      other = other.convert_to('d').round.convert_to('s') if %w(y decade century).include? other.units
+      other = other.convert_to('d').round.convert_to('s') if %w[y decade century].include? other.units
       begin
         unit_add(other.convert_to('s').scalar)
       rescue RangeError
@@ -69,7 +69,7 @@ class Time
   def -(other)
     case other
     when RubyUnits::Unit
-      other = other.convert_to('d').round.convert_to('s') if %w(y decade century).include? other.units
+      other = other.convert_to('d').round.convert_to('s') if %w[y decade century].include? other.units
       begin
         unit_sub(other.convert_to('s').scalar)
       rescue RangeError

data/lib/ruby_units/unit.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'date'
 # Copyright 2006-2015
 # @author Kevin C. Olbrich, Ph.D.
@@ -23,7 +22,6 @@ require 'date'
 #
 module RubyUnits
   class Unit < Numeric
-    VERSION            = Unit::Version::STRING
     @@definitions      = {}
     @@prefix_values    = {}
     @@prefix_map       = {}
@@ -62,7 +60,7 @@ module RubyUnits
     RANKINE            = ['<rankine>'].freeze
     CELSIUS            = ['<celsius>'].freeze
     @@temp_regex       = nil
-    SIGNATURE_VECTOR   = %i(
+    SIGNATURE_VECTOR   = %i[
       length
       time
       temperature
@@ -73,7 +71,7 @@ module RubyUnits
       currency
       information
       angle
-    ).freeze
+    ].freeze
     @@kinds = {
       -312_078     => :elastance,
       -312_058     => :resistance,
@@ -333,9 +331,9 @@ module RubyUnits
         when rational
           # if it has whitespace, it will be of the form '6 1/2'
           if num =~ RATIONAL_NUMBER
-            sign = $1 == '-' ? -1 : 1
-            n = $2.to_i
-            f = Rational($3.to_i, $4.to_i)
+            sign = Regexp.last_match(1) == '-' ? -1 : 1
+            n = Regexp.last_match(2).to_i
+            f = Rational(Regexp.last_match(3).to_i, Regexp.last_match(4).to_i)
             sign * (n + f)
           else
             Rational(*num.split('/').map(&:to_i))
@@ -369,7 +367,7 @@ module RubyUnits
 
     def self.temp_regex
       @@temp_regex ||= begin
-        temp_units = %w(tempK tempC tempF tempR degK degC degF degR)
+        temp_units = %w[tempK tempC tempF tempR degK degC degF degR]
         aliases = temp_units.map do |unit|
           d = RubyUnits::Unit.definition(unit)
           d && d.aliases
@@ -436,7 +434,11 @@ module RubyUnits
       @base = from.base?
       @signature   = from.signature
       @base_scalar = from.base_scalar
-      @unit_name = from.unit_name rescue nil
+      @unit_name = begin
+                     from.unit_name
+                   rescue
+                     nil
+                   end
       self
     end
 
@@ -474,7 +476,11 @@ module RubyUnits
           cached = @@cached_units[options[1]] * options[0]
           copy(cached)
         rescue
-          initialize("#{options[0]} #{(options[1].units rescue options[1])}")
+          initialize("#{options[0]} #{(begin
+                                         options[1].units
+                                       rescue
+                                         options[1]
+                                       end)}")
         end
         return
       end
@@ -495,7 +501,7 @@ module RubyUnits
         copy(options[0])
         return
       when Hash
-        @scalar      = options[0][:scalar] || 1
+        @scalar      = (options[0][:scalar] || 1)
         @numerator   = options[0][:numerator] || UNITY_ARRAY
         @denominator = options[0][:denominator] || UNITY_ARRAY
         @signature   = options[0][:signature]
@@ -582,28 +588,32 @@ module RubyUnits
         return base
       end
 
-      cached = ((@@base_unit_cache[units] * scalar) rescue nil)
+      cached = (begin
+                  (@@base_unit_cache[units] * scalar)
+                rescue
+                  nil
+                end)
       return cached if cached
 
       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
 
@@ -630,6 +640,7 @@ module RubyUnits
     #
     # output is cached so subsequent calls for the same format will be fast
     #
+    # @note Rational scalars that are equal to an integer will be represented as integers (i.e, 6/1 => 6, 4/2 => 2, etc..)
     # @param [Symbol] target_units
     # @return [String]
     def to_s(target_units = nil)
@@ -652,23 +663,25 @@ module RubyUnits
                 ''
               when /(%[\-+\.\w#]+)\s*(.+)*/ # format string like '%0.2f in'
                 begin
-                  if $2 # unit specified, need to convert
-                    convert_to($2).to_s($1)
+                  if Regexp.last_match(2) # unit specified, need to convert
+                    convert_to(Regexp.last_match(2)).to_s(Regexp.last_match(1))
                   else
-                    "#{$1 % @scalar}#{separator}#{$2 || units}".strip
+                    "#{Regexp.last_match(1) % @scalar}#{separator}#{Regexp.last_match(2) || units}".strip
                   end
                 rescue # parse it like a strftime format string
                   (DateTime.new(0) + self).strftime(target_units)
                 end
               when /(\S+)/ # unit only 'mm' or '1/mm'
-                convert_to($1).to_s
+                convert_to(Regexp.last_match(1)).to_s
               else
                 raise 'unhandled case'
               end
       else
         out = case @scalar
-              when Rational, Complex
+              when Complex
                 "#{@scalar}#{separator}#{units}"
+              when Rational
+                "#{@scalar == @scalar.to_i ? @scalar.to_i : @scalar}#{separator}#{units}"
               else
                 "#{'%g' % @scalar}#{separator}#{units}"
               end.strip
@@ -833,8 +846,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)
-            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).convert_to(self)
           end
         else
           raise ArgumentError, "Incompatible Units ('#{self}' not compatible with '#{other}')"
@@ -870,8 +882,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))
-            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).convert_to(self)
           end
         else
           raise ArgumentError, "Incompatible Units ('#{self}' not compatible with '#{other}')"
@@ -914,12 +925,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 +987,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
@@ -1063,28 +1078,30 @@ module RubyUnits
       if (Unit === other && other.temperature?) || (String === other && other =~ /temp[CFRK]/)
         raise ArgumentError, 'Receiver is not a temperature unit' unless degree?
         start_unit = units
-        target_unit = other.units rescue other
-        unless @base_scalar
-          @base_scalar = case @@unit_map[start_unit]
+        target_unit = begin
+                        other.units
+                      rescue
+                        other
+                      end
+        @base_scalar ||= case @@unit_map[start_unit]
                          when '<tempC>'
                            @scalar + 273.15
                          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
-        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
@@ -1308,7 +1325,11 @@ module RubyUnits
     def before(time_point = ::Time.now)
       case time_point
       when Time, Date, DateTime
-        return (time_point - self rescue time_point.to_datetime - self)
+        return (begin
+                  time_point - self
+                rescue
+                  time_point.to_datetime - self
+                end)
       else
         raise ArgumentError, 'Must specify a Time, Date, or DateTime'
       end
@@ -1352,7 +1373,11 @@ module RubyUnits
     def from(time_point)
       case time_point
       when Time, DateTime, Date
-        (time_point + self rescue time_point.to_datetime + self)
+        (begin
+           time_point + self
+         rescue
+           time_point.to_datetime + self
+         end)
       else
         raise ArgumentError, 'Must specify a Time, Date, or DateTime'
       end
@@ -1474,7 +1499,7 @@ module RubyUnits
     # @todo This should either be a separate class or at least a class method
     def parse(passed_unit_string = '0')
       unit_string = passed_unit_string.dup
-      unit_string = "#{$1} USD" if unit_string =~ /\$\s*(#{NUMBER_REGEX})/
+      unit_string = "#{Regexp.last_match(1)} USD" if unit_string =~ /\$\s*(#{NUMBER_REGEX})/
       unit_string.gsub!("\u00b0".force_encoding('utf-8'), 'deg') if unit_string.encoding == Encoding::UTF_8
 
       unit_string.gsub!(/[%'"#]/, '%' => 'percent', "'" => 'feet', '"' => 'inch', '#' => 'pound')
@@ -1496,8 +1521,12 @@ module RubyUnits
       end
 
       unit_string =~ NUMBER_REGEX
-      unit = @@cached_units[$2]
-      mult = ($1.empty? ? 1.0 : $1.to_f) rescue 1.0
+      unit = @@cached_units[Regexp.last_match(2)]
+      mult = begin
+               (Regexp.last_match(1).empty? ? 1.0 : Regexp.last_match(1).to_f)
+             rescue
+               1.0
+             end
       mult = mult.to_int if mult.to_int == mult
       if unit
         copy(unit)
@@ -1563,7 +1592,7 @@ module RubyUnits
         end
       end
       if bottom
-        bottom.gsub!(BOTTOM_REGEX) { "#{$1} " * $2.to_i }
+        bottom.gsub!(BOTTOM_REGEX) { "#{Regexp.last_match(1)} " * Regexp.last_match(2).to_i }
         # Separate leading decimal from denominator, if any
         bottom_scalar, bottom = bottom.scan(NUMBER_UNIT_REGEX)[0]
       end

data/lib/ruby_units/unit_definitions/base.rb

@@ -3,98 +3,98 @@ RubyUnits::Unit.new('1')
 
 RubyUnits::Unit.define('meter') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<meter>)
-  unit.aliases   = %w(m meter meters metre metres)
+  unit.numerator = %w[<meter>]
+  unit.aliases   = %w[m meter meters metre metres]
   unit.kind      = :length
 end
 
 RubyUnits::Unit.define('kilogram') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<kilogram>)
-  unit.aliases   = %w(kg kilogram kilograms)
+  unit.numerator = %w[<kilogram>]
+  unit.aliases   = %w[kg kilogram kilograms]
   unit.kind      = :mass
 end
 
 RubyUnits::Unit.define('second') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<second>)
-  unit.aliases   = %w(s sec second seconds)
+  unit.numerator = %w[<second>]
+  unit.aliases   = %w[s sec second seconds]
   unit.kind      = :time
 end
 
 RubyUnits::Unit.define('mole') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<mole>)
-  unit.aliases   = %w(mol mole)
+  unit.numerator = %w[<mole>]
+  unit.aliases   = %w[mol mole]
   unit.kind      = :substance
 end
 
 RubyUnits::Unit.define('ampere') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<ampere>)
-  unit.aliases   = %w(A ampere amperes amp amps)
+  unit.numerator = %w[<ampere>]
+  unit.aliases   = %w[A ampere amperes amp amps]
   unit.kind      = :current
 end
 
 RubyUnits::Unit.define('radian') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<radian>)
-  unit.aliases   = %w(rad radian radians)
+  unit.numerator = %w[<radian>]
+  unit.aliases   = %w[rad radian radians]
   unit.kind      = :angle
 end
 
 RubyUnits::Unit.define('kelvin') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<kelvin>)
-  unit.aliases   = %w(degK kelvin)
+  unit.numerator = %w[<kelvin>]
+  unit.aliases   = %w[degK kelvin]
   unit.kind      = :temperature
 end
 
 RubyUnits::Unit.define('tempK') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<tempK>)
-  unit.aliases   = %w(tempK)
+  unit.numerator = %w[<tempK>]
+  unit.aliases   = %w[tempK]
   unit.kind      = :temperature
 end
 
 RubyUnits::Unit.define('byte') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<byte>)
-  unit.aliases   = %w(B byte bytes)
+  unit.numerator = %w[<byte>]
+  unit.aliases   = %w[B byte bytes]
   unit.kind      = :information
 end
 
 RubyUnits::Unit.define('dollar') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<dollar>)
-  unit.aliases   = %w(USD dollar)
+  unit.numerator = %w[<dollar>]
+  unit.aliases   = %w[USD dollar]
   unit.kind      = :currency
 end
 
 RubyUnits::Unit.define('candela') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<candela>)
-  unit.aliases   = %w(cd candela)
+  unit.numerator = %w[<candela>]
+  unit.aliases   = %w[cd candela]
   unit.kind      = :luminosity
 end
 
 RubyUnits::Unit.define('each') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<each>)
-  unit.aliases   = %w(each)
+  unit.numerator = %w[<each>]
+  unit.aliases   = %w[each]
   unit.kind      = :counting
 end
 
 RubyUnits::Unit.define('steradian') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<steradian>)
-  unit.aliases   = %w(sr steradian steradians)
+  unit.numerator = %w[<steradian>]
+  unit.aliases   = %w[sr steradian steradians]
   unit.kind      = :solid_angle
 end
 
 RubyUnits::Unit.define('decibel') do |unit|
   unit.scalar    = 1
-  unit.numerator = %w(<decibel>)
-  unit.aliases   = %w(dB decibel decibels)
+  unit.numerator = %w[<decibel>]
+  unit.aliases   = %w[dB decibel decibels]
   unit.kind      = :logarithmic
 end