ruby-units 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 448201b21f6913329bfbd81fff22ea949e74ba81
-  data.tar.gz: 1021947fecb0fbd41a2cda3dcce5d1a16a31cf61
+  metadata.gz: 52d0abf6dc2d186c597aa3543dfb64a2e4e58437
+  data.tar.gz: bc9f92f2eaf3eeefb1df33699785d21a2ff9fcf8
 SHA512:
-  metadata.gz: 73e1a0a5ff0bf2c7cad7313296f1be2cf666394be7697e82ef0daf8c0d15ce8973ba2a9c4a40589d7bbdf381d5665fc71f237547ef6e10e19303e45fb36457c1
-  data.tar.gz: 5a41f0e985f8cc118674a29e64fc8b66b9c0cebd81bc622f4986469b0c5fe994c7276204fe1fcd87c81d63ce1e681d8a12f46ded7057f0f127b94ed56f185879
+  metadata.gz: cf20400a8552f515beb913042d5d8736402ac244736718fe515058b5556b4f13b3b04fc8091f65fde2adcdb5da8af48af5f32a54b7bdf51f1824ba1371df9f3b
+  data.tar.gz: '066711448923f74c7f9995bfd3f1c700495018ffe142ea48e1dbe1158e3842f3d19a363268ecd38546fc35768196334f8fbd05cf3aae693335217e43b3c70d83'

data/CHANGELOG.txt

@@ -1,5 +1,9 @@
 Change Log for Ruby-units
 =========================
+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
+                    * remove dependency on mathn (see #157)
 2016-12-28  2.1.0   * add support for ruby 2.4.0
                     * allow configuration for optional separator on output
                     * Fix issue #105 -- change 'grad' to 'gon'

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

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/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.
@@ -62,7 +61,7 @@ module RubyUnits
     RANKINE            = ['<rankine>'].freeze
     CELSIUS            = ['<celsius>'].freeze
     @@temp_regex       = nil
-    SIGNATURE_VECTOR   = %i(
+    SIGNATURE_VECTOR   = %i[
       length
       time
       temperature
@@ -73,7 +72,7 @@ module RubyUnits
       currency
       information
       angle
-    ).freeze
+    ].freeze
     @@kinds = {
       -312_078     => :elastance,
       -312_058     => :resistance,
@@ -333,9 +332,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 +368,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 +435,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 +477,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 +502,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,7 +589,11 @@ 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 = []
@@ -630,6 +641,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 +664,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,7 +847,13 @@ 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 ||= (Rational(@@cached_units[units].scalar, @@cached_units[units].base_scalar) rescue units.to_unit.to_base.scalar)
+            @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)
           end
         else
@@ -870,7 +890,13 @@ module RubyUnits
           elsif other.temperature?
             raise ArgumentError, 'Cannot subtract a temperature from a differential degree unit'
           else
-            @q ||= (Rational(@@cached_units[units].scalar, @@cached_units[units].base_scalar) rescue Rational(units.to_unit.scalar, units.to_unit.to_base.scalar))
+            @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)
           end
         else
@@ -1067,9 +1093,12 @@ 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>'
@@ -1079,7 +1108,6 @@ module RubyUnits
                          when '<tempR>'
                            @scalar * Rational(5, 9)
                          end
-        end
         q = case @@unit_map[target_unit]
             when '<tempC>'
               @base_scalar - 273.15
@@ -1312,7 +1340,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
@@ -1356,7 +1388,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
@@ -1478,7 +1514,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')
@@ -1500,8 +1536,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)
@@ -1567,7 +1607,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

data/lib/ruby_units/unit_definitions/prefix.rb

@@ -1,36 +1,34 @@
-# encoding: utf-8
-
 {
-  'googol' => [%w(googol),             1e100],
-  'yobi'   => [%w(Yi Yobi yobi),       2**80],
-  'zebi'   => [%w(Zi Zebi zebi),       2**70],
-  'exbi'   => [%w(Ei Exbi exbi),       2**60],
-  'pebi'   => [%w(Pi Pebi pebi),       2**50],
-  'tebi'   => [%w(Ti Tebi tebi),       2**40],
-  'gibi'   => [%w(Gi Gibi gibi),       2**30],
-  'mebi'   => [%w(Mi Mebi mebi),       2**20],
-  'kibi'   => [%w(Ki Kibi kibi),       2**10],
-  'yotta'  => [%w(Y Yotta yotta),      1e24],
-  'zetta'  => [%w(Z Zetta zetta),      1e21],
-  'exa'    => [%w(E Exa exa),          1e18],
-  'peta'   => [%w(P Peta peta),        1e15],
-  'tera'   => [%w(T Tera tera),        1e12],
-  'giga'   => [%w(G Giga giga),        1e9],
-  'mega'   => [%w(M Mega mega),        1e6],
-  'kilo'   => [%w(k kilo),             1e3],
-  'hecto'  => [%w(h Hecto hecto),      1e2],
-  'deca'   => [%w(da Deca deca deka),  1e1],
-  '1'      => [%w(1),                  1],
-  'deci'   => [%w(d Deci deci),        Rational(1, 1e1)],
-  'centi'  => [%w(c Centi centi),      Rational(1, 1e2)],
-  'milli'  => [%w(m Milli milli),      Rational(1, 1e3)],
-  'micro'  => [%w(u µ Micro micro mc), Rational(1, 1e6)],
-  'nano'   => [%w(n Nano nano),        Rational(1, 1e9)],
-  'pico'   => [%w(p Pico pico),        Rational(1, 1e12)],
-  'femto'  => [%w(f Femto femto),      Rational(1, 1e15)],
-  'atto'   => [%w(a Atto atto),        Rational(1, 1e18)],
-  'zepto'  => [%w(z Zepto zepto),      Rational(1, 1e21)],
-  'yocto'  => [%w(y Yocto yocto),      Rational(1, 1e24)]
+  'googol' => [%w[googol],             1e100],
+  'yobi'   => [%w[Yi Yobi yobi],       2**80],
+  'zebi'   => [%w[Zi Zebi zebi],       2**70],
+  'exbi'   => [%w[Ei Exbi exbi],       2**60],
+  'pebi'   => [%w[Pi Pebi pebi],       2**50],
+  'tebi'   => [%w[Ti Tebi tebi],       2**40],
+  'gibi'   => [%w[Gi Gibi gibi],       2**30],
+  'mebi'   => [%w[Mi Mebi mebi],       2**20],
+  'kibi'   => [%w[Ki Kibi kibi],       2**10],
+  'yotta'  => [%w[Y Yotta yotta],      1e24],
+  'zetta'  => [%w[Z Zetta zetta],      1e21],
+  'exa'    => [%w[E Exa exa],          1e18],
+  'peta'   => [%w[P Peta peta],        1e15],
+  'tera'   => [%w[T Tera tera],        1e12],
+  'giga'   => [%w[G Giga giga],        1e9],
+  'mega'   => [%w[M Mega mega],        1e6],
+  'kilo'   => [%w[k kilo],             1e3],
+  'hecto'  => [%w[h Hecto hecto],      1e2],
+  'deca'   => [%w[da Deca deca deka],  1e1],
+  '1'      => [%w[1],                  1],
+  'deci'   => [%w[d Deci deci],        Rational(1, 1e1)],
+  'centi'  => [%w[c Centi centi],      Rational(1, 1e2)],
+  'milli'  => [%w[m Milli milli],      Rational(1, 1e3)],
+  'micro'  => [%w[u µ Micro micro mc], Rational(1, 1e6)],
+  'nano'   => [%w[n Nano nano],        Rational(1, 1e9)],
+  'pico'   => [%w[p Pico pico],        Rational(1, 1e12)],
+  'femto'  => [%w[f Femto femto],      Rational(1, 1e15)],
+  'atto'   => [%w[a Atto atto],        Rational(1, 1e18)],
+  'zepto'  => [%w[z Zepto zepto],      Rational(1, 1e21)],
+  'yocto'  => [%w[y Yocto yocto],      Rational(1, 1e24)]
 }.each do |name, definition|
   RubyUnits::Unit.define(name) do |unit|
     aliases, scalar = definition