eye-of-newt 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc1184f54a4aac5a3e779685f661ff8d67575e45
-  data.tar.gz: ef2c419a4acb019a36ad2acf7af13a8cefef1f5c
+  metadata.gz: fc7218f76efd989d4a22dfd03275e75844baef9a
+  data.tar.gz: 4f1f5443d3353b2060c65d08bca95ed912d2592b
 SHA512:
-  metadata.gz: 3987e80af077ae560f675b21000311e2300135bf60a2bc1983745193c5c2ca01f4dce8d8b80c676afca52df89699f58927e9c0f51619649dce71c54deee3a795
-  data.tar.gz: 47b9df47b03212cefd21583f1b8329d38f8eb7e38a89176d61b87f7a0237c804b52d8175d5fdc2bddbc6b7b7a455c89f430b5254c6fe3ee0a00502b7bedcf63f
+  metadata.gz: 2d68430f015d02ad26c48227dfe5cdcad8f00792cf762db8977d8b4b6ea6a04195d4f37bcfb096328391e436e4cd91dffc1f85e36842d9c285e88d9cbf5912c0
+  data.tar.gz: f78aa1b38f038ba38bfb9cff4a56f4a2be3b23daf893d2d8d57741f16d9f4d445feb5c5bf7d152ec03efc1bf3501f1b2548004d08325f5a29ae912fdfce4508a

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

@@ -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
 

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
 

data/lib/eye_of_newt/version.rb

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

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eye-of-newt
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Peter McCracken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,98 +16,98 @@ dependencies:
     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:
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Natural language ingredient parser