+ <% @recipe.diet_info.each do |info| %>
+ <%= info %>
+ <% end %>
+
+
+
+
+
+ This is the recipe#show page
+
diff --git a/config/application.rb b/config/application.rb
index 20568697a..37e26bf37 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -22,5 +22,10 @@ class Application < Rails::Application
# Do not swallow errors in after_commit/after_rollback callbacks.
config.active_record.raise_in_transactional_callbacks = true
+
+# DONT FORGET to add the lib
+ # Automatically load all code from /lib
+ config.autoload_paths << Rails.root.join('lib')
+
end
end
diff --git a/config/routes.rb b/config/routes.rb
index 3f66539d5..12f74ae39 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,16 @@
Rails.application.routes.draw do
+
+ root 'home#index'
+
+ get '/recipes/more' => 'recipes#more'
+
+# Make note that all new /recipes/something routes must go above
+ get '/recipes/*uri' => 'recipes#show', as: 'recipe', constraints: {uri: /.+/}
+
+ get '/recipes' => 'recipes#search', as: 'search'
+
+ # get '/:id' => 'recipes#show'
+
# The priority is based upon order of creation: first created -> highest priority.
# See how all your routes lay out with "rake routes".
diff --git a/config/secrets.yml b/config/secrets.yml
index 0568244a4..4518a4614 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -11,6 +11,7 @@
# if you're sharing your code publicly.
development:
+
secret_key_base: 99a98298ee291a57ba658df7ba646710149956d7dd820679c01c388bc89c959a5d6e4b5300197595e453f0c2884cb6deb2db8b92c5253fb814d04f6a08c55b49
test:
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 000000000..4dfbb1680
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,16 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 0) do
+
+end
diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb
new file mode 100644
index 000000000..8d34b0d24
--- /dev/null
+++ b/lib/edamam_api_wrapper.rb
@@ -0,0 +1,64 @@
+require 'httparty'
+
+class EdamamApiWrapper
+ BASE_URL = "https://api.edamam.com/search"
+ THE_KEY = ENV["EDAMAM_KEY"]
+ THE_ID = ENV["EDAMAM_ID"]
+
+ attr_reader :data
+
+ def self.list_recipes(search_string, page=1)
+ # clean up string
+ clean_string = query_sanitation(search_string)
+ if clean_string.empty?
+ return []
+ end
+ #gives us the first ten
+
+ listing = (page*10) - 10
+
+ page_string = "&from=#{listing}"
+ url = BASE_URL + "?q=#{clean_string}" + page_string + "&app_id=#{THE_ID}&app_key=#{THE_KEY}"
+ # url = BASE_URL + "?q=chicken" + "&app_id=#{THE_ID}&app_key=#{THE_KEY}"
+ # puts "list_recipes URL: #{url}"
+ @data = HTTParty.get(url) #.parsed_response
+ search_results = []
+ if @data["hits"]
+ @data["hits"].each do |hit|
+ wrapper = Recipe.new(listing, hit["recipe"]["label"], hit["recipe"]["image"], hit["recipe"]["uri"], hit["recipe"]["url"], hit["recipe"]["ingredientLines"], hit["recipe"]["dietLabels"])
+ # label is recipe title
+ # image is image of recipe item
+ # uri is uri for recipe on edamam
+ # url is url for original recipe
+ # "ingredientLines" is the array of ingredients
+ # "dietLabels" is the array of dietary information
+ search_results << wrapper
+ end
+ end
+ return search_results
+ end
+
+# not implemented
+# restrictions on search queries imposed by Edamam @todo
+ def self.query_sanitation(search_string)
+ # puts "Requesting #{search_string} from Edamam database"
+ # Need to clean the string up
+ if search_string.nil?
+ return ''
+ end
+ clean_string = search_string.gsub(/[^a-zA-Z ]/, '')
+ # Used by the recipe controller action
+ return clean_string
+ end
+
+ def self.get_recipe(recipe_uri)
+ url = BASE_URL + "?r=#{URI.encode(recipe_uri)}" + "&app_id=#{THE_ID}&app_key=#{THE_KEY}"
+ @data = HTTParty.get(url).parsed_response
+ if @data.empty?
+ return nil
+ else
+ return Recipe.new(0, @data[0]['label'], @data[0]['image'], @data[0]['uri'], @data[0]['url'], @data[0]['ingredientLines'], @data[0]['dietLabels'] )
+ end
+ end
+
+end
diff --git a/lib/recipe.rb b/lib/recipe.rb
new file mode 100644
index 000000000..d3825af03
--- /dev/null
+++ b/lib/recipe.rb
@@ -0,0 +1,37 @@
+# tests first
+class Recipe
+ attr_reader :title, :image, :uri, :url, :ingredients, :diet_info, :listing_set
+
+ def initialize(listing, title, image, uri, url, ingredients, dietary_info)
+ @listing_set = listing
+ @title = title
+ @image = image
+ @uri = uri
+ @url = url
+ @ingredients = ingredients
+ @diet_info = dietary_info
+ end
+
+ def self.search_results(search_query, page=1)
+ # cleaned up in wrapper
+ @search_query = search_query
+ @page = page
+ return @recipes = EdamamApiWrapper.list_recipes(search_query, page)
+ end
+
+ def self.change_page(page_direction)
+ if ((@page + page_direction) < 1)
+ return @recipes
+ else
+ @page += page_direction
+ return @recipes = EdamamApiWrapper.list_recipes(@search_query, @page)
+ end
+ end
+
+
+# Method makes sure two recipe objects with the same content are the same
+ def ==(another_recipe)
+ return self.title == another_recipe.title && self.image == another_recipe.image && self.uri == another_recipe.uri && self.url == another_recipe.url && self.ingredients == another_recipe.ingredients && self.diet_info == another_recipe.diet_info
+ end
+
+end
diff --git a/test/controllers/home_controller_test.rb b/test/controllers/home_controller_test.rb
new file mode 100644
index 000000000..873c71e99
--- /dev/null
+++ b/test/controllers/home_controller_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class HomeControllerTest < ActionController::TestCase
+ test "should get the index" do
+ get :index
+ assert_response :success
+ end
+end
diff --git a/test/controllers/recipes_controller_test.rb b/test/controllers/recipes_controller_test.rb
new file mode 100644
index 000000000..a924d6125
--- /dev/null
+++ b/test/controllers/recipes_controller_test.rb
@@ -0,0 +1,91 @@
+require 'test_helper'
+
+class RecipesControllerTest < ActionController::TestCase
+
+ test "search form should have a successful search if search_query is valid" do
+ VCR.use_cassette("recipes") do
+ params = {"q" => "cilantro"}
+ get :search, params
+ assert_response 200
+ assert :index
+ end
+ end
+
+ test "search form should render root if empty" do
+ VCR.use_cassette("recipes") do
+ params = {"q" => ""}
+ get :search, params
+ assert_redirected_to root_path
+ end
+ end
+
+ test "search should render the correct page" do
+ VCR.use_cassette("recipes") do
+ params = {"q" => "tilapia", "page" => 2}
+ get :search, params
+ assert_response 200
+ assert :index
+ end
+ end
+
+ test "should get show" do
+ VCR.use_cassette("recipes") do
+ params = {"uri" => "http://www.edamam.com/ontologies/edamam.owl#recipe_55a8fd184bca071fefbbdc01325f88ef"}
+ get :show, params
+ assert_response :success
+ assert_response 200 # also works
+ assert :show
+ end
+ end
+
+ test "more should render index with a new page number" do
+ VCR.use_cassette("recipes") do
+ params = {"q" => "cilantro"}
+ get :search, params
+
+ #more (one page forward)
+ params["page_direction"] = "1"
+ get :more, params
+
+ assert_equal("2", params[:page])
+
+ #more (one more page forward)
+ params["page_direction"] = "1"
+ get :more, params
+
+ assert_equal("3", params[:page])
+
+ assert_response 200
+ assert :index
+ end
+ end
+
+ test "more should not change @page to less than one" do
+ VCR.use_cassette("recipes") do
+ # this is page one by default
+ params = {"q" => "cilantro"}
+ get :search, params
+
+ #more attempt backwards to zero
+ params["page_direction"] = "-1"
+ get :more, params
+
+ assert("1", params[:page])
+
+ params["page_direction"] = "-100"
+ get :more, params
+
+ assert("1", params[:page])
+ end
+ end
+
+# # parsing error in get_recipe that I dont know how to solve
+# test "should not get show for invalid uri params" do
+# VCR.use_cassette("recipe") do
+# params = {"uri" => 'myrecipes.com'}
+# get :show, params
+# assert :show
+# end
+# end
+
+end
diff --git a/test/helpers/recipes_helper_test.rb b/test/helpers/recipes_helper_test.rb
new file mode 100644
index 000000000..294d2d0a5
--- /dev/null
+++ b/test/helpers/recipes_helper_test.rb
@@ -0,0 +1,11 @@
+require 'test_helper'
+
+# Not sure this is included in rake, it gives lots of errors
+
+ # test "link_selector view helper method should not be nil" do
+ # VCR.use_cassette("recipes") do
+ # recipe = recipes.first
+ # recipe.url = nil
+ # assert_not_nil link_selector(recipe)
+ # end
+ # end
diff --git a/test/lib/edamam_api_wrapper_test.rb b/test/lib/edamam_api_wrapper_test.rb
new file mode 100644
index 000000000..2e18cd301
--- /dev/null
+++ b/test/lib/edamam_api_wrapper_test.rb
@@ -0,0 +1,84 @@
+class EdamamApiWrapperTest < ActiveSupport::TestCase
+
+#slack equivalent listchannels
+# this is for the greyed out version of list_recipes
+# this test passes when search_query is inserted into list_recipes
+ test "list_recipes returns array of recipes when it has a search string" do
+ VCR.use_cassette("recipes") do
+ clean_string = "cilantro"
+ recipes = EdamamApiWrapper.list_recipes(clean_string)
+ assert_kind_of Array, recipes
+ recipes.each do |recipe|
+ assert_kind_of Recipe, recipe
+ end
+ end
+ end
+
+ test "list_recipes returns an empty array if the query has no results back from the API" do
+ VCR.use_cassette("recipes") do
+ query = "automobile"
+ recipes = EdamamApiWrapper.list_recipes(query)
+ assert_equal([], recipes)
+ end
+ end
+
+ test "get_recipe should successfully return correct recipe" do
+ VCR.use_cassette("recipes") do
+ uri = 'http://www.edamam.com/ontologies/edamam.owl#recipe_c468dc28f8b64bb711125cc150b15c25'
+ actual_recipe = EdamamApiWrapper.get_recipe(uri)
+
+ expected_recipe = Recipe.new(0, 'Grilled Deviled Chickens Under a Brick', 'https://www.edamam.com/web-img/5f5/5f51c89f832d50da84e3c05bef3f66f9.jpg', uri, 'http://www.marthastewart.com/recipe/grilled-deviled-chickens-under-a-brick', ['4 baby chickens (poussins) or cornish hens (about 1 1/4 pounds each), or 4 chicken breast halves', '3 lemons, plus wedges for garnish', '4 cloves garlic, peeled and smashed', '1 tablespoon crushed red-pepper flakes, or to taste', '1 tablespoon finely chopped fresh thyme', '1 tablespoon finely chopped fresh rosemary', '1/2 cup olive oil', 'Salt, to taste'], ['Low-Carb'])
+
+ assert_equal(actual_recipe, expected_recipe)
+
+ end
+ end
+
+ test "list_recipes page should return the listings from that page" do
+ VCR.use_cassette("recipes") do
+ search_string = "tilapia"
+ page = 2
+ recipes = EdamamApiWrapper.list_recipes(search_string, page)
+ assert_equal('http://www.edamam.com/ontologies/edamam.owl#recipe_55a8fd184bca071fefbbdc01325f88ef', recipes.first.uri)
+ end
+ end
+
+ test "get_recipe should return nil for unexpected uri requests" do
+ VCR.use_cassette("recipes") do
+ uri = 'http://www.edamam.com/ontologies/edamam.owl#recipe_myownuri'
+ unexpected_uri_response = EdamamApiWrapper.get_recipe(uri)
+
+ assert_nil unexpected_uri_response
+
+ end
+ end
+
+ # test "get_recipe should return nil if the request to the API was unsuccessful" do
+ # VCR.use_cassette("recipes") do
+ # assert false
+ # end
+ # end
+
+
+ # # not implemented
+ # # query_sanitation should return the recipes matching the first word in the string typed in
+ # test "Can send a search query and get a valid response" do
+ # VCR.use_cassette("hits") do
+ # search_string = "cilantro"
+ # response = EdamamApiWrapper.query_sanitation(search_string)
+ # assert_equal(response, "cilantro") # because cilantro is the sanitized version of itself
+ # end
+ # end
+
+# dont know what to assert here to ensure it works
+ # test "an argument value for listing will return a successful API request" do
+ # VCR.use_cassette("hits") do
+ # clean_string = "cilantro"
+ # listing = 30
+ # response = EdamamApiWrapper.list_recipes(clean_string, listing)
+ # puts "#{response}"
+ # assert response[200]
+ # end
+ # end
+
+end
diff --git a/test/lib/recipe_test.rb b/test/lib/recipe_test.rb
new file mode 100644
index 000000000..b66d8f353
--- /dev/null
+++ b/test/lib/recipe_test.rb
@@ -0,0 +1,78 @@
+require 'test_helper'
+
+class RecipeTest < ActiveSupport::TestCase
+
+ test "Recipe.search_results should return an array of recipes" do
+ VCR.use_cassette("hits") do
+ clean_string = "cilantro"
+ recipes = Recipe.search_results(clean_string)
+ assert_kind_of Array, recipes
+ assert_not recipes.empty?
+ recipes.each do |recipe|
+ assert_kind_of Recipe, recipe
+ end
+ end
+ end
+
+ test "search_results should return an empty array if the search_query is not valid" do
+ numbers_string = "1234"
+ empty_string = ""
+ nil_that_should_be_a_string = nil
+
+ assert_equal([], Recipe.search_results(numbers_string))
+ assert_equal([], Recipe.search_results(empty_string))
+ assert_equal([], Recipe.search_results(nil_that_should_be_a_string))
+ end
+
+ test "change_page can be called after self.search_results and should return an array of recipes" do
+ VCR.use_cassette("hits") do
+ # we already asserted this works
+ clean_string = "cilantro"
+ recipes = Recipe.search_results(clean_string)
+
+ # test that this works to request the next set of recipes
+ next_set_recipes = Recipe.change_page(1)
+ assert_kind_of Array, next_set_recipes
+ assert_not next_set_recipes.empty?
+ next_set_recipes.each do |recipe|
+ assert_kind_of Recipe, recipe
+ end
+ assert_not_equal(recipes, next_set_recipes)
+
+ # test that this works to request the previous set of recipes (as in, the first 'recipes' in this test)
+ previous_set_recipes = Recipe.change_page((-1))
+
+ assert_kind_of Array, previous_set_recipes
+ # assert_not previous_set_recipes.empty?
+ # previous_set_recipes.each do |recipe|
+ # assert_kind_of Recipe, recipe
+ # end
+ assert_equal(recipes, previous_set_recipes)
+ assert_not_equal(next_set_recipes, previous_set_recipes)
+ end
+ end
+
+ test "change_page should not allow page <1 and instead return current page" do
+ VCR.use_cassette("hits") do
+ # we already asserted this works
+ clean_string = "cilantro"
+ recipes = Recipe.search_results(clean_string)
+
+ invalid_recipe_request = Recipe.change_page((-200))
+ assert_equal(recipes, invalid_recipe_request)
+ end
+ end
+
+# not implemented: will currently return: []
+ # test "change_page should not allow page higher than total number of pages (listings total)%10" do
+ # assert false
+ # end
+
+ test "two different recipe objects with the same data should be equal" do
+ recipe_a = Recipe.new(0, "Chocolate Ham", "ham.jpg", "http_string", "https_string", ["jam", "cheese"], ["Saturday night", "not for kids"])
+ recipe_b = Recipe.new(0, "Chocolate Ham", "ham.jpg", "http_string", "https_string", ["jam", "cheese"], ["Saturday night", "not for kids"])
+
+ assert_equal(recipe_a, recipe_b)
+ end
+
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 92e39b2d7..1754bd676 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,6 +2,22 @@
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
+require "minitest/reporters"
+
+# For API set-up
+require 'vcr'
+require 'webmock/minitest'
+
+
+VCR.configure do |config|
+ config.cassette_library_dir = 'test/cassettes' # folder where casettes will be located
+ config.hook_into :webmock # tie into this other tool called webmock
+ config.default_cassette_options = {
+ :record => :new_episodes, # record new data when we don't have it yet
+ :match_requests_on => [:method, :uri, :body] # The http method, URI and body of a request all need to match
+ }
+end
+
class ActiveSupport::TestCase
# Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
fixtures :all