Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pipes - Sara Frandsen - API Muncher #39

Open
wants to merge 104 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
c3dd965
initial rails setup, create .env, create constants in EdamamApiWrapper
Oct 31, 2017
3fcb480
add HTTParty gem
Oct 31, 2017
596e6b7
no change
Oct 31, 2017
a0f7217
create BASE_URL, APP_ID, APP_KEY constants, create self.search and se…
Oct 31, 2017
260a3b8
create initialize method
Oct 31, 2017
8b70a57
create recipe_controller file
Oct 31, 2017
b224100
create empty views for recipes index, show, main, _form
Oct 31, 2017
4a1cccb
create an index method that maps through results
Oct 31, 2017
74ed925
refactor self.search to remove unnecesary variable
Oct 31, 2017
ca86ec0
create create_recipe method
Oct 31, 2017
09f83de
general routs with recipes and root
Oct 31, 2017
119c2c7
no change
Oct 31, 2017
b7ab66f
removed previous index method and moved to EdamamApiWrapper
Oct 31, 2017
ca8f596
change get_status to look for http response codes
Nov 1, 2017
2cfeaad
generate recipe controller, render form in main for testing, add sear…
Nov 1, 2017
ec63618
add VCR gems
Nov 1, 2017
7c4d892
flesh out search method
Nov 1, 2017
c9e7ea2
add vcr to test_helper
Nov 1, 2017
0d50927
create search view
Nov 1, 2017
93ea57b
create lib/test dir
Nov 1, 2017
c7beabb
delete view
Nov 1, 2017
4dea057
change recipe[name] to recipe.name
Nov 1, 2017
0957559
organize initialize to include optional args
Nov 1, 2017
0f06ec8
use Recipe objects instead of mapping through 'hits'
Nov 1, 2017
073f85b
required a database to run tests
Nov 1, 2017
d2425c8
fixed line break for minitest
Nov 1, 2017
cabdbbc
create first 2 tests for Recipe
Nov 1, 2017
c38a357
change order of attributes
Nov 1, 2017
6a9f4c0
change what is required in Recipe
Nov 1, 2017
5c51339
rename recipe to recipe_test in test/lib
Nov 1, 2017
59dcaab
added missing autoload path for lib
Nov 1, 2017
8e74d73
renamed recipe to recipe_test
Nov 1, 2017
bce851e
finish recipe class init tests
Nov 1, 2017
bbbd108
add uri as required argument (to be used for id)
Nov 1, 2017
9384801
comment out fake tests
Nov 1, 2017
6cb7715
get rid of extra routes
Nov 1, 2017
8b30849
create basic layout to view search form and results
Nov 1, 2017
042c22e
create pseudo self.get_id
Nov 1, 2017
08cae93
forgot a comma
Nov 1, 2017
eb66cfc
forgot a comma
Nov 1, 2017
bfb3e7f
resolve merge conflicts
Nov 1, 2017
755a6d4
try using URI.encode
Nov 1, 2017
fee6d5a
resolve merge conflict
Nov 1, 2017
f5b6b21
update create_recipe to use BASE_URI instead of uri_encode
Nov 2, 2017
7a37b8e
no change
Nov 2, 2017
38921d2
change uri to uri.split
Nov 2, 2017
09f0ca5
change path from recipe to recipe.name
Nov 2, 2017
9de1766
uncomment args for Recipe
Nov 2, 2017
60216a5
create_recipe now returns correct url
Nov 2, 2017
e1aec9e
change def show to use EdamamApiWrapper.create_recipe to find id params
Nov 3, 2017
e042ae6
change path to use recipe.uri as id
Nov 3, 2017
41bc52a
no change
Nov 3, 2017
3458002
change @uri from uri to uri.split
Nov 3, 2017
7d2fb46
change get_recipe, change what is returned for create recipe, change …
Nov 3, 2017
c49764d
make sure information is able to be called accurately
Nov 3, 2017
b7d5f86
deleted repetitive code in route and controller, deleted duplicate re…
Nov 3, 2017
880e25c
create recipes cassette, pass 'receives a valid response for a search…
Nov 3, 2017
2c8cdd8
add simplecov
Nov 3, 2017
c1e98b1
no change
Nov 3, 2017
06e2ac5
crate nav partial
Nov 3, 2017
db97e89
create txt file to keep track of custom css classes
Nov 3, 2017
1b5f656
add css to application.css
Nov 3, 2017
11910de
adjust css for root page
Nov 3, 2017
dd3320d
add grid mixin to foundation scss
Nov 4, 2017
fb1e654
remove left padding on columns
Nov 4, 2017
2978398
remove mixin that didn't work
Nov 4, 2017
0c0dbce
use placeholder images to check layout, can now list 5 per row using …
Nov 4, 2017
920dee3
add more to my list of custom class
Nov 4, 2017
87d07da
main page text centered, search bar and flex needs fixing
Nov 5, 2017
50e6c14
header centered on search page
Nov 5, 2017
4366563
add padding to bottom of images on search page
Nov 5, 2017
132ff3b
header now completely centered
Nov 5, 2017
dc5253c
override some foundation styling for search page
Nov 5, 2017
35cbc05
add styles for centering in app css
Nov 5, 2017
6ae03ef
add more fake links to layout more easily
Nov 5, 2017
5245332
change link and text colors
Nov 5, 2017
581754f
install kaminari gem for pagination
Nov 5, 2017
3cb64ff
search results are aligned with added padding, offset added to show p…
Nov 5, 2017
ab2308a
fixed colon to semicolon in css
Nov 5, 2017
d4c6294
fix more css
Nov 5, 2017
c4409dd
add ruby version to gemfile
Nov 6, 2017
2e6a2ee
edit ruby version in gemfile
Nov 6, 2017
91650c3
forgot a '
Nov 6, 2017
a101dcd
lowercase httparty in EAW.rb
Nov 6, 2017
15f09b7
add suggested code for heroku deployment from slack
Nov 6, 2017
d6f726d
rename Recipe.rb to recipe.rb
Nov 6, 2017
191c8e3
remove some require lines in controller
Nov 6, 2017
62ced89
change language of search buttons from japanese to eng
Nov 6, 2017
4e1f6df
bundle install
Nov 6, 2017
fda47be
move listen gem
Nov 6, 2017
18bb7c4
trying suggestion from slack
Nov 6, 2017
106fbc3
create header partial view for suggested links
Nov 6, 2017
333fdfe
add pagination using methods in the search controller method
Nov 6, 2017
22bc350
create footer that sits at the bottom of the page
Nov 6, 2017
2bc60a2
edit tests to reflect changes in code, shorted required args to make …
Nov 6, 2017
e5bc345
pass test for get_search_url
Nov 6, 2017
9bcbb4b
add flash message for no results, pass tests for get_restults_from_re…
Nov 6, 2017
96a3334
create fake class FakeResponse in test/helpers to pass check_status test
Nov 6, 2017
6ff071f
pass get_recipe test
Nov 6, 2017
45d9b6e
just kidding get_recipe fails
Nov 6, 2017
0015a35
added psuedo tests for the controller
Nov 6, 2017
fd02702
change how ingredients list
Nov 6, 2017
497d4d1
last minute styling before turning in
Nov 6, 2017
0c14df7
get rid of cool japanese menu
Nov 6, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

/node_modules
/yarn-error.log

.byebug_history
.env
76 changes: 76 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end


gem 'dotenv-rails', groups: [:development, :test]
gem 'simplecov', :require => false, :group => :test

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.4'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
# gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
gem 'minitest-vcr'
gem 'webmock'
end

gem 'httparty'
group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'jquery-turbolinks'
gem 'foundation-rails', '6.4.1.2'
group :development do
gem 'better_errors'
gem 'pry-rails'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end

gem 'kaminari'
ruby '2.4.0'
282 changes: 282 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,282 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.4)
actionpack (= 5.1.4)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.4)
actionview (= 5.1.4)
activesupport (= 5.1.4)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.4)
activesupport (= 5.1.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.4)
activesupport (= 5.1.4)
globalid (>= 0.3.6)
activemodel (5.1.4)
activesupport (= 5.1.4)
activerecord (5.1.4)
activemodel (= 5.1.4)
activesupport (= 5.1.4)
arel (~> 8.0)
activesupport (5.1.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
arel (8.0.0)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.7.3)
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (9.1.0)
capybara (2.15.4)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.8.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.2)
debug_inspector (0.0.3)
docile (1.1.5)
dotenv (2.2.1)
dotenv-rails (2.2.1)
dotenv (= 2.2.1)
railties (>= 3.2, < 5.2)
erubi (1.7.0)
execjs (2.7.0)
ffi (1.9.18)
foundation-rails (6.4.1.2)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
hashdiff (0.3.7)
httparty (0.15.6)
multi_xml (>= 0.5.2)
i18n (0.9.0)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
json (2.1.0)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
kaminari-activerecord (= 1.1.1)
kaminari-core (= 1.1.1)
kaminari-actionview (1.1.1)
actionview
kaminari-core (= 1.1.1)
kaminari-activerecord (1.1.1)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (0.1.4)
mini_portile2 (2.3.0)
minispec-metadata (2.0.0)
minitest
minitest (5.10.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.1.18)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
minitest-vcr (1.4.0)
minispec-metadata (~> 2.0)
minitest (>= 4.7.5)
vcr (>= 2.9)
multi_json (1.12.2)
multi_xml (0.6.0)
nio4r (2.1.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
pg (0.21.0)
pry (0.11.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.0)
puma (3.10.0)
rack (2.0.3)
rack-test (0.7.0)
rack (>= 1.0, < 3)
rails (5.1.4)
actioncable (= 5.1.4)
actionmailer (= 5.1.4)
actionpack (= 5.1.4)
actionview (= 5.1.4)
activejob (= 5.1.4)
activemodel (= 5.1.4)
activerecord (= 5.1.4)
activesupport (= 5.1.4)
bundler (>= 1.3.0)
railties (= 5.1.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.1.4)
actionpack (= 5.1.4)
activesupport (= 5.1.4)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.2.1)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
rubyzip (1.2.1)
safe_yaml (1.0.4)
sass (3.4.25)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.6.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
simplecov (0.15.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-es6 (0.9.2)
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.3)
tzinfo (1.2.4)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
vcr (3.0.3)
web-console (3.5.1)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webmock (3.1.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xpath (2.1.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
dotenv-rails
foundation-rails (= 6.4.1.2)
httparty
jbuilder (~> 2.5)
jquery-turbolinks
kaminari
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
minitest-vcr
pg (~> 0.18)
pry-rails
puma (~> 3.7)
rails (~> 5.1.4)
sass-rails (~> 5.0)
selenium-webdriver
simplecov
spring
spring-watcher-listen (~> 2.0.0)
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)
webmock

RUBY VERSION
ruby 2.4.0p0

BUNDLED WITH
1.16.0
Loading