budget-bytes-cli 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd890826cf37793882a38c8668b25bfb0c01829
-  data.tar.gz: 4045d839bf92d038f32cd595a0bb01467e5b6190
+  metadata.gz: 12a8bab68c36e2b65a58f41cd043d44be8ece494
+  data.tar.gz: 9b8f70703bd4b0cfa7f168e2afce4fbf03904695
 SHA512:
-  metadata.gz: b3cc756a4d4f64483f2d3a082052940fd6d64ac516524d467c0d3d3159eb51034173f744bb24b736dc3c2c609000572a781c08413b5f1d0544689cdebf585859
-  data.tar.gz: b7fef8f19afd5b4099bfd3e0fd5d5ea607d730ad067994202b746f8ee8c9baeba8692ec80558eb4e8b4eafc0c4571877c0cadf9855a321a91103dd96b9fdb508
+  metadata.gz: a1b2ca52479cfa64582d3f93ef8eca61398380cc21f600db69199ab5107477824849cef206fd59a8521c2f2afecb93d99f251af82bec433ec5b91e73d8960347
+  data.tar.gz: 1a975893f5afb10fe1ac6cedf19d104f5d77130c96fc72e4dafb2023d755d5d2556873240b98d4eb2598f9c8c033414a8ce434ade925e7bf1f367799dcf29db2

data/lib/budget_bytes_cli/cli.rb

@@ -73,15 +73,19 @@ class BudgetBytesCli::CLI
     end
     
     def display_recipe(recipe_chosen)
-        puts recipe_chosen.name
-        puts "\nIngredients\n"
-        puts recipe_chosen.ingredients
-        puts ""
-        page_width = IO.console.winsize[1]
-        puts reformat_wrapped(recipe_chosen.instructions, page_width || 80)
-        puts ""
-        if yes_no_input("Do you want to open this recipe in your browser?") == 'Y'
-            Launchy.open(recipe_chosen.url)
+        if recipe_chosen.ingredients == "" || recipe_chosen.instructions == ""
+            puts "Error!  Could not scrape recipe from page selected!"
+        else
+            puts recipe_chosen.name
+            puts "\nIngredients\n"
+            puts recipe_chosen.ingredients
+            puts ""
+            page_width = IO.console.winsize[1]
+            puts reformat_wrapped(recipe_chosen.instructions, page_width || 80)
+            puts ""
+            if yes_no_input("Do you want to open this recipe in your browser?") == 'Y'
+                Launchy.open(recipe_chosen.url)
+            end
         end
     end
     

data/lib/budget_bytes_cli/recipe.rb

@@ -13,12 +13,42 @@ class BudgetBytesCli::Recipe
         ingredient_units = page.css('.wprm-recipe-ingredient-unit').map {|i| i.text}
         ingredient_names = page.css('.wprm-recipe-ingredient-name').map {|i| i.text}
         
-        ingredient_array = ingredient_amounts.each_with_index.map do |ele, idx|
-            [ele, ingredient_units[idx], ingredient_names[idx]].join(' ').strip
+        ingredient_array = []
+        
+        ingredient_amounts.each_with_index do |ele, idx|
+            ingredient_array << [ele, ingredient_units[idx], ingredient_names[idx]].join(' ').strip
+        end
+        
+        #scraping for old site before css switched so that the code above scrapes ingredients
+        old_ingredients_table = page.css("tr")
+        
+        #get rid of first, last rows in table (header and total cost)
+        old_ingredients_table.shift
+        old_ingredients_table.pop 
+        
+        old_ingredients_table.each do |old_ingredient|
+            old_ingredient_text = old_ingredient.text.split("\n")
+            
+            #get rid of first blank item, last cost item
+            old_ingredient_text.shift
+            old_ingredient_text.pop
+            
+            ingredient_array << old_ingredient_text.join(" ")
         end
+        
+        recipe_steps = []
+        
+        #scraping for old site before css switched to have recipe instructions in own class
+        page.css("p").map {|i| i.text}.each do |p|
+            if p.split(" ")[0] == "STEP"
+                recipe_steps << p.split(" ").slice(2, p.length - 2).join(" ")
+            end
+        end
+        
+        page.css(".wprm-recipe-instruction-text").each {|i| recipe_steps << i.text}
 
         @ingredients = ingredient_array.join("\n")
-        @instructions = page.css(".wprm-recipe-instruction-text").map {|i| i.text}.join("\n")
+        @instructions = recipe_steps.join("\n")
     end
     
     def ingredients

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: budget-bytes-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Larry Weinstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler