find_recipe 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18e9f6c1e1dc8b7c5323f2799d65320a07f07941
-  data.tar.gz: 152d2441751d34a2a573ad35272267ea1239b36f
+  metadata.gz: a0469f0e999a6bed24536d6df513a1aea4818c00
+  data.tar.gz: fc0a99024555146c134627b222fff336cabca5c3
 SHA512:
-  metadata.gz: fa77a12b522dff5aa252c4f4fbafc73f7e7c1d0c4e478506a7f41e0af1f155da99a61d29275c3c864204dd7f8f1db64329f9f34268e4a5bbe869ac2a6d94f3ad
-  data.tar.gz: '057578a1bf966c2880ec426f040823e07c1139af2a034cacfc3f2dbf5c535a9e61154a08dc4b6f02d5d2f2ca9b713346022988c339ed4d4f979a5e2cc54f5f02'
+  metadata.gz: 92dd86ff9275c9ab4d02fd6eadaa8d9160dac29ed5df4efde39d38ba6799dbff10d3f20a9d24c548cf0eb9cee2c308bb8dccbede770de30ef31fb876a5629d9c
+  data.tar.gz: a3e1152632a03a02643a23dadd76d9bb7ee60c8c2ccf66942ff7c4f5bd24f787915d7ce8ec5ce8ef0538d1d394bd08d9e1cdd21e8ae700744f9116797325348a

data/.gitignore

@@ -10,3 +10,13 @@
 
 # rspec failure tracking
 .rspec_status
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db

data/config/environment.rb

@@ -0,0 +1,12 @@
+require 'open-uri'
+require 'nokogiri'
+require 'colorize'
+# Uncomment below if you need to use pry for debugging, etc.
+# require 'pry'
+
+require_relative "../lib/find_recipe/version"
+require_relative "../lib/find_recipe/cli"
+require_relative "../lib/find_recipe/recipe"
+require_relative "../lib/find_recipe/searched_recipe"
+require_relative "../lib/find_recipe/trending_recipe"
+require_relative "../lib/find_recipe/scraper"

data/lib/find_recipe.rb

@@ -1,15 +1,4 @@
-# Loads the needed files.
-require 'open-uri'
-require 'nokogiri'
-require 'colorize'
-# Uncomment below if you need to use pry for debugging, etc.
-# require 'pry'
-
-require_relative "find_recipe/version"
-
 module FindRecipe
 end
 
-require_relative "find_recipe/cli"
-require_relative "find_recipe/recipe"
-require_relative "find_recipe/scraper"
+require_relative '../config/environment'

data/lib/find_recipe/cli.rb

@@ -20,21 +20,21 @@ class FindRecipe::CLI
 		if input == "1"
 			
 			# Scrapes recipes only once to save loading time
-			if !@trending_recipes
+			if FindRecipe::Recipe::TrendingRecipe.all.size == 0
 				puts "Please wait a moment for the recipes to be loaded..."
-				@trending_recipes = FindRecipe::Recipe.create_recipes
+				FindRecipe::Recipe::TrendingRecipe.create_recipes
 			end
 			trending_recipes
 		elsif input == "2"
 		
 			# Scrape recipes only if a search hasn't been done yet or if user restarts
-			if !@searched_recipes || @searched_recipes.length == 0
+			if FindRecipe::Recipe::SearchedRecipe.all.size == 0
 				puts "What is the dish or ingredient you want to search for?"
 				input = gets.strip.downcase
 				puts "Please wait a moment for the recipes to be loaded..."
 				
 				# If search keyword has spaces, it's necessary to replace them with %20 so the URL works
-				@searched_recipes = FindRecipe::Recipe.create_recipes( input.gsub( " ", "%20" ) )
+				FindRecipe::Recipe::SearchedRecipe.create_recipes( input.gsub( " ", "%20" ) )
 			end
 			choose_searched_recipes
 		elsif input == "exit"
@@ -43,12 +43,11 @@ class FindRecipe::CLI
 			puts "Not sure what you mean..."
 			search_options
 		end
-
 	end
 	
 	def trending_recipes
 		puts "\n\n"
-		@trending_recipes.each.with_index( 1 ) do |recipe, index|
+		FindRecipe::Recipe::TrendingRecipe.all.each.with_index( 1 ) do |recipe, index|
 			puts "#{index}.".green + " #{recipe.name}"
 		end
 		
@@ -57,8 +56,9 @@ class FindRecipe::CLI
 		
 		input = gets.strip.downcase
 
-		if input.to_i > 0 && input.to_i <= @trending_recipes.count
-			@trending_recipes[ input.to_i - 1 ].get_details
+		if input.to_i > 0 && input.to_i <= FindRecipe::Recipe::TrendingRecipe.all.count
+			chosen_recipe = FindRecipe::Recipe::TrendingRecipe.all[ input.to_i - 1 ]
+			chosen_recipe.get_details
 		elsif input == "back"
 			search_options
 		else
@@ -67,6 +67,14 @@ class FindRecipe::CLI
 		 trending_recipes
 		end
 		
+		puts "Open in browser? (y/n)"
+		
+		input = gets.strip.downcase
+		
+		if input == "y"
+			chosen_recipe.open_in_browser
+		end
+		
 		puts "Do you want to see the list again, restart, or exit?"
 		puts "Enter list, restart, or exit"	
 		input = gets.strip.downcase
@@ -78,14 +86,13 @@ class FindRecipe::CLI
 		elsif input == "exit"
 			exit_program
 		end
-
 	end
 		
 	def choose_searched_recipes
 		puts "\n\n"
 		puts "Search Results:".yellow
 		puts ""
-		@searched_recipes.each.with_index( 1 ) do |recipe, index|
+		FindRecipe::Recipe::SearchedRecipe.all.each.with_index( 1 ) do |recipe, index|
 			puts "#{index}.".green + " #{recipe.name}"
 		end
 		
@@ -94,16 +101,25 @@ class FindRecipe::CLI
 		
 		input = gets.strip.downcase
 
-		if input.to_i > 0 && input.to_i <= @searched_recipes.count
-			@searched_recipes[ input.to_i - 1 ].get_details
+		if input.to_i > 0 && input.to_i <= FindRecipe::Recipe::SearchedRecipe.all.count
+			chosen_recipe = FindRecipe::Recipe::SearchedRecipe.all[ input.to_i - 1 ]
+			chosen_recipe.get_details
 		elsif input == "restart"
-			@searched_recipes.clear
+			FindRecipe::Recipe::SearchedRecipe.reset
 			search_options
 		else
 			puts "Not sure what you mean..."
 			choose_searched_recipes
 		end
-
+		
+		puts "Open in browser? (y/n)"
+		
+		input = gets.strip.downcase
+		
+		if input == "y"
+			chosen_recipe.open_in_browser
+		end
+		
 		puts "Do you want to see the list again, restart, or exit?"
 		puts "Enter list, restart, or exit"	
 		input = gets.strip.downcase
@@ -111,17 +127,15 @@ class FindRecipe::CLI
 		if input == "list"
 			choose_searched_recipes
 		elsif input == "restart"
-			@searched_recipes.clear
+			FindRecipe::Recipe::SearchedRecipe.reset
 			search_options
 		elsif input == "exit"
 			exit_program
 		end
-		
 	end
 	
 	def exit_program
 		puts "See you next time!"
 		exit
 	end
-	
 end

data/lib/find_recipe/recipe.rb

@@ -8,29 +8,13 @@ class FindRecipe::Recipe
 		end
 	end
 	
-	# Create recipes based off an array of recipe data hashes output by the scraper
-	def self.create_recipes( keyword = nil )
-		if keyword
-			recipe_array = FindRecipe::Scraper.scrape_search_page( keyword )
-		else
-			recipe_array = FindRecipe::Scraper.scrape_trending_recipes_page
-		end
-		
-		recipes = recipe_array.collect do |recipe|
-			self.new( recipe )
-		end
+	def add_additional_recipe_data
+		additional_recipe_data = FindRecipe::Scraper.scrape_individual_recipe_data( self.url )
 		
-		# Add remaining attributes from each individual recipe page
-		recipes.each do |recipe|
-			additional_recipe_data = FindRecipe::Scraper.scrape_individual_recipe_data( recipe.url )
-			recipe.add_additional_recipe_data( additional_recipe_data )
-		end
-	end
-	
-	def add_additional_recipe_data( data_hash )
-		data_hash.each do |attribute, value|
+		additional_recipe_data.each do |attribute, value|
 			self.send( ("#{attribute}="), value )
 		end
+		
 		self
 	end
 	
@@ -53,5 +37,7 @@ class FindRecipe::Recipe
 		puts "\n\n"
 	end
 	
-	
+	def open_in_browser
+		system("open", self.url)
+	end
 end

data/lib/find_recipe/searched_recipe.rb

@@ -0,0 +1,27 @@
+class FindRecipe::Recipe::SearchedRecipe < FindRecipe::Recipe
+	
+	@@all = []
+	
+	# Create recipes based off an array of recipe data hashes output by the scraper
+	def self.create_recipes( keyword )
+		recipe_array = FindRecipe::Scraper.scrape_search_page( keyword )
+		
+		recipes = recipe_array.collect do |recipe|
+			self.new( recipe )
+		end
+		
+		# Add remaining attributes from each individual recipe page
+		recipes.each do |recipe|
+			recipe.add_additional_recipe_data
+			@@all << recipe
+		end
+	end
+	
+	def self.all
+		@@all
+	end
+	
+	def self.reset
+		@@all.clear
+	end
+end

data/lib/find_recipe/trending_recipe.rb

@@ -0,0 +1,23 @@
+class FindRecipe::Recipe::TrendingRecipe < FindRecipe::Recipe
+	
+	@@all = []
+	
+	# Create recipes based off an array of recipe data hashes output by the scraper
+	def self.create_recipes
+		recipe_array = FindRecipe::Scraper.scrape_trending_recipes_page
+		
+		recipes = recipe_array.collect do |recipe|
+			self.new( recipe )
+		end
+		
+		recipes.each do |recipe|
+			recipe.add_additional_recipe_data
+			@@all << recipe
+		end
+	end
+	
+	def self.all
+		@@all
+	end
+
+end

data/lib/find_recipe/version.rb

@@ -1,3 +1,3 @@
 module FindRecipe
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: find_recipe
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Felice Forby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-27 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,11 +120,15 @@ files:
 - bin/console
 - bin/find-recipe
 - bin/setup
+- config/environment.rb
+- find_recipe-0.1.0.gem
 - find_recipe.gemspec
 - lib/find_recipe.rb
 - lib/find_recipe/cli.rb
 - lib/find_recipe/recipe.rb
 - lib/find_recipe/scraper.rb
+- lib/find_recipe/searched_recipe.rb
+- lib/find_recipe/trending_recipe.rb
 - lib/find_recipe/version.rb
 - planning_notes.md
 - spec.md