ingreedy 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6d5071dc7a7febbdfce24e50a444ded4e753e15
-  data.tar.gz: 7abdbb8f28851cbe697453233c16836e673bb61e
+  metadata.gz: 452f17ed3a15ae973346ea074ee682bf173d1663
+  data.tar.gz: 6face6a2f60f6506160d815c69cd0546107fb787
 SHA512:
-  metadata.gz: a8840fc397fdb630a9456deb5aa97b5b8777179e3b6b2d4ec9c10c05cb6e01868bbdbdd1e20740fcc141fec214e9a0ebc83790f6cb0cdcf1da6f8a6f6013d621
-  data.tar.gz: 2dfd59ee0da0fc7d4b9e882cebf1f218fa94fa97bcfbb41c5dd68eff4235cce7512b584185bb7f72d3c2c13eda45c3ff8ad993c9ba8257c47aab75063ce65174
+  metadata.gz: acdc3c1f4f4c135188c9c92e4a83441d569539f4a9b0af31cdfd08e8ca653ce81689dff985d72814d8b71f10f59b4d1eb936cf46f6d35e99aeb1a0b31cc42275
+  data.tar.gz: b0801f2d7eb26f02eb14cd615102b00dfe5eb695ed03f3b53dd32bf2f62c2df1cc70ae5cebcd552634403de39dc94c3d859d1271b31ba8f3930ad77d03668421

data/.travis.yml

@@ -1,14 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.7
   - 2.2.3
+  - 2.3.0
   - ruby-head
-  - jruby-19mode
   - jruby-head
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
-    - rvm: rbx-2.1.1

data/lib/ingreedy.rb

@@ -5,6 +5,8 @@ require File.join(path, "ingreedy_parser")
 require File.join(path, "dictionary_collection")
 
 module Ingreedy
+  ParseFailed = Class.new(StandardError)
+
   def self.locale
     @locale ||= nil
   end
@@ -16,6 +18,8 @@ module Ingreedy
   def self.parse(query)
     parser = Parser.new(query)
     parser.parse
+  rescue Parslet::ParseFailed => e
+    fail ParseFailed.new(e.message), e.backtrace
   end
 
   def self.dictionaries

data/lib/ingreedy/amount_parser.rb

@@ -47,15 +47,11 @@ module Ingreedy
       word_digits.map { |d| stri(d) }.inject(:|) || any
     end
 
-    rule(:amount_unit_separator) do
-      whitespace | str("-")
-    end
-
     rule(:amount) do
       fraction |
         float.as(:float_amount) |
         integer.as(:integer_amount) |
-        word_digit.as(:word_integer_amount) >> amount_unit_separator
+        word_digit.as(:word_integer_amount) >> whitespace
     end
 
     root(:amount)

data/lib/ingreedy/root_parser.rb

@@ -3,11 +3,15 @@ module Ingreedy
     rule(:range) do
       AmountParser.new.as(:amount) >>
         whitespace.maybe >>
-        str("-") >>
+        range_separator >>
         whitespace.maybe >>
         AmountParser.new.as(:amount_end)
     end
 
+    rule(:range_separator) do
+      str("-") | str("~")
+    end
+
     rule(:amount) do
       AmountParser.new.as(:amount)
     end

data/lib/ingreedy/version.rb

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

data/spec/ingreedy_spec.rb

@@ -1,46 +1,7 @@
 # encoding: utf-8
 require "spec_helper"
 
-describe Ingreedy do
-  context "amount parsing" do
-    {
-      "1 cup flour" => 1,
-      "one cup flour" => 1,
-      "1 1/2 cups flour" => "3/2",
-      "¼ cups flour" => "1/4",
-      "1 ½ cups flour" => "3/2",
-      "1½ cups flour" => "3/2",
-      "1.0 cup flour" => 1,
-      "1.5 cups flour" => "3/2",
-      "1,5 cups flour" => "3/2",
-      "1 2/3 cups flour" => "5/3",
-      "1 (28 ounce) can crushed tomatoes" => 1,
-      "2 (28 ounce) can crushed tomatoes" => 2,
-      "3 28 ounce can crushed tomatoes" => 3,
-      "one 28 ounce can crushed tomatoes" => 1,
-      "two five-ounce can crushed tomatoes" => 2,
-      "two 28 ounce cans crushed tomatoes" => 2,
-      "three 28 ounce cans crushed tomatoes" => 3,
-      "1/2 cups flour" => "1/2",
-      ".25 cups flour" => "1/4",
-      "12oz tequila" => 12,
-      "1 banana" => 1,
-    }.each do |query, expected|
-      it "parses the correct amount as a rational" do
-        expect(Ingreedy.parse(query)).to parse_the_amount(expected.to_r)
-      end
-    end
-  end
-
-  context "unit parsing" do
-    context "(english)" do
-    end
-    context "(metric)" do
-    end
-    context "(nonstandard)" do
-    end
-  end
-
+describe Ingreedy, ".parse" do
   it "parses a simple example correctly" do
     result = Ingreedy.parse("1 lb potatoes")
 
@@ -50,7 +11,37 @@ describe Ingreedy do
   end
 end
 
-describe "english units" do
+describe Ingreedy, "amount parsing" do
+  {
+    "1 cup flour" => 1,
+    "one cup flour" => 1,
+    "1 1/2 cups flour" => "3/2",
+    "¼ cups flour" => "1/4",
+    "1 ½ cups flour" => "3/2",
+    "1½ cups flour" => "3/2",
+    "1.0 cup flour" => 1,
+    "1.5 cups flour" => "3/2",
+    "1,5 cups flour" => "3/2",
+    "1 2/3 cups flour" => "5/3",
+    "1 (28 ounce) can crushed tomatoes" => 1,
+    "2 (28 ounce) can crushed tomatoes" => 2,
+    "3 28 ounce can crushed tomatoes" => 3,
+    "one 28 ounce can crushed tomatoes" => 1,
+    "two five-ounce can crushed tomatoes" => 2,
+    "two 28 ounce cans crushed tomatoes" => 2,
+    "three 28 ounce cans crushed tomatoes" => 3,
+    "1/2 cups flour" => "1/2",
+    ".25 cups flour" => "1/4",
+    "12oz tequila" => 12,
+    "1 banana" => 1,
+  }.each do |query, expected|
+    it "parses the correct amount as a rational" do
+      expect(Ingreedy.parse(query)).to parse_the_amount(expected.to_r)
+    end
+  end
+end
+
+describe Ingreedy, "english units" do
   context "abbreviated" do
     {
       "1 c flour" => :cup,
@@ -88,7 +79,7 @@ describe "english units" do
       "1 LB flour" => :pound,
       "1 tSP sugar" => :teaspoon,
     }.each do |query, expected|
-      it "parses the units correctly" do
+      it "parses the #{expected} unit correctly" do
         expect(Ingreedy.parse(query)).to parse_the_unit(expected)
       end
     end
@@ -118,7 +109,7 @@ describe "english units" do
   end
 end
 
-describe "metric units" do
+describe Ingreedy, "metric units" do
   context "abbreviated" do
     {
       "1 g flour" => :gram,
@@ -160,7 +151,7 @@ describe "metric units" do
   end
 end
 
-describe "nonstandard units" do
+describe Ingreedy, "nonstandard units" do
   {
     "1 pinch pepper" => :pinch,
     "2 pinches pepper" => :pinch,
@@ -180,7 +171,7 @@ describe "nonstandard units" do
   end
 end
 
-describe "without units" do
+describe Ingreedy, "without units" do
   it "parses correctly" do
     result = Ingreedy.parse "3 eggs, lightly beaten"
 
@@ -190,7 +181,7 @@ describe "without units" do
   end
 end
 
-describe "container as part of quantity" do
+describe Ingreedy, "container as part of quantity" do
   it "parses correctly" do
     result = Ingreedy.parse "160g (2 cans) of tomatoes"
 
@@ -229,7 +220,7 @@ describe "container as part of quantity" do
   end
 end
 
-describe "with 'a' as quantity and preposition 'of'" do
+describe Ingreedy, "with 'a' as quantity and preposition 'of'" do
   it "parses correctly" do
     result = Ingreedy.parse "a dash of ginger"
 
@@ -239,7 +230,7 @@ describe "with 'a' as quantity and preposition 'of'" do
   end
 end
 
-describe "with 'reverse format'" do
+describe Ingreedy, "with 'reverse format'" do
   it "works with words containing a 'word digit'" do
     result = Ingreedy.parse "salt 200g"
 
@@ -265,7 +256,7 @@ describe "with 'reverse format'" do
   end
 end
 
-describe "Given a range" do
+describe Ingreedy, "Given a range" do
   it "works with simple ranges" do
     result = Ingreedy.parse "1-2 tbsp salt"
 
@@ -281,9 +272,17 @@ describe "Given a range" do
     expect(result.unit).to eq(:tablespoon)
     expect(result.ingredient).to eq("salt")
   end
+
+  it "works with tilde" do
+    result = Ingreedy.parse "1~2 tbsp salt"
+
+    expect(result.amount).to eq([1, 2])
+    expect(result.unit).to eq(:tablespoon)
+    expect(result.ingredient).to eq("salt")
+  end
 end
 
-describe "parsing in language with no prepositions" do
+describe Ingreedy, "parsing in language with no prepositions" do
   before(:all) do
     Ingreedy.dictionaries[:id] = {
       units: {
@@ -307,7 +306,7 @@ describe "parsing in language with no prepositions" do
   end
 end
 
-describe "custom dictionaries" do
+describe Ingreedy, "custom dictionaries" do
   context "using Ingreedy.locale=" do
     before(:all) do
       Ingreedy.dictionaries[:fr] = {
@@ -371,8 +370,16 @@ describe "custom dictionaries" do
   end
 end
 
-describe "ingredient formatting" do
+describe Ingreedy, "ingredient formatting" do
   it "strips preceding or trailing whitespace" do
     expect(Ingreedy.parse("1 cup flour ").ingredient).to eq("flour")
   end
 end
+
+describe Ingreedy, "error handling" do
+  it "wraps Parslet exceptions in a custom exception" do
+    expect do
+      Ingreedy.parse("nonsense")
+    end.to raise_error Ingreedy::ParseFailed
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ingreedy
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ian C. Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -116,7 +116,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rvmrc"
 - ".travis.yml"
 - Gemfile
 - README.md
@@ -158,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Recipe parser

data/.rvmrc

@@ -1 +0,0 @@
-rvm --create 1.9.3@ingreedy