meal_finder 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f98203ed0b9c54ff3d656da11ceaf94ce091fb917c39846f1d0c220f822456ec
-  data.tar.gz: 5a7ec1ff7103294b6f9aa2ad802f28151fec0f536c89e073af461bb1b6797057
+  metadata.gz: a3d2c754d979ef40df87e741bdf08f801a3417a72275889bf3acbdff07a7877a
+  data.tar.gz: 0eb0ff41e21374f6b4e9589057765c28fdf4fb4c7ade70238152307e758de6fa
 SHA512:
-  metadata.gz: f6323d53e5a37c7d192d186844131528cf708652ad71cab489e4d1cb01ec58396480b5cdf121888fd30cf20ee8f6edde6d336c8f8846ca04e6d5db7e02447e87
-  data.tar.gz: d6f150e45a19366da8eb330b30840b6458b2c83703b65c02c421e3451ee62de1a8c49720fe8f41a9ea0ba0024ce4562fbea9423eec95dd8eb2aad0e52ead1a2a
+  metadata.gz: a3cb5ff2a4472a53203972bf5a56d5e3f481e25c370c3ac1e38a68207ec40eabc99bf9ca9e61efff5e191f523713aa535880e1ea7a8e71bd49a0f0e209d84691
+  data.tar.gz: 97c921a7a08f68420caf81a25b8e73cc50e6b201b79a7e782ca817abeded45d6ea5bbcbb0fdf430b5d2403931fa7dbbd9182106edc9a5cbab1410c0c29d224f7

data/README.md

@@ -1,8 +1,6 @@
 # MealFinder
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/meal_finder`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Meal Finder is a command line interface that enables the user to browse and find recipe inspirations from the BBC Good Food website. The user will be presented with a list of available courses, and then the recipes for their chosen course. The user can then choose a recipe to find out more about the ingredients needed and the step by step methods for making their chosen dish.
 
 ## Installation
 
@@ -22,7 +20,11 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+From the local directory, execute
+
+    $ mealfinder 
+
+and follow the prompts.
 
 ## Development
 

data/lib/meal_finder/cli.rb

@@ -26,7 +26,7 @@ module MealFinder
       input = gets.chomp 
 
       if input.downcase == "list courses"
-        MealFinder::Course.list_course_names
+        MealFinder::Scraper.scrape_courses if MealFinder::Course.all.size == 0 
         list_courses
       elsif input.downcase == "exit"
         goodbye 
@@ -39,9 +39,7 @@ module MealFinder
     end 
     
     def list_courses
-      
-      course_arr = MealFinder::Course.all
-      
+          
       puts "\t 
       \t Here are the courses that we have available.
       \t To choose a course, type in the corresponding number below to get a list of recipe suggestions. 
@@ -50,26 +48,28 @@ module MealFinder
       
       \t"
         
-      puts course_arr.map.with_index {|meal,index|
+      puts MealFinder::Course.all.map.with_index {|meal,index|
           "\t#{index+1}. #{meal.name}"}
  
-      select_course(course_arr)
+      select_course
 
     end 
  
-    def select_course(course_arr)
+    def select_course
       
     input = gets.chomp
 
       if input.downcase == "exit"
         goodbye
 
-      elsif input.to_i > 0 && input.to_i < 23
-          selected_course = course_arr[input.to_i-1]
+      elsif input.to_i > 0 && input.to_i <= MealFinder::Course.all.size
+          selected_course = MealFinder::Course.all[input.to_i-1]
 
           puts "\t Great! Here are some ideas for you to make for #{selected_course.name}. Please type in the number of the dish you would like to 
           \t find out more about or simply type in 'list courses' to go back to the main menu and choose a different course\t" 
-        
+      
+          MealFinder::Scraper.scrape_recipes(selected_course) if MealFinder::Recipes.all.size == 0  
+          list_recipes
 
       else 
         puts "\t Sorry, I did not recognise that..."
@@ -78,80 +78,99 @@ module MealFinder
 
       end 
         
-    MealFinder::Recipes.list_recipe_names(selected_course)
-    list_recipes(selected_course)
+    
              
     end 
 
-    def list_recipes(selected_course)
-      recipe_arr = MealFinder::Recipes.all
+    def list_recipes
+      
   
-      puts recipe_arr.map.with_index {|recipe, i| 
+      puts MealFinder::Recipes.all.map.with_index {|recipe, i| 
         "#{i+1}. #{recipe.name}"}
+      
+      
 
-      select_recipe(recipe_arr)
+      select_recipe
 
     end 
     
 
-    def select_recipe(recipe_arr)
+    def select_recipe
     
-    input = gets.chomp 
+    input = gets.chomp.downcase 
 
       
-    if input.downcase == "list courses"
-      MealFinder::Recipes.all.clear 
+    if input == "list courses"
       list_courses
 
-      elsif input.downcase == "exit"
+      elsif input == "exit"
         goodbye
       
-      elsif input.to_i > 0 && input.to_i < 16
-          selected_recipe = recipe_arr[input.to_i-1]
- 
+      elsif input.to_i > 0 && input.to_i <= MealFinder::Recipes.all.size
+          selected_recipe = MealFinder::Recipes.all[input.to_i-1]
+        
       recipe_details(selected_recipe)
+
       
       else 
         puts "\t Sorry, I did not recognise that.
         \t Please type in the number of the dish that you are looking for 
         \t or 'list courses' to see the courses again or 'exit' to exit the program"
-      select_recipe(recipe_arr)
+      select_recipe
       end 
     end 
-  
-  
+    
     def recipe_details(selected_recipe)
+      MealFinder::Scraper.scrape_recipe_details(selected_recipe) unless selected_recipe.details 
+       
+      recipe_details_content(selected_recipe) 
+      
+      recipe_next_steps
+       
       
-      MealFinder::Recipes.recipe_details(selected_recipe)
+    end 
+    
+    def recipe_details_content(selected_recipe)
+#binding.pry
+      deets = selected_recipe.details 
+
+      puts "\t"
+      puts "Here is the recipe for #{selected_recipe.name}\n\t" 
+      
+      puts "#{deets[:description]}\n\t"
+      puts "#{deets[:prep_time]}"
+      puts "#{deets[:cook_time]}\n\t"
+    
+      puts "Ingredients:\n\t"
+      puts deets[:ingredients_list].collect {|item| "#{item}"}
+      puts "\nMethod:\n\t"
+      puts deets[:method_list].collect.with_index {|method, index| "#{index+1}. #{method}\n\t"}
+
+    end
+
+      
+
+     
+
+    def recipe_next_steps
 
       puts "\t Not quite what you are looking for? 
       \t Type 'list recipes' to go back to list of recipes from the same Course and choose a different dish\n\t
       \t To go back to the main menu, simply type 'list courses'
       \t To exit the program, type 'exit'"
-      
-      recipe_next_steps
 
-    end 
-
-    def recipe_next_steps
-      
       input = gets.chomp 
 
       if input.downcase == "list recipes"
-        recipe_arr = MealFinder::Recipes.all
   
-        puts recipe_arr.map.with_index {|recipe, i| 
+        puts MealFinder::Recipes.all.map.with_index {|recipe, i| 
           "#{i+1}. #{recipe.name}"}
         
-        select_recipe(recipe_arr)
+        select_recipe
 
       elsif input.downcase == "list courses"
-        MealFinder::Recipes.all.clear
         list_courses 
-        
-        
-        
-
+ 
       elsif input.downcase == "exit"
         goodbye
 
@@ -171,6 +190,7 @@ module MealFinder
     exit 
   end 
 
+  
   end 
 
 end 

data/lib/meal_finder/concerns/memorable.rb

@@ -1,13 +0,0 @@
-module Memorable 
-
-  module InstanceMethods 
-
-    def initialize(name = nil, url = nil)
-      @name = name
-      @url = url
-      self.class.all << self 
-    end 
-
-  end 
-
-end 

data/lib/meal_finder/course.rb

@@ -9,18 +9,25 @@ module MealFinder
   
     @@all = []
     
-      def initialize
-        super 
-      end 
-     
-      def self.list_course_names
-        MealFinder::Scraper.scrape_courses
+      def initialize (name = nil, url = nil)
+        @name = name 
+        @url = url  
+        @recipes = []
       end 
+      
   
       def self.all 
        @@all
       end 
+
+      def save 
+        @@all << self 
+      end 
   
+      def recipes 
+        @recipes 
+      end 
+
     end 
 
 end 

data/lib/meal_finder/recipes.rb

@@ -5,27 +5,27 @@ module MealFinder
 
     include Memorable::InstanceMethods 
 
-    attr_accessor :name, :url
+    attr_accessor :name, :url, :details
 
     @@recipe_collection = []
 
 
-    def initialize
-      super
+    def initialize (name = nil, url = nil) 
+      @name = name 
+      @url = url 
+      
     end 
 
 
-    def self.list_recipe_names(selected_course)
-      MealFinder::Scraper.scrape_recipes(selected_course)
-    end
-  
-    def self.recipe_details(selected_recipe)
-      MealFinder::Scraper.scrape_recipe_details(selected_recipe)
+    def save
+      @@recipe_collection << self
     end 
     
     def self.all 
       @@recipe_collection
     end 
-     
+    
+    
+    
   end
 end 

data/lib/meal_finder/scraper.rb

@@ -8,6 +8,7 @@ module MealFinder
     BASE_URL = "https://www.bbcgoodfood.com" 
 
     def self.scrape_courses
+    puts "************ scraping ***************"
       html = open('https://www.bbcgoodfood.com/search/recipes?query=course')
       doc = Nokogiri::HTML(html)
       
@@ -18,60 +19,69 @@ module MealFinder
          
         new_course.url = BASE_URL + course.css("a")[0]["href"]
         
+        Course.all << new_course
       end  
 
     end 
     
 
     def self.scrape_recipes(selected_course) 
-
+    puts "************ scraping ***************"
     doc = Nokogiri::HTML(open(selected_course.url))
-    #binding.pry
+    
       doc.css("#search-results h3").each do |recipes| 
         
         new_recipe = Recipes.new
         new_recipe.name = recipes.css("a").text.strip
         new_recipe.url = BASE_URL + recipes.css("a")[0]["href"]
-      
-      end 
+        
+        
 
+        Recipes.all << new_recipe
+      end 
+ 
     end 
 
 
     def self.scrape_recipe_details(selected_recipe)
-      ingredients_list = []
-      method_list = []
+      puts "************ scraping ***************"
+     
 
       doc = Nokogiri::HTML(open(selected_recipe.url))
 
-      puts "\t"
-      puts "Here is the recipe for #{selected_recipe.name}\n\t"
-      puts "#{doc.css(".recipe-header__description p").text}\n\t"
-      puts "#{doc.css(".recipe-details .recipe-details__text .recipe-details__cooking-time-prep").text}"
-      puts "#{doc.css(".recipe-details .recipe-details__text .recipe-details__cooking-time-cook").text}\n\t"
+      selected_recipe.details = {
+          description: doc.css(".recipe-header__description p").text, 
+          prep_time: doc.css(".recipe-details .recipe-details__text .recipe-details__cooking-time-prep").text, 
+          cook_time: doc.css(".recipe-details .recipe-details__text .recipe-details__cooking-time-cook").text, 
+          ingredients_list: [],
+          method_list: []   
+      }
       
+  
 
       doc.css(".recipe-content").each do |recipe|
         recipe.css(".ingredients-list li").each do |ingredient|
           ingredients = ingredient.attr("content")
           
-          ingredients_list << ingredients
-         
+          selected_recipe.details[:ingredients_list] << ingredients
+           
+                
         end 
+
         recipe.css(".method__list li").each do |method|
           method_actions = method.css("p").text 
 
-          method_list << method_actions
+          selected_recipe.details[:method_list] << method_actions 
+
+        
+
+          #binding.pry 
 
         end
         
-        puts "Ingredients:\n\t"
-        puts ingredients_list.collect {|item| "#{item}"}
-        puts "\nMethod:\n\t"
-        puts method_list.map.with_index {|method, index| "#{index+1}. #{method}\n\t"}
       
       end   
-
+      
     end 
 
   end 

data/lib/meal_finder/version.rb

@@ -1,3 +1,3 @@
 module MealFinder
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meal_finder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Jen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-14 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,7 @@ files:
 - lib/meal_finder/scraper.rb
 - lib/meal_finder/version.rb
 - meal_finder-0.1.0.gem
+- meal_finder-0.1.1.gem
 - meal_finder.gemspec
 homepage: https://github.com/jenniferanndcb/mealfinder
 licenses: