budget-bytes-cli 0.2.5 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12a8bab68c36e2b65a58f41cd043d44be8ece494
-  data.tar.gz: 9b8f70703bd4b0cfa7f168e2afce4fbf03904695
+  metadata.gz: 928104b51be5f14c7c5e731fd245c70aefc70035
+  data.tar.gz: dbd15194ace0333162416f65af95ce081aa51678
 SHA512:
-  metadata.gz: a1b2ca52479cfa64582d3f93ef8eca61398380cc21f600db69199ab5107477824849cef206fd59a8521c2f2afecb93d99f251af82bec433ec5b91e73d8960347
-  data.tar.gz: 1a975893f5afb10fe1ac6cedf19d104f5d77130c96fc72e4dafb2023d755d5d2556873240b98d4eb2598f9c8c033414a8ce434ade925e7bf1f367799dcf29db2
+  metadata.gz: 05cc86ddb7065a5fafd3fdeefc244589522f2e85ac6aedd0d9e8a6fa5265bca2cc9c46cd7b101c972609d5293333e874e7766703fdd6c9a7dba32704299cf534
+  data.tar.gz: 51827b09d2c44c2c6b35c6ad6887a80f6903cd3e538d99c12373f1b54215d750bb55775af27daf1bf059ad0a2fe0ad1b8950cbdc8b0f5f8186ad80951623cbec

data/config/environment.rb

@@ -5,7 +5,7 @@ require 'launchy'
 require 'io/console'
 
 require_relative '../lib/budget_bytes_cli/cli'
-require_relative '../lib/budget_bytes_cli/category-scraper'
+require_relative '../lib/budget_bytes_cli/scraper'
 require_relative '../lib/budget_bytes_cli/category'
 require_relative '../lib/budget_bytes_cli/recipe'
 require_relative '../lib/budget_bytes_cli/array-prompter'

data/lib/budget_bytes_cli/category.rb

@@ -14,50 +14,14 @@ class BudgetBytesCli::Category
     end
     
     def recipes
-        self.get_recipes unless @recipes
-        @recipes
-    end
-    
-    def get_recipes
-        @recipes = []
-        first_page = Nokogiri::HTML(open(self.url))
+        @recipes = BudgetBytesCli::Scraper.get_recipes(self.url) unless @recipes
         
-        page_nums = first_page.css(".page-numbers")
-        if page_nums.empty?
-            pages_total = 1
-        else
-            pages_total = page_nums.map{|p| p.text.to_i}.max
-        end
-        
-        (1..pages_total).each do |p|
-            get_recipes_from(create_page_url(p))
-        end
-    end
-    
-    def get_recipes_from(page_url)
-        recipe_page = Nokogiri::HTML(open(page_url))
-        recipe_links = recipe_page.css(".archive-post a")
-        recipe_links.each do |r|
-            recipe_title = r.attribute("title").value
-            recipe_url = r.attribute("href").value
-            @recipes << BudgetBytesCli::Recipe.new(recipe_url, recipe_title)
-        end
-    end
-    
-    def create_page_url(num)
-        if num == 1
-            self.url
-        else
-            self.url + "page/" + num.to_s + "/"
-        end
+        @recipes
     end
-    
+ 
     def combine_recipes(cat_to_combine)
         recipes_combined = cat_to_combine.recipes
         recipe_urls = self.recipes.map {|r| r.url}
-        filtered_recipes = recipes_combined.select do |r|
-            recipe_urls.include?(r.url)
-        end
-        filtered_recipes
+        recipes_combined.select {|r| recipe_urls.include?(r.url)}
     end
 end

data/lib/budget_bytes_cli/cli.rb

@@ -2,8 +2,7 @@ class BudgetBytesCli::CLI
     
     def call
         puts "Welcome to Budget Bytes CLI!"
-        scraper = BudgetBytesCli::CategoryScraper.new
-        scraper.create_categories
+        BudgetBytesCli::Scraper.create_categories
         category_selector = BudgetBytesCli::ArrayPrompter.new("Selecting recipe category.")
         category_selector.array_to_select = BudgetBytesCli::Category.all.map {|i| i.name}
         

data/lib/budget_bytes_cli/recipe.rb

@@ -6,58 +6,17 @@ class BudgetBytesCli::Recipe
         @url = url
     end
     
-    def scrape_recipe
-        page = Nokogiri::HTML(open(@url))
-        
-        ingredient_amounts = page.css('.wprm-recipe-ingredient-amount').map {|i| i.text}
-        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 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 = recipe_steps.join("\n")
-    end
-    
     def ingredients
-        self.scrape_recipe unless @ingredients
+        unless @ingredients
+            @ingredients, @instructions = BudgetBytesCli::Scraper.scrape_recipe(@url)
+        end
         @ingredients
     end
     
     def instructions
-        self.scrape_recipe unless @instructions
+        unless @instructions
+            @ingredients, @instructions = BudgetBytesCli::Scraper.scrape_recipe(@url) 
+        end
         @instructions
     end
     

data/lib/budget_bytes_cli/scraper.rb

@@ -0,0 +1,100 @@
+class BudgetBytesCli::Scraper
+    
+    #functions for getting categories
+    def self.open_page
+        Nokogiri::HTML(open("https://www.budgetbytes.com/recipes/"))
+    end
+    
+    def self.locate_categories
+        open_page.css(".cat-item")
+    end
+    
+     def self.create_categories
+        locate_categories.each do |item|
+            url = item.css("a").attribute("href").value
+            title = item.css("a").children[0].text
+            BudgetBytesCli::Category.new(url, title)
+        end
+    end
+    
+    #functions for scraping recipes within a category
+    def self.get_recipes(url)
+        first_page = Nokogiri::HTML(open(url))
+        
+        page_nums = first_page.css(".page-numbers")
+        if page_nums.empty?
+            pages_total = 1
+        else
+            pages_total = page_nums.map{|p| p.text.to_i}.max
+        end
+        
+        (1..pages_total).map {|p|get_recipes_from(create_page_url(p, url))}.flatten
+    end
+    
+    def self.get_recipes_from(page_url)
+        recipe_page = Nokogiri::HTML(open(page_url))
+        recipe_links = recipe_page.css(".archive-post a")
+        
+        recipe_links.map do |r|
+            recipe_title = r.attribute("title").value
+            recipe_url = r.attribute("href").value
+            BudgetBytesCli::Recipe.new(recipe_url, recipe_title)
+        end
+    end
+    
+    def self.create_page_url(num, url)
+        if num == 1
+            url
+        else
+            url + "page/" + num.to_s + "/"
+        end
+    end
+    
+    #scrape instructions, ingredients from recipe page
+    def self.scrape_recipe(url)
+        page = Nokogiri::HTML(open(url))
+        
+        ingredient_amounts = page.css('.wprm-recipe-ingredient-amount').map {|i| i.text}
+        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 = []
+        
+        #scraping ingredients for new site
+        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 instructions 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
+        
+        #scraping instructions for new site
+        page.css(".wprm-recipe-instruction-text").each {|i| recipe_steps << i.text}
+
+        [ingredient_array.join("\n"), recipe_steps.join("\n")]
+    end
+    
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: budget-bytes-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.4.2
 platform: ruby
 authors:
 - Larry Weinstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,10 +106,10 @@ files:
 - config/environment.rb
 - lib/budget_bytes_cli.rb
 - lib/budget_bytes_cli/array-prompter.rb
-- lib/budget_bytes_cli/category-scraper.rb
 - lib/budget_bytes_cli/category.rb
 - lib/budget_bytes_cli/cli.rb
 - lib/budget_bytes_cli/recipe.rb
+- lib/budget_bytes_cli/scraper.rb
 homepage: https://github.com/Larry-42/budget-bytes-cli
 licenses:
 - MIT

data/lib/budget_bytes_cli/category-scraper.rb

@@ -1,18 +0,0 @@
-class BudgetBytesCli::CategoryScraper
-    
-    def open_page
-        Nokogiri::HTML(open("https://www.budgetbytes.com/recipes/"))
-    end
-    
-    def locate_categories
-        open_page.css(".cat-item")
-    end
-    
-    def create_categories
-        locate_categories.each do |item|
-            url = item.css("a").attribute("href").value
-            title = item.css("a").children[0].text
-            BudgetBytesCli::Category.new(url, title)
-        end
-    end
-end