eye-of-newt 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de4710dcb531ffd8b1874697da048da3b8c86692
-  data.tar.gz: e13c944fe7319f5487d03d1f16fd7c16640684cc
+  metadata.gz: 93cc600dbd1c5f6a5e2e62f0f908110ae4e15647
+  data.tar.gz: 257935203d6f991a13faf85cca0c55b9334c7998
 SHA512:
-  metadata.gz: 83f7233696d639af0a6c1396f2b39962a6eec892b1eea04d7dff864b96aef26042d8abade4e096654cf4bf38719bd7b1fcbd2218628c617224dbc58fa39c6a74
-  data.tar.gz: 227d72db1af79cb8557c8dab469d07bbdd06c34ff2ca50f867f885c884194e5684d6e9ebd6ad2d426e6024f5ea6cb2e78154ad83205314bbfa4ef4314a793ce1
+  metadata.gz: 24cf9ba3437ce443288d47ddde41519a5c43544e2f84f1306b3b9fd472b740e9e7c64fef24ef7396a5dfd937abaa08683a80a7bb4132623d06426e598c390fea
+  data.tar.gz: 7c925794f3d1703e3028de2b2f5592fb11b8e893a36ae5b76f73f550dcf1faffc771b5378a1472bed2a07251a68a4970a1f621a1d7df6db0eadc1c2568142b8b

data/lib/eye_of_newt/ingredient.rb

@@ -1,10 +1,11 @@
 module EyeOfNewt
   class Ingredient
-    attr_accessor :amount, :unit, :name, :style, :note
+    attr_accessor :amount, :unit, :unit_modifier, :name, :style, :note
 
-    def initialize(amount: nil, unit: nil, name: nil, style: nil, note: nil)
+    def initialize(amount: nil, unit: nil, unit_modifier: nil, name: nil, style: nil, note: nil)
       self.amount = amount
       self.unit = unit
+      self.unit_modifier = unit_modifier
       self.name = name
       self.style = style
       self.note = note

data/lib/eye_of_newt/parser.rb

@@ -37,94 +37,105 @@ module EyeOfNewt
 ##### State transition tables begin ###
 
 racc_action_table = [
-   -32,    12,    22,    23,    24,    13,    18,    12,   -32,   -32,
-   -32,    13,    18,    12,    15,    14,    29,    13,    10,    14,
-    33,    26,    23,    24,    31,    32,    23,    24,    27,    16,
-    24,    40,    40,    42,    31,    43,    44,    24,    24,    47 ]
+   -39,    33,    14,    17,    16,    37,    15,    11,   -39,    13,
+   -39,   -39,    14,    16,    31,    29,    15,    20,    13,    14,
+    16,    16,    47,    15,    20,    24,    26,    25,    26,    25,
+    26,    35,    36,    25,    26,    44,    44,    18,    48,    49,
+    35,    50,    51,    26,    26,    54,    55 ]
 
 racc_action_check = [
-    10,    11,     3,     3,     3,    11,    11,     2,    10,    10,
-    10,     2,     2,     0,     0,     0,     7,     0,     0,     5,
-    16,     5,    19,    19,    15,    15,    17,    17,     6,     1,
-    20,    23,    24,    25,    29,    31,    32,    34,    36,    41 ]
+    11,     8,     0,     0,     0,    18,     0,     0,    11,     0,
+    11,    11,     2,     5,     7,     5,     2,     2,     5,    12,
+    27,     6,    27,    12,    12,     3,    22,     3,     3,    19,
+    19,    17,    17,    21,    21,    25,    26,     1,    28,    30,
+    33,    35,    36,    38,    40,    45,    46 ]
 
 racc_action_pointer = [
-    11,    29,     5,    -6,   nil,    15,    22,    13,   nil,   nil,
-     0,    -1,   nil,   nil,   nil,    12,    20,    17,   nil,    13,
-    20,   nil,   nil,    26,    27,    27,   nil,   nil,   nil,    22,
-   nil,    32,    33,   nil,    27,   nil,    28,   nil,   nil,   nil,
-   nil,    28,   nil,   nil,   nil,   nil,   nil,   nil ]
+     0,    37,    10,    17,   nil,     9,    17,     8,    -2,   nil,
+   nil,     0,    17,   nil,   nil,   nil,   nil,    18,     5,    19,
+   nil,    23,    15,   nil,   nil,    30,    31,    16,    32,   nil,
+    33,   nil,   nil,    27,   nil,    38,    39,   nil,    32,   nil,
+    33,   nil,   nil,   nil,   nil,    33,    40,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -38,   -38,   -38,   -12,   -13,   -17,   -19,   -20,   -22,   -23,
-   -24,   -29,   -31,   -33,   -34,   -35,   -38,    -8,   -32,   -10,
-   -11,    -6,   -25,   -38,   -38,   -15,   -16,   -18,   -21,   -38,
-   -28,   -38,   -38,    48,    -7,    -2,    -9,    -4,    -5,   -26,
-   -30,   -38,   -14,   -36,   -37,    -1,    -3,   -27 ]
+   -45,   -45,   -45,   -12,   -13,   -21,   -45,   -25,   -26,   -28,
+   -29,   -30,   -35,   -36,   -38,   -40,   -41,   -42,   -45,    -8,
+   -39,   -10,   -11,    -6,   -31,   -45,   -45,   -19,   -17,   -20,
+   -23,   -24,   -27,   -45,   -34,   -45,   -45,    56,    -7,    -2,
+    -9,    -4,    -5,   -32,   -37,   -45,   -15,   -18,   -16,   -22,
+   -43,   -44,    -1,    -3,   -33,   -14 ]
 
 racc_goto_table = [
-    21,     8,     6,     3,    20,    17,    30,    25,    28,    39,
-    41,     5,    19,     7,    35,     2,    37,    38,    34,     9,
-    36,     1,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    45,   nil,    46 ]
+    23,     7,     9,     6,    22,     5,    28,    30,    27,     3,
+    32,    19,    43,    45,    34,    21,    39,     8,    41,    42,
+    38,     2,    40,    10,     1,   nil,   nil,   nil,    46,   nil,
+   nil,   nil,   nil,   nil,   nil,    52,   nil,    53 ]
 
 racc_goto_check = [
-     5,    11,     9,     3,     4,     3,     7,     9,    11,    13,
-    13,     8,     6,    10,     5,     2,     5,     5,     4,    12,
-     4,     1,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,     5,   nil,     5 ]
+     5,    10,    12,     9,     4,     8,    10,    10,     9,     3,
+    12,     3,    14,    14,     7,     6,     5,    11,     5,     5,
+     4,     2,     4,    13,     1,   nil,   nil,   nil,    10,   nil,
+   nil,   nil,   nil,   nil,   nil,     5,   nil,     5 ]
 
 racc_goto_pointer = [
-   nil,    21,    15,     3,     1,    -3,     9,    -5,    11,     2,
-    13,     1,    19,   -14,   nil ]
+   nil,    24,    21,     9,     1,    -3,    12,     2,     5,     3,
+     1,    17,     2,    23,   -13,   nil ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,     4,   nil,   nil,
-   nil,   nil,   nil,   nil,    11 ]
+   nil,   nil,   nil,   nil,   nil,    12 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  4, 15, :_reduce_none,
-  3, 15, :_reduce_none,
-  4, 15, :_reduce_none,
-  3, 15, :_reduce_none,
-  3, 15, :_reduce_none,
-  2, 15, :_reduce_none,
-  3, 15, :_reduce_none,
-  2, 15, :_reduce_none,
-  3, 15, :_reduce_none,
-  2, 15, :_reduce_none,
-  2, 15, :_reduce_none,
-  1, 15, :_reduce_none,
-  1, 17, :_reduce_13,
+  4, 16, :_reduce_none,
+  3, 16, :_reduce_none,
+  4, 16, :_reduce_none,
+  3, 16, :_reduce_none,
   3, 16, :_reduce_none,
   2, 16, :_reduce_none,
+  3, 16, :_reduce_none,
+  2, 16, :_reduce_none,
+  3, 16, :_reduce_none,
   2, 16, :_reduce_none,
-  1, 16, :_reduce_none,
   2, 16, :_reduce_none,
   1, 16, :_reduce_none,
-  1, 22, :_reduce_20,
-  2, 22, :_reduce_21,
-  1, 22, :_reduce_22,
-  1, 22, :_reduce_23,
-  1, 22, :_reduce_24,
-  1, 20, :_reduce_25,
-  2, 18, :_reduce_26,
-  3, 19, :_reduce_27,
-  2, 21, :_reduce_28,
-  1, 21, :_reduce_none,
-  1, 27, :_reduce_none,
-  1, 28, :_reduce_none,
-  1, 28, :_reduce_none,
-  1, 28, :_reduce_none,
-  1, 23, :_reduce_34,
-  1, 24, :_reduce_35,
-  3, 25, :_reduce_36,
-  3, 26, :_reduce_37 ]
-
-racc_reduce_n = 38
-
-racc_shift_n = 48
+  1, 18, :_reduce_13,
+  4, 17, :_reduce_none,
+  3, 17, :_reduce_none,
+  3, 17, :_reduce_none,
+  2, 17, :_reduce_none,
+  3, 17, :_reduce_none,
+  2, 17, :_reduce_none,
+  2, 17, :_reduce_none,
+  1, 17, :_reduce_none,
+  3, 17, :_reduce_none,
+  2, 17, :_reduce_none,
+  2, 17, :_reduce_none,
+  1, 17, :_reduce_none,
+  1, 23, :_reduce_26,
+  2, 23, :_reduce_27,
+  1, 23, :_reduce_28,
+  1, 23, :_reduce_29,
+  1, 23, :_reduce_30,
+  1, 21, :_reduce_31,
+  2, 19, :_reduce_32,
+  3, 20, :_reduce_33,
+  2, 22, :_reduce_34,
+  1, 22, :_reduce_none,
+  1, 24, :_reduce_36,
+  1, 29, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 25, :_reduce_41,
+  1, 26, :_reduce_42,
+  3, 27, :_reduce_43,
+  3, 28, :_reduce_44 ]
+
+racc_reduce_n = 45
+
+racc_shift_n = 56
 
 racc_token_table = {
   false => 0,
@@ -136,13 +147,14 @@ racc_token_table = {
   :OF => 6,
   :A => 7,
   :TO_TASTE => 8,
-  "," => 9,
-  "(" => 10,
-  ")" => 11,
-  "/" => 12,
-  "." => 13 }
+  :UNIT_MODIFIER => 9,
+  "," => 10,
+  "(" => 11,
+  ")" => 12,
+  "/" => 13,
+  "." => 14 }
 
-racc_nt_base = 14
+racc_nt_base = 15
 
 racc_use_result_var = true
 
@@ -172,6 +184,7 @@ Racc_token_to_s_table = [
   "OF",
   "A",
   "TO_TASTE",
+  "UNIT_MODIFIER",
   "\",\"",
   "\"(\"",
   "\")\"",
@@ -186,6 +199,7 @@ Racc_token_to_s_table = [
   "to_taste",
   "words",
   "amount",
+  "unit_modifier",
   "unit",
   "number",
   "fraction",
@@ -240,77 +254,94 @@ end
 
 # reduce 19 omitted
 
-def _reduce_20(val, _values, result)
+# reduce 20 omitted
+
+# reduce 21 omitted
+
+# reduce 22 omitted
+
+# reduce 23 omitted
+
+# reduce 24 omitted
+
+# reduce 25 omitted
+
+def _reduce_26(val, _values, result)
  @ingredient.amount = result 
     result
 end
 
-def _reduce_21(val, _values, result)
+def _reduce_27(val, _values, result)
  @ingredient.amount = val[0] + val[1] 
     result
 end
 
-def _reduce_22(val, _values, result)
+def _reduce_28(val, _values, result)
  @ingredient.amount = result 
     result
 end
 
-def _reduce_23(val, _values, result)
+def _reduce_29(val, _values, result)
  @ingredient.amount = result 
     result
 end
 
-def _reduce_24(val, _values, result)
+def _reduce_30(val, _values, result)
  @ingredient.amount = 1 
     result
 end
 
-def _reduce_25(val, _values, result)
+def _reduce_31(val, _values, result)
  @ingredient.unit = to_unit(result) 
     result
 end
 
-def _reduce_26(val, _values, result)
+def _reduce_32(val, _values, result)
  @ingredient.style = val[1] 
     result
 end
 
-def _reduce_27(val, _values, result)
+def _reduce_33(val, _values, result)
  @ingredient.note = val[1] 
     result
 end
 
-def _reduce_28(val, _values, result)
+def _reduce_34(val, _values, result)
  result = val.join(' ') 
     result
 end
 
-# reduce 29 omitted
+# reduce 35 omitted
 
-# reduce 30 omitted
+def _reduce_36(val, _values, result)
+ @ingredient.unit_modifier = val[0] 
+    result
+end
 
-# reduce 31 omitted
+# reduce 37 omitted
 
-# reduce 32 omitted
+# reduce 38 omitted
 
-# reduce 33 omitted
+# reduce 39 omitted
 
-def _reduce_34(val, _values, result)
+# reduce 40 omitted
+
+def _reduce_41(val, _values, result)
  @ingredient.unit = to_unit(result) 
     result
 end
 
-def _reduce_35(val, _values, result)
+def _reduce_42(val, _values, result)
  result = val[0].to_i 
     result
 end
 
-def _reduce_36(val, _values, result)
+def _reduce_43(val, _values, result)
  result = val[0].to_f / val[2].to_f 
     result
 end
 
-def _reduce_37(val, _values, result)
+def _reduce_44(val, _values, result)
  result = val.join.to_f 
     result
 end

data/lib/eye_of_newt/parser.y

@@ -1,5 +1,5 @@
 class EyeOfNewt::Parser
-token WORD NUMBER UNIT TEXT OF A TO_TASTE
+token WORD NUMBER UNIT TEXT OF A TO_TASTE UNIT_MODIFIER
 rule
   ingredient
     : quantity ingredient_name style note
@@ -19,10 +19,16 @@ rule
     : words { @ingredient.name = result }
     ;
   quantity
-    : amount unit OF
+    : amount unit_modifier unit OF
+    | amount unit_modifier unit
+    | amount unit OF
     | amount unit
+    | amount unit_modifier OF
+    | amount unit_modifier
     | amount OF
     | amount
+    | unit_modifier unit OF
+    | unit_modifier unit
     | unit OF
     | unit
     ;
@@ -40,7 +46,8 @@ rule
     : word words { result = val.join(' ') }
     | word
     ;
-  text : TEXT
+  unit_modifier : UNIT_MODIFIER { @ingredient.unit_modifier = val[0] } ;
+  text : TEXT ;
   word : WORD | A | OF ;
   unit : UNIT { @ingredient.unit = to_unit(result) } ;
   number : NUMBER { result = val[0].to_i } ;

data/lib/eye_of_newt/quantity.rb

@@ -5,12 +5,13 @@ module EyeOfNewt
     DELTA = 0.01
     SIGNIFICANT_DIGITS = 3
 
-    attr_reader :amount, :unit, :units
+    attr_reader :amount, :unit, :modifier, :units
 
-    def initialize(amount, unit, units: EyeOfNewt.units)
+    def initialize(amount, unit, modifier: nil, units: EyeOfNewt.units)
       @amount = amount
       @units = units
       @unit = units[unit]
+      @modifier = modifier
     end
 
     def in(new_unit)
@@ -19,7 +20,7 @@ module EyeOfNewt
     end
 
     def to_s
-      [fraction_str, unit_str].compact.join(' ')
+      [fraction_str, modifier, unit_str].compact.join(' ')
     end
     alias :inspect :to_s
 

data/lib/eye_of_newt/tokenizer.rb

@@ -13,11 +13,12 @@ module EyeOfNewt
     TO_TASTE = /to taste/
     COMMA = ','
 
-    attr_reader :string, :units
+    attr_reader :string, :units, :unit_modifiers
 
-    def initialize(string, units: EyeOfNewt.units.all)
+    def initialize(string, units: EyeOfNewt.units.all, unit_modifiers: EyeOfNewt.units.unit_modifiers)
       @string = string
       @units = units
+      @unit_modifiers = unit_modifiers
       @ss = StringScanner.new(string)
     end
 
@@ -39,6 +40,8 @@ module EyeOfNewt
         [:TO_TASTE, text]
       when text = @ss.scan(/#{unit_matcher}\b/)
         [:UNIT, text]
+      when text = @ss.scan(/#{unit_modifier}\b/)
+        [:UNIT_MODIFIER, text]
       when text = @ss.scan(/#{WORD}\b/)
         [:WORD, text]
       else
@@ -50,9 +53,17 @@ module EyeOfNewt
 
     private
 
+    def unit_modifier
+      @unit_modifier_matcher ||= match_any(unit_modifiers)
+    end
+
     def unit_matcher
-      @unit_matcher ||= if units.any?
-        r = units
+      @unit_matcher ||= match_any(units)
+    end
+
+    def match_any(elements)
+      if elements.any?
+        r = elements
           .sort
           .reverse
           .map{|u|Regexp.escape(u)}

data/lib/eye_of_newt/units.rb

@@ -2,11 +2,12 @@ require 'active_support/core_ext/hash/deep_merge'
 
 module EyeOfNewt
   class Units
-    attr_reader :units, :conversions, :default
+    attr_reader :units, :conversions, :unit_modifiers, :default
 
     def initialize
       @units = {}
       @conversions = Hash.new { |h, k| h[k] = {} }
+      @unit_modifiers = []
       @default = nil
       @unquantified = []
     end
@@ -39,6 +40,10 @@ module EyeOfNewt
       conversions.deep_merge!(new_conversion)
     end
 
+    def add_unit_modifier(modifier)
+      unit_modifiers << modifier
+    end
+
     def conversion_rate(from, to)
       f = self[from]
       t = self[to]
@@ -84,6 +89,16 @@ module EyeOfNewt
         add_unit "dashes", "dash"
         add_unit "touches", "touch"
         add_unit "handfuls", "handful"
+        add_unit "cloves", "clove"
+        add_unit "bunches", "bunch"
+        add_unit "sprigs", "sprig"
+
+        add_unit_modifier "big"
+        add_unit_modifier "large"
+        add_unit_modifier "medium"
+        add_unit_modifier "small"
+        add_unit_modifier "heaping"
+        add_unit_modifier "level"
 
         # unquantified units
         add_unit "to taste", unquantified: true

data/lib/eye_of_newt/version.rb

@@ -1,3 +1,3 @@
 module EyeOfNewt
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/test/examples.txt

@@ -13,10 +13,17 @@ tomatoes | tomatoes | 1 | units
 1 teaspoon of cream of tartar | cream of tartar | 1 | tsp
 a pinch of salt | salt | 1 | pinches
 pinch of salt | salt | 1 | pinches
-4 large leeks, trimmed & thinly sliced | large leeks | 4 | units | trimmed & thinly sliced
+4 large leeks, trimmed & thinly sliced | leeks | 4 | units | trimmed & thinly sliced | | large
 3 pounds potatoes, washed and cut into 2-inch chunks | potatoes | 3 | lb | washed and cut into 2-inch chunks
 salt to taste | salt | 1 | to taste
 an apple, sliced (I like Fuji, but any variety will do) | apple | 1 | units | sliced | I like Fuji, but any variety will do
+1 sprig of rosemary | rosemary | 1 | sprigs
+3 cloves of garlic | garlic | 3 | cloves
+2 bunches of corriander | corriander | 2 | bunches
+2 big pinches of red pepper flakes | red pepper flakes | 2 | pinches | | | big
+big pinch of salt | salt | 1 | pinches | | | big
+heaping tablespoon of sugar | sugar | 1 | tbsp | | | heaping
+1 large yellow onion | yellow onion | 1 | units | | | large
 #4-5 handfuls of spinach, very roughly chopped | spinach | 4-5 | handfuls | very roughly chopped
 
 

data/test/eye_of_newt/quantity_test.rb

@@ -25,6 +25,7 @@ class EyeOfNewt::QuantityTest < ActiveSupport::TestCase
     assert_equal "1000 g", EyeOfNewt::Quantity.new(1001, "grams").to_s
     assert_equal "1/3 g", EyeOfNewt::Quantity.new(0.33, "grams").to_s
     assert_equal "to taste", EyeOfNewt::Quantity.new(1, "to taste").to_s
+    assert_equal "1 heaping tsp", EyeOfNewt::Quantity.new(1, "teaspoon", modifier: "heaping").to_s
   end
 
 end

data/test/eye_of_newt_test.rb

@@ -16,7 +16,8 @@ class EyeOfNewtTest < ActiveSupport::TestCase
         unit = tokens.shift.presence
         style = tokens.shift.presence
         note = tokens.shift.presence
-        expected = [name, amount, unit, style, note]
+        unit_modifier = tokens.shift.presence
+        expected = [name, amount, unit, style, note, unit_modifier]
         [line, expected]
       }.compact
     end
@@ -25,12 +26,13 @@ class EyeOfNewtTest < ActiveSupport::TestCase
   examples.each do |line, expected|
     test "parses #{line} correctly" do
       ingr = EyeOfNewt.parse(line)
-      name, amount, unit, style, note = *expected
+      name, amount, unit, style, note, unit_modifier = *expected
       assert_equal name, ingr.name, %Q{incorrect name}
       assert_equal amount, ingr.amount, %Q{incorrect amount}
       assert_equal unit, ingr.unit, %Q{incorrect unit}
       assert_equal style, ingr.style, %Q{incorrect style}
       assert_equal note, ingr.note, %Q{incorrect note}
+      assert_equal unit_modifier, ingr.unit_modifier, %Q{incorrect unit modifier}
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye-of-newt
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Peter McCracken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport