allrecipes 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcd90231bb99a50a29edd0c32105b20b4bf8820a
-  data.tar.gz: 1136762e02a2363375f6fb2038dd7a729d63549d
+  metadata.gz: a76845bcdebb9e51e1311fb837910787b0c01311
+  data.tar.gz: e5637481662634979738a7feb2ea3f8c76dc5aa5
 SHA512:
-  metadata.gz: 15de609534ffec45437568f31901a1b84bfc7f3829bbd5a9ddf7a659197a6161fa59116093e6f3f2af91dbdee9265fb8ac803fa9205c385ded435d141733e933
-  data.tar.gz: c606406a5bc8a57b3eaa37f45240c9989612695ee6cb4ed290e8fe2e712c74eab4844d47622b2038a8df870cd3cac5da105b2165b609382667d0f3d3664f4b86
+  metadata.gz: a7c0db453b9dab2927dd40147c4c3cc8dc2dd57a037400c8dfa63aa6e2a388bcb0496b0c9fa2708d435bd9c4b23cc81f113e5a91f46ff467b367abf365926c93
+  data.tar.gz: ec9fa16ffc9c391ff1facb8b130537431ad993793ede0e1b745eb4220ba0e57fce154fdef9997acd976f96da4a7b46d56b89476600c75538acc2417d5cc7af90

data/README.md

@@ -1,4 +1,4 @@
-# The Allrecipes Ruby Gem
+# The <a href="http://allrecipes.com" target="_blank">Allrecipes</a> Ruby Gem
 [![Gem Version](https://badge.fury.io/rb/allrecipes.svg)](http://badge.fury.io/rb/allrecipes)
 [![Build Status](https://travis-ci.org/shivamd/allrecipes.svg?branch=master)](https://travis-ci.org/shivamd/allrecipes)
 [![Dependency Status](https://gemnasium.com/shivamd/allrecipes.svg)](https://gemnasium.com/shivamd/allrecipes)
@@ -152,7 +152,15 @@ If mentioned outside of this scope, will resort to default(relevance).
 ```ruby
 recipes.ingredient("apples", { sort_by: "rating", page: 3 })
 ```
+**Get recipe from url** 
+```ruby
+recipes.recipe_url("http://allrecipes.com/Recipe/Worlds-Best-Lasagna")
+```
 
+**Get recipes from a page which has a collection of recipes**
+```ruby
+recipes.page_url("http://allrecipes.com/recipes?Page=7")
+```
 
 **Sample response**
 ```ruby
@@ -175,18 +183,21 @@ recipes.ingredient("apples", { sort_by: "rating", page: 3 })
            "Bring a large pot of lightly salted water to a boil"
          }
        ]
+      :rating => 5.0,   #number between 0 and 5, rounded to the nearest .5
+      :prep_time => 90, #in minutes
+      :cook_time => 60  #in minutes
     }
 ]
 ```
 
 ## Todo
 
-1. Complex search with queries such as multiple ingredients, course, time etc.
-2. Add prep time & cook time to results
-3. Add nutrional info to results.
-4. Add rating to results
-5. Add user photos for recipe to results
-6. Able to get popular recipes of the day.
-7. Able to request with recipe URL. 
-8. Able to request with page URL.
-9. Option for selecting what keys to return.
+1. Option for selecting what keys to return.
+2. Complex search with queries such as multiple ingredients, course, time etc.
+3. Faster test suite
+4. Move ingredients parsing into its own class.
+5. Add nutrional info to results.
+6. Add user photos for recipe to results
+7. Able to get popular recipes of the day. 
+
+

data/lib/allrecipes.rb

@@ -2,6 +2,7 @@ require "allrecipes/version"
 require "allrecipes/url_helper"
 require "allrecipes/main"
 require "allrecipes/page_parser"
+require "allrecipes/ingredients_parser"
 require "allrecipes/recipe_parser"
 require 'nokogiri'
 require 'mechanize'

data/lib/allrecipes/ingredients_parser.rb

@@ -0,0 +1,50 @@
+class IngredientsParser
+  def initialize(page)
+    @page = page
+    @ingredients = []
+    parse_ingredients
+  end
+
+  def parse_ingredients
+    ingredients_list.each do |ingredient|
+      amount = amount(ingredient)
+      ingredient_name= ingredient_name(ingredient)
+      add_ingredient_to_list(amount, ingredient_name)
+    end
+  end
+
+  def ingredients_list
+    @page.search(ingredients_class)
+  end
+
+  def ingredients_class
+    ".fl-ing"
+  end
+
+  def add_ingredient_to_list(amount, ingredient_name)
+    if amount && ingredient_name #some recipes have empty ingredients
+      quantity,unit = amount.text.split(" ")
+      @ingredients << { quantity: quantity.to_f, unit: unit, name: ingredient_name.text }
+    end
+  end
+
+  def amount(ingredient)
+    ingredient.search(ingredient_amount_class).children[0]
+  end
+
+  def ingredient_amount_class
+    ".ingredient-amount"
+  end
+
+  def ingredient_name(ingredient)
+    ingredient.search(ingredient_name_class).children[0]
+  end
+
+  def ingredient_name_class
+    ".ingredient-name"
+  end
+
+  def ingredients
+    @ingredients
+  end
+end

data/lib/allrecipes/recipe_parser.rb

@@ -3,7 +3,6 @@ class RecipeParser
   def initialize(page)
     @page = request_page(page)
     @directions = []
-    @ingredients = []
     get_ingredients
     get_directions
   end
@@ -94,43 +93,8 @@ class RecipeParser
     end
   end
 
-  def ingredients_list
-    @page.search(ingredients_class)
-  end
-
-  def ingredients_class
-    ".fl-ing"
-  end
-
   def get_ingredients
-    ingredients_list.each do |ingredient|
-      amount = amount(ingredient)
-      ingredient_name= ingredient_name(ingredient)
-      add_ingredient_to_list(amount, ingredient_name)
-    end
-  end
-
-  def add_ingredient_to_list(amount, ingredient_name)
-    if amount && ingredient_name #some recipes have empty ingredients
-      quantity,unit = amount.text.split(" ")
-      @ingredients << { "quantity" => quantity.to_f, "unit"=>unit, "name" => ingredient_name.text }
-    end
-  end
-
-  def amount(ingredient)
-    ingredient.search(ingredient_amount_class).children[0]
-  end
-
-  def ingredient_amount_class
-    ".ingredient-amount"
-  end
-
-  def ingredient_name(ingredient)
-    ingredient.search(ingredient_name_class).children[0]
-  end
-
-  def ingredient_name_class
-    ".ingredient-name"
+    @ingredients = IngredientsParser.new(@page).ingredients
   end
 
   def recipe

data/lib/allrecipes/version.rb

@@ -1,3 +1,3 @@
 class Allrecipes
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/ingredient_parser_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+describe IngredientsParser do
+  before do
+    VCR.use_cassette "ingredients_parser" do
+      url = "http://allrecipes.com/Recipe/Worlds-Best-Lasagna/"
+      page = Mechanize.new.get(url)
+      @ing_parser = IngredientsParser.new(page)
+    end
+  end
+
+  it "should have the right amount of ingredients" do
+    expect(@ing_parser.ingredients.count).to eq 21
+  end
+
+  it "should have the correct quantity" do
+    expect(@ing_parser.ingredients.first[:quantity]).to eq 1
+  end
+
+  it "should have the correct unit" do
+    expect(@ing_parser.ingredients.first[:unit]).to eq "pound"
+  end
+
+  it "should have the correct ingredient name" do
+    expect(@ing_parser.ingredients.first[:name]).to eq "sweet Italian sausage"
+  end
+end

data/spec/recipe_parser_spec.rb

@@ -31,21 +31,8 @@ describe RecipeParser do
     expect(@recipe[:cook_time]).to eq 150
   end
 
-  context "ingredients" do
-
-    it "should have the right amount of ingredients" do
-      expect(@recipe[:ingredients].count).to eq 21
-    end
-    it "should have the right quantity" do
-      expect(@recipe[:ingredients].first["quantity"]).to eq 1
-    end
-    it "should have the right unit" do
-      expect(@recipe[:ingredients].first["unit"]).to eq "pound"
-    end
-    it "should have the right name" do
-      expect(@recipe[:ingredients].first["name"]).to eq "sweet Italian sausage"
-    end
-
+  it "should have the right amount of ingredients" do
+    expect(@recipe[:ingredients].count).to eq 21
   end
 
   it "should have the right amount of directions" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allrecipes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - shivamd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -124,6 +124,7 @@ files:
 - Rakefile
 - allrecipes.gemspec
 - lib/allrecipes.rb
+- lib/allrecipes/ingredients_parser.rb
 - lib/allrecipes/main.rb
 - lib/allrecipes/page_parser.rb
 - lib/allrecipes/recipe_parser.rb
@@ -131,6 +132,7 @@ files:
 - lib/allrecipes/version.rb
 - spec/allrecipes_spec.rb
 - spec/fixtures/recipe.json
+- spec/ingredient_parser_spec.rb
 - spec/page_parser_spec.rb
 - spec/recipe_filter_spec.rb
 - spec/recipe_parser_spec.rb
@@ -162,6 +164,7 @@ summary: A Ruby wrapper for allrecipes.com
 test_files:
 - spec/allrecipes_spec.rb
 - spec/fixtures/recipe.json
+- spec/ingredient_parser_spec.rb
 - spec/page_parser_spec.rb
 - spec/recipe_filter_spec.rb
 - spec/recipe_parser_spec.rb