quantify 2.0.2 → 3.0.0

data/VERSION

@@ -1 +1 @@
-2.0.2
+3.0.0

data/lib/quantify/config.rb

@@ -374,4 +374,6 @@ Unit::NonSI.configure do
 
   non_si_base_units.each { |unit| unit.acts_as_equivalent_unit = true }
 
+  Dimensions.dimensionless.units.each { |unit| unit.acts_as_alternative_unit = false }
+
 end

data/lib/quantify/core_extensions/string.rb

@@ -21,6 +21,10 @@ class String
     words.size
   end
 
+  def starts_with_number?
+    (/\A([\d\s.,]+)/i).match(self) ? true : false
+  end
+
   def to_quantity
     Quantify::Quantity.parse(self)
   end

data/lib/quantify/parser.rb

@@ -0,0 +1,7 @@
+
+module Quantify
+  module Parser
+
+    
+  end
+end

data/lib/quantify/quantity.rb

@@ -44,13 +44,23 @@ module Quantify
 
 
     # Parse a string and return a Quantity object based upon the value and
-    # subseqent unit name, symbol or JScience label
+    # subseqent unit name, symbol or JScience label. Returns an array containing
+    # quantity objects for each quantity recognised.
     def self.parse(string)
-      if quantity = /\A([\d\s.,]+)(\D+.*)\z/.match(string)
-        Quantity.new($1.strip, $2)
-      else
-        raise Quantify::Exceptions::QuantityParseError, "Cannot parse string into value and unit"
-      end
+      words = string.words
+      quantities = words.each_with_index.map do |word,index|
+        if word.starts_with_number?
+          # Isolate number from subsequent string
+          value, string = word, words[index+1..-1].join(" ")
+          # Shift any trailing non-numeric characters to start of string.
+          value, string = $1, "#{$2} #{string}" if (/([\d\s.,]+)([^\d\s.,\^]+(\^[\d\.-]*)?)/i).match(word)
+          # Parse string for unit references
+          unit = Unit.parse(string, :iterative => true) || Unit.dimensionless
+          # Instantiate quantity using value and unit
+          Quantity.new(value,unit)
+        end
+      end.compact
+      return quantities
     rescue Quantify::Exceptions::InvalidArgumentError
       raise Quantify::Exceptions::QuantityParseError, "Cannot parse string into value and unit"
     end
@@ -58,6 +68,17 @@ module Quantify
     def self.configure(&block)
       self.class_eval(&block) if block
     end
+    
+    protected
+
+    def self.is_basic_conversion_with_scalings?(quantity,new_unit)
+      return true if (quantity.unit.has_scaling? || new_unit.has_scaling?) &&
+        !quantity.unit.is_compound_unit? &&
+        !new_unit.is_compound_unit?
+      return false
+    end
+
+    public
 
     attr_accessor :value, :unit
 
@@ -74,7 +95,7 @@ module Quantify
     # quantity which is represented by the Dimensions object in the Quantity unit.
     # e.g.
     #
-    #   Quantity.parse( )"25 yr").represents          #=> :time
+    #   Quantity.parse("25 yr").represents            #=> :time
     #
     #   1.foot.represents                             #=> :length
     #
@@ -119,7 +140,7 @@ module Quantify
     #
     def to(new_unit)
       new_unit = Unit.for new_unit
-      if is_basic_conversion_with_scalings? new_unit
+      if Quantity.is_basic_conversion_with_scalings?(self,new_unit)
         Quantity.new(@value,@unit).conversion_with_scalings! new_unit
       elsif self.unit.is_alternative_for? new_unit
         Quantity.new(@value,@unit).convert_to_equivalent_unit! new_unit
@@ -130,13 +151,6 @@ module Quantify
       end      
     end
 
-    def is_basic_conversion_with_scalings?(new_unit)
-      return true if (@unit.has_scaling? || new_unit.has_scaling?) &&
-        !@unit.is_compound_unit? &&
-        !new_unit.is_compound_unit?
-      return false
-    end
-
     # Conversion where both units (including compound units) are of precisely
     # equivalent dimensions, i.e. direct alternatives for one another. Where
     # previous unit is a compound unit, new unit must be cancelled by all original
@@ -317,6 +331,9 @@ module Quantify
       range.include? self
     end
 
+    protected :convert_compound_unit_to_si!, :add_or_subtract!, :multiply_or_divide!
+
+
     # Enables shorthand for reciprocal of quantity, e.g.
     #
     #   quantity = 2.m

data/lib/quantify/unit/base_unit.rb

@@ -417,6 +417,7 @@ module Quantify
       end
 
       def valid_descriptors?
+        return true if is_dimensionless?
         [:name, :symbol, :label].all? do |attr|
           attribute = send(attr)
           attribute.is_a?(String) && !attribute.empty?

data/lib/quantify/unit/unit.rb

@@ -173,6 +173,12 @@ module Quantify
       Quantity.new(value, new_unit)
     end
 
+    def self.dimensionless
+      Unit::Base.new(:dimensions => 'dimensionless') do |unit|
+        unit.acts_as_alternative_unit = false
+      end
+    end
+
     # Retrieve an object representing the specified unit.
     #
     # Argument can be the unit name, symbol or JScience label and provided as
@@ -204,9 +210,12 @@ module Quantify
       end
       if unit = Unit.match(name_symbol_or_label)
         return unit
-      end
-      if unit = Unit.parse(name_symbol_or_label)
+      elsif unit = Unit.parse(name_symbol_or_label)
         return unit
+      elsif unit = Unit.parse(name_symbol_or_label, :iterative => true)
+        return unit
+      else
+        return nil
       end
     rescue Exceptions::InvalidUnitError
       return nil
@@ -214,21 +223,12 @@ module Quantify
 
     # Parse complex strings into unit.
     #
-    def self.parse(string)
+    def self.parse(string, options={})
       string = string.remove_underscores.without_superscript_characters
-      if string.scan(/(\/|per)/).size > 1
-        raise Exceptions::InvalidArgumentError, "Malformed unit: multiple uses of '/' or 'per'"
-      end
-
-      units = []
-      numerator, per, denominator = string.split(/(\/|per)/)
-      units += Unit.parse_numerator_units(numerator)
-      units += Unit.parse_denominator_units(denominator) unless denominator.nil?
-      if units.size == 1 && units.first.index == 1
-        return units.first.unit
-      else
-        return Unit::Compound.new(*units)
-      end
+      units = options[:iterative] == true ? Unit.iterative_parse(string) : Unit.simple_parse(string)
+      return nil if units.empty?
+      return units.first.unit if units.size == 1 && units.first.index == 1
+      return Unit::Compound.new(*units)
     end
 
     def self.match(name_symbol_or_label)
@@ -266,23 +266,43 @@ module Quantify
       return nil
     end
 
-    # standardize query strings or symbols into canonical form for unit names,
-    # symbols and labels
-    #
-    def self.format_unit_attribute(attribute, string_or_symbol)
-      string_or_symbol = case attribute
-        when :symbol then string_or_symbol.remove_underscores
-        when :name then string_or_symbol.remove_underscores.singularize.downcase
-        else string_or_symbol.to_s
+    def self.simple_parse(string)
+      if string.scan(/(\/|per)/).size > 1
+        raise Exceptions::InvalidArgumentError, "Malformed unit: multiple uses of '/' or 'per'"
       end
-      Unit.use_superscript_characters? ?
-        string_or_symbol.with_superscript_characters : string_or_symbol.without_superscript_characters
+      units = []
+      numerator, per, denominator = string.split(/(\/|per)/)
+      units += Unit.parse_numerator_units(numerator)
+      units += Unit.parse_denominator_units(denominator) unless denominator.nil?
+      return units
+    end
+
+    def self.iterative_parse(string)
+      units=[]
+      current_set = "numerator_units"
+      while unit = Unit.unit_label_regex.match(string) || unit = Unit.unit_symbol_regex.match(string) ||
+          unit = Unit.unit_name_regex.match(string) || unit = Unit.unit_denominator_regex.match(string) do
+        if unit[0] =~ Unit.unit_denominator_regex
+          current_set = "denominator_units"
+        else
+          units += Unit.send("parse_#{current_set}".to_sym, unit[0])
+        end
+        # Remove matched pattern from string for next iteration
+        match_length = unit[0].size
+        string = string[match_length, string.length-match_length].strip
+      end
+      return units
     end
     
     def self.parse_unit_and_index(string)
       string.scan(/([^0-9\^]+)\^?([\d\.-]*)?/i)
       index = ($2.nil? || $2.empty? ? 1 : $2.to_i)
-      CompoundBaseUnit.new($1.to_s, index)
+      unit = Unit.match($1.to_s)
+      if unit.is_a? Compound
+        return unit.base_units.each {|base_unit| base_unit.index = base_unit.index * index}
+      else
+        return CompoundBaseUnit.new($1.to_s, index)
+      end
     end
 
     def self.parse_numerator_units(string)
@@ -294,7 +314,7 @@ module Quantify
       end
       num_units.map! do |substring|
         Unit.parse_unit_and_index(substring)
-      end
+      end.flatten
     end
 
     def self.parse_denominator_units(string)
@@ -304,6 +324,19 @@ module Quantify
       end
     end
 
+    # standardize query strings or symbols into canonical form for unit names,
+    # symbols and labels
+    #
+    def self.format_unit_attribute(attribute, string_or_symbol)
+      string_or_symbol = case attribute
+        when :symbol then string_or_symbol.remove_underscores
+        when :name then string_or_symbol.remove_underscores.singularize.downcase
+        else string_or_symbol.to_s
+      end
+      Unit.use_superscript_characters? ?
+        string_or_symbol.with_superscript_characters : string_or_symbol.without_superscript_characters
+    end
+    
     # This returns the suite of units which represents THE SI units for each of
     # the base dimensions, i.e. metre, kilogram, second, etc. but not prefixed
     # versions of the same unit
@@ -341,6 +374,24 @@ module Quantify
       @units.map {|unit| unit.symbol if unit.symbol.word_count > 1 }.compact
     end
 
+    # might want to try atomic groupings, but must get units in size order perhaps first
+    def self.unit_label_regex
+      /\A((#{Unit.units_for_regex(Unit::Prefix,:non_si_prefixes,:label)})?((#{Unit.units_for_regex(Unit,:non_si_non_prefixed_units,:label)})\b)|(#{Unit.units_for_regex(Unit::Prefix,:si_prefixes,:label)})?((#{Unit.units_for_regex(Unit,:si_non_prefixed_units,:label)})\b))(\^[\d\.-]*)?/
+    end
+
+    def self.unit_symbol_regex
+      /\A((#{Unit.units_for_regex(Unit::Prefix,:si_prefixes,:symbol)})?((#{Unit.units_for_regex(Unit,:si_non_prefixed_units,:symbol)})\b)|(#{Unit.units_for_regex(Unit::Prefix,:non_si_prefixes,:symbol)})?((#{Unit.units_for_regex(Unit,:non_si_non_prefixed_units,:symbol)})\b))(\^[\d\.-]*)?/
+    end
+
+    def self.unit_name_regex
+      # Specifically case insensitive
+      /\A((#{Unit.units_for_regex(Unit::Prefix,:non_si_prefixes,:name)})?((#{Unit.units_for_regex(Unit,:non_si_non_prefixed_units,:pluralized_name)}|#{Unit.units_for_regex(Unit,:non_si_non_prefixed_units,:name)})\b)|(#{Unit.units_for_regex(Unit::Prefix,:si_prefixes,:name)})?((#{Unit.units_for_regex(Unit,:si_non_prefixed_units,:pluralized_name)}|#{Unit.units_for_regex(Unit,:si_non_prefixed_units,:name)})\b))(\^[\d\.-]*)?/i
+    end
+
+    def self.unit_denominator_regex
+      /\A(\/|per)/i
+    end
+
     # Underscore any parts of string which represent multi-word unit identifiers
     # so that units can be parsed on whitespace
     #
@@ -354,9 +405,9 @@ module Quantify
     # Returns a list of "|" separated unit identifiers for use as regex
     # alternatives. Lists are constructed by calling 
     def self.units_for_regex(klass,method,attribute)
-      list = klass.send(method).map { |item| item.send(attribute) }
+      list = klass.send(method).map { |item| item.send(attribute).gsub("/","\\/").gsub("^","\\^")  }
       list.map! { |item| item.downcase } if attribute == :name
-      list.join("|")
+      list.sort {|x, y| y.size <=> x.size }.join("|")
     end
 
   end

data/quantify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{quantify}
-  s.version = "2.0.2"
+  s.version = "3.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Berkeley"]
-  s.date = %q{2011-10-28}
+  s.date = %q{2011-11-08}
   s.description = %q{A gem to support physical quantities and unit conversions}
   s.email = %q{andrew.berkeley.is@googlemail.com}
   s.extra_rdoc_files = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "lib/quantify/dimensions.rb",
     "lib/quantify/exception.rb",
     "lib/quantify/inflections.rb",
+    "lib/quantify/parser.rb",
     "lib/quantify/quantify.rb",
     "lib/quantify/quantity.rb",
     "lib/quantify/unit/base_unit.rb",
@@ -54,7 +55,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://github.com/spatchcock/quantify}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Support for handling physical quantities, unit conversions, etc}
 
   if s.respond_to? :specification_version then

data/spec/quantity_spec.rb

@@ -34,33 +34,162 @@ describe Quantity do
     quantity.unit.name.should == 'kilometre'
   end
 
+  it "should create valid instances with class parse method" do
+    quantities = Quantity.parse "10m driving and 5 tonnes carried"
+    quantities.should be_a Array
+    quantities.first.value.should == 10
+    quantities.first.unit.symbol.should == 'm'
+    quantities.last.value.should == 5
+    quantities.last.unit.symbol.should == 't'
+  end
+
   it "should create a valid instance with class parse method" do
-    quantity = Quantity.parse "10 m"
-    quantity.value.should == 10
-    quantity.unit.symbol.should == 'm'
+    quantities = Quantity.parse "10 m"
+    quantities.first.value.should == 10
+    quantities.first.unit.symbol.should == 'm'
   end
 
   it "should create a valid instance with class parse method" do
-    quantity = Quantity.parse "155.6789 ly"
-    quantity.value.should == 155.6789
-    quantity.unit.name.should == 'light year'
-    quantity.represents.should == 'length'
+    quantities = Quantity.parse "155.6789 ly"
+    quantities.first.value.should == 155.6789
+    quantities.first.unit.name.should == 'light year'
+    quantities.first.represents.should == 'length'
+  end
+
+  it "should create a valid instance with class parse method and per unit with symbols" do
+    quantities = Quantity.parse "10 m / h"
+    quantities.first.value.should == 10
+    quantities.first.unit.symbol.should == 'm/h'
+  end
+
+  it "should create a valid instance with class parse method and per unit with names" do
+    quantities = Quantity.parse "10 miles / hour"
+    quantities.first.value.should == 10
+    quantities.first.unit.symbol.should == 'mi/h'
+  end
+
+  it "should create a valid instance with class parse method and compound per unit with names" do
+    quantities = Quantity.parse "10 kilograms / tonne kilometre"
+    quantities.first.value.should == 10
+    quantities.first.unit.symbol.should == 'kg/t km'
+  end
+
+  it "should create a valid instance with class parse method and compound per unit with symbols" do
+    quantities = Quantity.parse "10 kg / t km"
+    quantities.first.value.should == 10
+    quantities.first.unit.symbol.should == 'kg/t km'
+  end
+
+  it "should create a valid instance from complex string with compound per unit" do
+    quantities = Quantity.parse "We sent some freight 6000 nautical miles by ship and the emissions rate was 10 kg / t km"
+    quantities.first.value.should == 6000
+    quantities.first.unit.name.should == 'nautical mile'
+    quantities.first.unit.symbol.should == 'nmi'
+    quantities[1].value.should == 10
+    quantities[1].unit.pluralized_name.should == 'kilograms per tonne kilometre'
+    quantities[1].unit.symbol.should == 'kg/t km'
+  end
+
+  it "should create valid instances from complex string" do
+    quantities = Quantity.parse "I travelled 220 miles driving my car and using 0.13 UK gallons per mile of diesel"
+    quantities.first.value.should == 220
+    quantities.first.unit.name.should == 'mile'
+    quantities.first.unit.symbol.should == 'mi'
+    quantities[1].value.should == 0.13
+    quantities[1].unit.pluralized_name.should == 'UK gallons per mile'
+    quantities[1].unit.symbol.should == 'gal/mi'
+  end
+
+  it "should create valid instances from easy string" do
+    quantities = Quantity.parse "100km"
+    quantities.first.value.should == 100
+    quantities.first.unit.name.should == 'kilometre'
+  end
+
+  it "should create valid instances from complex string, no space and two-digit symbol" do
+    quantities = Quantity.parse "100km driving cars"
+    quantities.first.value.should == 100
+    quantities.first.unit.name.should == 'kilometre'
+  end
+
+  it "should create valid instances from complex string with punctuation" do
+    quantities = Quantity.parse "66666 kg; 5 lb; 86 gigagrams per kelvin and some more words"
+    quantities.first.value.should == 66666
+    quantities.first.unit.name.should == 'kilogram'
+    quantities[1].value.should == 5
+    quantities[1].unit.pluralized_name.should == 'pounds'
+    quantities[1].unit.symbol.should == 'lb'
+    quantities[2].value.should == 86
+    quantities[2].unit.pluralized_name.should == 'gigagrams per kelvin'
+    quantities[2].unit.symbol.should == 'Gg/K'
+  end
+
+  it "should create valid instances from complex string with punctuation" do
+    quantities = Quantity.parse "6 kilogram square metre per second^2"
+    quantities.first.value.should == 6
+    quantities.first.unit.name.should == 'kilogram square metre per square second'
+  end
+  
+  it "should create valid instances from complex string with punctuation" do
+    quantities = Quantity.parse "I make 1 cup of tea with 1 tea bag, 0.3 litres of water, 10 g of sugar and 1 dram of milk"
+    quantities.first.value.should == 1
+    quantities.first.unit.name.should == 'cup'
+    quantities[1].value.should == 1
+    quantities[1].unit.name.should == ''
+    quantities[2].value.should == 0.3
+    quantities[2].unit.name.should == 'litre'
+    quantities[3].value.should == 10
+    quantities[3].unit.name.should == 'gram'
+    quantities[4].value.should == 1
+    quantities[4].unit.name.should == 'dram'
+  end
+
+  it "should create valid instances from complex string with indices" do
+    quantities = Quantity.parse "I sprayed 500 litres of fertilizer across 6000 m^2 of farmland"
+    quantities.first.value.should == 500
+    quantities.first.unit.name.should == 'litre'
+    quantities.first.unit.symbol.should == 'L'
+    quantities[1].value.should == 6000
+    quantities[1].unit.pluralized_name.should == 'square metres'
+    quantities[1].unit.symbol.should == 'm²'
+  end
+
+  it "should create valid instances from complex string with no spaces" do
+    quantities = Quantity.parse "I sprayed 500L of fertilizer across 6000m^2 of farmland"
+    quantities.first.value.should == 500
+    quantities.first.unit.name.should == 'litre'
+    quantities.first.unit.symbol.should == 'L'
+    quantities[1].value.should == 6000
+    quantities[1].unit.pluralized_name.should == 'square metres'
+    quantities[1].unit.symbol.should == 'm²'
+  end
+
+  it "should create a valid instance with class parse method and per unit" do
+    quantities = Quantity.parse "10 miles / hour"
+    quantities.first.value.should == 10
+    quantities.first.unit.symbol.should == 'mi/h'
+  end
+  
+  it "should parse using string method" do
+    "20 m".to_q.first.value.should == 20.0
+    "45.45 BTU".to_q.first.class.should == Quantity
+    "65 kilometres per hour".to_q.first.unit.class.should == Unit::Compound
   end
 
   it "should create a valid instance with class parse method based on to_string method" do
     quantity_1 = Quantity.new 15, :watt
     quantity_2 = Quantity.parse quantity_1.to_s
-    quantity_2.value.should == 15
-    quantity_2.unit.name.should == 'watt'
-    quantity_2.represents.should == 'power'
+    quantity_2.first.value.should == 15
+    quantity_2.first.unit.name.should == 'watt'
+    quantity_2.first.represents.should == 'power'
   end
 
   it "should create a valid instance with class parse method and unit prefix based on to_string method" do
     quantity_1 = Quantity.new 15, :watt
     quantity_2 = Quantity.parse quantity_1.to_s
-    quantity_2.value.should == 15
-    quantity_2.unit.name.should == 'watt'
-    quantity_2.represents.should == 'power'
+    quantity_2.first.value.should == 15
+    quantity_2.first.unit.name.should == 'watt'
+    quantity_2.first.represents.should == 'power'
   end
 
   it "should convert quantity correctly" do
@@ -243,13 +372,6 @@ describe Quantity do
     lambda{ ((10.m/1.s).pow! 0.5) }.should raise_error
   end
 
-  it "should parse using string method" do
-    "20 m".to_q.value.should == 20.0
-    "45.45 BTU".to_q.class.should == Quantity
-    "65 kilometres per hour".to_q.unit.class.should == Unit::Compound
-    "65 kilometre per hour".to_q.unit.class.should == Unit::Compound
-  end
-
   it "should cancel by base units of original compound unit if necessary" do
     quantity = Quantity.new(20, Unit.psi).to(Unit.inches_of_mercury)
     quantity.unit.base_units.size.should == 1

data/spec/unit_spec.rb

@@ -239,6 +239,7 @@ describe Unit do
       it "should NOT ignore case when initialising units by symbol" do
         Unit.m.label.should eql 'm'
         lambda{Unit.M}.should raise_error
+        
         Unit.Gg.name.should eql 'gigagram'
         lambda{Unit.GG}.should raise_error
       end
@@ -325,8 +326,8 @@ describe Unit do
     it "dynamic unit retrieval with symbol should be successful" do
       Unit.m.name.should == 'metre'
       Unit.ft.symbol.should == 'ft'
-      # Unit.μm.factor.should == 0.000001
-      # Unit.°C.name.should == 'degree celsius'
+      #Unit.μm.factor.should == 0.000001
+      #Unit.°C.name.should == 'degree celsius'
     end
 
     it "dynamic unit retrieval with symbol and prefix should be successful" do
@@ -455,10 +456,17 @@ describe Unit do
       unit.symbol.should == 'Mpd'
     end
 
-    it "should raise with block initialize and no name" do
+    it "should not raise with block initialize and no name if dimensionless" do
       lambda{unit = Unit::Base.new do |unit|
         unit.symbol = 'Mpd'
         unit.dimensions = Dimensions.dimensionless
+      end}.should_not raise_error
+    end
+
+    it "should raise with block initialize and no name" do
+      lambda{unit = Unit::Base.new do |unit|
+        unit.symbol = 'Mpd'
+        unit.dimensions = Dimensions.mass
       end}.should raise_error
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: quantify
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: 
   segments: 
-  - 2
+  - 3
   - 0
-  - 2
-  version: 2.0.2
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Andrew Berkeley
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 +01:00
+date: 2011-11-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: activesupport
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +30,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  name: activesupport
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: i18n
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +60,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +76,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  name: jeweler
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +92,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  name: rspec
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,12 +106,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,8 +120,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rdoc
-  version_requirements: *id007
+  prerelease: false
+  type: :development
+  requirement: *id007
 description: A gem to support physical quantities and unit conversions
 email: andrew.berkeley.is@googlemail.com
 executables: []
@@ -146,6 +146,7 @@ files:
 - lib/quantify/dimensions.rb
 - lib/quantify/exception.rb
 - lib/quantify/inflections.rb
+- lib/quantify/parser.rb
 - lib/quantify/quantify.rb
 - lib/quantify/quantity.rb
 - lib/quantify/unit/base_unit.rb
@@ -196,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Support for handling physical quantities, unit conversions, etc