lettuce 0.0.2 → 0.0.3

data/lib/lettuce.rb

@@ -1,6 +1,6 @@
 require "lettuce/version"
-require 'lettuce/hrecipe/hrecipe'
-require 'lettuce/hrecipe/all_recipes'
+require 'lettuce/recipe'
+require 'lettuce/all_recipes'
 require 'open-uri'
 require 'nokogiri'
 
@@ -8,7 +8,7 @@ module Lettuce
   
   def self.parsers
     { :all_recipes => Lettuce::AllRecipes, 
-      :hrecipe_generic => Lettuce::HRecipe }
+      :hrecipe_generic => Lettuce::Recipe }
   end
   
   def self.parse(url)

data/lib/lettuce/{hrecipe/all_recipes.rb → all_recipes.rb}

@@ -1,14 +1,12 @@
 module Lettuce
-  class AllRecipes < HRecipe
+  class AllRecipes < Recipe
 
     class << self
       def can_parse?(doc, url)
         URI(url).host == "allrecipes.com"
       end
-      
-      def get_root(doc)
-        doc.css('.hRecipe')
-      end
     end
+    
+    root '.hRecipe'
   end
 end

data/lib/lettuce/recipe.rb

@@ -0,0 +1,79 @@
+module Lettuce
+  class Recipe    
+    class << self
+      def can_parse?(doc, url)
+        doc.css('.hrecipe').size > 0
+      end
+      
+      def root(root)
+        @root = root
+      end
+            
+      def parse(doc, url)
+        recipe_root = doc.css(@root)
+        if recipe_root.size > 0
+          self.new(recipe_root[0], url)
+        end
+      end
+      
+      def parse_all(doc, url)
+        recipes = doc.css(@root)
+        
+        if recipes.size > 0
+          recipes.collect { |recipe_root| self.new(recipe_root, url) }
+        end
+      end
+    end
+    
+    root '.hrecipe'
+    
+    def initialize(recipe_root, url)
+      @root = recipe_root
+      @url = url
+    end
+    
+    def title(selector = '.fn')
+      @root.css(selector)[0].content.strip
+    end
+    
+    def ingredients(selector = '.ingredient')
+      @root.css(selector).collect { |ingredient| ingredient.content.strip }
+    end
+    
+    def photo(selector = '.photo')
+      @root.css(selector)[0]['src']
+    end
+    
+    def yield(selector = '.yield')
+      @root.css(selector)[0].content.strip
+    end
+    
+    def instructions(selector = '.instructions')
+      @root.css(selector)[0].content.strip
+    end
+    
+    def duration(selector = '.duration')
+      @root.css(selector).collect { |duration| duration.content.strip }
+    end
+    
+    def summary(selector = '.summary')
+      @root.css(selector)[0].content.strip
+    end
+    
+    def author(selector = '.author')
+      @root.css(selector).collect { |author| author.content.strip }
+    end
+    
+    def published(selector = '.published)')
+      @root.css(selector)[0].content.strip     
+    end
+    
+    def nutrition(selector = '.nutrition')
+      @root.css(selector).collect { |nutrition| nutrition.content.strip }
+    end
+    
+    def tags(selector = '.tag')
+      @root.css(selector).collect { |tag| tag.content.strip }
+    end
+  end
+end

data/lib/lettuce/version.rb

@@ -1,3 +1,3 @@
 module Lettuce
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/hrecipe_spec.rb

@@ -1,6 +1,6 @@
 require 'lettuce'
 
-describe Lettuce::HRecipe do
+describe Lettuce::Recipe do
   before(:all) do
    @file = open(File.join(File.dirname(__FILE__), "fixtures/asparagus.html"))
    @document = Nokogiri::HTML(@file)
@@ -9,22 +9,22 @@ describe Lettuce::HRecipe do
   end
 
   it 'should be able to parse this recipe' do
-    Lettuce::HRecipe.can_parse?(@document, @url)
+    Lettuce::Recipe.can_parse?(@document, @url)
   end
 
   it 'should be called Roasted Asparagus' do
-    recipe = Lettuce::HRecipe.new(@document, @url)
+    recipe = Lettuce::Recipe.new(@document, @url)
     
     recipe.title.should == "Roasted Asparagus"
   end
 
   it 'should return only 6 ingredients' do
-    recipe = Lettuce::HRecipe.new(@document, @url)
+    recipe = Lettuce::Recipe.new(@document, @url)
     recipe.ingredients.size.should == 5    
   end
   
   it 'should have a valid photo url' do
-    recipe = Lettuce::HRecipe.new(@document, @url)
+    recipe = Lettuce::Recipe.new(@document, @url)
     recipe.photo.should == "http://img.foodnetwork.com/FOOD/2009/01/13/vday_roastedasparagus4854_s4x3_med.jpg"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lettuce
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000Z
+date: 2012-02-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2157384140 !ruby/object:Gem::Requirement
+  requirement: &2153384440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157384140
+  version_requirements: *2153384440
 description: A Ruby hRecipe Microformat parser using Nokogiri
 email:
 - tmrudick@gmail.com
@@ -34,8 +34,8 @@ files:
 - Rakefile
 - lettuce.gemspec
 - lib/lettuce.rb
-- lib/lettuce/hrecipe/all_recipes.rb
-- lib/lettuce/hrecipe/hrecipe.rb
+- lib/lettuce/all_recipes.rb
+- lib/lettuce/recipe.rb
 - lib/lettuce/version.rb
 - spec/all_recipes_spec.rb
 - spec/fixtures/asparagus.html

data/lib/lettuce/hrecipe/hrecipe.rb

@@ -1,78 +0,0 @@
-module Lettuce
-  class HRecipe
-    class << self
-      def can_parse?(doc, url)
-        doc.css('.hrecipe').size > 0
-      end
-      
-      def get_root(doc)
-        doc.css('.hrecipe')
-      end
-      
-      def parse(doc, url)
-        root = get_root(doc)
-        if root.size > 0
-          self.new(root[0], url)
-        else 
-          nil
-        end
-      end 
-      
-      def parse_all(doc, url)
-        root = get_root(doc)
-        root.collect { |node| self.new(node, url) }
-      end     
-    end
-    
-    attr_reader :url
-    
-    def initialize(root, url)
-      @root = root
-      @url = url
-    end
-    
-    def title
-      @root.css('.fn')[0].content.strip
-    end
-    
-    def ingredients
-      @root.css('.ingredient').collect { |ingredient| ingredient.content.strip }
-    end
-    
-    def photo
-      @root.css('.photo')[0]['src']
-    end
-    
-    def yield
-      @root.css('.yield')[0].content.strip
-    end
-    
-    def instructions
-      @root.css('.instructions')[0].content.strip
-    end
-    
-    def duration
-      @root.css('.duration').collect { |duration| duration.content.strip }
-    end
-    
-    def summary
-      @root.css('.summary').content.strip
-    end
-    
-    def author
-      @root.css('.author').collect { |author| author.content.strip }
-    end
-    
-    def published
-      @root.css('.published')      
-    end
-    
-    def nutrition
-      @root.css('.nutrition').collect { |nutrition| nutrition.content.strip }
-    end
-    
-    def tags
-      @root.css('.tag').collect { |tag| tag.content.strip }
-    end
-  end
-end