hangry 0.0.5 → 0.0.6

data/lib/hangry/data_vocabulary_recipe_parser.rb

@@ -20,7 +20,7 @@ module Hangry
     end
 
     def parse_instructions
-      clean_string node_with_itemprop(:instructions).content
+      clean_string node_with_itemprop(:instructions).content, preserve_newlines: true
     end
 
     def parse_published_date

data/lib/hangry/hrecipe_parser.rb

@@ -43,7 +43,7 @@ module Hangry
     end
 
     def parse_instructions
-      clean_string node_with_class(:instructions).content
+      clean_string node_with_class(:instructions).content, preserve_newlines: true
     end
 
     def parse_name

data/lib/hangry/recipe_parser.rb

@@ -47,8 +47,17 @@ module Hangry
       end
     end
 
-    def clean_string(string)
-      string.strip.gsub(/\s+/, ' ')
+    def clean_string(string, options={})
+      preserve_newlines = options.fetch(:preserve_newlines, false)
+
+      string.strip!                     # remove leading and trailing spaces
+      if preserve_newlines
+        string.gsub!(/\s*\n\s*/, "\n")  # replace any whitespace group with a newline with a single newline
+        string.squeeze!(' ')            # consolidate duplicate spaces into a single space
+      else
+        string.gsub!(/\s+/, ' ')        # replace all consecutive whitespace with a single space
+      end
+      string
     end
 
     def initialize_nutrition

data/lib/hangry/schema_org_recipe_parser.rb

@@ -50,7 +50,7 @@ module Hangry
       end
     end
     def parse_instructions
-      clean_string node_with_itemprop(:recipeInstructions).content
+      clean_string node_with_itemprop(:recipeInstructions).content, preserve_newlines: true
     end
     def parse_name
       clean_string node_with_itemprop(:name).content

data/lib/hangry/version.rb

@@ -1,3 +1,3 @@
 module Hangry
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/real_examples/big_oven_spec.rb

@@ -24,7 +24,17 @@ describe Hangry do
     }
     its(:instructions) do
       instructions = <<-eos
-      As with any recipe, adaptation to your taste is the key to success and your culinary enjoyment. This recipe is a preparation of optional ingredients, then you build the tacos as you like them. 1. Cut across the cabbage on the end opposite the stem in 1/4 inch rounds, then turn the rings and cut again to shred into small bite size pieces. Place the cabbage in a gallon freezer bag. Add 1 tablespoon of lime juice, the vinegar and season with salt pepper, cumin and coriander as you like. Shake the bag every direction to mix the ingredients and let sit while you prepare everything else. 2. For the fish - Cut the fish into fillets that you will later pull apart with two forks. Mix the egg and milk together. Mix the flour and cornmeal, and add seasonings that you like. I have a 22 herb/spice mix that I've come up with that I mix in with the flour and corn meal. Coriander, cumin, salt and pepper, garlic and onion powder are a good start. I'll post the mix as a separate recipe. 3. Bathe the fish in the mile/egg mixture, and dredge in the flour/seasoning mixture on both sides. Set aside until all the fish is ready. 4. Heat the oil or butter in a pan on medium high, and cook the fish, about 4 minutes per side. Take the fish out of the pan with tongs, set on a cutting board and squeeze lime juice over it. Let it cool. 5. Prepare the tomato, onion and cilantro and set out in small bowls. Mix the salsa of your choice and sour cream. 6. When the fish has cooled, use one fork to anchor it and shred with the another, flaking off small pieces. Place in a bowl. 7. Set out the cabbage in a small bowl. 8. Heat the tortillas in a microwave. Place two on a plate, and build up your tacos with sour cream mix, fish, onion, tomato, tomato, jalapenos, hot sauce - whatever you like! Fold over and dig in, with a nice IPA or crisp white wine!
+      As with any recipe, adaptation to your taste is the key to success and your culinary enjoyment.
+This recipe is a preparation of optional ingredients, then you build the tacos as you like them.
+1. Cut across the cabbage on the end opposite the stem in 1/4 inch rounds, then turn the rings and cut again to shred into small bite size pieces. Place the cabbage in a gallon freezer bag. Add 1 tablespoon of lime juice, the vinegar and season with salt pepper, cumin and coriander as you like. Shake the bag every direction to mix the ingredients and let sit while you prepare everything else.
+2. For the fish - Cut the fish into fillets that you will later pull apart with two forks. Mix the egg and milk together. Mix the flour and cornmeal, and add seasonings that you like. I have a 22 herb/spice mix that I've come up with that I mix in with the flour and corn meal. Coriander, cumin, salt and pepper, garlic and onion powder are a good start. I'll post the mix as a separate recipe.
+3. Bathe the fish in the mile/egg mixture, and dredge in the flour/seasoning mixture on both sides. Set aside until all the fish is ready.
+4. Heat the oil or butter in a pan on medium high, and cook the fish, about 4 minutes per side. Take the fish out of the pan with tongs, set on a cutting board and squeeze lime juice over it. Let it cool.
+5. Prepare the tomato, onion and cilantro and set out in small bowls. Mix the salsa of your choice and sour cream.
+6. When the fish has cooled, use one fork to anchor it and shred with the another, flaking off small pieces. Place in a bowl.
+7. Set out the cabbage in a small bowl.
+8. Heat the tortillas in a microwave. Place two on a plate, and build up your tacos with sour cream mix, fish, onion, tomato, tomato, jalapenos, hot sauce - whatever you like!
+Fold over and dig in, with a nice IPA or crisp white wine!
       eos
       should == instructions.strip
     end

data/spec/real_examples/epicurious_spec.rb

@@ -31,8 +31,17 @@ describe Hangry do
     }
 
     its(:instructions) do
+      # hmm... preserving newlines for Epicurious instructions gives us some crappy results...
       instructions = <<-eos
-Preparation Toast cumin seeds and coriander seeds in small skillet over medium-high heat until aromatic and slightly darker in color, shaking skillet often, about 1 1/2 minutes. Cool. Finely grind toasted seeds in spice grinder or in mortar with pestle. Whisk mayonnaise, 2 tablespoons extra-virgin olive oil, fresh lemon juice, smoked paprika, garlic, and ground spices in small bowl. Season aioli to taste with salt and pepper. DO AHEAD: Aioli can be made 1 day ahead. Cover and refrigerate. Place turkey in medium bowl. Add 2 tablespoons aioli; mix gently. Using damp hands, divide turkey mixture into 4 equal portions, then form each into scant 3/4-inch thick patty, about 3 1/2 inches in diameter. Using thumb, make small indentation in center of each burger. DO AHEAD: Can be made 4 hours ahead. Cover and chill. Prepare barbecue (medium-high heat). Sprinkle burgers with salt and pepper. Brush onion slices and bell pepper pieces with oil; sprinkle with salt and pepper. Grill onions and bell peppers until soft and charred, about 4 minutes per side. Grill turkey burgers 5 minutes. Turn over; grill until almost cooked through, about 4 minutes. Top each burger with 1 cheese slice and grill until meat is cooked through and cheese melts, about 1 minute longer. Place 1 turkey burger on each of 4 bun bottoms. Arrange grilled red pepper pieces, then grilled red onion slices over. Top each with dollop of aioli and some arugula. Cover burgers with bun tops and serve with pickle wedges and corn chips. add your own note
+Preparation
+Toast cumin seeds and coriander seeds in small skillet over medium-high heat
+until aromatic and slightly darker in color, shaking skillet often, about 1 1/2 minutes. Cool. Finely grind toasted seeds in spice grinder or in mortar with pestle. Whisk mayonnaise, 2 tablespoons extra-virgin olive oil, fresh lemon juice, smoked paprika, garlic, and ground spices in small bowl. Season aioli to taste with salt and pepper. DO AHEAD: Aioli can be made 1 day ahead. Cover and refrigerate.
+Place turkey in medium bowl. Add 2 tablespoons aioli; mix gently. Using damp
+hands, divide turkey mixture into 4 equal portions, then form each into scant 3/4-inch thick patty, about 3 1/2 inches in diameter. Using thumb, make small indentation in center of each burger. DO AHEAD: Can be made 4 hours ahead. Cover and chill.
+Prepare barbecue (medium-high heat). Sprinkle burgers with salt and pepper. Brush onion slices and bell pepper pieces with oil; sprinkle with salt and pepper. Grill onions and bell peppers until soft and charred, about 4 minutes per side.
+Grill turkey burgers 5 minutes. Turn over; grill until almost cooked through,
+about 4 minutes. Top each burger with 1 cheese slice and grill until meat is cooked through and cheese melts, about 1 minute longer. Place 1 turkey burger on each of 4 bun bottoms. Arrange grilled red pepper pieces, then grilled red onion slices over. Top each with dollop of aioli and some arugula. Cover burgers with bun tops and serve with pickle wedges and corn chips.
+add your own note
       eos
       should == instructions.strip
     end

data/spec/real_examples/food_network_spec.rb

@@ -31,7 +31,10 @@ describe Hangry do
 
     its(:instructions) do
       instructions = <<-instructions
-Place breasts in the center of a plastic food storage bag or 2 large sheets of waxed paper. Pound out the chicken from the center of the bag outward using a heavy-bottomed skillet or mallet. Be firm but controlled with your strokes. Defrost spinach in the microwave. Transfer spinach to a kitchen towel. Twist towel around spinach and wring it out until very dry. Transfer to a medium-mixing bowl. Place a nonstick skillet over moderate heat. When skillet is hot, add butter, mushrooms, garlic and shallot. Season with salt and pepper and saute 5 minutes. Transfer mushrooms, garlic and shallot to the food processor. Pulse to grind the mushrooms and transfer to the mixing bowl, adding the processed mushrooms to the spinach. Add ricotta and grated cheese to the bowl and the nutmeg. Stir to combine the stuffing. Return your skillet to the stove over medium high heat. Place a mound of stuffing on each breast and wrap and roll breast over the stuffing. Secure breasts with toothpicks. Add 3 tablespoons oil to the pan, 3 turns of the pan. Add breasts to the pan and brown on all sides, cooking chicken 10 to 12 minutes. The meat will cook quickly because it is thin. Remove breasts; add butter to the pan and flour. Cook butter and flour for a minute, whisk in wine and reduce another minute. Whisk in broth and return breasts to the pan. Reduce heat and simmer until ready to serve. Remove toothpicks. Serve breasts whole or, remove from pan, slice on an angle and fan out on dinner plates. Top stuffed chicken breasts or sliced stuffed breasts with generous spoonfuls of the sauce.
+Place breasts in the center of a plastic food storage bag or 2 large sheets of waxed paper. Pound out the chicken from the center of the bag outward using a heavy-bottomed skillet or mallet. Be firm but controlled with your strokes.
+Defrost spinach in the microwave. Transfer spinach to a kitchen towel. Twist towel around spinach and wring it out until very dry. Transfer to a medium-mixing bowl.
+Place a nonstick skillet over moderate heat. When skillet is hot, add butter, mushrooms, garlic and shallot. Season with salt and pepper and saute 5 minutes. Transfer mushrooms, garlic and shallot to the food processor. Pulse to grind the mushrooms and transfer to the mixing bowl, adding the processed mushrooms to the spinach. Add ricotta and grated cheese to the bowl and the nutmeg. Stir to combine the stuffing. Return your skillet to the stove over medium high heat.
+Place a mound of stuffing on each breast and wrap and roll breast over the stuffing. Secure breasts with toothpicks. Add 3 tablespoons oil to the pan, 3 turns of the pan. Add breasts to the pan and brown on all sides, cooking chicken 10 to 12 minutes. The meat will cook quickly because it is thin. Remove breasts; add butter to the pan and flour. Cook butter and flour for a minute, whisk in wine and reduce another minute. Whisk in broth and return breasts to the pan. Reduce heat and simmer until ready to serve. Remove toothpicks. Serve breasts whole or, remove from pan, slice on an angle and fan out on dinner plates. Top stuffed chicken breasts or sliced stuffed breasts with generous spoonfuls of the sauce.
       instructions
       should == instructions.strip
     end

data/spec/real_examples/myrecipes_com_spec.rb

@@ -19,7 +19,10 @@ describe Hangry do
     }
     its(:instructions) do
       instructions = <<-eos
-      Line 3 (9-inch) round cakepans with wax paper; lightly grease and flour wax paper. Set pans aside. Stir together first 4 ingredients. Beat eggs and next 4 ingredients at medium speed with an electric mixer until smooth. Add flour mixture, beating at low speed until blended. Fold in carrot and next 3 ingredients. Pour batter into prepared cakepans. Bake at 350° for 25 to 30 minutes or until a wooden pick inserted in center comes out clean. Drizzle Buttermilk Glaze evenly over layers; cool in pans on wire racks 15 minutes. Remove from pans, and cool completely on wire racks. Spread Cream Cheese Frosting between layers and on top and sides of cake.
+      Line 3 (9-inch) round cakepans with wax paper; lightly grease and flour wax paper. Set pans aside.
+Stir together first 4 ingredients.
+Beat eggs and next 4 ingredients at medium speed with an electric mixer until smooth. Add flour mixture, beating at low speed until blended. Fold in carrot and next 3 ingredients. Pour batter into prepared cakepans.
+Bake at 350° for 25 to 30 minutes or until a wooden pick inserted in center comes out clean. Drizzle Buttermilk Glaze evenly over layers; cool in pans on wire racks 15 minutes. Remove from pans, and cool completely on wire racks. Spread Cream Cheese Frosting between layers and on top and sides of cake.
       eos
       should == instructions.strip
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hangry
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-03-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70299202813480 !ruby/object:Gem::Requirement
+  requirement: &70141407538320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299202813480
+  version_requirements: *70141407538320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70299202812940 !ruby/object:Gem::Requirement
+  requirement: &70141407537900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299202812940
+  version_requirements: *70141407537900
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70299202812440 !ruby/object:Gem::Requirement
+  requirement: &70141407537460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299202812440
+  version_requirements: *70141407537460
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70299202811840 !ruby/object:Gem::Requirement
+  requirement: &70141407536960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70299202811840
+  version_requirements: *70141407536960
 - !ruby/object:Gem::Dependency
   name: iso8601
-  requirement: &70299202811260 !ruby/object:Gem::Requirement
+  requirement: &70141407536420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70299202811260
+  version_requirements: *70141407536420
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70299202810720 !ruby/object:Gem::Requirement
+  requirement: &70141407535940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70299202810720
+  version_requirements: *70141407535940
 description: A recipe microformat parser.
 email:
 - ian@iancanderson.com