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

Hannah C - API Muncher - Octos #46

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
378644f
initailized rails, added httparty to gemfile
hannahlcameron May 2, 2018
36b8b35
added .env to gitignore
hannahlcameron May 2, 2018
60aae47
set up db, reserved heroku site, added .env
hannahlcameron May 2, 2018
c61c79c
added dotenv to gemfile, updated application.rb to handle lib file
hannahlcameron May 2, 2018
ec67556
added edamama_api_wrapper.rb to lib
hannahlcameron May 2, 2018
47b6e1d
added in edamam_api_wrapper; gav eit basic structure
hannahlcameron May 2, 2018
91fbddc
added in edamam attribution to footer
hannahlcameron May 2, 2018
8d78c19
added VCR to gemfile; cleaned up gemfile organization
hannahlcameron May 2, 2018
b93afc7
added in method to obfuscate id and token
hannahlcameron May 2, 2018
0c01c87
added in recipe controller
hannahlcameron May 2, 2018
e9502da
added in recipes#index, wrote out first part of api wrapper
hannahlcameron May 2, 2018
ab39fea
added in recipe class, added to recipe controller and api_wrapper
hannahlcameron May 2, 2018
4668d63
added valid_attribute method
hannahlcameron May 2, 2018
97e6749
added in routes
hannahlcameron May 2, 2018
fed4fd9
started search form
hannahlcameron May 3, 2018
5449b1c
added in remainder of list_recipes
hannahlcameron May 4, 2018
b4aeb8c
worked on display_recipe method
hannahlcameron May 4, 2018
b4b538e
wrote out display_recipe, modified recipe.rb to keep track of full am…
hannahlcameron May 4, 2018
e252826
updated with all info wanting to store
hannahlcameron May 4, 2018
f5aaf49
started html for index
hannahlcameron May 4, 2018
d496242
tweaked uri to only include recipe id
hannahlcameron May 4, 2018
2954d89
finished index html
hannahlcameron May 6, 2018
3e6c0da
Merge branch 'master' into api_wrapper
hannahlcameron May 6, 2018
db96ab7
no routes changed
hannahlcameron May 6, 2018
d002816
moved form for search, added new route and method
hannahlcameron May 6, 2018
28981ef
resolved merge conflict
hannahlcameron May 6, 2018
c4620d6
set root route, fixed issues with create method
hannahlcameron May 6, 2018
e6d7c47
fixed displaying index
hannahlcameron May 6, 2018
414536c
added pagination with the kaminari
hannahlcameron May 6, 2018
25d756e
update root path, add link to search page
hannahlcameron May 6, 2018
45f9bd8
added page title, fixed link for show page on index page
hannahlcameron May 6, 2018
4bb4945
added in show view
hannahlcameron May 7, 2018
edc82a9
wrote and passing most controller tests
hannahlcameron May 7, 2018
98545c6
added tests for wrapper
hannahlcameron May 7, 2018
d9aced3
wrote recipe tests
hannahlcameron May 7, 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
27 changes: 27 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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

# Ignore uploaded files in development
/storage/*

/node_modules
/yarn-error.log

/public/assets
.byebug_history
.env

# Ignore master key for decrypting credentials and more.
/config/master.key
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.5.0
75 changes: 75 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.0'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.0'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# 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 'mini_racer', 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', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

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

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false
gem 'httparty'
gem 'jquery-turbolinks'
gem 'jquery-rails'
gem 'foundation-rails'
gem 'normalize-rails'
gem 'kaminari'
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

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

group :development do
# Access an interactive console on exception pages or by calling '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'
gem 'better_errors'
gem 'binding_of_caller'
end

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15', '< 4.0'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
gem 'minitest-rails'
gem 'minitest-reporters'
end
Loading