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 - Kate Evans-Spitzer - API Muncher #21

Open
wants to merge 84 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
cb8a8ea
rails initialize
Guribot Oct 30, 2017
9c8dc0a
keep secrets secret
Guribot Oct 30, 2017
caba036
struggling with env again
Guribot Oct 30, 2017
4f3c1e2
.env works! Base class definitions for wrapper & Recipe
Guribot Oct 30, 2017
ef1ff99
implement RecipeSearchWrapper.search and Recipe.initialize methods
Guribot Oct 30, 2017
ea34f87
initialize controllers
Guribot Oct 30, 2017
b4dd5a0
root views
Guribot Oct 30, 2017
933609b
implement basic search functionality
Guribot Oct 31, 2017
781f78a
basic header
Guribot Oct 31, 2017
8f3c0c4
change RecipeSearchWrapper name to RecipeSearch
Guribot Oct 31, 2017
780f067
install simplecov
Guribot Oct 31, 2017
a4c6616
ignore simplecov
Guribot Oct 31, 2017
91dc80b
basic tests for RecipeSearch
Guribot Oct 31, 2017
9786e7d
add VCR
Guribot Oct 31, 2017
98aab9c
create test cassettes for search
Guribot Oct 31, 2017
7523e9e
experimenting with cassettes
Guribot Oct 31, 2017
e7450ce
format hero page
Guribot Oct 31, 2017
5922f7f
refactor recipe creation, re-record cassettes
Guribot Oct 31, 2017
8683e5b
semantic tidying
Guribot Oct 31, 2017
5bcfcad
testing attributes
Guribot Oct 31, 2017
1d2394b
Merge branch 'css' into lib-tests
Guribot Oct 31, 2017
ba0d228
Merge branch 'header' into lib-tests
Guribot Oct 31, 2017
b8c5895
icons and attribution
Guribot Oct 31, 2017
9fa3ab6
merrgggeee
Guribot Oct 31, 2017
ec2cbd8
attributions
Guribot Oct 31, 2017
8d21986
I forgot what my name was
Guribot Oct 31, 2017
132123d
formatting header/homepage
Guribot Oct 31, 2017
ed8df29
header formatting
Guribot Oct 31, 2017
a5a2e1c
add unique ID to recipe class
Guribot Oct 31, 2017
cf1e9f4
implement RecipeSearch.find method
Guribot Nov 1, 2017
478b883
Decide on fonts
Guribot Nov 1, 2017
0544dbc
Merge branch 'css' into lib-tests
Guribot Nov 1, 2017
6d3c4aa
routes for recipes
Guribot Nov 1, 2017
de9b25b
debug RecipeSearch#find
Guribot Nov 1, 2017
8c335f9
testing for RecipeSearch#find
Guribot Nov 1, 2017
81e5b3f
troubleshooooooting
Guribot Nov 1, 2017
2e030fd
fix double-encoding of IDs
Guribot Nov 1, 2017
280056d
mimic rails auto-encoding in test recipe
Guribot Nov 1, 2017
73efd1b
styling for recipe cards
Guribot Nov 1, 2017
4ddbc86
dry out css
Guribot Nov 1, 2017
0b850fe
format home search bar
Guribot Nov 1, 2017
4ba528a
refactor search to allow for refreshing results page
Guribot Nov 1, 2017
2514176
create pages controller???
Guribot Nov 1, 2017
70dab76
add page routes
Guribot Nov 1, 2017
aff9cfe
implement page display in RecipeSearch
Guribot Nov 1, 2017
7e094e8
refactor controller methods to properly display page numbers
Guribot Nov 1, 2017
c9e6a1c
fix routes conflicts
Guribot Nov 1, 2017
442114a
change title to link
Guribot Nov 1, 2017
5dfe720
refactor pages to use params i/o controller
Guribot Nov 1, 2017
134a684
styling for title
Guribot Nov 1, 2017
2059e39
add method to rebuild URI from show params
Guribot Nov 1, 2017
1a75388
recipe show image formatting
Guribot Nov 1, 2017
575b015
basic nutrient info
Guribot Nov 1, 2017
25212c0
rename 'dietary-info' to 'nutrition', add 'servings' value to Recipe
Guribot Nov 1, 2017
be7ebde
add basic_nutrients method to Recipe:
Guribot Nov 1, 2017
a9f53b0
formatting for recipe show
Guribot Nov 1, 2017
2ee445d
footer styling
Guribot Nov 1, 2017
95b62ad
show page formatting
Guribot Nov 1, 2017
99365bd
formatting
Guribot Nov 1, 2017
d98c1e6
refactor recipe IDs to only include hashes of URIs
Guribot Nov 1, 2017
a175b47
change verbage for nutrition facts
Guribot Nov 1, 2017
a33c5da
fix table width
Guribot Nov 1, 2017
fb3c28b
header/title formatting
Guribot Nov 2, 2017
1dbe88a
formatting for search bar
Guribot Nov 2, 2017
eecd210
formatting for hero search bar
Guribot Nov 2, 2017
8256ed7
formatting for footer
Guribot Nov 2, 2017
feba3f4
add rails-12factor gem to enable asset pipeline
Guribot Nov 2, 2017
22f671f
take two at enabling asset pipeline
Guribot Nov 2, 2017
dc21c69
formatting for page links
Guribot Nov 3, 2017
c7ad588
refactor 'more' argument in RecipeSearch.search method
Guribot Nov 3, 2017
9af654c
refactor search to use params instead of IDs, more RESTful routes
Guribot Nov 3, 2017
99942ee
routes are very restful nowgit add .git add .
Guribot Nov 3, 2017
b715d10
update navbar search with new functionality
Guribot Nov 3, 2017
c639e68
Merge branch 'refactor-search'
Guribot Nov 3, 2017
5951bb5
formatting, add links to attribution pg
Guribot Nov 3, 2017
803369b
show page external links open in new tab
Guribot Nov 3, 2017
d89ee8a
some cassettes got hecked
Guribot Nov 3, 2017
6be549b
tests for optional #search params
Guribot Nov 3, 2017
39e63d0
tests for nutrition info
Guribot Nov 3, 2017
3192950
controller tests for recipes
Guribot Nov 3, 2017
f70c3af
trying to make assets work
Guribot Nov 6, 2017
7822fd0
troubleshooting heroku permissions
Guribot Nov 6, 2017
87219f7
still
Guribot Nov 6, 2017
d3310ac
add live website to README
Guribot May 15, 2018
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
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# 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

/coverage
81 changes: 81 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
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


# 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'
gem "httparty"


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

group :production do
gem 'rails_12factor', group: :production
end

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 'dotenv'
gem 'dotenv-rails'
gem 'simplecov'
gem 'minitest-vcr'
gem 'webmock'
end

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'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
272 changes: 272 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,272 @@
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.0.2)
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)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
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.0)
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
httparty
jbuilder (~> 2.5)
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
minitest-vcr
pg (~> 0.18)
pry-rails
puma (~> 3.7)
rails (~> 5.1.4)
rails_12factor
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

BUNDLED WITH
1.16.0.pre.3
Loading