eye-of-newt 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa8794a5cef2066049431c1e0e171421b9f5fcca
-  data.tar.gz: 378020227175a0472e55f4ecb111c403b53549d2
+  metadata.gz: 9030bbeaacdf2439015bac1867eb22af36900b96
+  data.tar.gz: 50f0e11a38c624b45d698188f85f78d10fd79d02
 SHA512:
-  metadata.gz: d9284a0c28614d6a8ef5a20c040879ed0a5db9f162ea6065556e3a25e68a91fb80d99ec2929cc4425b3d7ab1fbb0c8cf54981fccb322f8a3027ec033691d9bc0
-  data.tar.gz: f7b2184eb2a7bf627e7e6f9324a00c9f0a4ee453b9ecee3e452968b47c99ad5814aef31ace40fb2aa72a0b515b038fb8d6f8579768aff68794de95d6c8c1d7b8
+  metadata.gz: 25eab353b59c33bfc79143032111833f2917941f715f4e85c60680e46b44ce71ac06144346d8e8a2c5bbf7415fe684e54560bbcbe2eee279510a8ae340ca8b1f
+  data.tar.gz: f2c42a2b47411636fc8a91cea55bdfdc6bc0713fc1f57324ab32b342b3ef091224927c36fa6412d922d2c4e351c898cb6a85f542f59599daae726aab60d95d9c

data/README.md

@@ -22,11 +22,15 @@ Or install it yourself as:
 ```
 ingredient = EyeOfNewt.parse("1 1/2 cups white flour, sifted")
 ingredient.name # == 'white flour'
-ingredient.quantity # == 1.5
+ingredient.amount # == 1.5
 ingredient.unit # == 'cups'
 ingredient.style # == 'sifted'
 ```
 
+## Acknowledgements
+
+The original list of units was taken from the [ingreedy project](https://github.com/iancanderson/ingreedy/blob/34d83a7f345efd1522065ac57f5ff0e9735e57de/lib/ingreedy/ingreedy_parser.rb#L59) by Ian C. Anderson
+
 ## Contributing
 
 1. Fork it ( http://github.com/<my-github-username>/eye_of_newt/fork )

data/eye_of_newt.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "activesupport"
+
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "racc"
-  spec.add_development_dependency "activesupport"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "pry-rescue"

data/lib/eye_of_newt.rb

@@ -1,24 +1,23 @@
-require "eye_of_newt/version"
-
-require "eye_of_newt/tokenizer"
-require "eye_of_newt/parser"
-require "eye_of_newt/ingredient"
+require 'active_support/core_ext/module/attribute_accessors'
 
 module EyeOfNewt
-  class InvalidIngredient < StandardError
-    attr_accessor :original
-    def initialize(line, original=nil)
-      super(%Q{Could not parse "#{line}" as ingredient})
-      self.original = original
-    end
-  end
 
-  def self.parse(ingredient_line)
-    tokenizer = EyeOfNewt::Tokenizer.new(ingredient_line)
-    parser = EyeOfNewt::Parser.new(tokenizer)
+  require "eye_of_newt/version"
+
+  require "eye_of_newt/tokenizer"
+  require "eye_of_newt/parser"
+  require "eye_of_newt/ingredient"
+  require "eye_of_newt/units"
+  require "eye_of_newt/quantity"
+  require "eye_of_newt/errors"
+
+  mattr_accessor :units
+  self.units = Units.defaults
+
+  def self.parse(ingredient_line, units: self.units)
+    tokenizer = Tokenizer.new(ingredient_line)
+    parser = Parser.new(tokenizer, units: units)
     parser.parse
-  rescue Racc::ParseError
-    raise InvalidIngredient, ingredient_line
   end
 
 end

data/lib/eye_of_newt/errors.rb

@@ -0,0 +1,23 @@
+module EyeOfNewt
+  class EyeOfNewtError < StandardError; end
+
+  class UnknownUnit < EyeOfNewtError
+    def initialize(unit)
+      super(%Q{Unknown unit '#{unit}'})
+    end
+  end
+
+  class UnknownConversion < EyeOfNewtError
+    def initialize(from, to)
+      super(%Q{Can't convert from "#{from}" to "#{to}"})
+    end
+  end
+
+  class InvalidIngredient < EyeOfNewtError
+    attr_accessor :original
+    def initialize(line, original=nil)
+      super(%Q{Could not parse "#{line}" as ingredient})
+      self.original = original
+    end
+  end
+end

data/lib/eye_of_newt/ingredient.rb

@@ -1,10 +1,12 @@
 module EyeOfNewt
   class Ingredient
-    attr_accessor :quantity, :unit, :name, :style
+    attr_accessor :amount, :unit, :name, :style
 
-    def initialize
-      self.quantity = 1
-      self.unit = Unit::DEFAULT
+    def initialize(amount: nil, unit: nil, name: nil, style: nil)
+      self.amount = amount
+      self.unit = unit
+      self.name = name
+      self.style = style
     end
   end
 end

data/lib/eye_of_newt/parser.rb

@@ -9,11 +9,10 @@ module EyeOfNewt
   class Parser < Racc::Parser
 
 
-  require 'eye_of_newt/ingredient'
-
-  def initialize(tokenizer, ingredient = EyeOfNewt::Ingredient.new)
+  def initialize(tokenizer, units:, ingredient: nil)
     @tokenizer = tokenizer
-    @ingredient = ingredient
+    @units = units
+    @ingredient = ingredient || default_ingredient
     super()
   end
 
@@ -24,10 +23,16 @@ module EyeOfNewt
   def parse
     do_parse
     @ingredient
+  rescue Racc::ParseError
+    raise InvalidIngredient, @tokenizer.string
   end
 
   def to_unit(u)
-    EyeOfNewt::Unit[u]
+    @units[u]
+  end
+
+  def default_ingredient
+    EyeOfNewt::Ingredient.new(amount: 1, unit: @units.default)
   end
 ##### State transition tables begin ###
 
@@ -188,27 +193,27 @@ end
 # reduce 9 omitted
 
 def _reduce_10(val, _values, result)
- @ingredient.quantity = result 
+ @ingredient.amount = result 
     result
 end
 
 def _reduce_11(val, _values, result)
- @ingredient.quantity = val[0] + val[1] 
+ @ingredient.amount = val[0] + val[1] 
     result
 end
 
 def _reduce_12(val, _values, result)
- @ingredient.quantity = result 
+ @ingredient.amount = result 
     result
 end
 
 def _reduce_13(val, _values, result)
- @ingredient.quantity = result 
+ @ingredient.amount = result 
     result
 end
 
 def _reduce_14(val, _values, result)
- @ingredient.quantity = 1 
+ @ingredient.amount = 1 
     result
 end
 

data/lib/eye_of_newt/parser.y

@@ -17,11 +17,11 @@ rule
     | amount
     ;
   amount
-    : number { @ingredient.quantity = result }
-    | number fraction { @ingredient.quantity = val[0] + val[1] }
-    | fraction { @ingredient.quantity = result }
-    | decimal { @ingredient.quantity = result }
-    | a { @ingredient.quantity = 1 }
+    : number { @ingredient.amount = result }
+    | number fraction { @ingredient.amount = val[0] + val[1] }
+    | fraction { @ingredient.amount = result }
+    | decimal { @ingredient.amount = result }
+    | a { @ingredient.amount = 1 }
     ;
   style : ',' words { @ingredient.style = val[1] } ;
   words
@@ -39,11 +39,10 @@ end
 
 ---- inner
 
-  require 'eye_of_newt/ingredient'
-
-  def initialize(tokenizer, ingredient = EyeOfNewt::Ingredient.new)
+  def initialize(tokenizer, units:, ingredient: nil)
     @tokenizer = tokenizer
-    @ingredient = ingredient
+    @units = units
+    @ingredient = ingredient || default_ingredient
     super()
   end
 
@@ -54,8 +53,14 @@ end
   def parse
     do_parse
     @ingredient
+  rescue Racc::ParseError
+    raise InvalidIngredient, @tokenizer.string
   end
 
   def to_unit(u)
-    EyeOfNewt::Unit[u]
+    @units[u]
+  end
+
+  def default_ingredient
+    EyeOfNewt::Ingredient.new(amount: 1, unit: @units.default)
   end

data/lib/eye_of_newt/quantity.rb

@@ -0,0 +1,48 @@
+require 'active_support/core_ext/string/inflections'
+
+module EyeOfNewt
+  class Quantity
+    DELTA = 0.01
+    SIGNIFICANT_DIGITS = 3
+
+    attr_reader :amount, :unit, :units
+
+    def initialize(amount, unit, units: EyeOfNewt.units)
+      @amount = amount
+      @units = units
+      @unit = units[unit]
+    end
+
+    def in(new_unit)
+      rate = units.conversion_rate(unit, new_unit)
+      self.class.new(amount * rate, new_unit, units: units)
+    end
+
+    def to_s
+      [fraction_str, unit_str].compact.join(' ')
+    end
+    alias :inspect :to_s
+
+    private
+
+    def fraction_str
+      whole = fraction.to_i
+      fractional = fraction - whole
+      [whole, fractional].reject(&:zero?).join(' ')
+    end
+
+    def unit_str
+      return nil if unit == units.default
+      singular = fraction <= 1 && fraction.numerator == 1
+      singular ? unit.singularize : unit
+    end
+
+    def fraction
+      @fraction ||= signif(amount, SIGNIFICANT_DIGITS).to_r.rationalize(DELTA)
+    end
+
+    def signif(value, digits)
+      Float("%.#{digits}g" % value)
+    end
+  end
+end

data/lib/eye_of_newt/tokenizer.rb

@@ -1,5 +1,4 @@
 require 'strscan'
-require 'eye_of_newt/unit'
 
 module EyeOfNewt
   class Tokenizer
@@ -11,7 +10,10 @@ module EyeOfNewt
     OF = /of/
     A = /an?/
 
-    def initialize(string, units=Unit.all)
+    attr_reader :string, :units
+
+    def initialize(string, units: EyeOfNewt.units.all)
+      @string = string
       @units = units
       @ss = StringScanner.new(string)
     end
@@ -41,8 +43,8 @@ module EyeOfNewt
     private
 
     def unit_matcher
-      @unit_matcher ||= if @units.any?
-        r = @units
+      @unit_matcher ||= if units.any?
+        r = units
           .sort
           .reverse
           .map{|u|Regexp.escape(u)}

data/lib/eye_of_newt/units.rb

@@ -0,0 +1,116 @@
+require 'active_support/core_ext/hash/deep_merge'
+
+module EyeOfNewt
+  class Units
+    attr_reader :units, :conversions, :default
+
+    def initialize
+      @units = {}
+      @conversions = Hash.new { |h, k| h[k] = {} }
+      @default = nil
+    end
+
+    def all
+      units.keys
+    end
+
+    def [](unit)
+      units[unit] or raise UnknownUnit.new(unit)
+    end
+
+    def add_unit(canonical, *variations, default: false)
+      units[canonical] = canonical
+      variations.each do |v|
+        units[v] = canonical
+      end
+
+      @default = canonical if default
+
+      conversions[canonical][canonical] = 1
+    end
+
+    def add_conversion(amount, unit, other_unit)
+      unit = self[unit]
+      other_unit = self[other_unit]
+
+      new_conversion = {unit => {other_unit => amount.to_r}, other_unit => {unit => 1/amount.to_r}}
+      conversions.deep_merge!(new_conversion)
+    end
+
+    def conversion_rate(from, to)
+      f = self[from]
+      t = self[to]
+      r = search_conversion(f, t) or raise UnknownConversion.new(from, to)
+      r.to_f
+    end
+
+    def setup(&block)
+      instance_eval &block
+      self
+    end
+
+    def self.defaults
+      new.setup do
+        # english volume units
+        add_unit "cups", "c.", "c", "cup"
+        add_unit "fl oz", "fl. oz.", "fluid ounces", "fluid ounce"
+        add_unit "gallons", "gal", "gal.", "gallon"
+        add_unit "pints", "pt", "pt.", "pint"
+        add_unit "quarts", "qt", "qt.", "qts", "qts.", "quart"
+        add_unit "tbsp", "tbsp.", "T", "T.", "tbs.", "tbs", "tablespoons", "tablespoon"
+        add_unit "tsp", "tsp.", "t", "t.", "teaspoons", "teaspoon"
+
+        # english mass units
+        add_unit "lb", "lb.", "pounds", "pound"
+        add_unit "oz", "oz.", "ounces", "ounce"
+
+        # metric volume units
+        add_unit "l", "l.", "liter", "liters", "litre", "litres"
+        add_unit "ml", "ml.", "milliliter", "milliliters", "millilitre", "millilitres"
+
+        # metric mass units
+        add_unit "kg", "kg.", "kilogram", "kilograms"
+        add_unit "g", "g.", "gr", "gr.", "gram", "grams"
+        add_unit "mg", "mg", "mg.", "milligram", "milligrams"
+
+        # nonstandard units
+        add_unit "pinches", "pinch"
+        add_unit "dashes", "dash"
+        add_unit "touches", "touch"
+        add_unit "handfuls", "handful"
+
+        add_unit "units", "unit", default: true
+
+        add_conversion 16, "tbsp", "cup"
+        add_conversion 8, "fl oz", "cup"
+        add_conversion 235, "ml", "cup"
+        add_conversion 4, "quarts", "gallon"
+        add_conversion 2, "cups", "pint"
+        add_conversion 2, "pints", "quart"
+        add_conversion 3, "tsp", "tbsp"
+
+        add_conversion 16, "oz", "pound"
+        add_conversion 454, "grams", "pound"
+
+        add_conversion 1000, "ml", "liter"
+
+        add_conversion 1000, "g", "kg"
+        add_conversion 1000, "mg", "g"
+      end
+    end
+
+    private
+
+    def search_conversion(from, to, rate=1, visited=[])
+      return rate if from == to
+      visited = visited + [from]
+      conversions[from].each do |k, r|
+        next if visited.include?(k)
+        value = search_conversion(k, to, rate*r, visited)
+        return value if value
+      end
+      nil
+    end
+
+  end
+end

data/lib/eye_of_newt/version.rb

@@ -1,3 +1,3 @@
 module EyeOfNewt
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/examples.txt

@@ -10,7 +10,7 @@ tomatoes | tomatoes | 1 | units
 1 tomato, diced | tomato | 1 | units | diced
 1 onion, finely chopped | onion | 1 | units | finely chopped
 1 cup of flour | flour | 1 | cups
-1 teaspoon of cream of tartar | cream of tartar | 1 | teaspoons
+1 teaspoon of cream of tartar | cream of tartar | 1 | tsp
 a pinch of salt | salt | 1 | pinches
 
 #1 (46 fluid ounce) can tomato juice' => ["1 (46 fluid ounce) can", "tomato juice"],

data/test/eye_of_newt/quantity_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class EyeOfNewt::QuantityTest < ActiveSupport::TestCase
+
+  def units
+    EyeOfNewt::Units.new.setup do
+      add_unit "foo"
+      add_unit "bar"
+      add_conversion 2, "foo", "bar"
+    end
+  end
+
+  test "#in returns a quantity in the new unit" do
+    bar = EyeOfNewt::Quantity.new(1, "bar", units: units)
+    foo = bar.in("foo")
+    assert_equal 0.5, foo.amount
+    assert_equal "foo", foo.unit
+  end
+
+  test "#to_s makes appropriate strings" do
+    assert_equal "1", EyeOfNewt::Quantity.new(1, "unit").to_s
+    assert_equal "1/2", EyeOfNewt::Quantity.new(0.5, "units").to_s
+    assert_equal "1/2 tbsp", EyeOfNewt::Quantity.new(0.5, "tbs").to_s
+    assert_equal "1 1/2 tbsp", EyeOfNewt::Quantity.new(1.5, "tbs").to_s
+    assert_equal "1000 g", EyeOfNewt::Quantity.new(1001, "grams").to_s
+    assert_equal "1/3 g", EyeOfNewt::Quantity.new(0.33, "grams").to_s
+  end
+
+end

data/test/eye_of_newt/tokenizer_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'eye_of_newt/tokenizer'
 
 class EyeOfNewt::TokenizerTest < ActiveSupport::TestCase
   test "tokenizes WORD" do
@@ -51,6 +50,6 @@ class EyeOfNewt::TokenizerTest < ActiveSupport::TestCase
   end
 
   def tok(string, units=[])
-    EyeOfNewt::Tokenizer.new(string, units)
+    EyeOfNewt::Tokenizer.new(string, units: units)
   end
 end

data/test/eye_of_newt/units_test.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+
+class EyeOfNewt::UnitsTest < ActiveSupport::TestCase
+
+  test "#all returns the list of unit names" do
+    units = EyeOfNewt::Units.new.setup do
+      add_unit "foo", "f"
+      add_unit "bar", "b"
+    end
+    assert_equal ["foo", "f", "bar", "b"], units.all
+  end
+
+  test "#default returns the default unit" do
+    units = EyeOfNewt::Units.new.setup do
+      add_unit "foo", "f", default: true
+    end
+    assert_equal "foo", units.default
+  end
+
+  test "#[] returns the canonical name of the unit" do
+    units = EyeOfNewt::Units.new.setup do
+      add_unit "foo", "f"
+    end
+    assert_equal "foo", units["f"]
+    assert_equal "foo", units["foo"]
+  end
+
+  test "#[] raises an exception for unknown units" do
+    units = EyeOfNewt::Units.new
+    assert_raise EyeOfNewt::UnknownUnit do
+      units["foo"]
+    end
+  end
+
+  test "#conversion_rate throws an error for unknown conversions" do
+    units = EyeOfNewt::Units.new.setup do
+      add_unit "foo"
+      add_unit "bar"
+    end
+    assert_raise EyeOfNewt::UnknownConversion do
+      units.conversion_rate("foo", "bar")
+    end
+  end
+
+  test "#conversion_rate succeeds for self-conversions" do
+    units = EyeOfNewt::Units.new.setup do
+      add_unit "foo"
+    end
+    assert_equal 1, units.conversion_rate("foo", "foo")
+  end
+
+  test "#conversion_rate returns the conversion rate" do
+    units = EyeOfNewt::Units.new.setup do
+      add_unit "foo"
+      add_unit "bar"
+      add_conversion 2, "foo", "bar"
+    end
+    assert_equal 2, units.conversion_rate("foo", "bar")
+    assert_equal 0.5, units.conversion_rate("bar", "foo")
+  end
+
+  test "#conversion_rate can find indirect conversions" do
+    units = EyeOfNewt::Units.new.setup do
+      add_unit "foo"
+      add_unit "bar"
+      add_unit "baz"
+      add_conversion 2, "foo", "bar"
+      add_conversion 2, "bar", "baz"
+    end
+    assert_equal 4, units.conversion_rate("foo", "baz")
+    assert_equal 0.25, units.conversion_rate("baz", "foo")
+  end
+end

data/test/eye_of_newt_test.rb

@@ -12,10 +12,10 @@ class EyeOfNewtTest < ActiveSupport::TestCase
         tokens = line.split('|').map(&:strip)
         line = tokens.shift
         name = tokens.shift
-        quantity = tokens.shift.to_f
-        unit = tokens.shift.presence.try(:to_sym)
+        amount = tokens.shift.to_f
+        unit = tokens.shift.presence
         style = tokens.shift.presence
-        expected = [name, quantity, unit, style]
+        expected = [name, amount, unit, style]
         [line, expected]
       }.compact
     end
@@ -24,8 +24,8 @@ class EyeOfNewtTest < ActiveSupport::TestCase
   examples.each do |line, expected|
     test "parses #{line} correctly" do
       ingr = EyeOfNewt.parse(line)
-      name, quantity, unit, style = *expected
-      assert_equal quantity, ingr.quantity, %Q{incorrect quantity}
+      name, amount, unit, style = *expected
+      assert_equal amount, ingr.amount, %Q{incorrect amount}
       assert_equal unit, ingr.unit, %Q{incorrect unit}
       assert_equal name, ingr.name, %Q{incorrect name}
       assert_equal style, ingr.style, %Q{incorrect style}

data/test/test_helper.rb

@@ -1,3 +1,4 @@
 require 'minitest/autorun'
 require 'active_support/all'
 require 'pry'
+require 'eye_of_newt'

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: eye-of-newt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Peter McCracken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: racc
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -125,15 +125,19 @@ files:
 - eye_of_newt.gemspec
 - lib/eye-of-newt.rb
 - lib/eye_of_newt.rb
+- lib/eye_of_newt/errors.rb
 - lib/eye_of_newt/ingredient.rb
 - lib/eye_of_newt/parser.rb
 - lib/eye_of_newt/parser.y
+- lib/eye_of_newt/quantity.rb
 - lib/eye_of_newt/tokenizer.rb
-- lib/eye_of_newt/unit.rb
+- lib/eye_of_newt/units.rb
 - lib/eye_of_newt/version.rb
 - script/console
 - test/examples.txt
+- test/eye_of_newt/quantity_test.rb
 - test/eye_of_newt/tokenizer_test.rb
+- test/eye_of_newt/units_test.rb
 - test/eye_of_newt_test.rb
 - test/test_helper.rb
 homepage: http://github.com/peterjm/eye_of_newt
@@ -162,6 +166,8 @@ specification_version: 4
 summary: Natural language ingredient parser
 test_files:
 - test/examples.txt
+- test/eye_of_newt/quantity_test.rb
 - test/eye_of_newt/tokenizer_test.rb
+- test/eye_of_newt/units_test.rb
 - test/eye_of_newt_test.rb
 - test/test_helper.rb

data/lib/eye_of_newt/unit.rb

@@ -1,54 +0,0 @@
-# List of units was taken from the ingreedy project by Ian C. Anderson
-# https://github.com/iancanderson/ingreedy/blob/34d83a7f345efd1522065ac57f5ff0e9735e57de/lib/ingreedy/ingreedy_parser.rb#L59
-
-module EyeOfNewt
-  class Unit
-    DEFAULT = :units
-
-    class << self
-      def units
-        @units ||= {}
-      end
-
-      def all
-        units.keys
-      end
-
-      def canonical(unit)
-        units[unit]
-      end
-      alias :[] :canonical
-
-      def set(canonical, *variations)
-        variations.each do |v|
-          units[v] = canonical.to_sym
-        end
-      end
-    end
-
-    # english units
-    set :cups, "c.", "c", "cup", "cups"
-    set :fluid_ounces, "fl. oz.", "fl oz", "fluid ounce", "fluid ounces"
-    set :gallons, "gal", "gal.", "gallon", "gallons"
-    set :ounces, "oz", "oz.", "ounce", "ounces"
-    set :pints, "pt", "pt.", "pint", "pints"
-    set :pounds, "lb", "lb.", "pound", "pounds"
-    set :quarts, "qt", "qt.", "qts", "qts.", "quart", "quarts"
-    set :tablespoons, "tbsp.", "tbsp", "T", "T.", "tablespoon", "tablespoons", "tbs.", "tbs"
-    set :teaspoons, "tsp.", "tsp", "t", "t.", "teaspoon", "teaspoons"
-
-    # metric units
-    set :grams, "g", "g.", "gr", "gr.", "gram", "grams"
-    set :kilograms, "kg", "kg.", "kilogram", "kilograms"
-    set :liters, "l", "l.", "liter", "liters", "litre", "litres"
-    set :milligrams, "mg", "mg.", "milligram", "milligrams"
-    set :milliliters, "ml", "ml.", "milliliter", "milliliters", "millilitre", "millilitres"
-
-    # nonstandard units
-    set :pinches, "pinch", "pinches"
-    set :dashes, "dash", "dashes"
-    set :touches, "touch", "touches"
-    set :handfuls, "handful", "handfuls"
-    set :units, "units", "unit"
-  end
-end