ruby-units 1.4.4 → 1.4.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5bd14da8390f2639d40cf70bc8472b4309eaaa7c
+  data.tar.gz: 2ed54e0bfcb09dcae021aebfe93a8ebfb75cfdc2
+SHA512:
+  metadata.gz: f64e111af012583fefee2a4a7d926a637852412fbb71b74fb8fa26bc914ba8b7d668e520d8dbb7874872f2c69acb5cd4edd77a9997c515f057122d92bd0d015e
+  data.tar.gz: 85dde9e28327df1d6103e25c4a46d8fca11dc77b4060591cbbf317c2004cbae027e2a6327d96b34c995c21df67718ca04dfe5240737ffac04ca47b885e65afc4

data/CHANGELOG.txt

@@ -1,5 +1,6 @@
 Change Log for Ruby-units
 =========================
+2014-02-21  1.4.5	* Fix issue #98 -- add mcg as a valid unit
 2013-07-19  1.4.4   * Fix issue #4 -- .best_prefix method
                     * Fix issue #60 -- Consider placing Unit in a module
                     * Fix issue #75 -- Siemens is kind of conductance not resistance

data/README.md

@@ -10,7 +10,7 @@ Project page: [http://github.com/olbrich/ruby-units](http://github.com/olbrich/r
 Many technical applications make use of specialized calculations at some point.  Frequently, these calculations require unit conversions to ensure accurate results.  Needless to say, this is a pain to properly keep track of, and is prone to numerous errors.
   
 ## Solution
-The 'Ruby units' gem is designed so simplify the handling of units for scientific calculations. The units of each quantity are specified when a Unit object is created and the Unit class will handle all subsequent conversions and manipulations to ensure an accurate result.
+The 'Ruby units' gem is designed to simplify the handling of units for scientific calculations. The units of each quantity are specified when a Unit object is created and the Unit class will handle all subsequent conversions and manipulations to ensure an accurate result.
   
 ## Installation:
 This package may be installed using:  `gem install ruby-units`
@@ -177,10 +177,10 @@ The actual class of a unit is the RubyUnits::Unit.  For simplicity and backwards
 
 To load ruby-units without this alias...
 
-    require 'ruby-units/namespaced'
+    require 'ruby_units/namespaced'
 
 When using bundler...
 
-    gem 'ruby-units', require: 'namespaced'
+    gem 'ruby-units', require: 'ruby_units/namespaced'
 
 Note: when using the namespaced version, the Unit('unit string') helper will not be defined.

data/VERSION

@@ -1 +1 @@
-1.4.4
+1.4.5

data/lib/ruby_units/time.rb

@@ -15,17 +15,21 @@ class Time
   # @param [Time] arg
   # @param [Integer] ms
   # @return [RubyUnits::Unit, Time]
-  def self.at(arg,ms=0)
+  def self.at(arg, ms=nil)
     case arg
     when Time
       unit_time_at(arg)
     when RubyUnits::Unit
-      unit_time_at(arg.convert_to("s").scalar, ms)
+      if ms
+        unit_time_at(arg.convert_to("s").scalar, ms)
+      else
+        unit_time_at(arg.convert_to("s").scalar)
+      end
     else
-      unit_time_at(arg, ms)
+      ms.nil? ? unit_time_at(arg) : unit_time_at(arg, ms)
     end
   end
-  
+
   # @return (see RubyUnits::Unit#initialize)
   def to_unit(other = nil)
     other ? RubyUnits::Unit.new(self).convert_to(other) : RubyUnits::Unit.new(self)

data/lib/ruby_units/unit.rb

@@ -48,7 +48,7 @@ module RubyUnits
     TIME_REGEX         = /(\d+)*:(\d+)*:*(\d+)*[:,]*(\d+)*/
     LBS_OZ_REGEX       = /(\d+)\s*(?:#|lbs|pounds|pound-mass)+[\s,]*(\d+)\s*(?:oz|ounces)/
     SCI_NUMBER         = %r{([+-]?\d*[.]?\d+(?:[Ee][+-]?)?\d*)}
-    RATIONAL_NUMBER    = /\(?([+-]?\d+)\/(\d+)\)?/
+    RATIONAL_NUMBER    = /\(?([+-])?(\d+[ -])?(\d+)\/(\d+)\)?/
     COMPLEX_NUMBER     = /#{SCI_NUMBER}?#{SCI_NUMBER}i\b/
     NUMBER_REGEX       = /#{SCI_NUMBER}*\s*(.+)?/
     UNIT_STRING_REGEX  = /#{SCI_NUMBER}*\s*([^\/]*)\/*(.+)*/
@@ -610,14 +610,14 @@ module RubyUnits
           raise NoMethodError, "undefined method `<=>' for #{self.base_scalar.inspect}"
         when other.nil?
           return self.base_scalar <=> nil
-        when !self.is_temperature? && other.zero?
+        when !self.is_temperature? && other.respond_to?(:zero?) && other.zero?
           return self.base_scalar <=> 0
         when other.instance_of?(Unit)
-          raise ArgumentError, "Incompatible Units (#{self.units} !~ #{other.units})" unless self =~ other
+          raise ArgumentError, "Incompatible Units ('#{self.units}' not compatible with '#{other.units}')" unless self =~ other
           return self.base_scalar <=> other.base_scalar
         else
           x, y = coerce(other)
-          return x <=> y
+          return y <=> x
       end
     end
 
@@ -819,7 +819,7 @@ module RubyUnits
     # @param [Object] other
     # @return [Array]
     def divmod(other)
-      raise ArgumentError, "Incompatible Units" unless self =~ other
+      raise ArgumentError, "Incompatible Units ('#{self}' not compatible with '#{other}')" unless self =~ other
       if self.units == other.units
         return self.scalar.divmod(other.scalar)
       else
@@ -991,7 +991,7 @@ module RubyUnits
           else
             raise ArgumentError, "Unknown target units"
         end
-        raise ArgumentError, "Incompatible Units" unless self =~ target
+        raise ArgumentError, "Incompatible Units ('#{self}' not compatible with '#{other}')" unless self =~ target
         _numerator1   = @numerator.map { |x| @@PREFIX_VALUES[x] ? @@PREFIX_VALUES[x] : x }.map { |i| i.kind_of?(Numeric) ? i : @@UNIT_VALUES[i][:scalar] }.compact
         _denominator1 = @denominator.map { |x| @@PREFIX_VALUES[x] ? @@PREFIX_VALUES[x] : x }.map { |i| i.kind_of?(Numeric) ? i : @@UNIT_VALUES[i][:scalar] }.compact
         _numerator2   = target.numerator.map { |x| @@PREFIX_VALUES[x] ? @@PREFIX_VALUES[x] : x }.map { |x| x.kind_of?(Numeric) ? x : @@UNIT_VALUES[x][:scalar] }.compact
@@ -1266,8 +1266,9 @@ module RubyUnits
       end
     end
 
-    # returns a new unit that has been
+    # returns a new unit that has been scaled to be more in line with typical usage.
     def best_prefix
+      return self.to_base if self.scalar == 0
       _best_prefix =  if (self.kind == :information)
         @@PREFIX_VALUES.key(2**((Math.log(self.base_scalar,2) / 10.0).floor * 10))
       else
@@ -1434,8 +1435,10 @@ module RubyUnits
       end
 
       if defined?(Rational) && unit_string =~ RATIONAL_NUMBER
-        numerator, denominator, unit_s = unit_string.scan(RATIONAL_REGEX)[0]
-        result                         = RubyUnits::Unit.new(unit_s || '1') * Rational(numerator.to_i, denominator.to_i)
+        sign, proper, numerator, denominator, unit_s = unit_string.scan(RATIONAL_REGEX)[0]
+        sign = (sign == '-') ? -1 : 1
+        rational = sign * (proper.to_i + Rational(numerator.to_i, denominator.to_i))
+        result  = RubyUnits::Unit.new(unit_s || '1') * rational
         copy(result)
         return
       end
@@ -1450,7 +1453,11 @@ module RubyUnits
         @base_scalar *= mult
         return self
       end
-      unit_string.gsub!(/<(#{@@UNIT_REGEX})><(#{@@UNIT_REGEX})>/, '\1*\2')
+
+      while unit_string.gsub! /(<#{@@UNIT_REGEX})><(#{@@UNIT_REGEX}>)/, '\1*\2'
+        # collapse <x><y><z> into <x*y*z>...
+      end
+      # ... and then strip the remaining brackets for x*y*z
       unit_string.gsub!(/[<>]/, "")
 
       if unit_string =~ /:/
@@ -1481,7 +1488,7 @@ module RubyUnits
         return
       end
 
-                                                                    # more than one per.  I.e., "1 m/s/s"
+      # more than one per.  I.e., "1 m/s/s"
       raise(ArgumentError, "'#{passed_unit_string}' Unit not recognized") if unit_string.count('/') > 1
       raise(ArgumentError, "'#{passed_unit_string}' Unit not recognized") if unit_string.scan(/\s[02-9]/).size > 0
       @scalar, top, bottom = unit_string.scan(UNIT_STRING_REGEX)[0] #parse the string into parts
@@ -1536,11 +1543,11 @@ module RubyUnits
     def self.parse_into_numbers_and_units(string)
       # scientific notation.... 123.234E22, -123.456e-10
       sci       = %r{[+-]?\d*[.]?\d+(?:[Ee][+-]?)?\d*}
-      # rational numbers.... -1/3, 1/5, 20/100
-      rational  = %r{[+-]?\d+\/\d+}
+      # rational numbers.... -1/3, 1/5, 20/100, -6 1/2, -6-1/2
+      rational  = %r{\(?[+-]?(?:\d+[ -])?\d+\/\d+\)?}
       # complex numbers... -1.2+3i, +1.2-3.3i
       complex   = %r{#{sci}{2,2}i}
-      anynumber = %r{(?:(#{complex}|#{rational}|#{sci})\b)?\s?([^\d\.].*)?}
+      anynumber = %r{(?:(#{complex}|#{rational}|#{sci})\b)?\s?([^-\d\.].*)?}
       num, unit = string.scan(anynumber).first
 
       return [case num
@@ -1555,7 +1562,15 @@ module RubyUnits
                     #:nocov_19:
                   end
                 when rational
-                  Rational(*num.split("/").map { |x| x.to_i })
+                  # 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 * (n + f)
+                  else
+                    Rational(*num.split("/").map { |x| x.to_i })
+                  end
                 else
                   num.to_f
               end, unit.to_s.strip]
@@ -1573,7 +1588,7 @@ module RubyUnits
     # @return [RegExp]
     # @private
     def self.unit_match_regex
-      @@UNIT_MATCH_REGEX ||= /(#{RubyUnits::Unit.prefix_regex})*?(#{RubyUnits::Unit.unit_regex})\b/
+      @@UNIT_MATCH_REGEX ||= /(#{RubyUnits::Unit.prefix_regex})??(#{RubyUnits::Unit.unit_regex})\b/
     end
 
     # return a regexp fragment used to match prefixes

data/lib/ruby_units/unit_definitions/prefix.rb

@@ -23,7 +23,7 @@
   '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},     Rational(1,1e6)],
+  '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)],

data/lib/ruby_units/unit_definitions/standard.rb

@@ -69,16 +69,16 @@ end
 
 # typesetting
 
-RubyUnits::Unit.define('point') do |point|
-  point.definition = RubyUnits::Unit.new('1/72 ft')
-  point.aliases    = %w{point points}
-end
-
 RubyUnits::Unit.define('pica') do |pica|
-  pica.definition = RubyUnits::Unit.new('12 point')
+  pica.definition = RubyUnits::Unit.new('1/72 ft')
   pica.aliases    = %w{P pica picas}
 end
 
+RubyUnits::Unit.define('point') do |point|
+  point.definition = RubyUnits::Unit.new('1/12 pica')
+  point.aliases    = %w{point points}
+end
+
 RubyUnits::Unit.define('dot') do |dot|
   dot.definition  = RubyUnits::Unit.new('1 each')
   dot.aliases     = %w{dot dots}
@@ -139,7 +139,7 @@ end
 
 RubyUnits::Unit.define('short-ton') do |ton|
   ton.definition = RubyUnits::Unit.new('2000 lbs')
-  ton.aliases    = %w{ton tn}
+  ton.aliases    = %w{tn ton tons short-tons}
 end
 
 RubyUnits::Unit.define('carat') do |carat|
@@ -559,7 +559,7 @@ end
 
 RubyUnits::Unit.define('unit') do |unit|
   unit.definition   = RubyUnits::Unit.new('1/60 microkatal')
-  unit.aliases      = %w{U enzRubyUnits::Unit}
+  unit.aliases      = %w{U enzUnit units}
 end
 
 #frequency

data/ruby-units.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile.rb, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: ruby-units 1.4.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ruby-units"
-  s.version = "1.4.4"
+  s.version = "1.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Kevin Olbrich, Ph.D."]
-  s.date = "2013-07-19"
+  s.date = "2014-02-21"
   s.description = "Provides classes and methods to perform unit math and conversions"
   s.email = ["kevin.olbrich+ruby_units@gmail.com"]
   s.extra_rdoc_files = [
@@ -48,23 +50,25 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/olbrich/ruby-units"
   s.licenses = ["MIT"]
   s.post_install_message = "====================\nDeprecation Warning\n====================\n\nSeveral convenience methods that ruby-units added to the string class have\nbeen deprecated in this release.  These methods include String#to, String#from, String#ago, String#before and others.\nIf your code relies on these functions, they can be added back by adding this line to your code.\n\nrequire 'ruby-units/string/extras'\n# note that these methods do not play well with Rails, which is one of the reasons they are being removed.\n\nThe extra functions mostly work the same, but will no longer properly handle cases when they are called with strings..\n\n'min'.from(\"4-1-2011\") # => Exception\n\nPass in a Date, Time, or DateTime object to get the expected result.\n\nThey will go away completely in the next release, so it would be a good idea to refactor your code\nto avoid using them.  They will also throw deprecation warnings when they are used.\n"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.2.2"
   s.summary = "A class that performs unit conversions and unit math"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
     else
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

metadata

@@ -1,46 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ruby-units
 version: !ruby/object:Gem::Version
-  version: 1.4.4
-  prerelease: 
+  version: 1.4.5
 platform: ruby
 authors:
 - Kevin Olbrich, Ph.D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
 description: Provides classes and methods to perform unit math and conversions
@@ -82,66 +91,44 @@ files:
 homepage: https://github.com/olbrich/ruby-units
 licenses:
 - MIT
-post_install_message: ! '====================
-
+metadata: {}
+post_install_message: |
+  ====================
   Deprecation Warning
-
   ====================
 
-
   Several convenience methods that ruby-units added to the string class have
+  been deprecated in this release.  These methods include String#to, String#from, String#ago, String#before and others.
+  If your code relies on these functions, they can be added back by adding this line to your code.
 
-  been deprecated in this release.  These methods include String#to, String#from,
-  String#ago, String#before and others.
-
-  If your code relies on these functions, they can be added back by adding this line
-  to your code.
-
-
-  require ''ruby-units/string/extras''
-
-  # note that these methods do not play well with Rails, which is one of the reasons
-  they are being removed.
+  require 'ruby-units/string/extras'
+  # note that these methods do not play well with Rails, which is one of the reasons they are being removed.
 
+  The extra functions mostly work the same, but will no longer properly handle cases when they are called with strings..
 
-  The extra functions mostly work the same, but will no longer properly handle cases
-  when they are called with strings..
-
-
-  ''min''.from("4-1-2011") # => Exception
-
+  'min'.from("4-1-2011") # => Exception
 
   Pass in a Date, Time, or DateTime object to get the expected result.
 
-
-  They will go away completely in the next release, so it would be a good idea to
-  refactor your code
-
+  They will go away completely in the next release, so it would be a good idea to refactor your code
   to avoid using them.  They will also throw deprecation warnings when they are used.
-
-'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3933693209796499850
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A class that performs unit conversions and unit math
 test_files: []