eye-of-newt 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93cc600dbd1c5f6a5e2e62f0f908110ae4e15647
-  data.tar.gz: 257935203d6f991a13faf85cca0c55b9334c7998
+  metadata.gz: a593b4f889ec78c7e789daba91965f94f9419810
+  data.tar.gz: f341eda16d664a480c92dbb5efbf65bfdf64873c
 SHA512:
-  metadata.gz: 24cf9ba3437ce443288d47ddde41519a5c43544e2f84f1306b3b9fd472b740e9e7c64fef24ef7396a5dfd937abaa08683a80a7bb4132623d06426e598c390fea
-  data.tar.gz: 7c925794f3d1703e3028de2b2f5592fb11b8e893a36ae5b76f73f550dcf1faffc771b5378a1472bed2a07251a68a4970a1f621a1d7df6db0eadc1c2568142b8b
+  metadata.gz: 00a299e06e879fdf92dc3ff06899494575fa77df6b549726a6bb4c4756b0680be936e765c2529da3a6f9d04a1566989002fc2df5a95106faf7683945a7b49ec5
+  data.tar.gz: 23bbf21df97753bbfe355adbf9a95c4177baa764ab1adf7e9c64fcb21f3620009c552de652eae07356e25eb7116750e3892b73ec78d36fb5002242546d5d6252

data/lib/eye_of_newt/parser.rb

@@ -37,105 +37,117 @@ module EyeOfNewt
 ##### State transition tables begin ###
 
 racc_action_table = [
-   -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 ]
+   -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 ]
 
 racc_action_check = [
-    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 ]
+    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 ]
 
 racc_action_pointer = [
-     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 ]
+     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 ]
 
 racc_action_default = [
-   -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 ]
+   -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 ]
 
 racc_goto_table = [
-    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 ]
+    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 ]
 
 racc_goto_check = [
-     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 ]
+     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 ]
 
 racc_goto_pointer = [
-   nil,    24,    21,     9,     1,    -3,    12,     2,     5,     3,
-     1,    17,     2,    23,   -13,   nil ]
+   nil,    14,    16,    10,     2,    -3,    10,    -8,     3,     6,
+     2,     1,    15,    -9,   nil,     3,   nil,   nil ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,     4,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    12 ]
+   nil,   nil,   nil,   nil,    14,    15,    16,    17 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  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,
-  2, 16, :_reduce_none,
-  1, 16, :_reduce_none,
-  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,
+  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,
+  3, 19, :_reduce_none,
+  2, 19, :_reduce_none,
+  3, 19, :_reduce_none,
+  2, 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,
+  1, 27, :_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,
+  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, 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 ]
+  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 ]
 
-racc_reduce_n = 45
+racc_reduce_n = 51
 
-racc_shift_n = 56
+racc_shift_n = 67
 
 racc_token_table = {
   false => 0,
@@ -151,10 +163,12 @@ racc_token_table = {
   "," => 10,
   "(" => 11,
   ")" => 12,
-  "/" => 13,
-  "." => 14 }
+  "-" => 13,
+  "\u{2013}" => 14,
+  "/" => 15,
+  "." => 16 }
 
-racc_nt_base = 15
+racc_nt_base = 17
 
 racc_use_result_var = true
 
@@ -188,6 +202,8 @@ Racc_token_to_s_table = [
   "\",\"",
   "\"(\"",
   "\")\"",
+  "\"-\"",
+  "\"\u{2013}\"",
   "\"/\"",
   "\".\"",
   "$start",
@@ -201,10 +217,12 @@ Racc_token_to_s_table = [
   "amount",
   "unit_modifier",
   "unit",
+  "numerical_amount",
+  "numerical_range",
+  "text",
   "number",
   "fraction",
   "decimal",
-  "text",
   "word" ]
 
 Racc_debug_parser = false
@@ -272,76 +290,94 @@ def _reduce_26(val, _values, result)
 end
 
 def _reduce_27(val, _values, result)
- @ingredient.amount = val[0] + val[1] 
+ @ingredient.amount = result 
     result
 end
 
 def _reduce_28(val, _values, result)
- @ingredient.amount = result 
+ @ingredient.amount = 1 
     result
 end
 
 def _reduce_29(val, _values, result)
- @ingredient.amount = result 
+ @ingredient.unit = to_unit(result) 
     result
 end
 
 def _reduce_30(val, _values, result)
- @ingredient.amount = 1 
+ @ingredient.unit = to_unit(result) 
     result
 end
 
 def _reduce_31(val, _values, result)
- @ingredient.unit = to_unit(result) 
+ @ingredient.style = val[1] 
     result
 end
 
 def _reduce_32(val, _values, result)
- @ingredient.style = val[1] 
+ @ingredient.note = val[1] 
     result
 end
 
 def _reduce_33(val, _values, result)
- @ingredient.note = val[1] 
+ @ingredient.unit_modifier = val[0] 
     result
 end
 
 def _reduce_34(val, _values, result)
- result = val.join(' ') 
+ @ingredient.unit_modifier = val[1] 
     result
 end
 
-# reduce 35 omitted
+def _reduce_35(val, _values, result)
+ result = [val[0], val[2]] 
+    result
+end
 
 def _reduce_36(val, _values, result)
- @ingredient.unit_modifier = val[0] 
+ result = [val[0], val[2]] 
     result
 end
 
 # reduce 37 omitted
 
-# reduce 38 omitted
+def _reduce_38(val, _values, result)
+ result = val[0] + val[1] 
+    result
+end
 
 # reduce 39 omitted
 
 # reduce 40 omitted
 
 def _reduce_41(val, _values, result)
- @ingredient.unit = to_unit(result) 
+ result = val.join(' ') 
     result
 end
 
-def _reduce_42(val, _values, result)
+# reduce 42 omitted
+
+# reduce 43 omitted
+
+# reduce 44 omitted
+
+# reduce 45 omitted
+
+# reduce 46 omitted
+
+# reduce 47 omitted
+
+def _reduce_48(val, _values, result)
  result = val[0].to_i 
     result
 end
 
-def _reduce_43(val, _values, result)
+def _reduce_49(val, _values, result)
  result = val[0].to_f / val[2].to_f 
     result
 end
 
-def _reduce_44(val, _values, result)
+def _reduce_50(val, _values, result)
  result = val.join.to_f 
     result
 end

data/lib/eye_of_newt/parser.y

@@ -33,23 +33,34 @@ rule
     | unit
     ;
   amount
-    : number { @ingredient.amount = result }
-    | number fraction { @ingredient.amount = val[0] + val[1] }
-    | fraction { @ingredient.amount = result }
-    | decimal { @ingredient.amount = result }
+    : numerical_amount { @ingredient.amount = result }
+    | numerical_range { @ingredient.amount = result }
     | A { @ingredient.amount = 1 }
     ;
+  unit : UNIT { @ingredient.unit = to_unit(result) } ;
   to_taste : TO_TASTE { @ingredient.unit = to_unit(result) } ;
   style : ',' text { @ingredient.style = val[1] } ;
   note : '(' text ')' { @ingredient.note = val[1] } ;
+  unit_modifier
+    : UNIT_MODIFIER { @ingredient.unit_modifier = val[0] }
+    | '(' text ')' { @ingredient.unit_modifier = val[1] }
+    ;
+  numerical_range
+    : numerical_amount '-' numerical_amount { result = [val[0], val[2]] }
+    | numerical_amount '–' numerical_amount { result = [val[0], val[2]] }
+    ;
+  numerical_amount
+    : number
+    | number fraction { result = val[0] + val[1] }
+    | fraction
+    | decimal
+    ;
   words
     : word words { result = val.join(' ') }
     | word
     ;
-  unit_modifier : UNIT_MODIFIER { @ingredient.unit_modifier = val[0] } ;
   text : TEXT ;
-  word : WORD | A | OF ;
-  unit : UNIT { @ingredient.unit = to_unit(result) } ;
+  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/quantity.rb

@@ -16,18 +16,25 @@ module EyeOfNewt
 
     def in(new_unit)
       rate = units.conversion_rate(unit, new_unit)
-      self.class.new(amount * rate, new_unit, units: units)
+      new_amount = range? ? amount.map{|a| a * rate} : amount * rate
+      self.class.new(new_amount, new_unit, units: units)
     end
 
     def to_s
-      [fraction_str, modifier, unit_str].compact.join(' ')
+      amount_str = range? ? amount.map{|a| fraction_str(a)}.join('–') : fraction_str(amount)
+      [amount_str, modifier, unit_str].compact.join(' ')
     end
     alias :inspect :to_s
 
     private
 
-    def fraction_str
+    def range?
+      amount.is_a?(Array)
+    end
+
+    def fraction_str(a)
       return nil if units.unquantified?(unit)
+      fraction = to_fraction(a)
       whole = fraction.to_i
       fractional = fraction - whole
       [whole, fractional].reject(&:zero?).join(' ')
@@ -35,12 +42,12 @@ module EyeOfNewt
 
     def unit_str
       return nil if unit == units.default
-      singular = fraction <= 1 && fraction.numerator == 1
+      singular = range? ? amount.last <= 1 : amount <= 1
       singular ? unit.singularize : unit
     end
 
-    def fraction
-      @fraction ||= signif(amount, SIGNIFICANT_DIGITS).to_r.rationalize(DELTA)
+    def to_fraction(a)
+      signif(a, SIGNIFICANT_DIGITS).to_r.rationalize(DELTA)
     end
 
     def signif(value, digits)

data/lib/eye_of_newt/tokenizer.rb

@@ -6,12 +6,11 @@ module EyeOfNewt
 
     WHITESPACE = /\s+/
     ANYTHING = /[^()]+/
-    WORD = /[\w-]+/
+    WORD = /\w+(-\w+)*/
     NUMBER = /\d+/
     OF = /of/
     A = /an?/
     TO_TASTE = /to taste/
-    COMMA = ','
 
     attr_reader :string, :units, :unit_modifiers
 
@@ -29,6 +28,7 @@ module EyeOfNewt
 
       case
       when @scan_text && text = @ss.scan(/#{ANYTHING}\b/)
+        @scan_text = false
         [:TEXT, text]
       when text = @ss.scan(NUMBER)
         [:NUMBER, text]

data/lib/eye_of_newt/units.rb

@@ -92,6 +92,7 @@ module EyeOfNewt
         add_unit "cloves", "clove"
         add_unit "bunches", "bunch"
         add_unit "sprigs", "sprig"
+        add_unit "cans", "can"
 
         add_unit_modifier "big"
         add_unit_modifier "large"

data/lib/eye_of_newt/version.rb

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

data/test/examples.txt

@@ -24,18 +24,6 @@ an apple, sliced (I like Fuji, but any variety will do) | apple | 1 | units | sl
 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
-
-
-
-
-#3 tablespoons sunflower oil, ghee, or clarified butter
-#1/2 cup crumbled feta, fresh ricotta, or fresh paneer
-
-#1 (46 fluid ounce) can tomato juice' => ["1 (46 fluid ounce) can", "tomato juice"],
-#1 (29 ounce) can tomato sauce' => ["1 (29 ounce) can", "tomato sauce"],
-#1 (15 ounce) can kidney beans, drained and rinsed' => ["1 (29 ounce) can", "kidney beans", "drained and rinsed"],
-#1 (15 ounce) can pinto beans, drained and rinsed' => ["1 (29 ounce) can", "pinto beans", "drained and rinsed"],
-
-#1 1/2 cups chopped onion' => ["1 1/2 cups", "onion", "chopped"],
-#1/4 cup chopped green bell pepper' => ["1/4 cup", "green bell pepper", "chopped"],
+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

data/test/eye_of_newt/quantity_test.rb

@@ -17,15 +17,26 @@ class EyeOfNewt::QuantityTest < ActiveSupport::TestCase
     assert_equal "foo", foo.unit
   end
 
+  test "#in returns a range in the new unit" do
+    bar = EyeOfNewt::Quantity.new([1, 2], "bar", units: units)
+    foo = bar.in("foo")
+    assert_equal [0.5, 1], 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 "2/3 tbsp", EyeOfNewt::Quantity.new(0.66, "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 "100 g", EyeOfNewt::Quantity.new(100.1, "grams").to_s
+    assert_equal "50 1/2 g", EyeOfNewt::Quantity.new(50.5, "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
+    assert_equal "1–2 handfuls", EyeOfNewt::Quantity.new([1, 2], "handfuls").to_s
   end
 
 end

data/test/eye_of_newt/tokenizer_test.rb

@@ -24,6 +24,16 @@ class EyeOfNewt::TokenizerTest < ActiveSupport::TestCase
     assert_nil t.next_token
   end
 
+  test "tokenizes TEXT between number and unit" do
+    t = tok("1 (46 oz) can", ["can"])
+    assert_equal [:NUMBER, "1"], t.next_token
+    assert_equal ['(', "("], t.next_token
+    assert_equal [:TEXT, "46 oz"], t.next_token
+    assert_equal [')', ')'], t.next_token
+    assert_equal [:UNIT, 'can'], t.next_token
+    assert_nil t.next_token
+  end
+
   test "tokenizes TEXT after a comma, with parens" do
     t = tok(", sliced (this is a note)")
     assert_equal [',', ","], t.next_token

data/test/eye_of_newt_test.rb

@@ -12,7 +12,8 @@ class EyeOfNewtTest < ActiveSupport::TestCase
         tokens = line.split('|').map(&:strip)
         line = tokens.shift
         name = tokens.shift
-        amount = tokens.shift.to_f
+        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

metadata

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