ruby-units 2.4.1 → 3.0.0

data/lib/ruby_units/unit.rb

@@ -1,27 +1,27 @@
 require 'date'
-# Copyright 2006-2015
-# @author Kevin C. Olbrich, Ph.D.
-# @see https://github.com/olbrich/ruby-units
-#
-# @note The accuracy of unit conversions depends on the precision of the conversion factor.
-#   If you have more accurate estimates for particular conversion factors, please send them
-#   to me and I will incorporate them into the next release.  It is also incumbent on the end-user
-#   to ensure that the accuracy of any conversions is sufficient for their intended application.
-#
-# While there are a large number of unit specified in the base package,
-# there are also a large number of units that are not included.
-# This package covers nearly all SI, Imperial, and units commonly used
-# in the United States. If your favorite units are not listed here, file an issue on github.
-#
-# To add or override a unit definition, add a code block like this..
-# @example Define a new unit
-#  RubyUnits::Unit.define("foobar") do |unit|
-#    unit.aliases    = %w{foo fb foo-bar}
-#    unit.definition = RubyUnits::Unit.new("1 baz")
-#  end
-#
 module RubyUnits
-  class Unit < Numeric
+  # Copyright 2006-2022
+  # @author Kevin C. Olbrich, Ph.D.
+  # @see https://github.com/olbrich/ruby-units
+  #
+  # @note The accuracy of unit conversions depends on the precision of the conversion factor.
+  #   If you have more accurate estimates for particular conversion factors, please send them
+  #   to me and I will incorporate them into the next release.  It is also incumbent on the end-user
+  #   to ensure that the accuracy of any conversions is sufficient for their intended application.
+  #
+  # While there are a large number of unit specified in the base package,
+  # there are also a large number of units that are not included.
+  # This package covers nearly all SI, Imperial, and units commonly used
+  # in the United States. If your favorite units are not listed here, file an issue on GitHub.
+  #
+  # To add or override a unit definition, add a code block like this..
+  # @example Define a new unit
+  #  RubyUnits::Unit.define("foobar") do |unit|
+  #    unit.aliases    = %w{foo fb foo-bar}
+  #    unit.definition = RubyUnits::Unit.new("1 baz")
+  #  end
+  #
+  class Unit < ::Numeric
     @@definitions      = {}
     @@prefix_values    = {}
     @@prefix_map       = {}
@@ -53,15 +53,15 @@ module RubyUnits
     #   -123.4E+5, -123.4e-5, etc.
     SCI_NUMBER         = /([+-]?\d*[.]?\d+(?:[Ee][+-]?)?\d*)/.freeze
     # Rational number, including improper fractions: 1 2/3, -1 2/3, 5/3, etc.
-    RATIONAL_NUMBER    = %r{\(?([+-])?(\d+[ -])?(\d+)\/(\d+)\)?}.freeze
+    RATIONAL_NUMBER    = %r{\(?([+-])?(\d+[ -])?(\d+)/(\d+)\)?}.freeze
     # Complex numbers: 1+2i, 1.0+2.0i, -1-1i, etc.
     COMPLEX_NUMBER     = /#{SCI_NUMBER}?#{SCI_NUMBER}i\b/.freeze
     # Any Complex, Rational, or scientific number
     ANY_NUMBER         = /(#{COMPLEX_NUMBER}|#{RATIONAL_NUMBER}|#{SCI_NUMBER})/.freeze
     ANY_NUMBER_REGEX   = /(?:#{ANY_NUMBER})?\s?([^-\d.].*)?/.freeze
     NUMBER_REGEX       = /#{SCI_NUMBER}*\s*(.+)?/.freeze
-    UNIT_STRING_REGEX  = %r{#{SCI_NUMBER}*\s*([^\/]*)\/*(.+)*}.freeze
-    TOP_REGEX          = /([^ \*]+)(?:\^|\*\*)([\d-]+)/.freeze
+    UNIT_STRING_REGEX  = %r{#{SCI_NUMBER}*\s*([^/]*)/*(.+)*}.freeze
+    TOP_REGEX          = /([^ *]+)(?:\^|\*\*)([\d-]+)/.freeze
     BOTTOM_REGEX       = /([^* ]+)(?:\^|\*\*)(\d+)/.freeze
     NUMBER_UNIT_REGEX  = /#{SCI_NUMBER}?(.*)/.freeze
     COMPLEX_REGEX      = /#{COMPLEX_NUMBER}\s?(.+)?/.freeze
@@ -84,62 +84,60 @@ module RubyUnits
       angle
     ].freeze
     @@kinds = {
-      -312_078     => :elastance,
-      -312_058     => :resistance,
-      -312_038     => :inductance,
-      -152_040     => :magnetism,
-      -152_038     => :magnetism,
-      -152_058     => :potential,
-      -7997        => :specific_volume,
-      -79          => :snap,
-      -59          => :jolt,
-      -39          => :acceleration,
-      -38          => :radiation,
-      -20          => :frequency,
-      -19          => :speed,
-      -18          => :viscosity,
-      -17          => :volumetric_flow,
-      -1           => :wavenumber,
-      0            => :unitless,
-      1            => :length,
-      2            => :area,
-      3            => :volume,
-      20           => :time,
-      400          => :temperature,
-      7941         => :yank,
-      7942         => :power,
-      7959         => :pressure,
-      7962         => :energy,
-      7979         => :viscosity,
-      7961         => :force,
-      7981         => :momentum,
-      7982         => :angular_momentum,
-      7997         => :density,
-      7998         => :area_density,
-      8000         => :mass,
-      152_020      => :radiation_exposure,
-      159_999      => :magnetism,
-      160_000      => :current,
-      160_020      => :charge,
-      312_058      => :conductance,
-      312_078      => :capacitance,
-      3_199_980    => :activity,
-      3_199_997    => :molar_concentration,
-      3_200_000    => :substance,
-      63_999_998   => :illuminance,
-      64_000_000   => :luminous_power,
+      -312_078 => :elastance,
+      -312_058 => :resistance,
+      -312_038 => :inductance,
+      -152_040 => :magnetism,
+      -152_038 => :magnetism,
+      -152_058 => :potential,
+      -7997 => :specific_volume,
+      -79 => :snap,
+      -59 => :jolt,
+      -39 => :acceleration,
+      -38 => :radiation,
+      -20 => :frequency,
+      -19 => :speed,
+      -18 => :viscosity,
+      -17 => :volumetric_flow,
+      -1 => :wavenumber,
+      0 => :unitless,
+      1 => :length,
+      2 => :area,
+      3 => :volume,
+      20 => :time,
+      400 => :temperature,
+      7941 => :yank,
+      7942 => :power,
+      7959 => :pressure,
+      7962 => :energy,
+      7979 => :viscosity,
+      7961 => :force,
+      7981 => :momentum,
+      7982 => :angular_momentum,
+      7997 => :density,
+      7998 => :area_density,
+      8000 => :mass,
+      152_020 => :radiation_exposure,
+      159_999 => :magnetism,
+      160_000 => :current,
+      160_020 => :charge,
+      312_058 => :conductance,
+      312_078 => :capacitance,
+      3_199_980 => :activity,
+      3_199_997 => :molar_concentration,
+      3_200_000 => :substance,
+      63_999_998 => :illuminance,
+      64_000_000 => :luminous_power,
       1_280_000_000 => :currency,
-      25_600_000_000  => :information,
+      25_600_000_000 => :information,
       511_999_999_980 => :angular_velocity,
       512_000_000_000 => :angle
     }.freeze
-    @@cached_units     = {}
-    @@base_unit_cache  = {}
 
     # Class Methods
 
     # setup internal arrays and hashes
-    # @return [true]
+    # @return [Boolean]
     def self.setup
       clear_cache
       @@prefix_values    = {}
@@ -180,7 +178,7 @@ module RubyUnits
     end
 
     # @param  [RubyUnits::Unit::Definition, String] unit_definition
-    # @param  [Block] block
+    # @param  [Proc] block
     # @return [RubyUnits::Unit::Definition]
     # @raise  [ArgumentError] when passed a non-string if using the block form
     # Unpack a unit definition and add it to the array of defined units
@@ -195,7 +193,8 @@ module RubyUnits
     #   RubyUnits::Unit.define(unit_definition)
     def self.define(unit_definition, &block)
       if block_given?
-        raise ArgumentError, 'When using the block form of RubyUnits::Unit.define, pass the name of the unit' unless unit_definition.instance_of?(String)
+        raise ArgumentError, 'When using the block form of RubyUnits::Unit.define, pass the name of the unit' unless unit_definition.is_a?(String)
+
         unit_definition = RubyUnits::Unit::Definition.new(unit_definition, &block)
       end
       definitions[unit_definition.name] = unit_definition
@@ -206,7 +205,7 @@ module RubyUnits
     # Get the definition for a unit and allow it to be redefined
     #
     # @param [String] name Name of unit to redefine
-    # @param [Block] _block
+    # @param [Proc] _block
     # @raise [ArgumentError] if a block is not given
     # @yieldparam [RubyUnits::Unit::Definition] the definition of the unit being
     #   redefined
@@ -232,22 +231,24 @@ module RubyUnits
       setup
     end
 
-    # @return [Hash]
+    # Unit cache
+    #
+    # @return [RubyUnits::Cache]
     def self.cached
-      @@cached_units
+      @cached ||= RubyUnits::Cache.new
     end
 
-    # @return [true]
+    # @return [Boolean]
     def self.clear_cache
-      @@cached_units    = {}
-      @@base_unit_cache = {}
+      cached.clear
+      base_unit_cache.clear
       new(1)
       true
     end
 
-    # @return [Hash]
+    # @return [RubyUnits::Cache]
     def self.base_unit_cache
-      @@base_unit_cache
+      @base_unit_cache ||= RubyUnits::Cache.new
     end
 
     # @example parse strings
@@ -269,7 +270,7 @@ module RubyUnits
       num.delete(UNITY)
       den.delete(UNITY)
 
-      combined = Hash.new(0)
+      combined = ::Hash.new(0)
 
       [[num, 1], [den, -1]].each do |array, increment|
         array.chunk_while { |elt_before, _| definition(elt_before).prefix? }
@@ -301,11 +302,12 @@ module RubyUnits
     # return an array of base units
     # @return [Array]
     def self.base_units
-      @@base_units ||= @@definitions.dup.delete_if { |_, defn| !defn.base? }.keys.map { |u| new(u) }
+      @@base_units ||= @@definitions.dup.select { |_, definition| definition.base? }.keys.map { |u| new(u) }
     end
 
-    # parse a string consisting of a number and a unit string
+    # Parse a string consisting of a number and a unit string
     # NOTE: This does not properly handle units formatted like '12mg/6ml'
+    #
     # @param [String] string
     # @return [Array(Numeric, String)] consisting of [number, "unit"]
     def self.parse_into_numbers_and_units(string)
@@ -339,7 +341,7 @@ module RubyUnits
     end
 
     # return a regex used to match units
-    # @return [RegExp]
+    # @return [Regexp]
     def self.unit_match_regex
       @@unit_match_regex ||= /(#{prefix_regex})??(#{unit_regex})\b/
     end
@@ -353,7 +355,7 @@ module RubyUnits
 
     # Generates (and memoizes) a regexp matching any of the temperature units or their aliases.
     #
-    # @return [RegExp]
+    # @return [Regexp]
     def self.temp_regex
       @@temp_regex ||= begin
         temp_units = %w[tempK tempC tempF tempR degK degC degF degR]
@@ -416,20 +418,16 @@ module RubyUnits
     attr_accessor :unit_name
 
     # Used to copy one unit to another
-    # @param [Unit] from Unit to copy definition from
-    # @return [Unit]
+    # @param from [RubyUnits::Unit] Unit to copy definition from
+    # @return [RubyUnits::Unit]
     def copy(from)
-      @scalar      = from.scalar
-      @numerator   = from.numerator
+      @scalar = from.scalar
+      @numerator = from.numerator
       @denominator = from.denominator
       @base = from.base?
-      @signature   = from.signature
+      @signature = from.signature
       @base_scalar = from.base_scalar
-      @unit_name = begin
-                     from.unit_name
-                   rescue
-                     nil
-                   end
+      @unit_name = from.unit_name
       self
     end
 
@@ -464,26 +462,22 @@ module RubyUnits
       if options.size == 2
         # options[0] is the scalar
         # options[1] is a unit string
-        begin
-          cached = @@cached_units[options[1]] * options[0]
-          copy(cached)
-        rescue
-          initialize("#{options[0]} #{(begin
-                                         options[1].units
-                                       rescue
-                                         options[1]
-                                       end)}")
+        cached = self.class.cached.get(options[1])
+        if cached.nil?
+          initialize("#{options[0]} #{options[1]}")
+        else
+          copy(cached * options[0])
         end
         return
       end
       if options.size == 3
         options[1] = options[1].join if options[1].is_a?(Array)
         options[2] = options[2].join if options[2].is_a?(Array)
-        begin
-          cached = @@cached_units["#{options[1]}/#{options[2]}"] * options[0]
-          copy(cached)
-        rescue
+        cached = self.class.cached.get("#{options[1]}/#{options[2]}")
+        if cached.nil?
           initialize("#{options[0]} #{options[1]}/#{options[2]}")
+        else
+          copy(cached) * options[0]
         end
         return
       end
@@ -524,17 +518,17 @@ module RubyUnits
       unary_unit = units || ''
       if options.first.instance_of?(String)
         _opt_scalar, opt_units = self.class.parse_into_numbers_and_units(options[0])
-        unless  @@cached_units.keys.include?(opt_units) ||
+        if !(self.class.cached.keys.include?(opt_units) ||
                 (opt_units =~ %r{\D/[\d+.]+}) ||
-                (opt_units =~ %r{(#{self.class.temp_regex})|(#{STONE_LB_UNIT_REGEX})|(#{LBS_OZ_UNIT_REGEX})|(#{FEET_INCH_UNITS_REGEX})|%|(#{TIME_REGEX})|i\s?(.+)?|&plusmn;|\+\/-})
-          @@cached_units[opt_units] = (scalar == 1 ? self : opt_units.to_unit) if opt_units && !opt_units.empty?
+                (opt_units =~ %r{(#{self.class.temp_regex})|(#{STONE_LB_UNIT_REGEX})|(#{LBS_OZ_UNIT_REGEX})|(#{FEET_INCH_UNITS_REGEX})|%|(#{TIME_REGEX})|i\s?(.+)?|&plusmn;|\+/-})) && (opt_units && !opt_units.empty?)
+          self.class.cached.set(opt_units, scalar == 1 ? self : opt_units.to_unit)
         end
       end
-      unless @@cached_units.keys.include?(unary_unit) || (unary_unit =~ /#{self.class.temp_regex}/)
-        @@cached_units[unary_unit] = (scalar == 1 ? self : unary_unit.to_unit)
+      unless self.class.cached.keys.include?(unary_unit) || (unary_unit =~ self.class.temp_regex)
+        self.class.cached.set(unary_unit, scalar == 1 ? self : unary_unit.to_unit)
       end
       [@scalar, @numerator, @denominator, @base_scalar, @signature, @base].each(&:freeze)
-      self
+      super()
     end
 
     # @todo: figure out how to handle :counting units.  This method should probably return :counting instead of :unitless for 'each'
@@ -544,9 +538,14 @@ module RubyUnits
       @@kinds[signature]
     end
 
-    # @return [Unit]
-    def to_unit
-      self
+    # Convert the unit to a Unit, possibly performing a conversion.
+    # > The ability to pass a Unit to convert to was added in v3.0.0 for
+    # > consistency with other uses of #to_unit.
+    #
+    # @param other [RubyUnits::Unit, String] unit to convert to
+    # @return [RubyUnits::Unit]
+    def to_unit(other = nil)
+      other ? convert_to(other) : self
     end
 
     alias unit to_unit
@@ -555,6 +554,7 @@ module RubyUnits
     # @return [Boolean]
     def base?
       return @base if defined? @base
+
       @base = (@numerator + @denominator)
               .compact
               .uniq
@@ -571,6 +571,7 @@ module RubyUnits
     # @todo this is brittle as it depends on the display_name of a unit, which can be changed
     def to_base
       return self if base?
+
       if @@unit_map[units] =~ /\A<(?:temp|deg)[CRF]>\Z/
         @signature = @@kinds.key(:temperature)
         base = if temperature?
@@ -581,12 +582,8 @@ module RubyUnits
         return base
       end
 
-      cached = (begin
-                  (@@base_unit_cache[units] * scalar)
-                rescue
-                  nil
-                end)
-      return cached if cached
+      cached_unit = self.class.base_unit_cache.get(units)
+      return cached_unit * scalar unless cached_unit.nil?
 
       num = []
       den = []
@@ -614,7 +611,7 @@ module RubyUnits
       den = den.flatten.compact
       num = UNITY_ARRAY if num.empty?
       base = self.class.new(self.class.eliminate_terms(q, num, den))
-      @@base_unit_cache[units] = base
+      self.class.base_unit_cache.set(units, base)
       base * @scalar
     end
 
@@ -639,6 +636,7 @@ module RubyUnits
     def to_s(target_units = nil)
       out = @output[target_units]
       return out if out
+
       separator = RubyUnits.configuration.separator
       case target_units
       when :ft
@@ -654,14 +652,14 @@ module RubyUnits
         out = case target_units.strip
               when /\A\s*\Z/ # whitespace only
                 ''
-              when /(%[\-+\.\w#]+)\s*(.+)*/ # format string like '%0.2f in'
+              when /(%[\-+.\w#]+)\s*(.+)*/ # format string like '%0.2f in'
                 begin
                   if Regexp.last_match(2) # unit specified, need to convert
                     convert_to(Regexp.last_match(2)).to_s(Regexp.last_match(1))
                   else
                     "#{Regexp.last_match(1) % @scalar}#{separator}#{Regexp.last_match(2) || units}".strip
                   end
-                rescue # parse it like a strftime format string
+                rescue StandardError # parse it like a strftime format string
                   (DateTime.new(0) + self).strftime(target_units)
                 end
               when /(\S+)/ # unit only 'mm' or '1/mm'
@@ -688,6 +686,7 @@ module RubyUnits
     # @return [String]
     def inspect(dump = nil)
       return super() if dump
+
       to_s
     end
 
@@ -695,7 +694,7 @@ module RubyUnits
     # @return [Boolean]
     # @todo use unit definition to determine if it's a temperature instead of a regex
     def temperature?
-      degree? && !(@@unit_map[units] =~ /temp[CFRK]/).nil?
+      degree? && units.match?(self.class.temp_regex)
     end
 
     alias is_temperature? temperature?
@@ -713,6 +712,7 @@ module RubyUnits
     # @return [String] possible values: degC, degF, degR, or degK
     def temperature_scale
       return nil unless temperature?
+
       "deg#{@@unit_map[units][/temp([CFRK])/, 1]}"
     end
 
@@ -726,17 +726,19 @@ module RubyUnits
     # Compare two Unit objects. Throws an exception if they are not of compatible types.
     # Comparisons are done based on the value of the unit in base SI units.
     # @param [Object] other
-    # @return [-1|0|1|nil]
+    # @return [Integer,nil]
     # @raise [NoMethodError] when other does not define <=>
     # @raise [ArgumentError] when units are not compatible
     def <=>(other)
       raise NoMethodError, "undefined method `<=>' for #{base_scalar.inspect}" unless base_scalar.respond_to?(:<=>)
+
       if other.nil?
         base_scalar <=> nil
       elsif !temperature? && other.respond_to?(:zero?) && other.zero?
         base_scalar <=> 0
       elsif other.instance_of?(Unit)
         raise ArgumentError, "Incompatible Units ('#{units}' not compatible with '#{other.units}')" unless self =~ other
+
         base_scalar <=> other.base_scalar
       else
         x, y = coerce(other)
@@ -757,6 +759,7 @@ module RubyUnits
         zero?
       elsif other.instance_of?(Unit)
         return false unless self =~ other
+
         base_scalar == other.base_scalar
       else
         begin
@@ -784,9 +787,9 @@ module RubyUnits
       else
         begin
           x, y = coerce(other)
-          return x =~ y
+          x =~ y
         rescue ArgumentError
-          return false
+          false
         end
       end
     end
@@ -807,9 +810,9 @@ module RubyUnits
       else
         begin
           x, y = coerce(other)
-          return x === y
+          x === y
         rescue ArgumentError
-          return false
+          false
         end
       end
     end
@@ -832,6 +835,7 @@ module RubyUnits
           other.dup
         elsif self =~ other
           raise ArgumentError, 'Cannot add two temperatures' if [self, other].all?(&:temperature?)
+
           if [self, other].any?(&:temperature?)
             if temperature?
               self.class.new(scalar: (scalar + other.convert_to(temperature_scale).scalar), numerator: @numerator, denominator: @denominator, signature: @signature)
@@ -881,7 +885,7 @@ module RubyUnits
           raise ArgumentError, "Incompatible Units ('#{self}' not compatible with '#{other}')"
         end
       when Time
-        raise ArgumentError, 'Date and Time objects represent fixed points in time and cannot be subtracted from to a Unit, which can only represent time spans'
+        raise ArgumentError, 'Date and Time objects represent fixed points in time and cannot be subtracted from a Unit'
       else
         x, y = coerce(other)
         y - x
@@ -896,6 +900,7 @@ module RubyUnits
       case other
       when Unit
         raise ArgumentError, 'Cannot multiply by temperatures' if [other, self].any?(&:temperature?)
+
         opts = self.class.eliminate_terms(@scalar * other.scalar, @numerator + other.numerator, @denominator + other.denominator)
         opts[:signature] = @signature + other.signature
         self.class.new(opts)
@@ -918,6 +923,7 @@ module RubyUnits
       when Unit
         raise ZeroDivisionError if other.zero?
         raise ArgumentError, 'Cannot divide with temperatures' if [other, self].any?(&:temperature?)
+
         sc = Rational(@scalar, other.scalar)
         sc = sc.numerator if sc.denominator == 1
         opts = self.class.eliminate_terms(sc, @numerator + other.denominator, @denominator + other.numerator)
@@ -925,6 +931,7 @@ module RubyUnits
         self.class.new(opts)
       when Numeric
         raise ZeroDivisionError if other.zero?
+
         sc = Rational(@scalar, other)
         sc = sc.numerator if sc.denominator == 1
         self.class.new(scalar: sc, numerator: @numerator, denominator: @denominator, signature: @signature)
@@ -942,6 +949,7 @@ module RubyUnits
     def divmod(other)
       raise ArgumentError, "Incompatible Units ('#{self}' not compatible with '#{other}')" unless self =~ other
       return scalar.divmod(other.scalar) if units == other.units
+
       to_base.scalar.divmod(other.to_base.scalar)
     end
 
@@ -952,7 +960,7 @@ module RubyUnits
       divmod(other).last
     end
 
-    # Exponentiate.  Only takes integer powers.
+    # Exponentiation.  Only takes integer powers.
     # Note that anything raised to the power of 0 results in a Unit object with a scalar of 1, and no units.
     # Throws an exception if exponent is not an integer.
     # Ideally this routine should accept a float for the exponent
@@ -968,6 +976,7 @@ module RubyUnits
     # @raise [ArgumentError] when an invalid exponent is passed
     def **(other)
       raise ArgumentError, 'Cannot raise a temperature to a power' if temperature?
+
       if other.is_a?(Numeric)
         return inverse if other == -1
         return self if other == 1
@@ -975,14 +984,16 @@ module RubyUnits
       end
       case other
       when Rational
-        return power(other.numerator).root(other.denominator)
+        power(other.numerator).root(other.denominator)
       when Integer
-        return power(other)
+        power(other)
       when Float
         return self**other.to_i if other == other.to_i
+
         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(Rational(1, other).to_int)
+
+        root(Rational(1, other).to_int)
       when Complex
         raise ArgumentError, 'exponentiation of complex numbers is not supported.'
       else
@@ -1002,6 +1013,7 @@ module RubyUnits
       return 1 if n.zero?
       return self if n == 1
       return (1..(n - 1).to_i).inject(self) { |acc, _elem| acc * self } if n >= 0
+
       (1..-(n - 1).to_i).inject(self) { |acc, _elem| acc / self }
     end
 
@@ -1009,7 +1021,7 @@ module RubyUnits
     # if n < 0, returns 1/unit^(1/n)
     # @param [Integer] n
     # @return [Unit]
-    # @raise [ArgumentError] when attemptint to take the root of a temperature
+    # @raise [ArgumentError] when attempting to take the root of a temperature
     # @raise [ArgumentError] when n is not an integer
     # @raise [ArgumentError] when n is 0
     def root(n)
@@ -1022,6 +1034,7 @@ module RubyUnits
       vec = unit_signature_vector
       vec = vec.map { |x| x % n }
       raise ArgumentError, 'Illegal root' unless vec.max.zero?
+
       num = @numerator.dup
       den = @denominator.dup
 
@@ -1110,7 +1123,7 @@ module RubyUnits
             when '<tempR>'
               @base_scalar.to_r * Rational(9, 5)
             end
-        return self.class.new("#{q} #{target_unit}")
+        self.class.new("#{q} #{target_unit}")
       else
         # @type [Unit]
         target = case other
@@ -1138,7 +1151,6 @@ module RubyUnits
         q = conversion_scalar * (numerator1 + denominator2).reduce(1, :*) / (numerator2 + denominator1).reduce(1, :*)
         # Convert the scalar to an Integer if the result is equivalent to an
         # integer
-
         q = q.to_i if @scalar.is_a?(Integer) && q.to_i == q
         self.class.new(scalar: q, numerator: target.numerator, denominator: target.denominator, signature: target.signature)
       end
@@ -1152,6 +1164,7 @@ module RubyUnits
     # @raise [RuntimeError] when not unitless
     def to_f
       return @scalar.to_f if unitless?
+
       raise "Cannot convert '#{self}' to Float unless unitless.  Use Unit#scalar"
     end
 
@@ -1160,6 +1173,7 @@ module RubyUnits
     # @raise [RuntimeError] when not unitless
     def to_c
       return Complex(@scalar) if unitless?
+
       raise "Cannot convert '#{self}' to Complex unless unitless.  Use Unit#scalar"
     end
 
@@ -1168,6 +1182,7 @@ module RubyUnits
     # @raise [RuntimeError] when not unitless
     def to_i
       return @scalar.to_int if unitless?
+
       raise "Cannot convert '#{self}' to Integer unless unitless.  Use Unit#scalar"
     end
 
@@ -1178,6 +1193,7 @@ module RubyUnits
     # @raise [RuntimeError] when not unitless
     def to_r
       return @scalar.to_r if unitless?
+
       raise "Cannot convert '#{self}' to Rational unless unitless.  Use Unit#scalar"
     end
 
@@ -1202,14 +1218,14 @@ module RubyUnits
       unless num == UNITY_ARRAY
         definitions = num.map { |element| self.class.definition(element) }
         definitions.reject!(&:prefix?) unless with_prefix
-        definitions = definitions.chunk_while { |defn, _| defn.prefix? }.to_a
+        definitions = definitions.chunk_while { |definition, _| definition.prefix? }.to_a
         output_numerator = definitions.map { |element| element.map(&:display_name).join }
       end
 
       unless den == UNITY_ARRAY
         definitions = den.map { |element| self.class.definition(element) }
         definitions.reject!(&:prefix?) unless with_prefix
-        definitions = definitions.chunk_while { |defn, _| defn.prefix? }.to_a
+        definitions = definitions.chunk_while { |definition, _| definition.prefix? }.to_a
         output_denominator = definitions.map { |element| element.map(&:display_name).join }
       end
 
@@ -1228,6 +1244,7 @@ module RubyUnits
     # @return [Numeric,Unit]
     def -@
       return -@scalar if unitless?
+
       dup * -1
     end
 
@@ -1235,6 +1252,7 @@ module RubyUnits
     # @return [Numeric,Unit]
     def abs
       return @scalar.abs if unitless?
+
       self.class.new(@scalar.abs, @numerator, @denominator)
     end
 
@@ -1282,6 +1300,7 @@ module RubyUnits
     # @raise [ArgumentError] when scalar is not equal to an integer
     def succ
       raise ArgumentError, 'Non Integer Scalar' unless @scalar == @scalar.to_i
+
       self.class.new(@scalar.to_i.succ, @numerator, @denominator)
     end
 
@@ -1293,6 +1312,7 @@ module RubyUnits
     # @raise [ArgumentError] when scalar is not equal to an integer
     def pred
       raise ArgumentError, 'Non Integer Scalar' unless @scalar == @scalar.to_i
+
       self.class.new(@scalar.to_i.pred, @numerator, @denominator)
     end
 
@@ -1306,7 +1326,7 @@ module RubyUnits
 
     # convert a duration to a DateTime.  This will work so long as the duration is the duration from the zero date
     # defined by DateTime
-    # @return [DateTime]
+    # @return [::DateTime]
     def to_datetime
       DateTime.new!(convert_to('d').scalar)
     end
@@ -1333,11 +1353,11 @@ module RubyUnits
     def before(time_point = ::Time.now)
       case time_point
       when Time, Date, DateTime
-        return (begin
-                  time_point - self
-                rescue
-                  time_point.to_datetime - self
-                end)
+        (begin
+          time_point - self
+        rescue StandardError
+          time_point.to_datetime - self
+        end)
       else
         raise ArgumentError, 'Must specify a Time, Date, or DateTime'
       end
@@ -1352,9 +1372,9 @@ module RubyUnits
     def since(time_point)
       case time_point
       when Time
-        (Time.now - time_point).to_unit('s').convert_to(self)
+        self.class.new(::Time.now - time_point, 'second').convert_to(self)
       when DateTime, Date
-        (DateTime.now - time_point).to_unit('d').convert_to(self)
+        self.class.new(::DateTime.now - time_point, 'day').convert_to(self)
       else
         raise ArgumentError, 'Must specify a Time, Date, or DateTime'
       end
@@ -1366,9 +1386,9 @@ module RubyUnits
     def until(time_point)
       case time_point
       when Time
-        (time_point - Time.now).to_unit('s').convert_to(self)
+        self.class.new(time_point - ::Time.now, 'second').convert_to(self)
       when DateTime, Date
-        (time_point - DateTime.now).to_unit('d').convert_to(self)
+        self.class.new(time_point - ::DateTime.now, 'day').convert_to(self)
       else
         raise ArgumentError, 'Must specify a Time, Date, or DateTime'
       end
@@ -1382,10 +1402,10 @@ module RubyUnits
       case time_point
       when Time, DateTime, Date
         (begin
-           time_point + self
-         rescue
-           time_point.to_datetime + self
-         end)
+          time_point + self
+        rescue StandardError
+          time_point.to_datetime + self
+        end)
       else
         raise ArgumentError, 'Must specify a Time, Date, or DateTime'
       end
@@ -1400,6 +1420,7 @@ module RubyUnits
     # @return [Array]
     def coerce(other)
       return [other.to_unit, self] if other.respond_to? :to_unit
+
       case other
       when Unit
         [other, self]
@@ -1411,10 +1432,11 @@ module RubyUnits
     # returns a new unit that has been scaled to be more in line with typical usage.
     def best_prefix
       return to_base if scalar.zero?
+
       best_prefix = if kind == :information
-                      @@prefix_values.key(2**((Math.log(base_scalar, 2) / 10.0).floor * 10))
+                      @@prefix_values.key(2**((::Math.log(base_scalar, 2) / 10.0).floor * 10))
                     else
-                      @@prefix_values.key(10**((Math.log10(base_scalar) / 3.0).floor * 3))
+                      @@prefix_values.key(10**((::Math.log10(base_scalar) / 3.0).floor * 3))
                     end
       to(self.class.new(@@prefix_map.key(best_prefix) + units(with_prefix: false)))
     end
@@ -1453,7 +1475,7 @@ module RubyUnits
     # @raise [ArgumentError] when exponent associated with a unit is > 20 or < -20
     def unit_signature_vector
       return to_base.unit_signature_vector unless base?
-      vector = Array.new(SIGNATURE_VECTOR.size, 0)
+      vector = ::Array.new(SIGNATURE_VECTOR.size, 0)
       # it's possible to have a kind that misses the array... kinds like :counting
       # are more like prefixes, so don't use them to calculate the vector
       @numerator.map { |element| self.class.definition(element) }.each do |definition|
@@ -1465,6 +1487,7 @@ module RubyUnits
         vector[index] -= 1 if index
       end
       raise ArgumentError, 'Power out of range (-20 < net power of a unit < 20)' if vector.any? { |x| x.abs >= 20 }
+
       vector
     end
 
@@ -1486,8 +1509,9 @@ module RubyUnits
     # @return [Array]
     def unit_signature
       return @signature unless @signature.nil?
+
       vector = unit_signature_vector
-      vector.each_with_index { |item, index| vector[index] = item * 20**index }
+      vector.each_with_index { |item, index| vector[index] = item * (20**index) }
       @signature = vector.inject(0) { |acc, elem| acc + elem }
       @signature
     end
@@ -1503,7 +1527,7 @@ module RubyUnits
     #  "GPa"  -- creates a unit with scalar 1 with units 'GPa'
     #  6'4"  -- recognized as 6 feet + 4 inches
     #  8 lbs 8 oz -- recognized as 8 lbs + 8 ounces
-    # @return [nil | Unit]
+    # @return [nil,RubyUnits::Unit]
     # @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
@@ -1529,13 +1553,10 @@ module RubyUnits
       end
 
       unit_string =~ NUMBER_REGEX
-      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
+      unit = self.class.cached.get(Regexp.last_match(2))
+      mult = Regexp.last_match(1).nil? ? 1.0 : Regexp.last_match(1).to_f
       mult = mult.to_int if mult.to_int == mult
+
       if unit
         copy(unit)
         @scalar      *= mult
@@ -1551,7 +1572,7 @@ module RubyUnits
 
       if unit_string =~ TIME_REGEX
         hours, minutes, seconds, microseconds = unit_string.scan(TIME_REGEX)[0]
-        raise ArgumentError,'Invalid Duration' if [hours, minutes, seconds, microseconds].all?(&:nil?)
+        raise ArgumentError, 'Invalid Duration' if [hours, minutes, seconds, microseconds].all?(&:nil?)
 
         result = self.class.new("#{hours || 0} h") +
                  self.class.new("#{minutes || 0} minutes") +
@@ -1627,7 +1648,7 @@ module RubyUnits
 
       # eliminate all known terms from this string.  This is a quick check to see if the passed unit
       # contains terms that are not defined.
-      used = "#{top} #{bottom}".to_s.gsub(self.class.unit_match_regex, '').gsub(%r{[\d\*, "'_^\/\$]}, '')
+      used = "#{top} #{bottom}".to_s.gsub(self.class.unit_match_regex, '').gsub(%r{[\d*, "'_^/$]}, '')
       raise(ArgumentError, "'#{passed_unit_string}' Unit not recognized") unless used.empty?
 
       @numerator = @numerator.map do |item|