From 20783be91bf7ed369143875ea64b1e9775b70aa4 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Tue, 31 Oct 2017 12:28:54 -0700 Subject: [PATCH 01/31] Ran rails new . to create project --- .gitignore | 19 ++ Gemfile | 71 ++++++ Gemfile.lock | 234 ++++++++++++++++++ Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 15 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.css | 15 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 3 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 38 +++ bin/spring | 17 ++ bin/update | 29 +++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 3 + config/cable.yml | 10 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++ config/environments/production.rb | 91 +++++++ config/environments/test.rb | 42 ++++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 ++ config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 56 +++++ config/routes.rb | 3 + config/secrets.yml | 32 +++ config/spring.rb | 6 + db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 +++++ public/422.html | 67 +++++ public/500.html | 66 +++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 9 + tmp/.keep | 0 vendor/.keep | 0 75 files changed, 1291 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..82701fedc --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +# 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 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..35726b7d8 --- /dev/null +++ b/Gemfile @@ -0,0 +1,71 @@ +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' + +# 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' +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' +group :development do + gem 'better_errors' + gem 'binding_of_caller' +end + +group :development, :test do + gem 'pry-rails' +end + +gem 'foundation-rails', '6.4.1.2' +gem 'awesome_print' +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..d05483c6c --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,234 @@ +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) + awesome_print (1.8.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) + crass (1.0.2) + debug_inspector (0.0.3) + 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) + 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 + 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) + 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 + multi_json (1.12.2) + 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) + 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) + 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) + web-console (3.5.1) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + 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 + awesome_print + better_errors + binding_of_caller + byebug + capybara (~> 2.13) + foundation-rails (= 6.4.1.2) + jbuilder (~> 2.5) + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.7) + rails (~> 5.1.4) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 1.15.4 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..b16e53d6d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 000000000..46b20359f --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,15 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require rails-ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 000000000..739aa5f02 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..d05ea0f51 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..1c07694e9 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..3360e304d --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + ApiMuncher + <%= csrf_meta_tags %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..78c4e861d --- /dev/null +++ b/bin/setup @@ -0,0 +1,38 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 000000000..c2bacef83 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +VENDOR_PATH = File.expand_path('..', __dir__) +Dir.chdir(VENDOR_PATH) do + begin + exec "yarnpkg #{ARGV.join(" ")}" + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..d47313ed2 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,25 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module ApiMuncher + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..ab338d3d1 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: api-muncher_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..4cb63a555 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: api-muncher_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: api-muncher + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: api-muncher_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: api-muncher_production + username: api-muncher + password: <%= ENV['API-MUNCHER_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..5187e2218 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..611bf345f --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,91 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "api-muncher_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..8e5cbde53 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..4b828e80c --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..5a6a32d37 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..99ec76d2a --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: 35d39b95f76bc220b4b1b92aa63a6b13c93a134248e216ddba7242860f28d360a0385d1a54c00fd9135fa14f251e00b079d764a5c2a023656a10713edf8cb896 + +test: + secret_key_base: 00339e8a9f4909cffcf47518a16d6746ea5180744c5f618f0b77aaa296d51483bbd08e21c28891d29a71052fcf30ff7469aa0bdc0a986253590b05fc5c16fabb + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..1beea2acc --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/package.json b/package.json new file mode 100644 index 000000000..5da55eadc --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "api-muncher", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..2be3af26f --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/422.html b/public/422.html new file mode 100644 index 000000000..c08eac0d1 --- /dev/null +++ b/public/422.html @@ -0,0 +1,67 @@ + + + + The change you wanted was rejected (422) + + + + + + +
+
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/500.html b/public/500.html new file mode 100644 index 000000000..78a030af2 --- /dev/null +++ b/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 000000000..d19212abd --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..e3c4ff0b8 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,9 @@ +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 251e61326ff0646ef9c6f8bb4fd7b895b688c433 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Tue, 31 Oct 2017 12:40:25 -0700 Subject: [PATCH 02/31] Created db and recipes controller --- .DS_Store | Bin 0 -> 6148 bytes app/.DS_Store | Bin 0 -> 6148 bytes app/assets/javascripts/recipes.js | 2 ++ app/assets/stylesheets/recipes.scss | 3 +++ app/controllers/recipes_controller.rb | 2 ++ app/helpers/recipes_helper.rb | 2 ++ db/schema.rb | 18 ++++++++++++++++++ test/controllers/recipes_controller_test.rb | 7 +++++++ 8 files changed, 34 insertions(+) create mode 100644 .DS_Store create mode 100644 app/.DS_Store create mode 100644 app/assets/javascripts/recipes.js create mode 100644 app/assets/stylesheets/recipes.scss create mode 100644 app/controllers/recipes_controller.rb create mode 100644 app/helpers/recipes_helper.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/recipes_controller_test.rb diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6469d3a1e9afb92733e870cbb6e5e3ec3b7f5677 GIT binary patch literal 6148 zcmeHK%}&BV5Z(pU5@Y0Gg2%mh;{ZtfIhZtv2X7`AJ*a`!5@}M~h8Bq;rjMa-2ZgI+usLuQiMZ#tdX?S5@`IzkB99C|e&N97*g3 zkqcMvZoCl9j{nF2zPr3|L@Z)=H2?krKS`_A51GpsR#w-nV$mvYSU2r{G-{_#I!v0* z;7VWlUe6`_Jc@#u?YI|yZ`3Jm9Y>JD(P{Vo@oD@#d3iOIO8EM;Y!Xi44Gh|ym)r&} zJRgRV>!CdegDAWM&vb%mA|o@v3@`&r%>W&G*7{QKk~hZ;Fay6~0M7>nif9vN2KCVa zgKhx;3*goQHue&jqX=!n%plwWktP+;q)KWrq)7+AqBxr{GicIj zl@1ruHpnA0zzlq40DC`>64w8dpZk9u!~-+H3@j%Dve0U`ny@#jtqZ%vTB|_2pePuZ m8Jwknp-VBuVkzDR)dGHn2B1xt83Ydq{|IOrcwh$plz~r=`BX9h literal 0 HcmV?d00001 diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a8912936ff01b49962d597ff64709cbefb4c7c39 GIT binary patch literal 6148 zcmeHK!A=4(5N!c<2{Cdo!DBDpH~9@N0D5ZPqilHEn3h}qB3Kk^U! z9cS8t669oJ44EO*H=WM3=_~1M8DqRT>{b~oGR7=W#7rKV9|Xry7bIgmh+NGPG06h> z^;onJO^*M_0G?fe-NLzrEP+$|I=|Q(#RD&p9z?u*gTRlIO67xRvbnYO4J)6w@|)I; z)0ZPBag$-(bfYWP^SeFI*ymCPGu!np{NAWt+&-3J;`(7P`WAkD>4#l8YRX~QjnzD7 zZqkQbwNSfQ8joxBT3H+(Ov+;1XjICgzPCS_SXODbdUV>ke|#E0PhMU%#T@>PO12D6 z;SG!>yM1t?Fp%LLL`<`%S%ky@F+dEg8UyB@vkI%WG1?C?Kn(nv0lXgsD57mJ)u^rx zXz=q9$8(4%VB=c?Q5duhrW#=cgzHp5oyyGOf~9s#?{I&k6D?U7YbLa zgI}m{#%+z%5(C7*JOf$XEn@vYS^oZ?Pof?%Kn$!D13cGqT20uJsjUl}!&)mqJD?~S nmuj4)fT2n;#9}Gl0aXHifd-&$Fx3bi5c&{MG*Ckf{3!#U|Akcv literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/recipes.js b/app/assets/javascripts/recipes.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/recipes.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/recipes.scss b/app/assets/stylesheets/recipes.scss new file mode 100644 index 000000000..95482059f --- /dev/null +++ b/app/assets/stylesheets/recipes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Recipes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb new file mode 100644 index 000000000..67874584c --- /dev/null +++ b/app/controllers/recipes_controller.rb @@ -0,0 +1,2 @@ +class RecipesController < ApplicationController +end diff --git a/app/helpers/recipes_helper.rb b/app/helpers/recipes_helper.rb new file mode 100644 index 000000000..f526316e2 --- /dev/null +++ b/app/helpers/recipes_helper.rb @@ -0,0 +1,2 @@ +module RecipesHelper +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# 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 + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/test/controllers/recipes_controller_test.rb b/test/controllers/recipes_controller_test.rb new file mode 100644 index 000000000..f837296a9 --- /dev/null +++ b/test/controllers/recipes_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RecipesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 3de70a1b07d51c670c178828fc42e62b8c207182 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Tue, 31 Oct 2017 12:43:04 -0700 Subject: [PATCH 03/31] created recipe class file and api wrapper file in lib directory --- lib/edamam_api_wrapper.rb | 10 ++++++++++ lib/recipe.rb | 3 +++ 2 files changed, 13 insertions(+) create mode 100644 lib/edamam_api_wrapper.rb create mode 100644 lib/recipe.rb diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb new file mode 100644 index 000000000..17a22dbe2 --- /dev/null +++ b/lib/edamam_api_wrapper.rb @@ -0,0 +1,10 @@ +require "HTTParty" +require 'pry' + +class EdamamApiWrapper + BASE_URL = "url here" + TOKEN = ENV["token here"] + + class ApiError < StandardError + end +end diff --git a/lib/recipe.rb b/lib/recipe.rb new file mode 100644 index 000000000..52d0c4b9d --- /dev/null +++ b/lib/recipe.rb @@ -0,0 +1,3 @@ +class Recipe + +end From 7b2c002898ff67e62cd8078908dd0a766a3dbc97 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Tue, 31 Oct 2017 12:47:10 -0700 Subject: [PATCH 04/31] added foundations to project --- app/assets/javascripts/application.js | 3 + app/assets/stylesheets/_settings.scss | 863 ++++++++++++++++++ app/assets/stylesheets/application.css | 2 + .../stylesheets/foundation_and_overrides.scss | 53 ++ app/views/layouts/application.html.erb | 15 +- 5 files changed, 931 insertions(+), 5 deletions(-) create mode 100644 app/assets/stylesheets/_settings.scss create mode 100644 app/assets/stylesheets/foundation_and_overrides.scss diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 46b20359f..4f2cc0f55 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,5 +11,8 @@ // about supported directives. // //= require rails-ujs +//= require foundation //= require turbolinks //= require_tree . + +$(function(){ $(document).foundation(); }); diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss new file mode 100644 index 000000000..b67ff00cd --- /dev/null +++ b/app/assets/stylesheets/_settings.scss @@ -0,0 +1,863 @@ +// Foundation for Sites Settings +// ----------------------------- +// +// Table of Contents: +// +// 1. Global +// 2. Breakpoints +// 3. The Grid +// 4. Base Typography +// 5. Typography Helpers +// 6. Abide +// 7. Accordion +// 8. Accordion Menu +// 9. Badge +// 10. Breadcrumbs +// 11. Button +// 12. Button Group +// 13. Callout +// 14. Card +// 15. Close Button +// 16. Drilldown +// 17. Dropdown +// 18. Dropdown Menu +// 19. Flexbox Utilities +// 20. Forms +// 21. Label +// 22. Media Object +// 23. Menu +// 24. Meter +// 25. Off-canvas +// 26. Orbit +// 27. Pagination +// 28. Progress Bar +// 29. Prototype Arrow +// 30. Prototype Border-Box +// 31. Prototype Border-None +// 32. Prototype Bordered +// 33. Prototype Display +// 34. Prototype Font-Styling +// 35. Prototype List-Style-Type +// 36. Prototype Overflow +// 37. Prototype Position +// 38. Prototype Rounded +// 39. Prototype Separator +// 40. Prototype Shadow +// 41. Prototype Sizing +// 42. Prototype Spacing +// 43. Prototype Text-Decoration +// 44. Prototype Text-Transformation +// 45. Prototype Text-Utilities +// 46. Responsive Embed +// 47. Reveal +// 48. Slider +// 49. Switch +// 50. Table +// 51. Tabs +// 52. Thumbnail +// 53. Title Bar +// 54. Tooltip +// 55. Top Bar +// 56. Xy Grid + +@import 'util/util'; + +// 1. Global +// --------- + +$global-font-size: 100%; +$global-width: rem-calc(1200); +$global-lineheight: 1.5; +$foundation-palette: ( + primary: #1779ba, + secondary: #767676, + success: #3adb76, + warning: #ffae00, + alert: #cc4b37, +); +$light-gray: #e6e6e6; +$medium-gray: #cacaca; +$dark-gray: #8a8a8a; +$black: #0a0a0a; +$white: #fefefe; +$body-background: $white; +$body-font-color: $black; +$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; +$body-antialiased: true; +$global-margin: 1rem; +$global-padding: 1rem; +$global-position: 1rem; +$global-weight-normal: normal; +$global-weight-bold: bold; +$global-radius: 0; +$global-menu-padding: 0.7rem 1rem; +$global-menu-nested-margin: 1rem; +$global-text-direction: ltr; +$global-flexbox: true; +$global-prototype-breakpoints: false; +$global-color-pick-contrast-tolerance: 0; +$print-transparent-backgrounds: true; + +@include add-foundation-colors; + +// 2. Breakpoints +// -------------- + +$breakpoints: ( + small: 0, + medium: 640px, + large: 1024px, + xlarge: 1200px, + xxlarge: 1440px, +); +$print-breakpoint: large; +$breakpoint-classes: (small medium large); + +// 3. The Grid +// ----------- + +$grid-row-width: $global-width; +$grid-column-count: 12; +$grid-column-gutter: ( + small: 20px, + medium: 30px, +); +$grid-column-align-edge: true; +$grid-column-alias: 'columns'; +$block-grid-max: 8; + +// 4. Base Typography +// ------------------ + +$header-font-family: $body-font-family; +$header-font-weight: $global-weight-normal; +$header-font-style: normal; +$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; +$header-color: inherit; +$header-lineheight: 1.4; +$header-margin-bottom: 0.5rem; +$header-styles: ( + small: ( + 'h1': ('font-size': 24), + 'h2': ('font-size': 20), + 'h3': ('font-size': 19), + 'h4': ('font-size': 18), + 'h5': ('font-size': 17), + 'h6': ('font-size': 16), + ), + medium: ( + 'h1': ('font-size': 48), + 'h2': ('font-size': 40), + 'h3': ('font-size': 31), + 'h4': ('font-size': 25), + 'h5': ('font-size': 20), + 'h6': ('font-size': 16), + ), +); +$header-text-rendering: optimizeLegibility; +$small-font-size: 80%; +$header-small-font-color: $medium-gray; +$paragraph-lineheight: 1.6; +$paragraph-margin-bottom: 1rem; +$paragraph-text-rendering: optimizeLegibility; +$code-color: $black; +$code-font-family: $font-family-monospace; +$code-font-weight: $global-weight-normal; +$code-background: $light-gray; +$code-border: 1px solid $medium-gray; +$code-padding: rem-calc(2 5 1); +$anchor-color: $primary-color; +$anchor-color-hover: scale-color($anchor-color, $lightness: -14%); +$anchor-text-decoration: none; +$anchor-text-decoration-hover: none; +$hr-width: $global-width; +$hr-border: 1px solid $medium-gray; +$hr-margin: rem-calc(20) auto; +$list-lineheight: $paragraph-lineheight; +$list-margin-bottom: $paragraph-margin-bottom; +$list-style-type: disc; +$list-style-position: outside; +$list-side-margin: 1.25rem; +$list-nested-side-margin: 1.25rem; +$defnlist-margin-bottom: 1rem; +$defnlist-term-weight: $global-weight-bold; +$defnlist-term-margin-bottom: 0.3rem; +$blockquote-color: $dark-gray; +$blockquote-padding: rem-calc(9 20 0 19); +$blockquote-border: 1px solid $medium-gray; +$cite-font-size: rem-calc(13); +$cite-color: $dark-gray; +$cite-pseudo-content: '\2014 \0020'; +$keystroke-font: $font-family-monospace; +$keystroke-color: $black; +$keystroke-background: $light-gray; +$keystroke-padding: rem-calc(2 4 0); +$keystroke-radius: $global-radius; +$abbr-underline: 1px dotted $black; + +// 5. Typography Helpers +// --------------------- + +$lead-font-size: $global-font-size * 1.25; +$lead-lineheight: 1.6; +$subheader-lineheight: 1.4; +$subheader-color: $dark-gray; +$subheader-font-weight: $global-weight-normal; +$subheader-margin-top: 0.2rem; +$subheader-margin-bottom: 0.5rem; +$stat-font-size: 2.5rem; + +// 6. Abide +// -------- + +$abide-inputs: true; +$abide-labels: true; +$input-background-invalid: get-color(alert); +$form-label-color-invalid: get-color(alert); +$input-error-color: get-color(alert); +$input-error-font-size: rem-calc(12); +$input-error-font-weight: $global-weight-bold; + +// 7. Accordion +// ------------ + +$accordion-background: $white; +$accordion-plusminus: true; +$accordion-title-font-size: rem-calc(12); +$accordion-item-color: $primary-color; +$accordion-item-background-hover: $light-gray; +$accordion-item-padding: 1.25rem 1rem; +$accordion-content-background: $white; +$accordion-content-border: 1px solid $light-gray; +$accordion-content-color: $body-font-color; +$accordion-content-padding: 1rem; + +// 8. Accordion Menu +// ----------------- + +$accordionmenu-padding: $global-menu-padding; +$accordionmenu-nested-margin: $global-menu-nested-margin; +$accordionmenu-submenu-padding: $accordionmenu-padding; +$accordionmenu-arrows: true; +$accordionmenu-arrow-color: $primary-color; +$accordionmenu-item-background: null; +$accordionmenu-border: null; +$accordionmenu-submenu-toggle-background: null; +$accordion-submenu-toggle-border: $accordionmenu-border; +$accordionmenu-submenu-toggle-width: 40px; +$accordionmenu-submenu-toggle-height: $accordionmenu-submenu-toggle-width; +$accordionmenu-arrow-size: 6px; + +// 9. Badge +// -------- + +$badge-background: $primary-color; +$badge-color: $white; +$badge-color-alt: $black; +$badge-palette: $foundation-palette; +$badge-padding: 0.3em; +$badge-minwidth: 2.1em; +$badge-font-size: 0.6rem; + +// 10. Breadcrumbs +// --------------- + +$breadcrumbs-margin: 0 0 $global-margin 0; +$breadcrumbs-item-font-size: rem-calc(11); +$breadcrumbs-item-color: $primary-color; +$breadcrumbs-item-color-current: $black; +$breadcrumbs-item-color-disabled: $medium-gray; +$breadcrumbs-item-margin: 0.75rem; +$breadcrumbs-item-uppercase: true; +$breadcrumbs-item-separator: true; +$breadcrumbs-item-separator-item: '/'; +$breadcrumbs-item-separator-item-rtl: '\\'; +$breadcrumbs-item-separator-color: $medium-gray; + +// 11. Button +// ---------- + +$button-font-family: inherit; +$button-padding: 0.85em 1em; +$button-margin: 0 0 $global-margin 0; +$button-fill: solid; +$button-background: $primary-color; +$button-background-hover: scale-color($button-background, $lightness: -15%); +$button-color: $white; +$button-color-alt: $black; +$button-radius: $global-radius; +$button-hollow-border-width: 1px; +$button-sizes: ( + tiny: 0.6rem, + small: 0.75rem, + default: 0.9rem, + large: 1.25rem, +); +$button-palette: $foundation-palette; +$button-opacity-disabled: 0.25; +$button-background-hover-lightness: -20%; +$button-hollow-hover-lightness: -50%; +$button-transition: background-color 0.25s ease-out, color 0.25s ease-out; + +// 12. Button Group +// ---------------- + +$buttongroup-margin: 1rem; +$buttongroup-spacing: 1px; +$buttongroup-child-selector: '.button'; +$buttongroup-expand-max: 6; +$buttongroup-radius-on-each: true; + +// 13. Callout +// ----------- + +$callout-background: $white; +$callout-background-fade: 85%; +$callout-border: 1px solid rgba($black, 0.25); +$callout-margin: 0 0 1rem 0; +$callout-padding: 1rem; +$callout-font-color: $body-font-color; +$callout-font-color-alt: $body-background; +$callout-radius: $global-radius; +$callout-link-tint: 30%; + +// 14. Card +// -------- + +$card-background: $white; +$card-font-color: $body-font-color; +$card-divider-background: $light-gray; +$card-border: 1px solid $light-gray; +$card-shadow: none; +$card-border-radius: $global-radius; +$card-padding: $global-padding; +$card-margin-bottom: $global-margin; + +// 15. Close Button +// ---------------- + +$closebutton-position: right top; +$closebutton-offset-horizontal: ( + small: 0.66rem, + medium: 1rem, +); +$closebutton-offset-vertical: ( + small: 0.33em, + medium: 0.5rem, +); +$closebutton-size: ( + small: 1.5em, + medium: 2em, +); +$closebutton-lineheight: 1; +$closebutton-color: $dark-gray; +$closebutton-color-hover: $black; + +// 16. Drilldown +// ------------- + +$drilldown-transition: transform 0.15s linear; +$drilldown-arrows: true; +$drilldown-padding: $global-menu-padding; +$drilldown-nested-margin: 0; +$drilldown-background: $white; +$drilldown-submenu-padding: $drilldown-padding; +$drilldown-submenu-background: $white; +$drilldown-arrow-color: $primary-color; +$drilldown-arrow-size: 6px; + +// 17. Dropdown +// ------------ + +$dropdown-padding: 1rem; +$dropdown-background: $body-background; +$dropdown-border: 1px solid $medium-gray; +$dropdown-font-size: 1rem; +$dropdown-width: 300px; +$dropdown-radius: $global-radius; +$dropdown-sizes: ( + tiny: 100px, + small: 200px, + large: 400px, +); + +// 18. Dropdown Menu +// ----------------- + +$dropdownmenu-arrows: true; +$dropdownmenu-arrow-color: $anchor-color; +$dropdownmenu-arrow-size: 6px; +$dropdownmenu-arrow-padding: 1.5rem; +$dropdownmenu-min-width: 200px; +$dropdownmenu-background: $white; +$dropdownmenu-submenu-background: $dropdownmenu-background; +$dropdownmenu-padding: $global-menu-padding; +$dropdownmenu-nested-margin: 0; +$dropdownmenu-submenu-padding: $dropdownmenu-padding; +$dropdownmenu-border: 1px solid $medium-gray; +$dropdown-menu-item-color-active: get-color(primary); +$dropdown-menu-item-background-active: transparent; + +// 19. Flexbox Utilities +// --------------------- + +$flex-source-ordering-count: 6; +$flexbox-responsive-breakpoints: true; + +// 20. Forms +// --------- + +$fieldset-border: 1px solid $medium-gray; +$fieldset-padding: rem-calc(20); +$fieldset-margin: rem-calc(18 0); +$legend-padding: rem-calc(0 3); +$form-spacing: rem-calc(16); +$helptext-color: $black; +$helptext-font-size: rem-calc(13); +$helptext-font-style: italic; +$input-prefix-color: $black; +$input-prefix-background: $light-gray; +$input-prefix-border: 1px solid $medium-gray; +$input-prefix-padding: 1rem; +$form-label-color: $black; +$form-label-font-size: rem-calc(14); +$form-label-font-weight: $global-weight-normal; +$form-label-line-height: 1.8; +$select-background: $white; +$select-triangle-color: $dark-gray; +$select-radius: $global-radius; +$input-color: $black; +$input-placeholder-color: $medium-gray; +$input-font-family: inherit; +$input-font-size: rem-calc(16); +$input-font-weight: $global-weight-normal; +$input-line-height: $global-lineheight; +$input-background: $white; +$input-background-focus: $white; +$input-background-disabled: $light-gray; +$input-border: 1px solid $medium-gray; +$input-border-focus: 1px solid $dark-gray; +$input-padding: $form-spacing / 2; +$input-shadow: inset 0 1px 2px rgba($black, 0.1); +$input-shadow-focus: 0 0 5px $medium-gray; +$input-cursor-disabled: not-allowed; +$input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out; +$input-number-spinners: true; +$input-radius: $global-radius; +$form-button-radius: $global-radius; + +// 21. Label +// --------- + +$label-background: $primary-color; +$label-color: $white; +$label-color-alt: $black; +$label-palette: $foundation-palette; +$label-font-size: 0.8rem; +$label-padding: 0.33333rem 0.5rem; +$label-radius: $global-radius; + +// 22. Media Object +// ---------------- + +$mediaobject-margin-bottom: $global-margin; +$mediaobject-section-padding: $global-padding; +$mediaobject-image-width-stacked: 100%; + +// 23. Menu +// -------- + +$menu-margin: 0; +$menu-nested-margin: $global-menu-nested-margin; +$menu-items-padding: $global-menu-padding; +$menu-simple-margin: 1rem; +$menu-item-color-active: $white; +$menu-item-background-active: get-color(primary); +$menu-icon-spacing: 0.25rem; +$menu-item-background-hover: $light-gray; +$menu-state-back-compat: true; +$menu-centered-back-compat: true; + +// 24. Meter +// --------- + +$meter-height: 1rem; +$meter-radius: $global-radius; +$meter-background: $medium-gray; +$meter-fill-good: $success-color; +$meter-fill-medium: $warning-color; +$meter-fill-bad: $alert-color; + +// 25. Off-canvas +// -------------- + +$offcanvas-size: 250px; +$offcanvas-vertical-size: 250px; +$offcanvas-background: $light-gray; +$offcanvas-shadow: 0 0 10px rgba($black, 0.7); +$offcanvas-inner-shadow-size: 20px; +$offcanvas-inner-shadow-color: rgba($black, 0.25); +$offcanvas-overlay-zindex: 11; +$offcanvas-push-zindex: 12; +$offcanvas-overlap-zindex: 13; +$offcanvas-reveal-zindex: 12; +$offcanvas-transition-length: 0.5s; +$offcanvas-transition-timing: ease; +$offcanvas-fixed-reveal: true; +$offcanvas-exit-background: rgba($white, 0.25); +$maincontent-class: 'off-canvas-content'; + +// 26. Orbit +// --------- + +$orbit-bullet-background: $medium-gray; +$orbit-bullet-background-active: $dark-gray; +$orbit-bullet-diameter: 1.2rem; +$orbit-bullet-margin: 0.1rem; +$orbit-bullet-margin-top: 0.8rem; +$orbit-bullet-margin-bottom: 0.8rem; +$orbit-caption-background: rgba($black, 0.5); +$orbit-caption-padding: 1rem; +$orbit-control-background-hover: rgba($black, 0.5); +$orbit-control-padding: 1rem; +$orbit-control-zindex: 10; + +// 27. Pagination +// -------------- + +$pagination-font-size: rem-calc(14); +$pagination-margin-bottom: $global-margin; +$pagination-item-color: $black; +$pagination-item-padding: rem-calc(3 10); +$pagination-item-spacing: rem-calc(1); +$pagination-radius: $global-radius; +$pagination-item-background-hover: $light-gray; +$pagination-item-background-current: $primary-color; +$pagination-item-color-current: $white; +$pagination-item-color-disabled: $medium-gray; +$pagination-ellipsis-color: $black; +$pagination-mobile-items: false; +$pagination-mobile-current-item: false; +$pagination-arrows: true; + +// 28. Progress Bar +// ---------------- + +$progress-height: 1rem; +$progress-background: $medium-gray; +$progress-margin-bottom: $global-margin; +$progress-meter-background: $primary-color; +$progress-radius: $global-radius; + +// 29. Prototype Arrow +// ------------------- + +$prototype-arrow-directions: ( + down, + up, + right, + left +); +$prototype-arrow-size: 0.4375rem; +$prototype-arrow-color: $black; + +// 30. Prototype Border-Box +// ------------------------ + +$prototype-border-box-breakpoints: $global-prototype-breakpoints; + +// 31. Prototype Border-None +// ------------------------- + +$prototype-border-none-breakpoints: $global-prototype-breakpoints; + +// 32. Prototype Bordered +// ---------------------- + +$prototype-bordered-breakpoints: $global-prototype-breakpoints; +$prototype-border-width: rem-calc(1); +$prototype-border-type: solid; +$prototype-border-color: $medium-gray; + +// 33. Prototype Display +// --------------------- + +$prototype-display-breakpoints: $global-prototype-breakpoints; +$prototype-display: ( + inline, + inline-block, + block, + table, + table-cell +); + +// 34. Prototype Font-Styling +// -------------------------- + +$prototype-font-breakpoints: $global-prototype-breakpoints; +$prototype-wide-letter-spacing: rem-calc(4); +$prototype-font-normal: $global-weight-normal; +$prototype-font-bold: $global-weight-bold; + +// 35. Prototype List-Style-Type +// ----------------------------- + +$prototype-list-breakpoints: $global-prototype-breakpoints; +$prototype-style-type-unordered: ( + disc, + circle, + square +); +$prototype-style-type-ordered: ( + decimal, + lower-alpha, + lower-latin, + lower-roman, + upper-alpha, + upper-latin, + upper-roman +); + +// 36. Prototype Overflow +// ---------------------- + +$prototype-overflow-breakpoints: $global-prototype-breakpoints; +$prototype-overflow: ( + visible, + hidden, + scroll +); + +// 37. Prototype Position +// ---------------------- + +$prototype-position-breakpoints: $global-prototype-breakpoints; +$prototype-position: ( + static, + relative, + absolute, + fixed +); +$prototype-position-z-index: 975; + +// 38. Prototype Rounded +// --------------------- + +$prototype-rounded-breakpoints: $global-prototype-breakpoints; +$prototype-border-radius: rem-calc(3); + +// 39. Prototype Separator +// ----------------------- + +$prototype-separator-breakpoints: $global-prototype-breakpoints; +$prototype-separator-align: center; +$prototype-separator-height: rem-calc(2); +$prototype-separator-width: 3rem; +$prototype-separator-background: $primary-color; +$prototype-separator-margin-top: $global-margin; + +// 40. Prototype Shadow +// -------------------- + +$prototype-shadow-breakpoints: $global-prototype-breakpoints; +$prototype-box-shadow: 0 2px 5px 0 rgba(0,0,0,.16), + 0 2px 10px 0 rgba(0,0,0,.12); + +// 41. Prototype Sizing +// -------------------- + +$prototype-sizing-breakpoints: $global-prototype-breakpoints; +$prototype-sizing: ( + width, + height +); +$prototype-sizes: ( + 25: 25%, + 50: 50%, + 75: 75%, + 100: 100% +); + +// 42. Prototype Spacing +// --------------------- + +$prototype-spacing-breakpoints: $global-prototype-breakpoints; +$prototype-spacers-count: 3; + +// 43. Prototype Text-Decoration +// ----------------------------- + +$prototype-decoration-breakpoints: $global-prototype-breakpoints; +$prototype-text-decoration: ( + overline, + underline, + line-through, +); + +// 44. Prototype Text-Transformation +// --------------------------------- + +$prototype-transformation-breakpoints: $global-prototype-breakpoints; +$prototype-text-transformation: ( + lowercase, + uppercase, + capitalize +); + +// 45. Prototype Text-Utilities +// ---------------------------- + +$prototype-utilities-breakpoints: $global-prototype-breakpoints; +$prototype-text-overflow: ellipsis; + +// 46. Responsive Embed +// -------------------- + +$responsive-embed-margin-bottom: rem-calc(16); +$responsive-embed-ratios: ( + default: 4 by 3, + widescreen: 16 by 9, +); + +// 47. Reveal +// ---------- + +$reveal-background: $white; +$reveal-width: 600px; +$reveal-max-width: $global-width; +$reveal-padding: $global-padding; +$reveal-border: 1px solid $medium-gray; +$reveal-radius: $global-radius; +$reveal-zindex: 1005; +$reveal-overlay-background: rgba($black, 0.45); + +// 48. Slider +// ---------- + +$slider-width-vertical: 0.5rem; +$slider-transition: all 0.2s ease-in-out; +$slider-height: 0.5rem; +$slider-background: $light-gray; +$slider-fill-background: $medium-gray; +$slider-handle-height: 1.4rem; +$slider-handle-width: 1.4rem; +$slider-handle-background: $primary-color; +$slider-opacity-disabled: 0.25; +$slider-radius: $global-radius; + +// 49. Switch +// ---------- + +$switch-background: $medium-gray; +$switch-background-active: $primary-color; +$switch-height: 2rem; +$switch-height-tiny: 1.5rem; +$switch-height-small: 1.75rem; +$switch-height-large: 2.5rem; +$switch-radius: $global-radius; +$switch-margin: $global-margin; +$switch-paddle-background: $white; +$switch-paddle-offset: 0.25rem; +$switch-paddle-radius: $global-radius; +$switch-paddle-transition: all 0.25s ease-out; + +// 50. Table +// --------- + +$table-background: $white; +$table-color-scale: 5%; +$table-border: 1px solid smart-scale($table-background, $table-color-scale); +$table-padding: rem-calc(8 10 10); +$table-hover-scale: 2%; +$table-row-hover: darken($table-background, $table-hover-scale); +$table-row-stripe-hover: darken($table-background, $table-color-scale + $table-hover-scale); +$table-is-striped: true; +$table-striped-background: smart-scale($table-background, $table-color-scale); +$table-stripe: even; +$table-head-background: smart-scale($table-background, $table-color-scale / 2); +$table-head-row-hover: darken($table-head-background, $table-hover-scale); +$table-foot-background: smart-scale($table-background, $table-color-scale); +$table-foot-row-hover: darken($table-foot-background, $table-hover-scale); +$table-head-font-color: $body-font-color; +$table-foot-font-color: $body-font-color; +$show-header-for-stacked: false; +$table-stack-breakpoint: medium; + +// 51. Tabs +// -------- + +$tab-margin: 0; +$tab-background: $white; +$tab-color: $primary-color; +$tab-background-active: $light-gray; +$tab-active-color: $primary-color; +$tab-item-font-size: rem-calc(12); +$tab-item-background-hover: $white; +$tab-item-padding: 1.25rem 1.5rem; +$tab-expand-max: 6; +$tab-content-background: $white; +$tab-content-border: $light-gray; +$tab-content-color: $body-font-color; +$tab-content-padding: 1rem; + +// 52. Thumbnail +// ------------- + +$thumbnail-border: solid 4px $white; +$thumbnail-margin-bottom: $global-margin; +$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2); +$thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, 0.5); +$thumbnail-transition: box-shadow 200ms ease-out; +$thumbnail-radius: $global-radius; + +// 53. Title Bar +// ------------- + +$titlebar-background: $black; +$titlebar-color: $white; +$titlebar-padding: 0.5rem; +$titlebar-text-font-weight: bold; +$titlebar-icon-color: $white; +$titlebar-icon-color-hover: $medium-gray; +$titlebar-icon-spacing: 0.25rem; + +// 54. Tooltip +// ----------- + +$has-tip-cursor: help; +$has-tip-font-weight: $global-weight-bold; +$has-tip-border-bottom: dotted 1px $dark-gray; +$tooltip-background-color: $black; +$tooltip-color: $white; +$tooltip-padding: 0.75rem; +$tooltip-max-width: 10rem; +$tooltip-font-size: $small-font-size; +$tooltip-pip-width: 0.75rem; +$tooltip-pip-height: $tooltip-pip-width * 0.866; +$tooltip-radius: $global-radius; + +// 55. Top Bar +// ----------- + +$topbar-padding: 0.5rem; +$topbar-background: $light-gray; +$topbar-submenu-background: $topbar-background; +$topbar-title-spacing: 0.5rem 1rem 0.5rem 0; +$topbar-input-width: 200px; +$topbar-unstack-breakpoint: medium; + +// 56. Xy Grid +// ----------- + +$xy-grid: true; +$grid-container: $global-width; +$grid-columns: 12; +$grid-margin-gutters: ( + small: 20px, + medium: 30px +); +$grid-padding-gutters: $grid-margin-gutters; +$grid-container-padding: $grid-padding-gutters; +$grid-container-max: $global-width; +$block-grid-max: 8; + diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d05ea0f51..a152282fc 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -12,4 +12,6 @@ * *= require_tree . *= require_self + *= require foundation_and_overrides + */ diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss new file mode 100644 index 000000000..8de94cb11 --- /dev/null +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -0,0 +1,53 @@ +@charset 'utf-8'; + +@import 'settings'; +@import 'foundation'; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +@import 'motion-ui/motion-ui'; + +// We include everything by default. To slim your CSS, remove components you don't use. + +@include foundation-global-styles; +@include foundation-grid; +@include foundation-typography; +@include foundation-button; +@include foundation-forms; +@include foundation-visibility-classes; +@include foundation-float-classes; +@include foundation-accordion; +@include foundation-accordion-menu; +@include foundation-badge; +@include foundation-breadcrumbs; +@include foundation-button-group; +@include foundation-callout; +@include foundation-card; +@include foundation-close-button; +@include foundation-drilldown-menu; +@include foundation-dropdown; +@include foundation-dropdown-menu; +@include foundation-responsive-embed; +@include foundation-label; +@include foundation-media-object; +@include foundation-menu; +@include foundation-menu-icon; +@include foundation-off-canvas; +@include foundation-orbit; +@include foundation-pagination; +@include foundation-progress-bar; +@include foundation-slider; +@include foundation-sticky; +@include foundation-reveal; +@include foundation-switch; +@include foundation-table; +@include foundation-tabs; +@include foundation-thumbnail; +@include foundation-title-bar; +@include foundation-tooltip; +@include foundation-top-bar; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +@include motion-ui-transitions; +@include motion-ui-animations; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3360e304d..cd6000489 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,19 @@ - + - ApiMuncher - <%= csrf_meta_tags %> + + + + <%= content_for?(:title) ? yield(:title) : "Untitled" %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + <%= yield %> + From a54613a4c4940722749fb629a4fdeaa3f51a8d28 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Tue, 31 Oct 2017 13:53:10 -0700 Subject: [PATCH 05/31] Adds env to git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 82701fedc..fd7861bad 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /yarn-error.log .byebug_history +.env From f013c1ac2bc1428b4218ee7fa35e1d9ce0bb1b12 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Tue, 31 Oct 2017 14:45:33 -0700 Subject: [PATCH 06/31] Added basic routes --- app/controllers/recipes_controller.rb | 2 ++ config/routes.rb | 3 +++ lib/edamam_api_wrapper.rb | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb index 67874584c..3094ae505 100644 --- a/app/controllers/recipes_controller.rb +++ b/app/controllers/recipes_controller.rb @@ -1,2 +1,4 @@ class RecipesController < ApplicationController +# uri.sub(/[#]{1}/, '%') + end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..f8591dc9a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root 'recipes#root' + resouces :recipes, only: [:index, :show] + end diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index 17a22dbe2..eec210bb5 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -2,8 +2,9 @@ require 'pry' class EdamamApiWrapper - BASE_URL = "url here" - TOKEN = ENV["token here"] + BASE_URL = "https://api.edamam.com/search" + APP_ID = ENV["EDAMAN_ID"] + APP_KEY = ENV["EDAMAN_KEY"] class ApiError < StandardError end From 5503f0e5c57f853bf03f701a061f5aad3f961a34 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Tue, 31 Oct 2017 16:49:40 -0700 Subject: [PATCH 07/31] Adds recipes class and a get_recipes method in the api wrapper --- Gemfile | 2 ++ Gemfile.lock | 4 ++++ app/controllers/recipes_controller.rb | 12 +++++++++++- app/views/recipes/index.html.erb | 0 app/views/recipes/root.html.erb | 1 + app/views/recipes/show.html.erb | 0 config/routes.rb | 3 +-- lib/edamam_api_wrapper.rb | 26 ++++++++++++++++++++++++++ lib/recipe.rb | 18 +++++++++++++++++- 9 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 app/views/recipes/index.html.erb create mode 100644 app/views/recipes/root.html.erb create mode 100644 app/views/recipes/show.html.erb diff --git a/Gemfile b/Gemfile index 35726b7d8..cde0e48f2 100644 --- a/Gemfile +++ b/Gemfile @@ -33,6 +33,8 @@ gem 'jbuilder', '~> 2.5' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development +gem 'httparty' + 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] diff --git a/Gemfile.lock b/Gemfile.lock index d05483c6c..ae7555577 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,6 +78,8 @@ GEM sprockets-es6 (>= 0.9.0) globalid (0.4.1) activesupport (>= 4.2.0) + httparty (0.15.6) + multi_xml (>= 0.5.2) i18n (0.9.0) concurrent-ruby (~> 1.0) jbuilder (2.7.0) @@ -111,6 +113,7 @@ GEM minitest (>= 5.0) ruby-progressbar multi_json (1.12.2) + multi_xml (0.6.0) nio4r (2.1.0) nokogiri (1.8.1) mini_portile2 (~> 2.3.0) @@ -212,6 +215,7 @@ DEPENDENCIES byebug capybara (~> 2.13) foundation-rails (= 6.4.1.2) + httparty jbuilder (~> 2.5) jquery-turbolinks listen (>= 3.0.5, < 3.2) diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb index 3094ae505..b5f054e8a 100644 --- a/app/controllers/recipes_controller.rb +++ b/app/controllers/recipes_controller.rb @@ -1,4 +1,14 @@ class RecipesController < ApplicationController -# uri.sub(/[#]{1}/, '%') + def root + # I don't think this needs anything currently. + end + def index + + end + + def show + # https://api.edamam.com/search?r=http://www.edamam.com/ontologies/edamam.owl%23recipe_637913ec61d9da69eb451818c3293df2 + # uri.sub(/[#]{1}/, '%') this regex will replace # with % + end end diff --git a/app/views/recipes/index.html.erb b/app/views/recipes/index.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/recipes/root.html.erb b/app/views/recipes/root.html.erb new file mode 100644 index 000000000..019f1828f --- /dev/null +++ b/app/views/recipes/root.html.erb @@ -0,0 +1 @@ +

API MUNCHER ROOT

diff --git a/app/views/recipes/show.html.erb b/app/views/recipes/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/config/routes.rb b/config/routes.rb index f8591dc9a..621a3d8b8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root 'recipes#root' - resouces :recipes, only: [:index, :show] - + resources :recipes, only: [:index, :show] end diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index eec210bb5..e648e7f3d 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -8,4 +8,30 @@ class EdamamApiWrapper class ApiError < StandardError end + + def self.list_recipes(search_term) + url = BASE_URL + "?q=" + search_term + "&app_id=#{APP_ID}" + "&app_key=#{APP_KEY}" + + response = HTTParty.get(url) + + check_hits(response) + return_recipies = [] + + response["hits"].each do |recipe_data| + return_recipies << create_recipe(recipe_data) + end + + end + +private + # make sure status is 200 okay, and you have at least one search results, otherwise raise ApiError + def check_hits(response) + unless response.code == 200 + raise ApiError.new("Api call to Edaman failed. Status was #{response.code} #{response.message}") + else + if response["count"] < 1 + raise ApiError.new("Api call to Edaman failed to return any results for the search term #{response["q"]}") + end + end + end end diff --git a/lib/recipe.rb b/lib/recipe.rb index 52d0c4b9d..b35bb9998 100644 --- a/lib/recipe.rb +++ b/lib/recipe.rb @@ -1,3 +1,19 @@ class Recipe + attr_reader :label, :uri, :image, :source, :url, :yield, :calories, :ingredients, :healthLabels, :totalDaily -end + def initialize(label, uri, options = {}) + raise ArgumentError if label == nil || label == "" || uri == nil || uri == "" + + @label = label + @uri = uri + + @image = options["image"] + @url = options['url'] + @source = options['source'] + @yield = options['yield'] + @calories = options['calories'] + @ingredients = options['ingredients'] + @healthLabels = options['healthLabels'] + @totalDaily = options['totalDaily'] + end +end From bba10fc3ec3439949e0be92eb8d2331142178ffa Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Tue, 31 Oct 2017 16:57:22 -0700 Subject: [PATCH 08/31] adds testing lib folder and files for recipes and api wrapper testing --- app/controllers/recipes_controller.rb | 2 +- test/lib/edamam_api_wrapper_test.rb | 13 +++++++++++++ test/lib/recipe_test.rb | 19 +++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 test/lib/edamam_api_wrapper_test.rb create mode 100644 test/lib/recipe_test.rb diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb index b5f054e8a..8b0cb161f 100644 --- a/app/controllers/recipes_controller.rb +++ b/app/controllers/recipes_controller.rb @@ -4,7 +4,7 @@ def root end def index - + @recipes = EdamamApiWrapper.list_recipes() end def show diff --git a/test/lib/edamam_api_wrapper_test.rb b/test/lib/edamam_api_wrapper_test.rb new file mode 100644 index 000000000..7061c2876 --- /dev/null +++ b/test/lib/edamam_api_wrapper_test.rb @@ -0,0 +1,13 @@ +require "test_helper" + +describe EdamamApiWrapper do + describe "list_recipes" do + it "can generate a list of recipes for a search term" do + + end + + it "Raises and ApiError when the Api key is bogus" do + + end + end +end diff --git a/test/lib/recipe_test.rb b/test/lib/recipe_test.rb new file mode 100644 index 000000000..0be7d02da --- /dev/null +++ b/test/lib/recipe_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe "recipe" do + it "can be instantiated" do + + end + + it "requires a label and a uri" do + + end + + it "tracks label and uri" do + + end + + it "tracks optional arguments" do + + end +end From 4f99bdea20ce3e35ad259cb39da218a6bd1d9ce7 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Tue, 31 Oct 2017 19:51:58 -0700 Subject: [PATCH 09/31] Added gems for env file and altered config so that it recognizes lib folder --- Gemfile | 17 ++++++++--------- Gemfile.lock | 22 ++++++++++++++++++++++ config/application.rb | 1 + lib/edamam_api_wrapper.rb | 26 ++++++++++++++++++++++---- lib/recipe.rb | 16 ++++++++-------- test/test_helper.rb | 17 +++++++++++++++++ 6 files changed, 78 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index cde0e48f2..fc5188702 100644 --- a/Gemfile +++ b/Gemfile @@ -41,6 +41,9 @@ group :development, :test do # Adds support for Capybara system testing and selenium driver gem 'capybara', '~> 2.13' gem 'selenium-webdriver' + gem 'pry-rails' + gem 'minitest-vcr' + gem 'webmock' end group :development do @@ -50,23 +53,19 @@ group :development do # 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' + gem 'dotenv-rails' 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' -group :development do - gem 'better_errors' - gem 'binding_of_caller' -end - -group :development, :test do - gem 'pry-rails' -end - gem 'foundation-rails', '6.4.1.2' gem 'awesome_print' + + group :test do gem 'minitest-rails' gem 'minitest-reporters' diff --git a/Gemfile.lock b/Gemfile.lock index ae7555577..d055d23bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,8 +67,14 @@ GEM 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) + 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) @@ -78,6 +84,7 @@ GEM 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) @@ -103,6 +110,8 @@ GEM 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) @@ -112,6 +121,10 @@ GEM 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) @@ -158,6 +171,7 @@ GEM 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) @@ -194,11 +208,16 @@ GEM 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) @@ -214,6 +233,7 @@ DEPENDENCIES binding_of_caller byebug capybara (~> 2.13) + dotenv-rails foundation-rails (= 6.4.1.2) httparty jbuilder (~> 2.5) @@ -221,6 +241,7 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) minitest-rails minitest-reporters + minitest-vcr pg (~> 0.18) pry-rails puma (~> 3.7) @@ -233,6 +254,7 @@ DEPENDENCIES tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) + webmock BUNDLED WITH 1.15.4 diff --git a/config/application.rb b/config/application.rb index d47313ed2..990df3687 100644 --- a/config/application.rb +++ b/config/application.rb @@ -21,5 +21,6 @@ class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. + config.autoload_paths << Rails.root.join('lib') end end diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index e648e7f3d..4551048f3 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -13,19 +13,20 @@ def self.list_recipes(search_term) url = BASE_URL + "?q=" + search_term + "&app_id=#{APP_ID}" + "&app_key=#{APP_KEY}" response = HTTParty.get(url) - + # binding.pry check_hits(response) - return_recipies = [] + recipies_array = [] response["hits"].each do |recipe_data| - return_recipies << create_recipe(recipe_data) + recipies_array << create_recipe(recipe_data) end + return recipies_array end private # make sure status is 200 okay, and you have at least one search results, otherwise raise ApiError - def check_hits(response) + def self.check_hits(response) unless response.code == 200 raise ApiError.new("Api call to Edaman failed. Status was #{response.code} #{response.message}") else @@ -34,4 +35,21 @@ def check_hits(response) end end end + + def self.create_recipe(api_params) + return Recipe.new( + api_params['recipe']["label"], + api_params['recipe']["uri"], + { + image: api_params['recipe']["image"], + source: api_params['recipe']["source"], + url: api_params['recipe']["url"], + yield: api_params['recipe']['yield'], + calories: api_params['recipe']['calories'], + ingredients: api_params['recipe']["ingredients"], + healthLabels: api_params['recipe']["healthLabels"], + totalDaily: api_params['recipe']['totalDaily'] + } + ) + end end diff --git a/lib/recipe.rb b/lib/recipe.rb index b35bb9998..a9f9c9e9f 100644 --- a/lib/recipe.rb +++ b/lib/recipe.rb @@ -7,13 +7,13 @@ def initialize(label, uri, options = {}) @label = label @uri = uri - @image = options["image"] - @url = options['url'] - @source = options['source'] - @yield = options['yield'] - @calories = options['calories'] - @ingredients = options['ingredients'] - @healthLabels = options['healthLabels'] - @totalDaily = options['totalDaily'] + @image = options[:image] + @url = options[:url] + @source = options[:source] + @yield = options[:yield] + @calories = options[:calories] + @ingredients = options[:ingredients] + @healthLabels = options[:healthLabels] + @totalDaily = options[:totalDaily] end end diff --git a/test/test_helper.rb b/test/test_helper.rb index e3c4ff0b8..a83552f75 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,5 +1,22 @@ require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' +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 + } + # Don't leave our Slack token lying around in a cassette file. + config.filter_sensitive_data("") do + ENV['EDAMAN_ID'] + ENV['EDAMAN_KEY'] + end +end + class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From 0d8b59c5a5196639855e987f28fe8b33356cc400 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Tue, 31 Oct 2017 20:22:30 -0700 Subject: [PATCH 10/31] modified test helpers and tried to solve cassette issue --- .gitignore | 1 + lib/edamam_api_wrapper.rb | 4 ++-- test/lib/edamam_api_wrapper_test.rb | 22 +++++++++++++++++----- test/test_helper.rb | 8 +++++--- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index fd7861bad..0e10cd693 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ .byebug_history .env +/test/cassettes/* diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index 4551048f3..d841aa952 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -10,8 +10,8 @@ class ApiError < StandardError end def self.list_recipes(search_term) - url = BASE_URL + "?q=" + search_term + "&app_id=#{APP_ID}" + "&app_key=#{APP_KEY}" - + url = BASE_URL + "?q=" + search_term + "&app_id=" + APP_ID + "&app_key=" + APP_KEY + puts "#{url}" response = HTTParty.get(url) # binding.pry check_hits(response) diff --git a/test/lib/edamam_api_wrapper_test.rb b/test/lib/edamam_api_wrapper_test.rb index 7061c2876..911c5626d 100644 --- a/test/lib/edamam_api_wrapper_test.rb +++ b/test/lib/edamam_api_wrapper_test.rb @@ -1,13 +1,25 @@ require "test_helper" - +require "httparty" describe EdamamApiWrapper do describe "list_recipes" do it "can generate a list of recipes for a search term" do - + VCR.use_cassette("smoothie") do + result = EdamamApiWrapper.list_recipes("yogurt") + result.length.must_be :>, 0 + result.must_be_kind_of Array + result.each do |recipe| + recipe.must_be_kind_of Recipe + end + end end - it "Raises and ApiError when the Api key is bogus" do - - end + # it "Raises and ApiError when the app_id is bogus" do + # VCR.use_cassette("smoothie_recipes") do + # proc { + # EdamamApiWrapper.list_recipes("smoothie","bogus app id") + # }.must_raise EdamamApiWrapper::ApiError + # end + # + # end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index a83552f75..a8ed21fe7 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -11,9 +11,11 @@ :match_requests_on => [:method, :uri, :body] # The http method, URI and body of a request all need to match } # Don't leave our Slack token lying around in a cassette file. - config.filter_sensitive_data("") do - ENV['EDAMAN_ID'] - ENV['EDAMAN_KEY'] + config.filter_sensitive_data("") do + ENV['EDAMAM_KEY'] + end + config.filter_sensitive_data("") do + ENV['EDAMAM_ID'] end end From 26d01ab952262d32cfd81aceb6bdc1b782661b26 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Tue, 31 Oct 2017 21:11:22 -0700 Subject: [PATCH 11/31] Added views logic --- .DS_Store | Bin 6148 -> 8196 bytes Gemfile | 6 +++++- Gemfile.lock | 7 +++++++ app/.DS_Store | Bin 6148 -> 8196 bytes app/controllers/.DS_Store | Bin 0 -> 6148 bytes app/controllers/recipes_controller.rb | 2 +- app/views/recipes/index.html.erb | 8 ++++++++ app/views/recipes/root.html.erb | 6 ++++++ app/views/recipes/show.html.erb | 1 + config/.DS_Store | Bin 0 -> 6148 bytes lib/.DS_Store | Bin 0 -> 6148 bytes lib/edamam_api_wrapper.rb | 4 ++-- test/.DS_Store | Bin 0 -> 8196 bytes test/lib/edamam_api_wrapper_test.rb | 16 ++++++++-------- 14 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 app/controllers/.DS_Store create mode 100644 config/.DS_Store create mode 100644 lib/.DS_Store create mode 100644 test/.DS_Store diff --git a/.DS_Store b/.DS_Store index 6469d3a1e9afb92733e870cbb6e5e3ec3b7f5677..5daccc2230297d7eeaa24f95e3c5711a1962b5ec 100644 GIT binary patch literal 8196 zcmeHML2DC16n>M9X^K??7FrNwJqRL2(psz@3QLR!Z$d;5Ds46!lR&Z?l1+ogXoQ}m zH!pgTD(KPQA$agsPoBJZ^jL4cH#<${ZMJw5u`^}oP3D_#zL{@#XEG@Oh(ga>23Q1u zEM63I$1zJtgwr*ZQmSSRqd-11Ys;ld&}vV$G!@1Hd&s^Y zp(ZyD7zd7|1GGNacu{mz97Rzs9hk`@0LC;{%Y@||6)@T=Ix3E$hzKSTQ87kTp^g|L zqGP?S+BqtYq8QOZsKbX)%0it`gjC1=ZP^@z6Gf972aE&L4$#>>4VRz>4G7u!J+-&3 zW38ZA^m<_hVDIeyXW7x1*9yEtv36biP2i+M#F+yP@edr@d zZo$S8Eix9Ap$%=f-)+0iz{Orax$S178|L$0MaoJa%gkhFXS1^>vJXo2pkE5hVXs># zckang4X^5|^6emKj>~2DPNUl2$jx65{IJ~cs~xTR{ksj{3;Kni=X+h*&#iJ;N3Imw z$Sn*8E2}F@_O+|SC3~>8mS3`0FJBoBv)P67%j-8cTaO+Oo(!M9k{*Ciiy@qfK9BR) zSW>g|x|ODjC3tW82eWna^FD3}nd{2}E4pU$_K5~TXI0rgG+`*l7rGtpB^W!B^c-wFp zlC!Gt`!#FJNrDj<;rEyYPtQV7$z=#WkZws2lPK8*o%m>QumT-O}DOTs62Gzn+=l5Vm; zIY2utrbRmc-#GmDf7!@n#sTBN|LK587fZzg&W*mMB_;aSV&k=m7bR*pilU@oMop+* p9>+0`|6zz_TValhqbMSR>979~pdCkGmquXre*m-p)01$N(r=kN23G(8 delta 135 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGjUE#6q~50D9Q|y2Z 2.0.0' gem 'better_errors' gem 'binding_of_caller' - gem 'dotenv-rails' + end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem @@ -69,4 +71,6 @@ gem 'awesome_print' group :test do gem 'minitest-rails' gem 'minitest-reporters' + gem 'minitest-spec-rails' + gem 'minitest-skip' end diff --git a/Gemfile.lock b/Gemfile.lock index d055d23bd..5c4812a77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,6 +121,11 @@ GEM builder minitest (>= 5.0) ruby-progressbar + minitest-skip (0.0.1) + minitest (~> 5.0) + minitest-spec-rails (5.4.0) + minitest (~> 5.0) + rails (>= 4.1) minitest-vcr (1.4.0) minispec-metadata (~> 2.0) minitest (>= 4.7.5) @@ -241,6 +246,8 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) minitest-rails minitest-reporters + minitest-skip + minitest-spec-rails minitest-vcr pg (~> 0.18) pry-rails diff --git a/app/.DS_Store b/app/.DS_Store index a8912936ff01b49962d597ff64709cbefb4c7c39..af3fcdcdb192f087bb6500af0129b18910b87b67 100644 GIT binary patch literal 8196 zcmeHMPm9w)6o1+6wkeC)gRtvG0^-RY+I890gAi&xcoCtZ2bFEoWVewtQ<`*()=K>r zdKCN;egkg`f_@cm`sUBpnM|@Lk;2Y|nK#Y*JHMG^@}>Y_b*4cZU>5*vtdusku_-8& zPpeio#GUI%Ez}3dAdOGjy#X1GHEDChAYc$M2p9wm0tSI~Kmhk_TI`a2pL0!X5HJW_ zNCfEn!NE$YE9jC__Ugcfr2t4Pc$*dMV;;bC96?<{mz*+Hw8^svOQ>2R#jvDZ5nj}l+}aU7*ttM${`*sN?-Yj(YE*Du*GdP6enWnMN-JKp3O z`xOPDFZz!OiC2Bke-eeWqsEncB+0xe2`7^H^QTb~kXeUJlOSbw9(maib(y21#?E}c zx4+kP?%ZB9o%!KmtLg0DI#?`hd*?>`?t}j5)$942#oPCEIQTLYFHN}2f3MmP*ee-r zkPc!WXFmBsoC|I+_|THoDBl zd|K5}z=19yNB{0K@--WB)Ws5Nv<|gVftR?vd~LbklzFmm@wlz@WUqOi>W^)TH5lPT z7M(5U+_;a?YfhrTw^X^oII0*2fuQhFe~3{i{DK&Ad@TZnU*LZWP7#F=W_jc* z)Vsu$eT!LDxPLwCT-9$M4Vz*RST6)Nc{sZ?|G!^;{=Z&9n`jII27!NyfK}=Cx*arm z_L-QsPIGMsYac5uRBp*BQ^AI%<49RLj&${hA@&^#=_-{ zlMQ58CbtNQPc{>LH~GB~|HhIhEQ{GWI0Tu2I)Ffc8%VfP)lqOLTE;^ z-`IX*J5P%3AtK%$$ChYKL=B1{i&HV_t`1!|c?D#hRecipes Index +
    + <% @recipes.each do |recipe| %> +
  • + <%= link_to recipe.label, recipe_path(recipe.label, recipe_uri: recipe.uri) %> +
    • + <% end %> +
diff --git a/app/views/recipes/root.html.erb b/app/views/recipes/root.html.erb index 019f1828f..40b31e434 100644 --- a/app/views/recipes/root.html.erb +++ b/app/views/recipes/root.html.erb @@ -1 +1,7 @@

API MUNCHER ROOT

+<%= form_tag recipes_path, method: "get" do %> + <%= label_tag(:search_term, "Enter search term here") %> + <%= text_field_tag(:search_term) %> + <%= submit_tag("submit") %> + +<% end %> diff --git a/app/views/recipes/show.html.erb b/app/views/recipes/show.html.erb index e69de29bb..68475b7cd 100644 --- a/app/views/recipes/show.html.erb +++ b/app/views/recipes/show.html.erb @@ -0,0 +1 @@ +

Recipe show page

diff --git a/config/.DS_Store b/config/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..202e8e0aabf342c184a7c0cc04f75edc7386310e GIT binary patch literal 6148 zcmeHKK~BR!4D_~@C~6Kpaw*Ca=ntYQ+>!bLP*MR>(^Mtp0GB)kcogqpY_Fnj(iBce zAX~C$-9{Jbhv&MJ+1HO%d9N6I+5AzRBTbEX}+&AqR-3Mcgg6jTa@{aW48~7JzR0&2%T=A z74(kQurHXwuHEnC?Nn^g?+2IduN(CHO>Ee2&2`VvV@a9xx@vbhyy->+y(yQi8bL=# zBf>uT|7~In7z4&Y!vOYdmhnWd6;1NDk|8@WUKTNVGW55{rR}8pOx=a_ClHXf9ljFTMhTcM1IIdP~QZSIM7_qz+UqD6R Xk9h!0Jl2ZvKCYJ1|cU*S`{hnd)*hK;y^Dr8s5 zWHWJ`%&N&+M09cJ=OQx^nW7MtjfSziNuBv%l3M22%kJfIzFckA+r~tv*u}M9%DwFH zdyw|}D}KG{y8f_ViM-#uzLhO~937}i3ILp-yBONcCFqkJv*Tb0 z2Bzi;G*|T$L(Lui$;V~K!O+}AJ^4_N{F%IHiH`YG87`U)qYec^fm(rcdz|t9zr|ms zndH|l@e~S#0{=__opj4?flc|{I@%uZ+Jth4LgToB4H(+hM*tppj$9Yg_{28GWyisg Uv#`Io1LH%W2ohB&@COQf0Qnw5PXGV_ literal 0 HcmV?d00001 diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index d841aa952..1bb3c184e 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -9,8 +9,8 @@ class EdamamApiWrapper class ApiError < StandardError end - def self.list_recipes(search_term) - url = BASE_URL + "?q=" + search_term + "&app_id=" + APP_ID + "&app_key=" + APP_KEY + def self.list_recipes(search_term, key=APP_KEY) + url = BASE_URL + "?q=" + search_term + "&app_id=" + APP_ID + "&app_key=" + key puts "#{url}" response = HTTParty.get(url) # binding.pry diff --git a/test/.DS_Store b/test/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..78265a5e40ade2dbd4f09082d252719948fe119b GIT binary patch literal 8196 zcmeHM!EVz)5PeIkHYgX4Js}_Xf&PJ2g=;Upa-bxkjTGaEG!hjD+++C#PJ9LjeuH1( z%A46$?e*>=P6&}%Yj-Tqo1N#kwxihqaOeBw8E^_<$}aZVj6gexy-9pix& zZh5S*+gvATyI=~K0;Yf|U<#N5|AGSi&6YMT{O)_Nji!JpaF7bf_n~4JTL;^DtDg=I zS_04>@v=6avkuUhD%d*M&RY%ToW6Q+A=HHu!})OfD}mG2!FJyIa5x_h7c#q0p*YRX zxJu!0wYN5!0;WK!fYk0!vA`8}JO=gq+2x{bwi+;b^^iw3?R>u6-!6b3&wpMhHZxb# zF8=_vy%}cI#53}0@s2wR?`bzYRy^b0!Td7G^U--ua6=XwY_oa^WQ53YNe~H>5hBB5Mpb0> zR=B1vS3FzGdXCml_!N*CUPWZWuYk<(oKUMZ-o(5npUEqDhCIH15yHKv&l`K Date: Wed, 1 Nov 2017 10:47:11 -0700 Subject: [PATCH 12/31] Added some work for get recipe apiwrapper method --- .DS_Store | Bin 8196 -> 8196 bytes lib/edamam_api_wrapper.rb | 25 ++++++++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.DS_Store b/.DS_Store index 5daccc2230297d7eeaa24f95e3c5711a1962b5ec..fcdf3c2d479ac4f3b6f4520444364d2ae82a0d5e 100644 GIT binary patch delta 122 zcmZp1XmQw}DqzXXY|FsFz`~%%kj{|FP?DSP;*wHYlFYzxP44GgpbUy!3X9QjCy8xhN8&7E1OOStBme*a delta 122 zcmZp1XmQw}DqzWUt%ZSsfrUYjA)O(Up(Hoo#U-V*B$9=zCy8xhN8&7E1ORL#Bzyn> diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index 1bb3c184e..33adab319 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -2,7 +2,8 @@ require 'pry' class EdamamApiWrapper - BASE_URL = "https://api.edamam.com/search" + BASE_URLQ = "https://api.edamam.com/search?q=" + BASE_URLR = "https://api.edamam.com/search?r=" APP_ID = ENV["EDAMAN_ID"] APP_KEY = ENV["EDAMAN_KEY"] @@ -10,8 +11,8 @@ class ApiError < StandardError end def self.list_recipes(search_term, key=APP_KEY) - url = BASE_URL + "?q=" + search_term + "&app_id=" + APP_ID + "&app_key=" + key - puts "#{url}" + url = BASE_URLQ + search_term + "&app_id=" + APP_ID + "&app_key=" + key + # puts "#{url}" response = HTTParty.get(url) # binding.pry check_hits(response) @@ -23,6 +24,15 @@ def self.list_recipes(search_term, key=APP_KEY) return recipies_array end + # + # def self.show_recipe(uri, key=APP_KEY) + # uri_fix = uri_regex(uri) + # url = BASE_URLR + uri_fix + "&app_id=" + APP_ID + "&app_key=" + key + # + # response = HTTParty.get(url) + # + # end + private # make sure status is 200 okay, and you have at least one search results, otherwise raise ApiError @@ -52,4 +62,13 @@ def self.create_recipe(api_params) } ) end + + + # def self.uri_regex(uri) + # return uri.sub(/[#]{1}/, '%') + # end + + # def build_url(search_term, key=APP_KEY) + # return BASE_URL + "?q=" + search_term + "&app_id=" + APP_ID + "&app_key=" + key + # end end From 213274cf58f7385b3459239e4c6add0d2b08ea73 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Wed, 1 Nov 2017 11:00:45 -0700 Subject: [PATCH 13/31] Added snippet to test helper to fix issue with test display in terminal --- test/lib/edamam_api_wrapper_test.rb | 3 +-- test/test_helper.rb | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/lib/edamam_api_wrapper_test.rb b/test/lib/edamam_api_wrapper_test.rb index 0297691a5..00e4b97c0 100644 --- a/test/lib/edamam_api_wrapper_test.rb +++ b/test/lib/edamam_api_wrapper_test.rb @@ -3,7 +3,7 @@ describe EdamamApiWrapper do describe "list_recipes" do it "can generate a list of recipes for a search term" do - VCR.use_cassette("smoothie") do + VCR.use_cassette("yogurt") do result = EdamamApiWrapper.list_recipes("yogurt") result.length.must_be :>, 0 result.must_be_kind_of Array @@ -19,7 +19,6 @@ EdamamApiWrapper.list_recipes("smoothie","bogus app id") }.must_raise EdamamApiWrapper::ApiError end - end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index a8ed21fe7..5c5352f7e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,6 +2,7 @@ require 'rails/test_help' require 'vcr' require 'webmock/minitest' +require "minitest/reporters" VCR.configure do |config| config.cassette_library_dir = 'test/cassettes' # folder where casettes will be located @@ -19,6 +20,11 @@ end end +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From d429e4edd57c7101abbaae366f1d246ba4b4361f Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Wed, 1 Nov 2017 12:08:15 -0700 Subject: [PATCH 14/31] updated recipe class fields --- app/views/recipes/root.html.erb | 1 - lib/edamam_api_wrapper.rb | 67 ++++++++++++++++------------- lib/recipe.rb | 8 ++-- test/lib/edamam_api_wrapper_test.rb | 11 +++++ 4 files changed, 52 insertions(+), 35 deletions(-) diff --git a/app/views/recipes/root.html.erb b/app/views/recipes/root.html.erb index 40b31e434..0d7d6110f 100644 --- a/app/views/recipes/root.html.erb +++ b/app/views/recipes/root.html.erb @@ -3,5 +3,4 @@ <%= label_tag(:search_term, "Enter search term here") %> <%= text_field_tag(:search_term) %> <%= submit_tag("submit") %> - <% end %> diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index 33adab319..187a7c549 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -2,36 +2,41 @@ require 'pry' class EdamamApiWrapper - BASE_URLQ = "https://api.edamam.com/search?q=" - BASE_URLR = "https://api.edamam.com/search?r=" + BASE_URL = "https://api.edamam.com/search" APP_ID = ENV["EDAMAN_ID"] APP_KEY = ENV["EDAMAN_KEY"] + Q = "?q=" + R = "?r=" class ApiError < StandardError end def self.list_recipes(search_term, key=APP_KEY) - url = BASE_URLQ + search_term + "&app_id=" + APP_ID + "&app_key=" + key - # puts "#{url}" + url = build_url(search_term, key) + response = HTTParty.get(url) - # binding.pry + check_hits(response) recipies_array = [] - response["hits"].each do |recipe_data| + response["hits"].each do |hit_data| + recipe_data = hit_data["recipe"] recipies_array << create_recipe(recipe_data) end return recipies_array end - # - # def self.show_recipe(uri, key=APP_KEY) - # uri_fix = uri_regex(uri) - # url = BASE_URLR + uri_fix + "&app_id=" + APP_ID + "&app_key=" + key - # - # response = HTTParty.get(url) - # - # end + + def self.show_recipe(uri, key=APP_KEY, type=R) + binding.pry + uri = uri_regex(uri) + url = build_url(uri, key, type) + # url = BASE_URLR + uri_fix + "&app_id=" + APP_ID + "&app_key=" + key + + response = HTTParty.get(url) + # binding.pry + return response + end private @@ -48,27 +53,27 @@ def self.check_hits(response) def self.create_recipe(api_params) return Recipe.new( - api_params['recipe']["label"], - api_params['recipe']["uri"], + api_params["label"], + api_params["uri"], { - image: api_params['recipe']["image"], - source: api_params['recipe']["source"], - url: api_params['recipe']["url"], - yield: api_params['recipe']['yield'], - calories: api_params['recipe']['calories'], - ingredients: api_params['recipe']["ingredients"], - healthLabels: api_params['recipe']["healthLabels"], - totalDaily: api_params['recipe']['totalDaily'] + image: api_params["image"], + source: api_params["source"], + url: api_params["url"], + yield: api_params['yield'], + calories: api_params['calories'], + ingredientLines: api_params["ingredientLines"], + healthLabels: api_params["healthLabels"], + # totalDaily: api_params['totalDaily'], + dietLabels: api_params["dietLabels"] } ) end + def self.build_url(search_term, key, type=Q) + return BASE_URL + type + search_term + "&app_id=" + APP_ID + "&app_key=" + key + end - # def self.uri_regex(uri) - # return uri.sub(/[#]{1}/, '%') - # end - - # def build_url(search_term, key=APP_KEY) - # return BASE_URL + "?q=" + search_term + "&app_id=" + APP_ID + "&app_key=" + key - # end + def self.uri_regex(uri) + return uri.sub(/[#]{1}/, '%') + end end diff --git a/lib/recipe.rb b/lib/recipe.rb index a9f9c9e9f..1f38a6f45 100644 --- a/lib/recipe.rb +++ b/lib/recipe.rb @@ -1,5 +1,6 @@ class Recipe - attr_reader :label, :uri, :image, :source, :url, :yield, :calories, :ingredients, :healthLabels, :totalDaily + attr_reader :label, :uri, :image, :source, :url, :yield, :calories, :ingredients, :healthLabels, :dietLabels + # :totalDaily def initialize(label, uri, options = {}) raise ArgumentError if label == nil || label == "" || uri == nil || uri == "" @@ -12,8 +13,9 @@ def initialize(label, uri, options = {}) @source = options[:source] @yield = options[:yield] @calories = options[:calories] - @ingredients = options[:ingredients] + @ingredientLines = options[:ingredientLines] + @dietLabels = options[:dietLabels] @healthLabels = options[:healthLabels] - @totalDaily = options[:totalDaily] + # @totalDaily = options[:totalDaily] end end diff --git a/test/lib/edamam_api_wrapper_test.rb b/test/lib/edamam_api_wrapper_test.rb index 00e4b97c0..86a83b8d7 100644 --- a/test/lib/edamam_api_wrapper_test.rb +++ b/test/lib/edamam_api_wrapper_test.rb @@ -1,5 +1,8 @@ require "test_helper" require "httparty" + +let(:uri){ "http://www.edamam.com/ontologies/edamam.owl#23recipe_637913ec61d9da69eb451818c3293df2"} + describe EdamamApiWrapper do describe "list_recipes" do it "can generate a list of recipes for a search term" do @@ -21,4 +24,12 @@ end end end + + describe "show_recipe" do + it "return a single recipe" do + VCR.use_cassette("recipe_show") do + result = EdamamApiWrapper.show_recipe(uri) + end + end + end end From ad1d7b0dc90d1b02390868e0e732ab518ca0cc7e Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Wed, 1 Nov 2017 12:27:39 -0700 Subject: [PATCH 15/31] working version of show_recipe method --- lib/edamam_api_wrapper.rb | 16 ++++++++++++---- lib/recipe.rb | 6 +++--- test/lib/edamam_api_wrapper_test.rb | 1 - 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index 187a7c549..aedb04059 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -1,4 +1,3 @@ -require "HTTParty" require 'pry' class EdamamApiWrapper @@ -28,14 +27,23 @@ def self.list_recipes(search_term, key=APP_KEY) end def self.show_recipe(uri, key=APP_KEY, type=R) - binding.pry + # binding.pry uri = uri_regex(uri) url = build_url(uri, key, type) # url = BASE_URLR + uri_fix + "&app_id=" + APP_ID + "&app_key=" + key response = HTTParty.get(url) # binding.pry - return response + + recipe = '' + + if response.empty? + raise ApiError.new("Api call to Edaman to show a given failed.") + else + recipe = create_recipe(response[0]) + end + binding.pry + return recipe end @@ -63,7 +71,7 @@ def self.create_recipe(api_params) calories: api_params['calories'], ingredientLines: api_params["ingredientLines"], healthLabels: api_params["healthLabels"], - # totalDaily: api_params['totalDaily'], + totalDaily: api_params['totalDaily'], dietLabels: api_params["dietLabels"] } ) diff --git a/lib/recipe.rb b/lib/recipe.rb index 1f38a6f45..0e2c034d9 100644 --- a/lib/recipe.rb +++ b/lib/recipe.rb @@ -1,6 +1,6 @@ class Recipe - attr_reader :label, :uri, :image, :source, :url, :yield, :calories, :ingredients, :healthLabels, :dietLabels - # :totalDaily + attr_reader :label, :uri, :image, :source, :url, :yield, :calories, :ingredients, :healthLabels, :dietLabels, + :totalDaily def initialize(label, uri, options = {}) raise ArgumentError if label == nil || label == "" || uri == nil || uri == "" @@ -16,6 +16,6 @@ def initialize(label, uri, options = {}) @ingredientLines = options[:ingredientLines] @dietLabels = options[:dietLabels] @healthLabels = options[:healthLabels] - # @totalDaily = options[:totalDaily] + @totalDaily = options[:totalDaily] end end diff --git a/test/lib/edamam_api_wrapper_test.rb b/test/lib/edamam_api_wrapper_test.rb index 86a83b8d7..c32951b5b 100644 --- a/test/lib/edamam_api_wrapper_test.rb +++ b/test/lib/edamam_api_wrapper_test.rb @@ -1,5 +1,4 @@ require "test_helper" -require "httparty" let(:uri){ "http://www.edamam.com/ontologies/edamam.owl#23recipe_637913ec61d9da69eb451818c3293df2"} From b53e84b373c42e698d35cf5345d2e19d5c6cb3ae Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Wed, 1 Nov 2017 12:54:49 -0700 Subject: [PATCH 16/31] More testing for api wrapper and recipes class --- lib/edamam_api_wrapper.rb | 7 ++--- lib/recipe.rb | 2 +- test/lib/edamam_api_wrapper_test.rb | 33 +++++++++++++++++++--- test/lib/recipe_test.rb | 44 ++++++++++++++++++++++++++--- 4 files changed, 72 insertions(+), 14 deletions(-) diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index aedb04059..ac41fb080 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -27,22 +27,19 @@ def self.list_recipes(search_term, key=APP_KEY) end def self.show_recipe(uri, key=APP_KEY, type=R) - # binding.pry uri = uri_regex(uri) url = build_url(uri, key, type) - # url = BASE_URLR + uri_fix + "&app_id=" + APP_ID + "&app_key=" + key response = HTTParty.get(url) - # binding.pry recipe = '' - + if response.empty? raise ApiError.new("Api call to Edaman to show a given failed.") else recipe = create_recipe(response[0]) end - binding.pry + return recipe end diff --git a/lib/recipe.rb b/lib/recipe.rb index 0e2c034d9..37bcc7737 100644 --- a/lib/recipe.rb +++ b/lib/recipe.rb @@ -1,5 +1,5 @@ class Recipe - attr_reader :label, :uri, :image, :source, :url, :yield, :calories, :ingredients, :healthLabels, :dietLabels, + attr_reader :label, :uri, :image, :source, :url, :yield, :calories, :ingredientLines, :healthLabels, :dietLabels, :totalDaily def initialize(label, uri, options = {}) diff --git a/test/lib/edamam_api_wrapper_test.rb b/test/lib/edamam_api_wrapper_test.rb index c32951b5b..374fa0238 100644 --- a/test/lib/edamam_api_wrapper_test.rb +++ b/test/lib/edamam_api_wrapper_test.rb @@ -1,8 +1,11 @@ require "test_helper" -let(:uri){ "http://www.edamam.com/ontologies/edamam.owl#23recipe_637913ec61d9da69eb451818c3293df2"} - describe EdamamApiWrapper do + before do + @uri_good = "http://www.edamam.com/ontologies/edamam.owl#23recipe_637913ec61d9da69eb451818c3293df2" + @uri_bad = "http://www.edamam.com/ontologies/edamam.owl#23recipe_637913ec61d9da69eb451818" + end + describe "list_recipes" do it "can generate a list of recipes for a search term" do VCR.use_cassette("yogurt") do @@ -15,19 +18,41 @@ end end - it "Raises and ApiError when the app_id is bogus" do + it "Raises an ApiError when the app_id is bogus" do VCR.use_cassette("smoothie_recipes") do proc { EdamamApiWrapper.list_recipes("smoothie","bogus app id") }.must_raise EdamamApiWrapper::ApiError end end + + it "Raises an ApiError when the search term is bogus either empty or returns no recipes" do + VCR.use_cassette("smoothie_recipes") do + proc { + EdamamApiWrapper.list_recipes("") + }.must_raise EdamamApiWrapper::ApiError + proc { + EdamamApiWrapper.list_recipes("asdf909834jjklksr098g09rjlkj45-908djgdlfkjgl") + }.must_raise EdamamApiWrapper::ApiError + end + end + + # TODO: do we need a test for when no recipes are returned? end describe "show_recipe" do it "return a single recipe" do VCR.use_cassette("recipe_show") do - result = EdamamApiWrapper.show_recipe(uri) + result = EdamamApiWrapper.show_recipe(@uri_good) + result.must_be_kind_of Recipe + end + end + + it "Raises Api Error when the uri is bad and you don't get any data back from api" do + VCR.use_cassette("recipe_show") do + proc { + EdamamApiWrapper.show_recipe(@uri_bad) + }.must_raise EdamamApiWrapper::ApiError end end end diff --git a/test/lib/recipe_test.rb b/test/lib/recipe_test.rb index 0be7d02da..3cae8ae53 100644 --- a/test/lib/recipe_test.rb +++ b/test/lib/recipe_test.rb @@ -2,18 +2,54 @@ describe "recipe" do it "can be instantiated" do - + Recipe.new("label","uri") end it "requires a label and a uri" do - + proc { + Recipe.new() + }.must_raise ArgumentError + + proc { + Recipe.new("label") + }.must_raise ArgumentError + + # empty strings are not permitted either + proc { + Recipe.new("","") + }.must_raise ArgumentError end it "tracks label and uri" do - + label = "test_label" + uri = "test_uri" + recipe = Recipe.new(label,uri) + recipe.label.must_equal label + recipe.uri.must_equal uri end it "tracks optional arguments" do - + options = { + image: "test_image", + url: "test_url", + source: "test_source", + yield: "test_yield", + calories: "test_calories", + ingredientLines: "test_ingredientLines", + dietLabels: "test_dietLabels", + healthLabels: "test_healthLabels", + totalDaily: "test_totalDaily" + } + + recipe = Recipe.new("test_label","test_uri",options) + recipe.image.must_equal options[:image] + recipe.url.must_equal options[:url] + recipe.source.must_equal options[:source] + recipe.yield.must_equal options[:yield] + recipe.calories.must_equal options[:calories] + recipe.ingredientLines.must_equal options[:ingredientLines] + recipe.dietLabels.must_equal options[:dietLabels] + recipe.healthLabels.must_equal options[:healthLabels] + recipe.totalDaily.must_equal options[:totalDaily] end end From f431a48b121942f863cd9baae8c993e1db92555e Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Wed, 1 Nov 2017 14:00:56 -0700 Subject: [PATCH 17/31] Change how uri is handled in recipes class, now only digits after underscore, because it was not working on server --- app/controllers/recipes_controller.rb | 1 + app/views/recipes/index.html.erb | 4 ++++ app/views/recipes/show.html.erb | 6 ++++++ lib/edamam_api_wrapper.rb | 10 ++++++---- lib/recipe.rb | 3 +-- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb index d256af050..7c10684d7 100644 --- a/app/controllers/recipes_controller.rb +++ b/app/controllers/recipes_controller.rb @@ -8,6 +8,7 @@ def index end def show + @recipe = EdamamApiWrapper.show_recipe(params[:recipe_uri]) # https://api.edamam.com/search?r=http://www.edamam.com/ontologies/edamam.owl%23recipe_637913ec61d9da69eb451818c3293df2 # uri.sub(/[#]{1}/, '%') this regex will replace # with % end diff --git a/app/views/recipes/index.html.erb b/app/views/recipes/index.html.erb index 8534a1de8..071276c39 100644 --- a/app/views/recipes/index.html.erb +++ b/app/views/recipes/index.html.erb @@ -6,3 +6,7 @@ <% end %> + +def show + @recipe = EdamamApiWrapper.show_recipe(params[:recipe_uri]) +end diff --git a/app/views/recipes/show.html.erb b/app/views/recipes/show.html.erb index 68475b7cd..d02a78077 100644 --- a/app/views/recipes/show.html.erb +++ b/app/views/recipes/show.html.erb @@ -1 +1,7 @@

Recipe show page

+
    +
  • Title: <%= @recipe.label%>
    • +
  • <%= image_tag "#{@recipe.image}"%>
    • +
  • Source: <%= @recipe.source%>
    • +
  • Calories: <%= @recipe.calories%>
    • +
diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index ac41fb080..ad94e6668 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -4,6 +4,7 @@ class EdamamApiWrapper BASE_URL = "https://api.edamam.com/search" APP_ID = ENV["EDAMAN_ID"] APP_KEY = ENV["EDAMAN_KEY"] + BASE_URI = "?r=http://www.edamam.com/ontologies/edamam.owl%23recipe_" Q = "?q=" R = "?r=" @@ -27,13 +28,14 @@ def self.list_recipes(search_term, key=APP_KEY) end def self.show_recipe(uri, key=APP_KEY, type=R) - uri = uri_regex(uri) - url = build_url(uri, key, type) - + # binding.pry + # uri = uri_regex(uri) + # url = build_url(uri, key, type) + url = BASE_URL + BASE_URI + uri + "&app_id=" + APP_ID + "&app_key=" + key response = HTTParty.get(url) recipe = '' - + if response.empty? raise ApiError.new("Api call to Edaman to show a given failed.") else diff --git a/lib/recipe.rb b/lib/recipe.rb index 37bcc7737..ff46271e6 100644 --- a/lib/recipe.rb +++ b/lib/recipe.rb @@ -6,8 +6,7 @@ def initialize(label, uri, options = {}) raise ArgumentError if label == nil || label == "" || uri == nil || uri == "" @label = label - @uri = uri - + @uri = uri.split('_')[-1] @image = options[:image] @url = options[:url] @source = options[:source] From b62603578fb398ce284acd7066d79e4549d2f689 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Wed, 1 Nov 2017 15:17:52 -0700 Subject: [PATCH 18/31] Adds a partial so in show page it can list ingredients and tables --- app/controllers/recipes_controller.rb | 2 +- app/views/recipes/_list.html.erb | 11 +++++++++++ app/views/recipes/index.html.erb | 6 ++---- app/views/recipes/show.html.erb | 19 +++++++++++++------ lib/edamam_api_wrapper.rb | 6 +++--- 5 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 app/views/recipes/_list.html.erb diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb index 7c10684d7..4ca5c966f 100644 --- a/app/controllers/recipes_controller.rb +++ b/app/controllers/recipes_controller.rb @@ -5,11 +5,11 @@ def root def index @recipes = EdamamApiWrapper.list_recipes(params[:search_term]) + @search_term = params[:search_term] end def show @recipe = EdamamApiWrapper.show_recipe(params[:recipe_uri]) # https://api.edamam.com/search?r=http://www.edamam.com/ontologies/edamam.owl%23recipe_637913ec61d9da69eb451818c3293df2 - # uri.sub(/[#]{1}/, '%') this regex will replace # with % end end diff --git a/app/views/recipes/_list.html.erb b/app/views/recipes/_list.html.erb new file mode 100644 index 000000000..4b8b249f1 --- /dev/null +++ b/app/views/recipes/_list.html.erb @@ -0,0 +1,11 @@ + +
+

+ <%= list_title %> +

+
    + <% list_obj.each do |line| %> +
  • <%= line %>
    • + <% end %> + +
diff --git a/app/views/recipes/index.html.erb b/app/views/recipes/index.html.erb index 071276c39..76600982e 100644 --- a/app/views/recipes/index.html.erb +++ b/app/views/recipes/index.html.erb @@ -1,12 +1,10 @@

Recipes Index

+

Results for "<%= @search_term %>"

    <% @recipes.each do |recipe| %>
  • <%= link_to recipe.label, recipe_path(recipe.label, recipe_uri: recipe.uri) %> + <%= image_tag "#{recipe.image}"%>
    • <% end %>
- -def show - @recipe = EdamamApiWrapper.show_recipe(params[:recipe_uri]) -end diff --git a/app/views/recipes/show.html.erb b/app/views/recipes/show.html.erb index d02a78077..47760b1d1 100644 --- a/app/views/recipes/show.html.erb +++ b/app/views/recipes/show.html.erb @@ -1,7 +1,14 @@

Recipe show page

-
    -
  • Title: <%= @recipe.label%>
    • -
  • <%= image_tag "#{@recipe.image}"%>
    • -
  • Source: <%= @recipe.source%>
    • -
  • Calories: <%= @recipe.calories%>
    • -
+
+

<%= @recipe.label%>

+

By: <%= link_to "#{@recipe.source}", @recipe.url%>

+
+<%= image_tag "#{@recipe.image}"%> + +<%= render partial: "list", locals: { + list_obj: @recipe.ingredientLines, list_title: "Ingredients" +} %> + +<%= render partial: "list", locals: { + list_obj: @recipe.dietLabels, list_title: "Dietary Labels" +} %> diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index ad94e6668..8d4fb0c7a 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -28,12 +28,12 @@ def self.list_recipes(search_term, key=APP_KEY) end def self.show_recipe(uri, key=APP_KEY, type=R) - # binding.pry + # uri = uri_regex(uri) # url = build_url(uri, key, type) url = BASE_URL + BASE_URI + uri + "&app_id=" + APP_ID + "&app_key=" + key - response = HTTParty.get(url) + response = HTTParty.get(url) recipe = '' if response.empty? @@ -41,7 +41,7 @@ def self.show_recipe(uri, key=APP_KEY, type=R) else recipe = create_recipe(response[0]) end - + # raise return recipe end From c13a94ea2cab6d47603f6d21deec9d86833771b6 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Wed, 1 Nov 2017 23:06:21 -0700 Subject: [PATCH 19/31] Started styling --- app/assets/stylesheets/_settings.scss | 1 - .../{application.css => application.scss} | 22 +++++++++++++++++++ app/views/layouts/application.html.erb | 6 +++++ app/views/recipes/root.html.erb | 14 +++++++----- lib/edamam_api_wrapper.rb | 3 ++- 5 files changed, 38 insertions(+), 8 deletions(-) rename app/assets/stylesheets/{application.css => application.scss} (61%) diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss index b67ff00cd..0ef2ccf1a 100644 --- a/app/assets/stylesheets/_settings.scss +++ b/app/assets/stylesheets/_settings.scss @@ -860,4 +860,3 @@ $grid-padding-gutters: $grid-margin-gutters; $grid-container-padding: $grid-padding-gutters; $grid-container-max: $global-width; $block-grid-max: 8; - diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss similarity index 61% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.scss index a152282fc..2f669627b 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.scss @@ -15,3 +15,25 @@ *= require foundation_and_overrides */ + +$primary-grey: #9c9999; +$primary-offwhite: #fbf7f4; +@import url('https://fonts.googleapis.com/css?family=Muli'); + +body { + font-family: 'Muli', sans-serif; +} + +.root { + background: url('http://bufferblog.wpengine.netdna-cdn.com/wp-content/uploads/2014/05/1443725_58313555.jpg') no-repeat center center; + background-size: cover; + background-attachment: fixed; +} + +footer { + position: absolute; + bottom: 0; + width: 100%; + height: 6em; + background-color: $primary-grey; +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cd6000489..c29b58b46 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,6 +1,7 @@ + TITLE @@ -16,4 +17,9 @@ <%= yield %> +
+

+ Powered by Edamam +

+
diff --git a/app/views/recipes/root.html.erb b/app/views/recipes/root.html.erb index 0d7d6110f..86577a568 100644 --- a/app/views/recipes/root.html.erb +++ b/app/views/recipes/root.html.erb @@ -1,6 +1,8 @@ -

API MUNCHER ROOT

-<%= form_tag recipes_path, method: "get" do %> - <%= label_tag(:search_term, "Enter search term here") %> - <%= text_field_tag(:search_term) %> - <%= submit_tag("submit") %> -<% end %> +
+

API MUNCHER ROOT

+ <%= form_tag recipes_path, method: "get" do %> + <%= label_tag(:search_term, "Enter search term here") %> + <%= text_field_tag(:search_term) %> + <%= submit_tag("submit") %> + <% end %> +
diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index 8d4fb0c7a..363beef8d 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -41,7 +41,7 @@ def self.show_recipe(uri, key=APP_KEY, type=R) else recipe = create_recipe(response[0]) end - # raise + # raise return recipe end @@ -54,6 +54,7 @@ def self.check_hits(response) else if response["count"] < 1 raise ApiError.new("Api call to Edaman failed to return any results for the search term #{response["q"]}") + # TODO: think about using flash vs error for this case end end end From d56ccbc577f46522b5e39f81bb8a2c6f00c2bbb3 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Thu, 2 Nov 2017 10:29:26 -0700 Subject: [PATCH 20/31] Css work for a footer, on root full size background image and some custom fonts --- app/assets/stylesheets/application.scss | 63 ++++++++++++++++++++++--- app/views/layouts/application.html.erb | 8 ++-- app/views/recipes/root.html.erb | 18 ++++--- 3 files changed, 74 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 2f669627b..675cee5dd 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,24 +16,75 @@ */ +// alt images http://bufferblog.wpengine.netdna-cdn.com/wp-content/uploads/2014/05/1443725_58313555.jpg + +@import url('https://fonts.googleapis.com/css?family=Muli'); + +/* ***************************************************** + STORED VARIABLES +****************************************************** */ $primary-grey: #9c9999; $primary-offwhite: #fbf7f4; -@import url('https://fonts.googleapis.com/css?family=Muli'); +$primary-font: 'Muli', sans-serif; + + -body { - font-family: 'Muli', sans-serif; +body, h1, h2, h3, h4, h5 { + font-family: $primary-font } -.root { - background: url('http://bufferblog.wpengine.netdna-cdn.com/wp-content/uploads/2014/05/1443725_58313555.jpg') no-repeat center center; +html, body { + height: 100%; + margin: 0; + padding: 0; + font-family: $primary-font; +} + +/* ***************************************************** + Root Page +****************************************************** */ + + +div.darken-overlay { + width: 100%; + background-color: rgba(0, 0, 0, 0.5); + height: 100%; +} + +div.root { + background: url('https://static.pexels.com/photos/372851/pexels-photo-372851.jpeg') no-repeat center center; background-size: cover; background-attachment: fixed; + width: 100%; + height: 100%; + max-height: 100%; } +.root { + h1, p, label { + color: $primary-offwhite; + } +} + + + + +/* ***************************************************** + FOOTER +****************************************************** */ + footer { position: absolute; bottom: 0; width: 100%; - height: 6em; + height: 3em; background-color: $primary-grey; + div { + padding: 0; + height: 3em; + } + #credit { + line-height: 3em; + margin: 0; + } } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c29b58b46..fbbbcc75b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,8 +18,10 @@
-

- Powered by Edamam -

+
+

+ Powered by Edamam +

+
diff --git a/app/views/recipes/root.html.erb b/app/views/recipes/root.html.erb index 86577a568..fcddd8f9e 100644 --- a/app/views/recipes/root.html.erb +++ b/app/views/recipes/root.html.erb @@ -1,8 +1,14 @@
-

API MUNCHER ROOT

- <%= form_tag recipes_path, method: "get" do %> - <%= label_tag(:search_term, "Enter search term here") %> - <%= text_field_tag(:search_term) %> - <%= submit_tag("submit") %> - <% end %> +
+
+

API MUNCHER ROOT

+
+ <%= form_tag recipes_path, method: "get" do %> + <%= label_tag(:search_term, "Enter search term here") %> + <%= text_field_tag(:search_term) %> + <%= submit_tag("submit") %> + <% end %> +
+
+
From 66bbcf57a1662b743bc85895b9b4027e6a9d6425 Mon Sep 17 00:00:00 2001 From: Sarah Read-Brown Date: Sat, 11 Nov 2017 12:49:55 -0800 Subject: [PATCH 21/31] Updates sticky footer using vh for repsonzive hieght adjustments --- app/assets/stylesheets/application.scss | 54 ++++++++++++++++++------- app/views/layouts/application.html.erb | 2 +- app/views/recipes/root.html.erb | 4 +- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 675cee5dd..a8e39d843 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -40,6 +40,11 @@ html, body { font-family: $primary-font; } +body { + position:relative; /*REQUIRED Sets up positioning for your footer*/ +} + + /* ***************************************************** Root Page ****************************************************** */ @@ -67,24 +72,43 @@ div.root { } - + // E5FCC2 9DE0AD 45ADA8 547980 594F4F /* ***************************************************** FOOTER ****************************************************** */ -footer { - position: absolute; - bottom: 0; - width: 100%; - height: 3em; - background-color: $primary-grey; - div { - padding: 0; - height: 3em; - } - #credit { - line-height: 3em; - margin: 0; - } +// footer { +// position: absolute; +// bottom: 0; +// width: 100%; +// height: 3em; +// background-color: #E5FCC2; +// div { +// padding: 0; +// height: 3em; +// } +// #credit { +// line-height: 3em; +// margin: 0; +// } +// } + + + +#sticky { + width:100%; + height:10vh; + padding-top:3vh; + background:#E5FCC2; + // color:white; + font-weight:bold; + font-size:3vh; + text-align:center; + position:fixed; /*Here's what sticks it*/ + bottom:0; /*to the bottom of the window*/ + left:0; /*and to the left of the window.*/ +} +p#sticky { + margin: 0; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index fbbbcc75b..3af6d1012 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -19,7 +19,7 @@