ruby-units 1.4.1 → 1.4.2

data/CHANGELOG.txt

@@ -1,5 +1,9 @@
 Change Log for Ruby-units
 =========================
+2012-09-16  1.4.2   * Fix issue #54 -- pluralization of fluid-ounces
+                    * Fix issue #53, 51 -- incorrect definition for gee
+                    * Fix issue #52 -- add support for degree symbol
+                    * Fix issue #50 -- fix conversion to json
 2012-05-13  1.4.1   * Fix issue #40 -- Unit parsing truncates invalid portions of the unit
                     * Fix issue #41 -- initializing with a nil gives unexpected result
 2012-02-01          * Fix issue #34 -- Time.at takes more than one parameter

data/RakeFile

@@ -57,7 +57,7 @@ begin
   desc "Run specs"
   RSpec::Core::RakeTask.new do |spec|
 	puts
-	puts %x{rvm current}
+	# puts %x{rvm current}
 	puts
   end
   
@@ -88,4 +88,4 @@ end
 desc "Run specs against several ruby versions, requires rvm"
 task "spec:all" => rubies.keys.map {|name| "spec:#{name}"}
 
-task :default => :spec
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/lib/ruby_units/unit.rb

@@ -21,7 +21,7 @@ end
 # 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 
+# @example Define a new unit
 #  Unit.define("foobar") do |unit|
 #    unit.aliases    = %w{foo fb foo-bar}
 #    unit.definition = Unit("1 baz")
@@ -59,8 +59,7 @@ class Unit < Numeric
   FAHRENHEIT         = ['<fahrenheit>']
   RANKINE            = ['<rankine>']
   CELSIUS            = ['<celsius>']
-  TEMP_REGEX         = /(?:temp|deg)[CFRK]/
-
+  @@TEMP_REGEX       = nil
   SIGNATURE_VECTOR = [
                       :length,
                       :time,
@@ -141,19 +140,19 @@ class Unit < Numeric
     @@definitions.each do |name, definition|
       self.use_definition(definition)
     end
-    
+
     Unit.new(1)
     return true
   end
- 
-  
+
+
   # determine if a unit is already defined
   # @param [String] unit
   # @return [Boolean]
   def self.defined?(unit)
     return @@UNIT_VALUES.keys.include?("<#{unit}>")
   end
-  
+
   # return the unit definition for a unit
   # @param [String] unit
   # @return [Unit::Definition, nil]
@@ -161,13 +160,13 @@ class Unit < Numeric
     unit = (_unit =~ /^<.+>$/) ? _unit : "<#{_unit}>"
     return @@definitions[unit]
   end
-  
+
   # return a list of all defined units
   # @return [Array]
   def self.definitions
     return @@definitions
   end
-  
+
   # @param  [Unit::Definition|String] unit_definition
   # @param  [Block] block
   # @return [Unit::Definition]
@@ -191,7 +190,7 @@ class Unit < Numeric
     Unit.use_definition(unit_definition)
     return unit_definition
   end
-    
+
   # @param [String] name Name of unit to redefine
   # @param [Block] block
   # @raise [ArgumentError] if a block is not given
@@ -204,7 +203,7 @@ class Unit < Numeric
     yield unit_definition
     self.define(unit_definition)
   end
-  
+
   # @param [String] name of unit to undefine
   # @return (see Unit.setup)
   # Undefine a unit.  Will not raise an exception for unknown units.
@@ -212,12 +211,12 @@ class Unit < Numeric
     @@definitions.delete("<#{unit}>")
     Unit.setup
   end
-  
+
   include Comparable
 
   # @return [Numeric]
   attr_accessor :scalar
-  
+
   # @return [Array]
   attr_accessor :numerator
 
@@ -225,20 +224,20 @@ class Unit < Numeric
   attr_accessor :denominator
 
   # @return [Integer]
-  attr_accessor :signature  
+  attr_accessor :signature
 
   # @return [Numeric]
   attr_accessor :base_scalar
-  
+
   # @return [Array]
   attr_accessor :base_numerator
-  
+
   # @return [Array]
   attr_accessor :base_denominator
-  
+
   # @return [String]
   attr_accessor :output
-  
+
   # @return [String]
   attr_accessor :unit_name
 
@@ -265,7 +264,7 @@ class Unit < Numeric
 
   if RUBY_VERSION < "1.9"
     # :nocov_19:
-  
+
     # a list of properties to emit to yaml
     # @return [Array]
     def to_yaml_properties
@@ -370,11 +369,11 @@ class Unit < Numeric
     unary_unit = self.units || ""
     if options.first.instance_of?(String)
       opt_scalar, opt_units = Unit.parse_into_numbers_and_units(options[0])
-      unless @@cached_units.keys.include?(opt_units) || (opt_units =~ /(#{TEMP_REGEX})|(pounds|lbs[ ,]\d+ ounces|oz)|('\d+")|(ft|feet[ ,]\d+ in|inch|inches)|%|(#{TIME_REGEX})|i\s?(.+)?|&plusmn;|\+\/-/)
+      unless @@cached_units.keys.include?(opt_units) || (opt_units =~ /(#{Unit.temp_regex})|(pounds|lbs[ ,]\d+ ounces|oz)|('\d+")|(ft|feet[ ,]\d+ in|inch|inches)|%|(#{TIME_REGEX})|i\s?(.+)?|&plusmn;|\+\/-/)
         @@cached_units[opt_units] = (self.scalar == 1 ? self : opt_units.unit) if opt_units && !opt_units.empty?
       end
     end
-    unless @@cached_units.keys.include?(unary_unit) || (unary_unit =~ /#{TEMP_REGEX}/) then
+    unless @@cached_units.keys.include?(unary_unit) || (unary_unit =~ /#{Unit.temp_regex}/) then
       @@cached_units[unary_unit] = (self.scalar == 1 ? self : unary_unit.unit)
     end
     [@scalar, @numerator, @denominator, @base_scalar, @signature, @is_base].each {|x| x.freeze}
@@ -441,7 +440,7 @@ class Unit < Numeric
   # @todo this is brittle as it depends on the display_name of a unit, which can be changed
   def to_base
     return self if self.is_base?
-    if self.units =~ /\A(?:temp|deg)[CRF]\Z/
+    if @@UNIT_MAP[self.units] =~ /\A<(?:temp|deg)[CRF]>\Z/
       if RUBY_VERSION < "1.9"
         # :nocov_19:
         @signature = @@KINDS.index(:temperature)
@@ -563,7 +562,7 @@ class Unit < Numeric
   # @return [Boolean]
   # @todo use unit definition to determine if it's a temperature instead of a regex
   def is_temperature?
-    return self.is_degree? && (!(self.units =~ /temp[CFRK]/).nil?)
+    return self.is_degree? && (!(@@UNIT_MAP[self.units] =~ /temp[CFRK]/).nil?)
   end
   alias :temperature? :is_temperature?
 
@@ -579,7 +578,7 @@ class Unit < Numeric
   # @return [String] possible values: degC, degF, degR, or degK
   def temperature_scale
     return nil unless self.is_temperature?
-    return "deg#{self.units[/temp([CFRK])/,1]}"
+    return "deg#{@@UNIT_MAP[self.units][/temp([CFRK])/,1]}"
   end
 
   # returns true if no associated units
@@ -946,25 +945,25 @@ class Unit < Numeric
       start_unit = self.units
       target_unit = other.units rescue other
       unless @base_scalar
-        @base_scalar = case start_unit
-        when 'tempC'
+        @base_scalar = case @@UNIT_MAP[start_unit]
+        when '<tempC>'
           @scalar + 273.15
-        when 'tempK'
+        when '<tempK>'
           @scalar
-        when 'tempF'
+        when '<tempF>'
           (@scalar+459.67)*Rational(5,9)
-        when 'tempR'
+        when '<tempR>'
           @scalar*Rational(5,9)
         end
       end
-      q=  case target_unit
-      when 'tempC'
+      q=  case @@UNIT_MAP[target_unit]
+      when '<tempC>'
         @base_scalar - 273.15
-      when 'tempK'
+      when '<tempK>'
         @base_scalar
-      when 'tempF'
+      when '<tempF>'
         @base_scalar * Rational(9,5) - 459.67
-      when 'tempR'
+      when '<tempR>'
         @base_scalar * Rational(9,5)
       end
       return Unit.new("#{q} #{target_unit}")
@@ -1025,6 +1024,12 @@ class Unit < Numeric
     raise RuntimeError, "Cannot convert '#{self.to_s}' to Rational unless unitless.  Use Unit#scalar"
   end
 
+  # Returns string formatted for json
+  # @return [String]
+  def as_json(*args)
+    to_s
+  end
+
   # returns the 'unit' part of the Unit object without the scalar
   # @return [String]
   def units
@@ -1034,7 +1039,7 @@ class Unit < Numeric
     output_denominator = []
     num                = @numerator.clone.compact
     den                = @denominator.clone.compact
-        
+
     if @numerator == UNITY_ARRAY
       output_numerator << "1"
     else
@@ -1042,11 +1047,11 @@ class Unit < Numeric
         if defn && defn.prefix?
           output_numerator << defn.display_name + Unit.definition(num.shift).display_name
         else
-          output_numerator << defn.display_name          
+          output_numerator << defn.display_name
         end
       end
     end
-    
+
     if @denominator == UNITY_ARRAY
       output_denominator = []
     else
@@ -1054,11 +1059,11 @@ class Unit < Numeric
         if defn && defn.prefix?
           output_denominator << defn.display_name + Unit.definition(den.shift).display_name
         else
-          output_denominator << defn.display_name          
+          output_denominator << defn.display_name
         end
       end
     end
-    
+
     on = output_numerator.uniq.
           map {|x| [x, output_numerator.count(x)]}.
           map {|element, power| ("#{element}".strip + (power > 1 ? "^#{power}" : ''))}
@@ -1098,9 +1103,9 @@ class Unit < Numeric
   end
 
   # @return [Numeric,Unit]
-  def round
-    return @scalar.round if self.unitless?
-    return Unit.new(@scalar.round, @numerator, @denominator)
+  def round(ndigits = 0)
+    return @scalar.round(ndigits) if self.unitless?
+    return Unit.new(@scalar.round(ndigits), @numerator, @denominator)
   end
 
   # @return [Numeric, Unit]
@@ -1362,6 +1367,9 @@ class Unit < Numeric
     if unit_string =~ /\$\s*(#{NUMBER_REGEX})/
       unit_string = "#{$1} USD"
     end
+
+    unit_string.gsub!("\xC2\xB0".force_encoding('utf-8'), 'deg') unless RUBY_VERSION < '1.9'
+
     unit_string.gsub!(/%/,'percent')
     unit_string.gsub!(/'/,'feet')
     unit_string.gsub!(/"/,'inch')
@@ -1474,7 +1482,7 @@ class Unit < Numeric
     @denominator = UNITY_ARRAY if @denominator.empty?
     return self
   end
-  
+
   # return an array of base units
   # @return [Array]
   def self.base_units
@@ -1496,7 +1504,7 @@ class Unit < Numeric
     complex   = %r{#{sci}{2,2}i}
     anynumber = %r{(?:(#{complex}|#{rational}|#{sci})\b)?\s?([\D].*)?}
     num, unit = string.scan(anynumber).first
-    
+
     return [case num
       when NilClass
         1
@@ -1514,7 +1522,7 @@ class Unit < Numeric
         num.to_f
     end, unit.to_s.strip]
   end
-  
+
   # return a fragment of a regex to be used for matching units or reconstruct it if hasn't been used yet.
   # Unit names are reverse sorted by length so the regexp matcher will prefer longer and more specific names
   # @return [String]
@@ -1522,7 +1530,7 @@ class Unit < Numeric
   def self.unit_regex
     @@UNIT_REGEX ||= @@UNIT_MAP.keys.sort_by {|unit_name| [unit_name.length, unit_name]}.reverse.join('|')
   end
-  
+
   # return a regex used to match units
   # @return [RegExp]
   # @private
@@ -1536,11 +1544,21 @@ class Unit < Numeric
   def self.prefix_regex
     return @@PREFIX_REGEX ||= @@PREFIX_MAP.keys.sort_by {|prefix| [prefix.length, prefix]}.reverse.join('|')
   end
-  
+
+  def self.temp_regex
+    @@TEMP_REGEX ||= Regexp.new "(?:#{
+      temp_units=%w(tempK tempC tempF tempR degK degC degF degR)
+      aliases=temp_units.map{|unit| d=Unit.definition(unit); d && d.aliases}.flatten.compact
+      regex_str= aliases.empty? ? '(?!x)x' : aliases.join('|')
+      regex_str
+    })"
+  end
+
   # inject a definition into the internal array and set it up for use
   # @private
   def self.use_definition(definition)
     @@UNIT_MATCH_REGEX = nil #invalidate the unit match regex
+    @@TEMP_REGEX = nil #invalidate the temp regex
     if definition.prefix?
       @@PREFIX_VALUES[definition.name] = definition.scalar
       definition.aliases.each {|_alias| @@PREFIX_MAP[_alias] = definition.name }

data/lib/ruby_units/unit_definitions/standard.rb

@@ -237,7 +237,7 @@ end
 
 Unit.define('fluid-ounce') do |floz|
   floz.definition = Unit('1/128 gal')
-  floz.aliases    = %w{floz fluid-ounce}
+  floz.aliases    = %w{floz fluid-ounce fluid-ounces}
 end
 
 Unit.define('tablespoon') do |tbsp|
@@ -278,7 +278,7 @@ end
 
 Unit.define('gee') do |gee|
   # approximated as a rational number to minimize round-off errors
-  gee.definition    = Unit(Rational(196131,20000), 'm/s^2') # equivalent to 9.80655 m/s^2
+  gee.definition    = Unit(Rational(196133,20000), 'm/s^2') # equivalent to 9.80665 m/s^2
   gee.aliases       = %w{gee standard-gravitation}
 end
 
@@ -702,4 +702,4 @@ end
 
 Unit.define('ppb') do |ppb|
   ppb.definition  = Unit(1) / 1_000_000_000
-end
+end

data/ruby-units.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-units"
-  s.version = "1.4.1"
+  s.version = "1.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Olbrich, Ph.D."]
-  s.date = "2012-05-13"
+  s.date = "2012-09-16"
   s.description = "Provides classes and methods to perform unit math and conversions"
   s.email = ["kevin.olbrich+ruby_units@gmail.com"]
   s.extra_rdoc_files = [
@@ -62,8 +62,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
-      s.add_development_dependency(%q<autotest-growl>, [">= 0"])
-      s.add_development_dependency(%q<autotest-fsevent>, [">= 0"])
     else
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -72,8 +70,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.5"])
       s.add_dependency(%q<autotest>, [">= 0"])
-      s.add_dependency(%q<autotest-growl>, [">= 0"])
-      s.add_dependency(%q<autotest-fsevent>, [">= 0"])
     end
   else
     s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -83,8 +79,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.5"])
     s.add_dependency(%q<autotest>, [">= 0"])
-    s.add_dependency(%q<autotest-growl>, [">= 0"])
-    s.add_dependency(%q<autotest-fsevent>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-units
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,38 +123,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: autotest-growl
-  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: autotest-fsevent
-  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'
 description: Provides classes and methods to perform unit math and conversions
 email:
 - kevin.olbrich+ruby_units@gmail.com
@@ -240,6 +208,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3013548990298419513
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: