eye-of-newt 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a593b4f889ec78c7e789daba91965f94f9419810
-  data.tar.gz: f341eda16d664a480c92dbb5efbf65bfdf64873c
+  metadata.gz: a22153a502ff31dcf2c78bbc353759a09e3a972d
+  data.tar.gz: 9942d74541ae7d441540ef11c99ef39d44a106c0
 SHA512:
-  metadata.gz: 00a299e06e879fdf92dc3ff06899494575fa77df6b549726a6bb4c4756b0680be936e765c2529da3a6f9d04a1566989002fc2df5a95106faf7683945a7b49ec5
-  data.tar.gz: 23bbf21df97753bbfe355adbf9a95c4177baa764ab1adf7e9c64fcb21f3620009c552de652eae07356e25eb7116750e3892b73ec78d36fb5002242546d5d6252
+  metadata.gz: cf13232d805fc460a0e5accb943d6841fa17b9ad3eb7ccc5d11eb1d4e93dac5b5408a31ea5afa3c6be1ab38903b6aa32f8b3b48e3e3b14f133b33ea5e993de48
+  data.tar.gz: 677735c13e5b2d58cae5523c86fef5a2d328166e9cedef99682a47612999c59d75d8f635b4481a328a131b7630b96cfd6a354c2ddadd355b3f4577fee3e72723

data/lib/eye_of_newt/ingredient.rb

@@ -1,14 +1,22 @@
 module EyeOfNewt
   class Ingredient
-    attr_accessor :amount, :unit, :unit_modifier, :name, :style, :note
+    attr_accessor :amount, :unit, :unit_modifier, :names, :style, :note
 
-    def initialize(amount: nil, unit: nil, unit_modifier: nil, name: nil, style: nil, note: nil)
+    def initialize(amount: nil, unit: nil, unit_modifier: nil, names: [], style: nil, note: nil)
       self.amount = amount
       self.unit = unit
       self.unit_modifier = unit_modifier
-      self.name = name
+      self.names = names
       self.style = style
       self.note = note
     end
+
+    def name
+      names.first
+    end
+
+    def name=(n)
+      self.names = [n]
+    end
   end
 end

data/lib/eye_of_newt/parser.rb

@@ -37,117 +37,121 @@ module EyeOfNewt
 ##### State transition tables begin ###
 
 racc_action_table = [
-   -45,    42,    18,    20,    11,    40,    19,    10,   -45,    12,
-   -45,    13,    18,    11,   -33,    33,    19,    23,    34,    24,
-    13,    18,    11,    46,    55,    19,    23,    28,    24,    29,
-    30,    37,    38,    29,    30,    44,    45,    29,    30,    36,
-    11,    30,    40,    40,    21,    56,    57,    20,    20,    60,
-    44,    61,    62,    30,    30,    65,    66 ]
+   -47,    44,    19,    21,    12,    42,    20,   -47,    11,   -47,
+    13,   -47,    14,    19,    19,    39,    40,    20,    20,    24,
+    24,    25,    25,    19,    12,   -35,    35,    20,    48,    24,
+    36,    25,    14,    29,    38,    30,    31,    12,    12,    58,
+    30,    31,    46,    47,    30,    31,    31,    42,    42,    32,
+    22,    59,    60,    21,    21,    63,    46,    64,    65,    31,
+    31,    68,    69 ]
 
 racc_action_check = [
-    10,    14,     0,     0,     0,    13,     0,     0,    10,     0,
-    10,     0,     2,     5,    12,     5,     2,     2,     5,     2,
-     5,    17,    31,    21,    31,    17,    17,     3,    17,     3,
-     3,     8,     8,    22,    22,    20,    20,    25,    25,     7,
-     6,    26,    29,    30,     1,    32,    35,    37,    38,    39,
-    42,    44,    45,    47,    49,    53,    54 ]
+    11,    15,     0,     0,     0,    14,     0,    11,     0,    11,
+     0,    11,     0,     2,    18,     9,     9,     2,    18,     2,
+    18,     2,    18,    32,     6,    13,     6,    32,    22,    32,
+     6,    32,     6,     3,     8,     3,     3,    33,     7,    33,
+    23,    23,    21,    21,    26,    26,    27,    30,    31,     4,
+     1,    34,    37,    39,    40,    41,    44,    46,    47,    49,
+    51,    55,    57 ]
 
 racc_action_pointer = [
-     0,    44,    10,    19,   nil,     9,    36,    33,    18,   nil,
-     0,   nil,    10,     0,    -2,   nil,   nil,    19,   nil,   nil,
-    20,    23,    23,   nil,   nil,    27,    30,   nil,   nil,    37,
-    38,    18,    39,   nil,   nil,    40,   nil,    44,    45,    37,
-   nil,   nil,    35,   nil,    48,    49,   nil,    42,   nil,    43,
-   nil,   nil,   nil,    43,    50,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+     0,    50,    11,    24,    42,   nil,    20,    34,    28,     1,
+   nil,     0,   nil,    21,     0,    -2,   nil,   nil,    12,   nil,
+   nil,    26,    28,    29,   nil,   nil,    33,    34,   nil,   nil,
+    42,    43,    21,    33,    45,   nil,   nil,    46,   nil,    50,
+    51,    42,   nil,   nil,    40,   nil,    54,    55,   nil,    47,
+   nil,    48,   nil,   nil,   nil,    48,   nil,    56,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -51,   -51,   -51,   -12,   -13,   -21,   -51,   -25,   -26,   -27,
-   -28,   -29,   -47,   -51,   -37,   -39,   -40,   -42,   -44,   -46,
-   -48,   -51,    -8,   -45,   -47,   -10,   -11,    -6,   -30,   -51,
-   -51,   -19,   -17,   -20,   -33,   -23,   -24,   -51,   -51,   -51,
-   -43,   -38,   -51,   -41,   -51,   -51,    67,    -7,    -2,    -9,
-    -4,    -5,   -31,   -51,   -15,   -18,   -16,   -22,   -35,   -36,
-   -34,   -49,   -50,    -1,    -3,   -32,   -14 ]
+   -53,   -53,   -53,   -12,   -14,   -15,   -23,   -53,   -27,   -28,
+   -29,   -30,   -31,   -49,   -53,   -39,   -41,   -42,   -44,   -46,
+   -48,   -50,   -53,    -8,   -47,   -49,   -10,   -11,    -6,   -32,
+   -53,   -53,   -53,   -21,   -19,   -22,   -35,   -25,   -26,   -53,
+   -53,   -53,   -45,   -40,   -53,   -43,   -53,   -53,    70,    -7,
+    -2,    -9,    -4,    -5,   -33,   -53,   -13,   -17,   -20,   -18,
+   -24,   -37,   -38,   -36,   -51,   -52,    -1,    -3,   -34,   -16 ]
 
 racc_goto_table = [
-    27,     8,     7,     5,    39,    26,     6,    32,    35,    43,
-     3,    31,    22,    25,     1,     9,     2,    41,   nil,    48,
-    52,    53,    50,    51,    47,   nil,   nil,    49,   nil,   nil,
-   nil,   nil,   nil,    54,   nil,   nil,   nil,   nil,    58,    59,
-   nil,   nil,   nil,   nil,    63,   nil,    64 ]
+    28,     9,     8,     6,     3,    27,    23,     7,    34,    37,
+    41,    45,    26,    33,     1,    10,     2,    43,   nil,   nil,
+    50,   nil,   nil,    52,    53,    49,    54,    55,    51,   nil,
+   nil,   nil,   nil,   nil,   nil,    57,    56,   nil,   nil,   nil,
+    61,    62,   nil,   nil,   nil,   nil,    66,   nil,    67 ]
 
 racc_goto_check = [
-     5,    11,    10,     8,    13,     4,     9,    10,    10,     7,
-     3,     9,     3,     6,     1,    12,     2,    15,   nil,     5,
-    13,    13,     5,     5,     4,   nil,   nil,     4,   nil,   nil,
-   nil,   nil,   nil,    10,   nil,   nil,   nil,   nil,    11,    11,
-   nil,   nil,   nil,   nil,     5,   nil,     5 ]
+     5,    12,    11,     9,     3,     4,     3,    10,    11,    11,
+    14,     8,     6,    10,     1,    13,     2,    16,   nil,   nil,
+     5,   nil,   nil,     5,     5,     4,    14,    14,     4,   nil,
+   nil,   nil,   nil,   nil,   nil,    11,     3,   nil,   nil,   nil,
+    12,    12,   nil,   nil,   nil,   nil,     5,   nil,     5 ]
 
 racc_goto_pointer = [
-   nil,    14,    16,    10,     2,    -3,    10,    -8,     3,     6,
-     2,     1,    15,    -9,   nil,     3,   nil,   nil ]
+   nil,    14,    16,     4,     2,    -3,     9,   nil,    -7,     3,
+     7,     2,     1,    15,    -4,   nil,     2,   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     4,   nil,   nil,
-   nil,   nil,   nil,   nil,    14,    15,    16,    17 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     4,     5,   nil,
+   nil,   nil,   nil,   nil,   nil,    15,    16,    17,    18 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  4, 18, :_reduce_none,
-  3, 18, :_reduce_none,
-  4, 18, :_reduce_none,
-  3, 18, :_reduce_none,
-  3, 18, :_reduce_none,
-  2, 18, :_reduce_none,
-  3, 18, :_reduce_none,
-  2, 18, :_reduce_none,
-  3, 18, :_reduce_none,
-  2, 18, :_reduce_none,
-  2, 18, :_reduce_none,
-  1, 18, :_reduce_none,
-  1, 20, :_reduce_13,
   4, 19, :_reduce_none,
   3, 19, :_reduce_none,
+  4, 19, :_reduce_none,
   3, 19, :_reduce_none,
-  2, 19, :_reduce_none,
   3, 19, :_reduce_none,
   2, 19, :_reduce_none,
+  3, 19, :_reduce_none,
   2, 19, :_reduce_none,
-  1, 19, :_reduce_none,
   3, 19, :_reduce_none,
   2, 19, :_reduce_none,
   2, 19, :_reduce_none,
   1, 19, :_reduce_none,
-  1, 25, :_reduce_26,
-  1, 25, :_reduce_27,
-  1, 25, :_reduce_28,
+  3, 21, :_reduce_none,
+  1, 21, :_reduce_none,
+  1, 25, :_reduce_15,
+  4, 20, :_reduce_none,
+  3, 20, :_reduce_none,
+  3, 20, :_reduce_none,
+  2, 20, :_reduce_none,
+  3, 20, :_reduce_none,
+  2, 20, :_reduce_none,
+  2, 20, :_reduce_none,
+  1, 20, :_reduce_none,
+  3, 20, :_reduce_none,
+  2, 20, :_reduce_none,
+  2, 20, :_reduce_none,
+  1, 20, :_reduce_none,
+  1, 27, :_reduce_28,
   1, 27, :_reduce_29,
-  1, 23, :_reduce_30,
-  2, 21, :_reduce_31,
-  3, 22, :_reduce_32,
-  1, 26, :_reduce_33,
-  3, 26, :_reduce_34,
-  3, 29, :_reduce_35,
-  3, 29, :_reduce_36,
-  1, 28, :_reduce_none,
-  2, 28, :_reduce_38,
-  1, 28, :_reduce_none,
-  1, 28, :_reduce_none,
-  2, 24, :_reduce_41,
-  1, 24, :_reduce_none,
+  1, 27, :_reduce_30,
+  1, 29, :_reduce_31,
+  1, 24, :_reduce_32,
+  2, 22, :_reduce_33,
+  3, 23, :_reduce_34,
+  1, 28, :_reduce_35,
+  3, 28, :_reduce_36,
+  3, 31, :_reduce_37,
+  3, 31, :_reduce_38,
+  1, 30, :_reduce_none,
+  2, 30, :_reduce_40,
+  1, 30, :_reduce_none,
   1, 30, :_reduce_none,
-  1, 34, :_reduce_none,
-  1, 34, :_reduce_none,
-  1, 34, :_reduce_none,
-  1, 34, :_reduce_none,
-  1, 31, :_reduce_48,
-  3, 32, :_reduce_49,
-  3, 33, :_reduce_50 ]
+  2, 26, :_reduce_43,
+  1, 26, :_reduce_none,
+  1, 32, :_reduce_none,
+  1, 36, :_reduce_none,
+  1, 36, :_reduce_none,
+  1, 36, :_reduce_none,
+  1, 36, :_reduce_none,
+  1, 33, :_reduce_50,
+  3, 34, :_reduce_51,
+  3, 35, :_reduce_52 ]
 
-racc_reduce_n = 51
+racc_reduce_n = 53
 
-racc_shift_n = 67
+racc_shift_n = 70
 
 racc_token_table = {
   false => 0,
@@ -157,18 +161,19 @@ racc_token_table = {
   :UNIT => 4,
   :TEXT => 5,
   :OF => 6,
-  :A => 7,
-  :TO_TASTE => 8,
-  :UNIT_MODIFIER => 9,
-  "," => 10,
-  "(" => 11,
-  ")" => 12,
-  "-" => 13,
-  "\u{2013}" => 14,
-  "/" => 15,
-  "." => 16 }
-
-racc_nt_base = 17
+  :OR => 7,
+  :A => 8,
+  :TO_TASTE => 9,
+  :UNIT_MODIFIER => 10,
+  "," => 11,
+  "(" => 12,
+  ")" => 13,
+  "-" => 14,
+  "\u{2013}" => 15,
+  "/" => 16,
+  "." => 17 }
+
+racc_nt_base = 18
 
 racc_use_result_var = true
 
@@ -196,6 +201,7 @@ Racc_token_to_s_table = [
   "UNIT",
   "TEXT",
   "OF",
+  "OR",
   "A",
   "TO_TASTE",
   "UNIT_MODIFIER",
@@ -209,11 +215,12 @@ Racc_token_to_s_table = [
   "$start",
   "ingredient",
   "quantity",
-  "ingredient_name",
+  "ingredient_names",
   "style",
   "note",
   "to_taste",
-  "words",
+  "ingredient_name",
+  "ingredient_words",
   "amount",
   "unit_modifier",
   "unit",
@@ -223,7 +230,7 @@ Racc_token_to_s_table = [
   "number",
   "fraction",
   "decimal",
-  "word" ]
+  "ingredient_word" ]
 
 Racc_debug_parser = false
 
@@ -255,14 +262,14 @@ Racc_debug_parser = false
 
 # reduce 12 omitted
 
-def _reduce_13(val, _values, result)
- @ingredient.name = result 
-    result
-end
+# reduce 13 omitted
 
 # reduce 14 omitted
 
-# reduce 15 omitted
+def _reduce_15(val, _values, result)
+ @ingredient.names << result 
+    result
+end
 
 # reduce 16 omitted
 
@@ -284,81 +291,81 @@ end
 
 # reduce 25 omitted
 
-def _reduce_26(val, _values, result)
+# reduce 26 omitted
+
+# reduce 27 omitted
+
+def _reduce_28(val, _values, result)
  @ingredient.amount = result 
     result
 end
 
-def _reduce_27(val, _values, result)
+def _reduce_29(val, _values, result)
  @ingredient.amount = result 
     result
 end
 
-def _reduce_28(val, _values, result)
+def _reduce_30(val, _values, result)
  @ingredient.amount = 1 
     result
 end
 
-def _reduce_29(val, _values, result)
+def _reduce_31(val, _values, result)
  @ingredient.unit = to_unit(result) 
     result
 end
 
-def _reduce_30(val, _values, result)
+def _reduce_32(val, _values, result)
  @ingredient.unit = to_unit(result) 
     result
 end
 
-def _reduce_31(val, _values, result)
+def _reduce_33(val, _values, result)
  @ingredient.style = val[1] 
     result
 end
 
-def _reduce_32(val, _values, result)
+def _reduce_34(val, _values, result)
  @ingredient.note = val[1] 
     result
 end
 
-def _reduce_33(val, _values, result)
+def _reduce_35(val, _values, result)
  @ingredient.unit_modifier = val[0] 
     result
 end
 
-def _reduce_34(val, _values, result)
+def _reduce_36(val, _values, result)
  @ingredient.unit_modifier = val[1] 
     result
 end
 
-def _reduce_35(val, _values, result)
+def _reduce_37(val, _values, result)
  result = [val[0], val[2]] 
     result
 end
 
-def _reduce_36(val, _values, result)
+def _reduce_38(val, _values, result)
  result = [val[0], val[2]] 
     result
 end
 
-# reduce 37 omitted
+# reduce 39 omitted
 
-def _reduce_38(val, _values, result)
+def _reduce_40(val, _values, result)
  result = val[0] + val[1] 
     result
 end
 
-# reduce 39 omitted
+# reduce 41 omitted
 
-# reduce 40 omitted
+# reduce 42 omitted
 
-def _reduce_41(val, _values, result)
+def _reduce_43(val, _values, result)
  result = val.join(' ') 
     result
 end
 
-# reduce 42 omitted
-
-# reduce 43 omitted
-
 # reduce 44 omitted
 
 # reduce 45 omitted
@@ -367,17 +374,21 @@ end
 
 # reduce 47 omitted
 
-def _reduce_48(val, _values, result)
+# reduce 48 omitted
+
+# reduce 49 omitted
+
+def _reduce_50(val, _values, result)
  result = val[0].to_i 
     result
 end
 
-def _reduce_49(val, _values, result)
+def _reduce_51(val, _values, result)
  result = val[0].to_f / val[2].to_f 
     result
 end
 
-def _reduce_50(val, _values, result)
+def _reduce_52(val, _values, result)
  result = val.join.to_f 
     result
 end

data/lib/eye_of_newt/parser.y

@@ -1,22 +1,26 @@
 class EyeOfNewt::Parser
-token WORD NUMBER UNIT TEXT OF A TO_TASTE UNIT_MODIFIER
+token WORD NUMBER UNIT TEXT OF OR A TO_TASTE UNIT_MODIFIER
 rule
   ingredient
-    : quantity ingredient_name style note
-    | quantity ingredient_name note
-    | ingredient_name to_taste style note
-    | ingredient_name to_taste note
-    | ingredient_name style note
-    | ingredient_name note
-    | quantity ingredient_name style
-    | quantity ingredient_name
-    | ingredient_name to_taste style
-    | ingredient_name to_taste
-    | ingredient_name style
+    : quantity ingredient_names style note
+    | quantity ingredient_names note
+    | ingredient_names to_taste style note
+    | ingredient_names to_taste note
+    | ingredient_names style note
+    | ingredient_names note
+    | quantity ingredient_names style
+    | quantity ingredient_names
+    | ingredient_names to_taste style
+    | ingredient_names to_taste
+    | ingredient_names style
+    | ingredient_names
+    ;
+  ingredient_names
+    : ingredient_name OR ingredient_names
     | ingredient_name
     ;
   ingredient_name
-    : words { @ingredient.name = result }
+    : ingredient_words { @ingredient.names << result }
     ;
   quantity
     : amount unit_modifier unit OF
@@ -55,12 +59,12 @@ rule
     | fraction
     | decimal
     ;
-  words
-    : word words { result = val.join(' ') }
-    | word
+  ingredient_words
+    : ingredient_word ingredient_words { result = val.join(' ') }
+    | ingredient_word
     ;
   text : TEXT ;
-  word : WORD | A | OF | UNIT_MODIFIER ;
+  ingredient_word : WORD | A | OF | UNIT_MODIFIER ;
   number : NUMBER { result = val[0].to_i } ;
   fraction : NUMBER '/' NUMBER { result = val[0].to_f / val[2].to_f } ;
   decimal : NUMBER '.' NUMBER { result = val.join.to_f } ;

data/lib/eye_of_newt/tokenizer.rb

@@ -9,6 +9,7 @@ module EyeOfNewt
     WORD = /\w+(-\w+)*/
     NUMBER = /\d+/
     OF = /of/
+    OR = /or/
     A = /an?/
     TO_TASTE = /to taste/
 
@@ -36,6 +37,8 @@ module EyeOfNewt
         [:OF, text]
       when text = @ss.scan(/#{A}\b/)
         [:A, text]
+      when text = @ss.scan(/#{OR}\b/)
+        [:OR, text]
       when text = @ss.scan(/#{TO_TASTE}\b/)
         [:TO_TASTE, text]
       when text = @ss.scan(/#{unit_matcher}\b/)

data/lib/eye_of_newt/version.rb

@@ -1,3 +1,3 @@
 module EyeOfNewt
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/test/examples.txt

@@ -27,3 +27,4 @@ heaping tablespoon of sugar | sugar | 1 | tbsp | | | heaping
 1 pound of large beans | large beans | 1 | lb
 4-5 handfuls of spinach, very roughly chopped | spinach | 4-5 | handfuls | very roughly chopped
 1 (46 oz) can tomato juice | tomato juice | 1 | cans | | | 46 oz
+kale or chard or spinach | kale,chard,spinach | 1 | units

data/test/eye_of_newt/tokenizer_test.rb

@@ -59,6 +59,14 @@ class EyeOfNewt::TokenizerTest < ActiveSupport::TestCase
     assert_nil t.next_token
   end
 
+  test "tokenizes OR" do
+    t = tok("this or that")
+    assert_equal [:WORD, "this"], t.next_token
+    assert_equal [:OR, "or"], t.next_token
+    assert_equal [:WORD, "that"], t.next_token
+    assert_nil t.next_token
+  end
+
   test "tokenizes fractions" do
     t = tok("1 1/2")
     assert_equal [:NUMBER, "1"], t.next_token

data/test/eye_of_newt_test.rb

@@ -11,14 +11,14 @@ class EyeOfNewtTest < ActiveSupport::TestCase
 
         tokens = line.split('|').map(&:strip)
         line = tokens.shift
-        name = tokens.shift
+        names = tokens.shift.split(',').map(&:strip)
         amount = tokens.shift.split('-').map(&:to_f)
         amount = amount.first unless amount.many?
         unit = tokens.shift.presence
         style = tokens.shift.presence
         note = tokens.shift.presence
         unit_modifier = tokens.shift.presence
-        expected = [name, amount, unit, style, note, unit_modifier]
+        expected = [names, amount, unit, style, note, unit_modifier]
         [line, expected]
       }.compact
     end
@@ -27,8 +27,8 @@ class EyeOfNewtTest < ActiveSupport::TestCase
   examples.each do |line, expected|
     test "parses #{line} correctly" do
       ingr = EyeOfNewt.parse(line)
-      name, amount, unit, style, note, unit_modifier = *expected
-      assert_equal name, ingr.name, %Q{incorrect name}
+      names, amount, unit, style, note, unit_modifier = *expected
+      assert_equal names, ingr.names, %Q{incorrect names}
       assert_equal amount, ingr.amount, %Q{incorrect amount}
       assert_equal unit, ingr.unit, %Q{incorrect unit}
       assert_equal style, ingr.style, %Q{incorrect style}

data/test/test_helper.rb

@@ -2,3 +2,5 @@ require 'minitest/autorun'
 require 'active_support/all'
 require 'pry'
 require 'eye_of_newt'
+
+ActiveSupport::TestCase.test_order = :random

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eye-of-newt
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Peter McCracken