tychus 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31bfca329642b6f6ff3ea7e03c5e51c6ddc19dc1
-  data.tar.gz: cc5950e7db596ed6f2726d8eeeb139a15ef3a543
+  metadata.gz: 6bc9018fe36889fe35e6f7c628bca5e4920b5fb4
+  data.tar.gz: a6af0d410b9c61d59c618d447ff53df239b8ea30
 SHA512:
-  metadata.gz: 5373215f9f13c69a02bf53af7d67a41d2abe42485cec37f3fb530c0ca7f24b442c070fad454b595473b45fb8262b9dd37ee7021cc97c09202ae839f05267f811
-  data.tar.gz: 4a75a2251cea8003277b304eaf596746578f4ec2ec7d1a0644e0cc904424514066c98a5c0bc2eeeacca4e1a836ef962cd3cf7d8d28132dafb3137b9359ffca88
+  metadata.gz: 9019b38648df1eb14df472991eaca4e8f349b6456a7c78d4b4458cd713e03d0ee61c8a24904dea1e60c8159de56c04799808f03b8c98c4d2089e480a1cba40a9
+  data.tar.gz: 714686e496f584676dd25677287eec0fc63973dc87ea566a49685068ae1251660385cb6b0f2abf9d13459799766050ebcd3e2878248d24e0662794c1519df75e

data/lib/tychus/parsers/allrecipes_parser.rb

@@ -6,8 +6,9 @@ module Parsers
       "allrecipes.com"
     end
 
-    def clean_instructions(instructions)
+    def parse_recipe_instructions
       #reject last "Kitchen Friendly View" element
+      instructions = super
       instructions[0..-2]
     end
   end

data/lib/tychus/parsers/base.rb

@@ -35,6 +35,10 @@ module Parsers
       @recipe_doc = @doc.css(root_doc)
     end
 
+    def clean_instructions(obj)
+      obj
+    end
+
     def parse
       recipe_attributes.each do |attr|
         property_value = __send__("parse_#{attr}")
@@ -47,10 +51,6 @@ module Parsers
       self.class.recipe_attributes
     end
 
-    def clean_instructions(obj)
-      obj
-    end
-
     def Value(obj)
       case obj
       when NullObject then nil

data/lib/tychus/parsers/kraft_recipes_parser.rb

@@ -13,6 +13,23 @@ module Parsers
       doc.css('meta[name="description"]').first.attr('content')
     end
 
+    def parse_ingredients
+      # "1 lb.\r\n\t\t\t\t\t\t\t\t boneless skinless chicken breasts, cut into 1-1/2-inch pieces", "2 cups\r\n\t\t\t\t\t\t\t\t fresh pineapple chunks (1-1/2 inch)", "1 \r\n\t\t\t\t\t\t\t\t each red and green pepper, cut into 1-1/2-inch pieces", "1/2 cup\r\n\t\t\t\t\t\t\t\t KRAFT Original Barbecue Sauce", "3 Tbsp.\r\n\t\t\t\t\t\t\t\t frozen orange juice concentrate, thawed"
+      recipe_doc
+        .css('[itemprop="ingredients"]')
+        .map do|ingredient_node|
+          ingredient_node
+            .element_children
+            .map do |node| node.content
+              .lstrip
+              .rstrip
+              .squeeze(" ")
+              .gsub(/(\r|\n|\t)/,'')
+            end.join(" ")
+        end.reject(&:blank?)
+    end
+
+
     def parse_name
       # "\r\n\tSweet BBQ Chicken Kabobs\r\n\t"
       result = super
@@ -31,23 +48,6 @@ module Parsers
         end.flatten.reject(&:blank?)
     end
 
-    def parse_ingredients
-      # NOT FIRST
-      # "1 lb.\r\n\t\t\t\t\t\t\t\t boneless skinless chicken breasts, cut into 1-1/2-inch pieces", "2 cups\r\n\t\t\t\t\t\t\t\t fresh pineapple chunks (1-1/2 inch)", "1 \r\n\t\t\t\t\t\t\t\t each red and green pepper, cut into 1-1/2-inch pieces", "1/2 cup\r\n\t\t\t\t\t\t\t\t KRAFT Original Barbecue Sauce", "3 Tbsp.\r\n\t\t\t\t\t\t\t\t frozen orange juice concentrate, thawed"
-      recipe_doc
-        .css('[itemprop="ingredients"]')
-        .map do|ingredient_node|
-          ingredient_node
-            .element_children
-            .map do |node| node.content
-              .lstrip
-              .rstrip
-              .squeeze(" ")
-              .gsub(/(\r|\n|\t)/,'')
-            end.join(" ")
-        end.reject(&:blank?)
-    end
-
   end
 
 end

data/lib/tychus/parsers/schema_org_parser.rb

@@ -14,6 +14,10 @@ module Parsers
       strip_video_object_microformat
     end
 
+    def itemprop_node_for(property)
+      recipe_doc.css("[itemprop='#{property}']").first || NullObject.new
+    end
+
     def parse_author
       itemprop_node_for(:author).content
     end
@@ -31,7 +35,7 @@ module Parsers
       # reject headers such as "Directions" and divs such as .categories for Foodnetwork recipes
       reject_regex = /^(h.|div)$/
 
-      clean_instructions(itemprop_node_for(:recipeInstructions)
+      itemprop_node_for(:recipeInstructions)
         .element_children
         .reject { |node| node.name =~ reject_regex }
         .map do |node|
@@ -39,11 +43,7 @@ module Parsers
             .squeeze(" ")
             .rstrip
             .split("\r\n\s\r\n\s")
-        end.flatten.reject(&:blank?))
-    end
-
-    def parse_name
-      itemprop_node_for(:name).content
+        end.flatten.reject(&:blank?)
     end
 
     def parse_cook_time
@@ -51,6 +51,20 @@ module Parsers
       parse_duration(itemprop_node_for(:cookTime))
     end
 
+    def parse_duration(node)
+      # Allrecipes - 'time' element
+      # Foodnetwork - 'meta' element (std according to
+      # Schema.org/Recipe)
+      case node.name
+      when "meta", "span"
+        node.attr('content')
+      when "time"
+        node.attr('datetime')
+      else
+        NullObject.new
+      end
+    end
+
     def parse_image
       itemprop_node_for(:image).attr('src')
     end
@@ -67,22 +81,12 @@ module Parsers
         end.reject(&:blank?)
     end
 
-    def parse_prep_time
-      parse_duration(itemprop_node_for(:prepTime))
+    def parse_name
+      itemprop_node_for(:name).content
     end
 
-    def parse_duration(node)
-      # Allrecipes - 'time' element
-      # Foodnetwork - 'meta' element (std according to
-      # Schema.org/Recipe)
-      case node.name
-      when "meta", "span"
-        node.attr('content')
-      when "time"
-        node.attr('datetime')
-      else
-        NullObject.new
-      end
+    def parse_prep_time
+      parse_duration(itemprop_node_for(:prepTime))
     end
 
     def parse_recipe_yield
@@ -102,9 +106,6 @@ module Parsers
       recipe_doc.css(video_object_doc).remove
     end
 
-    def itemprop_node_for(property)
-      recipe_doc.css("[itemprop='#{property}']").first || NullObject.new
-    end
   end
 
 end

data/lib/tychus/version.rb

@@ -1,3 +1,3 @@
 module Tychus
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tychus
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Wayne Yang
@@ -172,7 +172,6 @@ files:
 - lib/tychus/parsers/kraft_recipes_parser.rb
 - lib/tychus/parsers/schema_org_parser.rb
 - lib/tychus/uri_resolver.rb
-- lib/tychus/utilities/url_parser.rb
 - lib/tychus/version.rb
 - questions.md
 - spec/fixtures/allrecipes.html