eye-of-newt 0.0.11 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cc1184f54a4aac5a3e779685f661ff8d67575e45
-  data.tar.gz: ef2c419a4acb019a36ad2acf7af13a8cefef1f5c
+SHA256:
+  metadata.gz: 273010052f34b67d89c3543a3b1111779d7fff441e75fc7d09a0ddcb4de27fcb
+  data.tar.gz: 1c273f1b42b1d555661f22548d557f00798f3f79d8fb1127af65bcd496ffe34d
 SHA512:
-  metadata.gz: 3987e80af077ae560f675b21000311e2300135bf60a2bc1983745193c5c2ca01f4dce8d8b80c676afca52df89699f58927e9c0f51619649dce71c54deee3a795
-  data.tar.gz: 47b9df47b03212cefd21583f1b8329d38f8eb7e38a89176d61b87f7a0237c804b52d8175d5fdc2bddbc6b7b7a455c89f430b5254c6fe3ee0a00502b7bedcf63f
+  metadata.gz: b919b9775ce56dc136c4224a67d9bedad3aea134ccd1c2beb3438daad025ee5af8ac1db51b0d02d015da603a15a5a1404c3615fba0a96019f1a000f27bc80271
+  data.tar.gz: '09576ffd8e91cadbb26cdc82d43b7ed2e0d03f0cb5c7d278c0b53739474e57259a86df4bc543be168416b0a39c34acf1faf95e96bae9e3cb5317f9d2e275386a'

data/eye_of_newt.gemspec

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

data/lib/eye_of_newt/parser.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.11
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.6.0
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -37,28 +37,28 @@ module EyeOfNewt
 ##### State transition tables begin ###
 
 racc_action_table = [
-   -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,
+   -47,    22,    19,    21,    12,    32,    20,   -47,    11,   -47,
+    13,   -47,    14,    19,    12,    12,    35,    20,    38,    24,
+    36,    25,    14,    19,    19,    39,    40,    20,    20,    24,
+    24,    25,    25,    29,   -35,    30,    31,    12,    42,    58,
+    46,    47,    30,    31,    30,    31,    44,    48,    31,    42,
+    42,    59,    60,    21,    21,    63,    46,    64,    65,    31,
     31,    68,    69 ]
 
 racc_action_check = [
-    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,
+    11,     1,     0,     0,     0,     4,     0,    11,     0,    11,
+     0,    11,     0,     2,     6,     7,     6,     2,     8,     2,
+     6,     2,     6,    18,    32,     9,     9,    18,    32,    18,
+    32,    18,    32,     3,    13,     3,     3,    33,    14,    33,
+    21,    21,    23,    23,    26,    26,    15,    22,    27,    30,
+    31,    34,    37,    39,    40,    41,    44,    46,    47,    49,
     51,    55,    57 ]
 
 racc_action_pointer = [
-     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,
+     0,     1,    11,    24,    -2,   nil,    10,    11,    12,    11,
+   nil,     0,   nil,    30,    33,    43,   nil,   nil,    21,   nil,
+   nil,    24,    47,    31,   nil,   nil,    33,    36,   nil,   nil,
+    44,    45,    22,    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 ]
@@ -73,22 +73,22 @@ racc_action_default = [
    -24,   -37,   -38,   -36,   -51,   -52,    -1,    -3,   -34,   -16 ]
 
 racc_goto_table = [
-    28,     9,     8,     6,     3,    27,    23,     7,    34,    37,
-    41,    45,    26,    33,     1,    10,     2,    43,   nil,   nil,
+    28,     9,     8,     1,     3,    27,    23,     7,    34,    37,
+    41,     2,    26,    33,    45,     6,    10,    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,    12,    11,     9,     3,     4,     3,    10,    11,    11,
-    14,     8,     6,    10,     1,    13,     2,    16,   nil,   nil,
+     5,    12,    11,     1,     3,     4,     3,    10,    11,    11,
+    14,     2,     6,    10,     8,     9,    13,    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,     4,     2,    -3,     9,   nil,    -7,     3,
-     7,     2,     1,    15,    -4,   nil,     2,   nil,   nil ]
+   nil,     3,    11,     4,     2,    -3,     9,   nil,    -4,    15,
+     7,     2,     1,    16,    -4,   nil,     2,   nil,   nil ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,     4,     5,   nil,
@@ -169,7 +169,7 @@ racc_token_table = {
   "(" => 12,
   ")" => 13,
   "-" => 14,
-  "\u{2013}" => 15,
+  "\xE2\x80\x93" => 15,
   "/" => 16,
   "." => 17 }
 
@@ -209,7 +209,7 @@ Racc_token_to_s_table = [
   "\"(\"",
   "\")\"",
   "\"-\"",
-  "\"\u{2013}\"",
+  "\"\\xE2\\x80\\x93\"",
   "\"/\"",
   "\".\"",
   "$start",
@@ -267,7 +267,7 @@ Racc_debug_parser = false
 # reduce 14 omitted
 
 def _reduce_15(val, _values, result)
- @ingredient.names << result 
+ @ingredient.names << result
     result
 end
 
@@ -296,64 +296,64 @@ end
 # reduce 27 omitted
 
 def _reduce_28(val, _values, result)
- @ingredient.amount = result 
+ @ingredient.amount = result
     result
 end
 
 def _reduce_29(val, _values, result)
- @ingredient.amount = result 
+ @ingredient.amount = result
     result
 end
 
 def _reduce_30(val, _values, result)
- @ingredient.amount = 1 
+ @ingredient.amount = 1
     result
 end
 
 def _reduce_31(val, _values, result)
- @ingredient.unit = to_unit(result) 
+ @ingredient.unit = to_unit(result)
     result
 end
 
 def _reduce_32(val, _values, result)
- @ingredient.unit = to_unit(result) 
+ @ingredient.unit = to_unit(result)
     result
 end
 
 def _reduce_33(val, _values, result)
- @ingredient.style = val[1] 
+ @ingredient.style = val[1]
     result
 end
 
 def _reduce_34(val, _values, result)
- @ingredient.note = val[1] 
+ @ingredient.note = val[1]
     result
 end
 
 def _reduce_35(val, _values, result)
- @ingredient.unit_modifier = val[0] 
+ @ingredient.unit_modifier = val[0]
     result
 end
 
 def _reduce_36(val, _values, result)
- @ingredient.unit_modifier = val[1] 
+ @ingredient.unit_modifier = val[1]
     result
 end
 
 def _reduce_37(val, _values, result)
- result = [val[0], val[2]] 
+ result = [val[0], val[2]]
     result
 end
 
 def _reduce_38(val, _values, result)
- result = [val[0], val[2]] 
+ result = [val[0], val[2]]
     result
 end
 
 # reduce 39 omitted
 
 def _reduce_40(val, _values, result)
- result = val[0] + val[1] 
+ result = val[0] + val[1]
     result
 end
 
@@ -362,7 +362,7 @@ end
 # reduce 42 omitted
 
 def _reduce_43(val, _values, result)
- result = val.join(' ') 
+ result = val.join(' ')
     result
 end
 
@@ -379,17 +379,17 @@ end
 # reduce 49 omitted
 
 def _reduce_50(val, _values, result)
- result = val[0].to_i 
+ result = val[0].to_i
     result
 end
 
 def _reduce_51(val, _values, result)
- result = val[0].to_f / val[2].to_f 
+ result = val[0].to_f / val[2].to_f
     result
 end
 
 def _reduce_52(val, _values, result)
- result = val.join.to_f 
+ result = val.join.to_f
     result
 end
 
@@ -398,4 +398,4 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class Parser
-  end   # module EyeOfNewt
+end   # module EyeOfNewt

data/lib/eye_of_newt/tokenizer.rb

@@ -20,6 +20,7 @@ module EyeOfNewt
       @units = units
       @unit_modifiers = unit_modifiers
       @ss = StringScanner.new(string)
+      @scan_text = nil
     end
 
     def next_token

data/lib/eye_of_newt/units.rb

@@ -56,7 +56,7 @@ module EyeOfNewt
     end
 
     def setup(&block)
-      instance_eval &block
+      instance_eval(&block)
       self
     end
 
@@ -84,6 +84,9 @@ module EyeOfNewt
         add_unit "g", "g.", "gr", "gr.", "gram", "grams"
         add_unit "mg", "mg", "mg.", "milligram", "milligrams"
 
+        # english distance units
+        add_unit "inch", "inches"
+
         # nonstandard units
         add_unit "pinches", "pinch"
         add_unit "dashes", "dash"
@@ -95,6 +98,7 @@ module EyeOfNewt
         add_unit "cans", "can"
         add_unit "packages", "package"
         add_unit "containers", "container"
+        add_unit "sticks", "stick"
 
         add_unit_modifier "big"
         add_unit_modifier "large"
@@ -102,6 +106,7 @@ module EyeOfNewt
         add_unit_modifier "small"
         add_unit_modifier "heaping"
         add_unit_modifier "level"
+        add_unit_modifier "scant"
 
         # unquantified units
         add_unit "to taste", unquantified: true

data/lib/eye_of_newt/version.rb

@@ -1,3 +1,3 @@
 module EyeOfNewt
-  VERSION = "0.0.11"
+  VERSION = "0.0.15"
 end

data/test/examples.txt

@@ -29,3 +29,4 @@ heaping tablespoon of sugar | sugar | 1 | tbsp | | | heaping
 1 (46 oz) can tomato juice | tomato juice | 1 | cans | | | 46 oz
 kale or chard or spinach | kale,chard,spinach | 1 | units
 kale OR chard OR spinach | kale,chard,spinach | 1 | units
+1 inch ginger | ginger | 1 | inch

data/test/eye_of_newt_test.rb

@@ -31,9 +31,9 @@ class EyeOfNewtTest < ActiveSupport::TestCase
       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}
-      assert_equal note, ingr.note, %Q{incorrect note}
-      assert_equal unit_modifier, ingr.unit_modifier, %Q{incorrect unit modifier}
+      assert_equal_or_nil style, ingr.style, %Q{incorrect style}
+      assert_equal_or_nil note, ingr.note, %Q{incorrect note}
+      assert_equal_or_nil unit_modifier, ingr.unit_modifier, %Q{incorrect unit modifier}
     end
   end
 
@@ -42,4 +42,12 @@ class EyeOfNewtTest < ActiveSupport::TestCase
       EyeOfNewt.parse("1")
     end
   end
+
+  def assert_equal_or_nil(expected, actual, message)
+    if expected
+      assert_equal expected, actual, message
+    else
+      assert_nil actual, message
+    end
+  end
 end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: eye-of-newt
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.15
 platform: ruby
 authors:
 - Peter McCracken
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 description: Parses natural ingredients (e.g. "1 1/2 pounds of potatoes, peeled")
   into usable parts.
 email:
@@ -145,7 +145,7 @@ homepage: http://github.com/peterjm/eye_of_newt
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,9 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.20
+signing_key:
 specification_version: 4
 summary: Natural language ingredient parser
 test_files: