From 03d196e95aec0d37fccbdb0425e0f79dafa6dff5 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Wed, 31 Oct 2018 12:27:29 -0700 Subject: [PATCH 01/11] created rails app --- .gitignore | 27 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 279 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 20 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.scss | 18 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + 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 | 15 + 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 | 36 +++ bin/spring | 17 ++ bin/update | 31 ++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 61 ++++ config/environments/production.rb | 94 ++++++ config/environments/test.rb | 46 +++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 ++ 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 | 34 +++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ 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 + storage/.keep | 0 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 | 24 ++ tmp/.keep | 0 vendor/.keep | 0 80 files changed, 1408 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile 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.scss 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/credentials.yml.enc 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/content_security_policy.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/spring.rb create mode 100644 config/storage.yml 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 storage/.keep 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..18b43c9cd --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +/node_modules +/yarn-error.log + +/public/assets +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..6219256bd --- /dev/null +++ b/Gemfile @@ -0,0 +1,81 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +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] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-rails' +gem 'jquery-turbolinks' +gem 'bootstrap', '~> 4.1.3' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..c3a26ecad --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,279 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.11.0) + io-like (~> 0.3.0) + arel (9.0.0) + autoprefixer-rails (9.3.1) + execjs + better_errors (2.5.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.3.2) + msgpack (~> 1.0) + bootstrap (4.1.3) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.9, < 2) + sass (>= 3.5.2) + builder (3.2.3) + byebug (10.0.2) + capybara (3.10.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.1.0) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.25) + formatador (0.2.5) + globalid (0.4.1) + activesupport (>= 4.2.0) + guard (2.14.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.1.1) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + 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.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.3) + popper_js (1.14.3) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + regexp_parser (1.2.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.6.0) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + 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.14.1) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + shellany (0.0.1) + 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.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + 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.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.19) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + bootstrap (~> 4.1.3) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + 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) + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.6 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end 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..4f73c21a7 --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,20 @@ +// 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 jquery3 + //= require popper + //= require bootstrap-sprockets + +// +//= require rails-ujs +//= require activestorage +//= 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.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 000000000..35f37aeae --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,18 @@ +/* + * 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. + * + */ + + /* Custom bootstrap variables must be set or imported *before* bootstrap. */ + @import "bootstrap"; + /* Import scss content */ + @import "**/*"; 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..09705d12a --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +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..f2e0d8faa --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + + ApiMuncher + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= 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..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +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..94fd4d797 --- /dev/null +++ b/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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..58bfaed51 --- /dev/null +++ b/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + 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..460dd565b --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + 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..0b5eed283 --- /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.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..cf3ce7efa --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: api-muncher_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..43138ba29 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +pbLt8UehKOYEWP5p0pnfZZt88I7XCe9fRvZs3uqkL87V6ZzjwwYcZgCbJzUXPV958d1zJXDpLCihtSJLPkCINaM6rpDFVfloMQ8z9TRUBeKAOapKDgsKEFJjfHpmI7DjXvlQgZa2ZaYQNsmwLnp7E8xopJUnMKBlnBUfSvnhd6lNO582de3D97jYDucxW8kANOx2GkiquHV7BAFrcMcKYq3F3OyDD1T5tBkpQrKtgN8zBokc5qiyhxVdKiWZYl+tJlpD1cXdqoyX5ZVZi0GWKJk8uO1zOV6uV0L+ikZLxCo233IQRSvLgz3t7sV2+6uygzZ282wAV0qrPu4Zo1M3FoodToHrijwWOGVX0Vq+eyB4GofgHT5/AjlBHwlsnlzog5gWYy/DAPIQ8Bq8bzdhkAfwAIcpApYKWMIF--NRaLqrJOZwybGg/c--rjdt1joFlGy1HfbpwyW7zA== \ No newline at end of file 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..1311e3e4e --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +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. + # Run rails dev:cache to toggle caching. + 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.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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 + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # 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..1d8a23cbf --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +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 + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = 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 + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +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.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 + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + 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/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 000000000..d3bcaa5ec --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true 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..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# 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. +# +# preload_app! + +# 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/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /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/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] 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/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb 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..46d22c3bb --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" require "minitest/reporters" # for Colorized output + # For colorful output! + Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter + ) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +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 e7d772d9e5e2e1324b5eac955f82e4f1ebcd3088 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Thu, 1 Nov 2018 15:50:39 -0700 Subject: [PATCH 02/11] created a search controller, api wrapper, and recipe object --- .gitignore | 3 ++ Gemfile | 3 ++ Gemfile.lock | 18 ++++++++++ app/assets/javascripts/search.js | 2 ++ app/assets/stylesheets/search.scss | 3 ++ app/controllers/search_controller.rb | 16 +++++++++ app/helpers/search_helper.rb | 2 ++ app/views/search/index.html.erb | 0 config/initializers/action_view.rb | 1 + lib/edamam_api_wrapper.rb | 42 ++++++++++++++++++++++ lib/recipe.rb | 13 +++++++ test/controllers/search_controller_test.rb | 7 ++++ 12 files changed, 110 insertions(+) create mode 100644 app/assets/javascripts/search.js create mode 100644 app/assets/stylesheets/search.scss create mode 100644 app/controllers/search_controller.rb create mode 100644 app/helpers/search_helper.rb create mode 100644 app/views/search/index.html.erb create mode 100644 config/initializers/action_view.rb create mode 100644 lib/edamam_api_wrapper.rb create mode 100644 lib/recipe.rb create mode 100644 test/controllers/search_controller_test.rb diff --git a/.gitignore b/.gitignore index 18b43c9cd..092f87e09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ + # 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 @@ -25,3 +26,5 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +.env diff --git a/Gemfile b/Gemfile index 6219256bd..e3d9ad9fd 100644 --- a/Gemfile +++ b/Gemfile @@ -66,6 +66,8 @@ gem 'jquery-turbolinks' gem 'bootstrap', '~> 4.1.3' group :development, :test do gem 'pry-rails' + gem 'dotenv-rails' + gem 'httparty' end group :development do @@ -78,4 +80,5 @@ end group :test do gem 'minitest-rails' gem 'minitest-reporters' + gem 'webmock' end diff --git a/Gemfile.lock b/Gemfile.lock index c3a26ecad..12e1a5e0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,8 +80,14 @@ GEM nokogiri (~> 1.8) coderay (1.1.2) concurrent-ruby (1.1.0) + crack (0.4.3) + safe_yaml (~> 1.0.0) crass (1.0.4) debug_inspector (0.0.3) + dotenv (2.5.0) + dotenv-rails (2.5.0) + dotenv (= 2.5.0) + railties (>= 3.2, < 6.0) erubi (1.7.1) execjs (2.7.0) ffi (1.9.25) @@ -101,6 +107,9 @@ GEM guard-minitest (2.4.6) guard-compat (~> 1.2) minitest (>= 3.0) + hashdiff (0.3.7) + httparty (0.16.2) + multi_xml (>= 0.5.2) i18n (1.1.1) concurrent-ruby (~> 1.0) io-like (0.3.0) @@ -141,6 +150,7 @@ GEM ruby-progressbar msgpack (1.2.4) multi_json (1.13.1) + multi_xml (0.6.0) nenv (0.3.0) nio4r (2.3.1) nokogiri (1.8.5) @@ -192,6 +202,7 @@ GEM ruby-progressbar (1.10.0) ruby_dep (1.5.0) rubyzip (1.2.2) + safe_yaml (1.0.4) sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -234,6 +245,10 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) + webmock (3.4.2) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) @@ -251,8 +266,10 @@ DEPENDENCIES byebug capybara (>= 2.15) chromedriver-helper + dotenv-rails guard guard-minitest + httparty jbuilder (~> 2.5) jquery-rails jquery-turbolinks @@ -271,6 +288,7 @@ DEPENDENCIES tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) + webmock RUBY VERSION ruby 2.5.1p57 diff --git a/app/assets/javascripts/search.js b/app/assets/javascripts/search.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/search.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/search.scss b/app/assets/stylesheets/search.scss new file mode 100644 index 000000000..22fd39482 --- /dev/null +++ b/app/assets/stylesheets/search.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the search 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/search_controller.rb b/app/controllers/search_controller.rb new file mode 100644 index 000000000..35d4cc07d --- /dev/null +++ b/app/controllers/search_controller.rb @@ -0,0 +1,16 @@ +class SearchController < ApplicationController + def index + #search results + @searches = EdamamApiWrapper.search_recipes(query) + end + + def searchbar + #search bar + #make a new what? + end + + def show + #single search result - single recipe + #something goes here + end +end diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb new file mode 100644 index 000000000..b3ce20acb --- /dev/null +++ b/app/helpers/search_helper.rb @@ -0,0 +1,2 @@ +module SearchHelper +end diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb new file mode 100644 index 000000000..6f633db28 --- /dev/null +++ b/lib/edamam_api_wrapper.rb @@ -0,0 +1,42 @@ +require 'httparty' + +class EdamamApiWrapper + BASE_URL = "https://api.edamam.com/search" + ID = ENV[APP_ID] + KEY = ENV[APP_KEY] + + + https://api.edamam.com/search?app_id=06a49133&app_key=3cf463de5ba73c4f32ecd937e555603c&q=banana + def self.search_recipes(query) + url = BASE_URL + "?" + "app_id=#{ID}" + "&app_key=#{KEY}" + "&q=#{query}" + #if doesn't work - change & to be included in string before it + + data = HTTParty.get(url) + + search_list = [] + + if data["hits"] + data["hits"].each do |query_data| + search_list << create_result_list(query_data) + end + end + + return search_list + end + + private + + def self.create_result_list(api_params) + return Recipe.new( + api_params["label"], + api_params["image"], + api_params["url"], + { + ingredientLines: api_params["ingredientLines"], + healthLabels: api_params["healthLabels"] + } + ) + end + + +end diff --git a/lib/recipe.rb b/lib/recipe.rb new file mode 100644 index 000000000..04b387ad4 --- /dev/null +++ b/lib/recipe.rb @@ -0,0 +1,13 @@ +class Recipe + attr_reader :label, :image, :url, :ingredientLines, :healthlabels + + def initialize(label, image, url, ingredients, options = {} ) + raise ArgumentError if label == nil || label == "" || url == nil || url == "" || image == nil || image == "" + + @label = label + @image = image + @url = url + @ingredientLines = options[:ingredientLines] + @healthLabels = options[:healthLabels] + end +end diff --git a/test/controllers/search_controller_test.rb b/test/controllers/search_controller_test.rb new file mode 100644 index 000000000..f84610864 --- /dev/null +++ b/test/controllers/search_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe SearchController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 273789d7df17bf7c77e9864cfca23e94f8566734 Mon Sep 17 00:00:00 2001 From: griffifam <33267556+griffifam@users.noreply.github.com> Date: Thu, 1 Nov 2018 16:47:37 -0700 Subject: [PATCH 03/11] Update edamam_api_wrapper.rb --- lib/edamam_api_wrapper.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index 6f633db28..5f9bba782 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -5,8 +5,6 @@ class EdamamApiWrapper ID = ENV[APP_ID] KEY = ENV[APP_KEY] - - https://api.edamam.com/search?app_id=06a49133&app_key=3cf463de5ba73c4f32ecd937e555603c&q=banana def self.search_recipes(query) url = BASE_URL + "?" + "app_id=#{ID}" + "&app_key=#{KEY}" + "&q=#{query}" #if doesn't work - change & to be included in string before it From 0228706c351cd2a107bbd4ee8bff91a43d458af8 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Thu, 1 Nov 2018 17:10:11 -0700 Subject: [PATCH 04/11] deleted commits and re-added some features --- .gitignore | 2 ++ app/controllers/search_controller.rb | 16 +++++++++++ config/routes.rb | 3 +++ lib/edamam_api_wrapper.rb | 40 ++++++++++++++++++++++++++++ lib/recipe.rb | 13 +++++++++ 5 files changed, 74 insertions(+) create mode 100644 app/controllers/search_controller.rb create mode 100644 lib/edamam_api_wrapper.rb create mode 100644 lib/recipe.rb diff --git a/.gitignore b/.gitignore index 18b43c9cd..931707d15 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +.env diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb new file mode 100644 index 000000000..d2fda0d78 --- /dev/null +++ b/app/controllers/search_controller.rb @@ -0,0 +1,16 @@ +class SearchController < ApplicationController + def index + #search results + @recipes = EdamamApiWrapper.search_recipes(query) + end + + def show + search_id = params[:id] + @recipe = EdamamApiWrapper.find_by(id: recipe_id) + if @recipe.nil? + head :not_found + end + #single search result - single recipe + #something goes here + end +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..3256644fc 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 'search#index' + get '/searches/:id', to: 'searches#show', as: 'search' end diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb new file mode 100644 index 000000000..b3fc60537 --- /dev/null +++ b/lib/edamam_api_wrapper.rb @@ -0,0 +1,40 @@ +require 'httparty' + +class EdamamApiWrapper + BASE_URL = "https://api.edamam.com/search" + ID = ENV[APP_ID] + KEY = ENV[APP_KEY] + + def self.search_recipes(query) + url = BASE_URL + "?" + "app_id=#{ID}" + "&app_key=#{KEY}" + "&q=#{query}" + #if doesn't work - change & to be included in string before it + + data = HTTParty.get(url) + + search_list = [] + + if data["hits"] + data["hits"].each do |query_data| + search_list << create_result_list(query_data) + end + end + + return search_list + end + + private + + def self.create_result_list(api_params) + return Recipe.new( + { + label: api_params["label"], + image: api_params["label"], + url: api_params["url"], + ingredientLines: api_params["ingredientLines"], + healthLabels: api_params["healthLabels"] + } + ) + end + + +end diff --git a/lib/recipe.rb b/lib/recipe.rb new file mode 100644 index 000000000..08937d1c7 --- /dev/null +++ b/lib/recipe.rb @@ -0,0 +1,13 @@ +class Recipe + attr_reader :label, :image, :url, :ingredientLines, :healthLabels + + def initialize(options = {} ) + raise ArgumentError if options[:label] == nil || options[:label] == "" || options[:url] == nil || options[:url] == "" || options[:image] == nil || options[:image] == "" + + @label = options[:label] + @image = options[:image] + @url = options[:url] + @ingredientLines = options[:ingredientLines] + @healthLabels = options[:healthLabels] + end +end From c99c13f74209ff671470985b89ea9b323f8fe646 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Thu, 1 Nov 2018 17:26:16 -0700 Subject: [PATCH 05/11] create show.html and updated routes --- app/views/search/show.html.erb | 0 config/routes.rb | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 app/views/search/show.html.erb diff --git a/app/views/search/show.html.erb b/app/views/search/show.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/config/routes.rb b/config/routes.rb index 3256644fc..925daad72 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,7 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - root 'search#index' + root + get '/search/', to: 'search#index', as: 'homepage' get '/searches/:id', to: 'searches#show', as: 'search' end From a56799953ace7e40dfd963f2b34d6b96ac3d031e Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Fri, 2 Nov 2018 12:29:36 -0700 Subject: [PATCH 06/11] added encoded_uri to wrapper and updated routes and homepage to a new.html.erb --- app/controllers/search_controller.rb | 17 ++++------- app/views/search/index.html.erb | 42 ++++++++++++++++++++++++++++ app/views/search/new.html.erb | 8 ++++++ config/routes.rb | 8 ++++-- lib/edamam_api_wrapper.rb | 32 +++++++++------------ 5 files changed, 73 insertions(+), 34 deletions(-) create mode 100644 app/views/search/new.html.erb diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 9f6f4850b..a6c891ef6 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -1,7 +1,11 @@ class SearchController < ApplicationController + + def new + @query = params + end + def index #search results -<<<<<<< HEAD @recipes = EdamamApiWrapper.search_recipes(query) end @@ -11,17 +15,6 @@ def show if @recipe.nil? head :not_found end -======= - @searches = EdamamApiWrapper.search_recipes(query) - end - - def searchbar - #search bar - #make a new what? - end - - def show ->>>>>>> 273789d7df17bf7c77e9864cfca23e94f8566734 #single search result - single recipe #something goes here end diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb index e69de29bb..b416a3744 100644 --- a/app/views/search/index.html.erb +++ b/app/views/search/index.html.erb @@ -0,0 +1,42 @@ +
+

Search Results

+ <% if @recipes %> + +
    + <% @recipes.each do |recipe| %> +
  • + Recipe Title: <%= recipe.label %> +
    • +
  • + Image: <%= recipe.image %> +
    • +
  • + Original URL: <%= recipe.url %> +
    • + +
  • + Ingredients: +
      + <% recipe.ingredientLines.each do |ingredient| %> +
    • + <%= ingredient %> +
      • + <% end %> +
    +
    • + +
  • + Dietary Restrictions: +
      + <% recipe.healthLabels.each do |label| %> +
    • + <%= label %> +
      • + <% end %> +
    +
    • + +
+ <% end %> + +
diff --git a/app/views/search/new.html.erb b/app/views/search/new.html.erb new file mode 100644 index 000000000..bd2ebc390 --- /dev/null +++ b/app/views/search/new.html.erb @@ -0,0 +1,8 @@ +

Search for Recipes by Ingredient

+ +<%= form_tag results_path(@channel/#@query), method: "get" do %> + <%= label_tag(:message, "Search by food name:") %> + <%= text_field_tag(:message) %> + <%= submit_tag("Send") %> + +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 925daad72..27381df39 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,9 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - root - get '/search/', to: 'search#index', as: 'homepage' - get '/searches/:id', to: 'searches#show', as: 'search' + root '/search/', to: 'search#new' + + get '/search/', to: 'search#index', as: 'results' + + get '/searches/:id', to: 'searches#show', as: 'recipe' end diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index 3c7472bc5..8db0ecc2f 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -9,36 +9,30 @@ def self.search_recipes(query) url = BASE_URL + "?" + "app_id=#{ID}" + "&app_key=#{KEY}" + "&q=#{query}" #if doesn't work - change & to be included in string before it - data = HTTParty.get(url) + encoded_url = URI.encode(url) + response = HTTParty.get(encoded_url) - search_list = [] + recipe_list = [] + + if response["hits"] + response["hits"].each do |hit| + recipe_list << create_recipe(hit) - if data["hits"] - data["hits"].each do |query_data| - search_list << create_result_list(query_data) end end - return search_list end private - def self.create_result_list(api_params) + def self.create_recipe(api_params) return Recipe.new( -<<<<<<< HEAD - { - label: api_params["label"], - image: api_params["label"], - url: api_params["url"], -======= - api_params["label"], - api_params["image"], - api_params["url"], { ->>>>>>> 273789d7df17bf7c77e9864cfca23e94f8566734 - ingredientLines: api_params["ingredientLines"], - healthLabels: api_params["healthLabels"] + label: api_params["recipe"]["label"], + image: api_params["recipe"]["label"], + url: api_params["recipe"]["url"], + ingredientLines: api_params["recipe"]["ingredientLines"], + healthLabels: api_params["recipe"]["healthLabels"] } ) end From 4db8ffee3b4a6b72d624325ddf29c8a03d948a4d Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Sat, 3 Nov 2018 17:12:26 -0700 Subject: [PATCH 07/11] renamed controller to searches- pluralization --- .../javascripts/{search.js => searches.js} | 0 .../{search.scss => searches.scss} | 2 +- ...h_controller.rb => searches_controller.rb} | 11 +++-- app/helpers/search_helper.rb | 2 - app/helpers/searches_helper.rb | 2 + app/views/search/index.html.erb | 42 ------------------- app/views/search/new.html.erb | 8 ---- app/views/search/show.html.erb | 0 config/application.rb | 1 + config/routes.rb | 10 +++-- db/schema.rb | 18 ++++++++ lib/edamam_api_wrapper.rb | 2 +- ...er_test.rb => searches_controller_test.rb} | 2 +- 13 files changed, 38 insertions(+), 62 deletions(-) rename app/assets/javascripts/{search.js => searches.js} (100%) rename app/assets/stylesheets/{search.scss => searches.scss} (63%) rename app/controllers/{search_controller.rb => searches_controller.rb} (53%) delete mode 100644 app/helpers/search_helper.rb create mode 100644 app/helpers/searches_helper.rb delete mode 100644 app/views/search/index.html.erb delete mode 100644 app/views/search/new.html.erb delete mode 100644 app/views/search/show.html.erb create mode 100644 db/schema.rb rename test/controllers/{search_controller_test.rb => searches_controller_test.rb} (75%) diff --git a/app/assets/javascripts/search.js b/app/assets/javascripts/searches.js similarity index 100% rename from app/assets/javascripts/search.js rename to app/assets/javascripts/searches.js diff --git a/app/assets/stylesheets/search.scss b/app/assets/stylesheets/searches.scss similarity index 63% rename from app/assets/stylesheets/search.scss rename to app/assets/stylesheets/searches.scss index 22fd39482..886c1d09f 100644 --- a/app/assets/stylesheets/search.scss +++ b/app/assets/stylesheets/searches.scss @@ -1,3 +1,3 @@ -// Place all the styles related to the search controller here. +// Place all the styles related to the searches 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/search_controller.rb b/app/controllers/searches_controller.rb similarity index 53% rename from app/controllers/search_controller.rb rename to app/controllers/searches_controller.rb index a6c891ef6..7694e6894 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/searches_controller.rb @@ -1,7 +1,11 @@ -class SearchController < ApplicationController +class SearchesController < ApplicationController def new - @query = params + # @recipe = EdamamApiWrapper.new + end + + def create + @recipe = EdamamApiWrapper.create_recipe(api_params) end def index @@ -10,8 +14,7 @@ def index end def show - search_id = params[:id] - @recipe = EdamamApiWrapper.find_by(id: recipe_id) + @recipe = EdamamApiWrapper.find_by(uri: recipe.uri) if @recipe.nil? head :not_found end diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb deleted file mode 100644 index b3ce20acb..000000000 --- a/app/helpers/search_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module SearchHelper -end diff --git a/app/helpers/searches_helper.rb b/app/helpers/searches_helper.rb new file mode 100644 index 000000000..382355326 --- /dev/null +++ b/app/helpers/searches_helper.rb @@ -0,0 +1,2 @@ +module SearchesHelper +end diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb deleted file mode 100644 index b416a3744..000000000 --- a/app/views/search/index.html.erb +++ /dev/null @@ -1,42 +0,0 @@ -
-

Search Results

- <% if @recipes %> - -
    - <% @recipes.each do |recipe| %> -
  • - Recipe Title: <%= recipe.label %> -
    • -
  • - Image: <%= recipe.image %> -
    • -
  • - Original URL: <%= recipe.url %> -
    • - -
  • - Ingredients: -
      - <% recipe.ingredientLines.each do |ingredient| %> -
    • - <%= ingredient %> -
      • - <% end %> -
    -
    • - -
  • - Dietary Restrictions: -
      - <% recipe.healthLabels.each do |label| %> -
    • - <%= label %> -
      • - <% end %> -
    -
    • - -
- <% end %> - -
diff --git a/app/views/search/new.html.erb b/app/views/search/new.html.erb deleted file mode 100644 index bd2ebc390..000000000 --- a/app/views/search/new.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -

Search for Recipes by Ingredient

- -<%= form_tag results_path(@channel/#@query), method: "get" do %> - <%= label_tag(:message, "Search by food name:") %> - <%= text_field_tag(:message) %> - <%= submit_tag("Send") %> - -<% end %> diff --git a/app/views/search/show.html.erb b/app/views/search/show.html.erb deleted file mode 100644 index e69de29bb..000000000 diff --git a/config/application.rb b/config/application.rb index 0b5eed283..e2e4c5f58 100644 --- a/config/application.rb +++ b/config/application.rb @@ -21,5 +21,6 @@ class Application < Rails::Application # Application configuration can go into files in config/initializers # -- all .rb files in that directory are automatically loaded after loading # the framework and any gems in your application. + config.eager_load_paths << Rails.root.join('lib') end end diff --git a/config/routes.rb b/config/routes.rb index 27381df39..26b953d6a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,13 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - root '/search/', to: 'search#new' + root 'searches#new' - get '/search/', to: 'search#index', as: 'results' + post '/', to: 'searches#create', as: 'found_recipes' - get '/searches/:id', to: 'searches#show', as: 'recipe' + get ':searches/new', to: 'searches#new', as: 'search' + + get ':searches/index', to: 'searches#index', as: 'results' + + get ':searches/:id', to: 'searches#show', as: 'recipe' 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/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index 8db0ecc2f..b204e8fa5 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -6,7 +6,7 @@ class EdamamApiWrapper KEY = ENV[APP_KEY] def self.search_recipes(query) - url = BASE_URL + "?" + "app_id=#{ID}" + "&app_key=#{KEY}" + "&q=#{query}" + url = BASE_URL + "?app_id=#{ID}" + "&app_key=#{KEY}" + "&q=#{query}" #if doesn't work - change & to be included in string before it encoded_url = URI.encode(url) diff --git a/test/controllers/search_controller_test.rb b/test/controllers/searches_controller_test.rb similarity index 75% rename from test/controllers/search_controller_test.rb rename to test/controllers/searches_controller_test.rb index f84610864..4d243acfd 100644 --- a/test/controllers/search_controller_test.rb +++ b/test/controllers/searches_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -describe SearchController do +describe SearchesController do # it "must be a real test" do # flunk "Need real tests" # end From 64179751ad3b73d757edf6a2351d583693958bc2 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Sat, 3 Nov 2018 17:22:40 -0700 Subject: [PATCH 08/11] updated renamed controller with views --- app/views/searches/index.html.erb | 42 +++++++++++++++++++++++++++++++ app/views/searches/new.html.erb | 8 ++++++ app/views/searches/show.html.erb | 0 3 files changed, 50 insertions(+) create mode 100644 app/views/searches/index.html.erb create mode 100644 app/views/searches/new.html.erb create mode 100644 app/views/searches/show.html.erb diff --git a/app/views/searches/index.html.erb b/app/views/searches/index.html.erb new file mode 100644 index 000000000..b416a3744 --- /dev/null +++ b/app/views/searches/index.html.erb @@ -0,0 +1,42 @@ +
+

Search Results

+ <% if @recipes %> + +
    + <% @recipes.each do |recipe| %> +
  • + Recipe Title: <%= recipe.label %> +
    • +
  • + Image: <%= recipe.image %> +
    • +
  • + Original URL: <%= recipe.url %> +
    • + +
  • + Ingredients: +
      + <% recipe.ingredientLines.each do |ingredient| %> +
    • + <%= ingredient %> +
      • + <% end %> +
    +
    • + +
  • + Dietary Restrictions: +
      + <% recipe.healthLabels.each do |label| %> +
    • + <%= label %> +
      • + <% end %> +
    +
    • + +
+ <% end %> + +
diff --git a/app/views/searches/new.html.erb b/app/views/searches/new.html.erb new file mode 100644 index 000000000..c5551111c --- /dev/null +++ b/app/views/searches/new.html.erb @@ -0,0 +1,8 @@ +

Search for Recipes by Ingredient

+ +<%= form_tag found_recipes_path, method: "post" do %> + <%= label_tag(:search, "Enter Food:") %> + <%= text_field_tag(:search) %> + <%= submit_tag("Send") %> + +<% end %> diff --git a/app/views/searches/show.html.erb b/app/views/searches/show.html.erb new file mode 100644 index 000000000..e69de29bb From 6f8d5c4269332df17eb132ac095365e8f5638566 Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Sun, 4 Nov 2018 20:33:31 -0800 Subject: [PATCH 09/11] updated routes show, index, recipe.rb and api wrapper --- Gemfile | 3 +- app/controllers/searches_controller.rb | 18 +++-------- app/views/searches/index.html.erb | 41 ++++++++++++------------- app/views/searches/new.html.erb | 8 ----- app/views/searches/root.html.erb | 8 +++++ app/views/searches/show.html.erb | 35 +++++++++++++++++++++ config/routes.rb | 8 ++--- lib/edamam_api_wrapper.rb | 42 +++++++++++++++++++------- lib/recipe.rb | 20 ++++-------- 9 files changed, 108 insertions(+), 75 deletions(-) delete mode 100644 app/views/searches/new.html.erb create mode 100644 app/views/searches/root.html.erb diff --git a/Gemfile b/Gemfile index e3d9ad9fd..be2d59be7 100644 --- a/Gemfile +++ b/Gemfile @@ -67,7 +67,6 @@ gem 'bootstrap', '~> 4.1.3' group :development, :test do gem 'pry-rails' gem 'dotenv-rails' - gem 'httparty' end group :development do @@ -82,3 +81,5 @@ group :test do gem 'minitest-reporters' gem 'webmock' end + +gem 'httparty' diff --git a/app/controllers/searches_controller.rb b/app/controllers/searches_controller.rb index 7694e6894..255a34773 100644 --- a/app/controllers/searches_controller.rb +++ b/app/controllers/searches_controller.rb @@ -1,24 +1,16 @@ -class SearchesController < ApplicationController +require 'httparty' - def new - # @recipe = EdamamApiWrapper.new - end +class SearchesController < ApplicationController - def create - @recipe = EdamamApiWrapper.create_recipe(api_params) + def root end def index #search results - @recipes = EdamamApiWrapper.search_recipes(query) + @recipes = EdamamApiWrapper.search_recipes( params[:recipe] ) end def show - @recipe = EdamamApiWrapper.find_by(uri: recipe.uri) - if @recipe.nil? - head :not_found - end - #single search result - single recipe - #something goes here + @recipe = EdamamApiWrapper.show_recipe( params[:id] ) end end diff --git a/app/views/searches/index.html.erb b/app/views/searches/index.html.erb index b416a3744..99b3919df 100644 --- a/app/views/searches/index.html.erb +++ b/app/views/searches/index.html.erb @@ -4,39 +4,36 @@
    <% @recipes.each do |recipe| %> -
  • - Recipe Title: <%= recipe.label %> -
    • -
  • - Image: <%= recipe.image %> -
    • -
  • - Original URL: <%= recipe.url %> -
    • +
  • Recipe Title: <%= recipe.label %>
    • +
  • Image: <%= recipe.image %>
    • + <%= link_to recipe_path(recipe.id) do %> + <%= image_tag(recipe.image, alt: "food-porn") %> + <% end %> +
  • Origin: <%= recipe.uri %>
    • -
  • - Ingredients: +
  • Ingredients:
      - <% recipe.ingredientLines.each do |ingredient| %> -
    • - <%= ingredient %> -
      • + <% if recipe.ingredientLines %> + <% @recipe.ingredientLines.length.times do |i| %> +
    • <%= @recipe.ingredientLines[i] %>
      • <% end %>
    + <% end %>
    • -
  • - Dietary Restrictions: +
  • Dietary Restrictions:
      - <% recipe.healthLabels.each do |label| %> -
    • - <%= label %> -
      • + <% if recipe.healthLabels %> + <% @recipe.healthLabels.length.times do |i| %> +
    • <%= @recipe.healthLabels[i] %>
      • <% end %>
    + <% end %>
    • + <% end %>
+ <% end %> - + diff --git a/app/views/searches/new.html.erb b/app/views/searches/new.html.erb deleted file mode 100644 index c5551111c..000000000 --- a/app/views/searches/new.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -

Search for Recipes by Ingredient

- -<%= form_tag found_recipes_path, method: "post" do %> - <%= label_tag(:search, "Enter Food:") %> - <%= text_field_tag(:search) %> - <%= submit_tag("Send") %> - -<% end %> diff --git a/app/views/searches/root.html.erb b/app/views/searches/root.html.erb new file mode 100644 index 000000000..45fb36906 --- /dev/null +++ b/app/views/searches/root.html.erb @@ -0,0 +1,8 @@ +

Search for Recipes by Ingredient

+ +<%= form_tag( '/searches/index', :method => :get ) do %> +<%= label_tag(:recipe, "Search for:") %> +<%= text_field_tag(:recipe) %> +<%= submit_tag("Send") %> + +<% end %> diff --git a/app/views/searches/show.html.erb b/app/views/searches/show.html.erb index e69de29bb..8c646fa7f 100644 --- a/app/views/searches/show.html.erb +++ b/app/views/searches/show.html.erb @@ -0,0 +1,35 @@ +
+

Recipe Details

+ +
    +
  • Recipe Title: <%= @recipe.label %>
    • +
  • Image: <%= image_tag(@recipe.image, alt: "food-porn") %>
    • +
  • Origin: <%= @recipe.uri %>
    • + +
  • Ingredients: +
      + <% if @recipe.ingredientLines %> + <% @recipe.ingredientLines.length.times do |i| %> +
    • <%= @recipe.ingredientLines[i] %>
      • + <% else %> +
    • N/A
      • + <% end %> +
    + <% end %> +
    • + +
  • Dietary Restrictions: +
      + <% if @recipe.healthLabels %> + <% @recipe.healthLabels.length.times do |i| %> +
    • <%= @recipe.healthLabels[i] %>
      • + <% else %> +
    • N/A
      • + <% end %> +
    + <% end %> +
    • + +
+ +
diff --git a/config/routes.rb b/config/routes.rb index 26b953d6a..3fe4eb18c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,13 +1,9 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - root 'searches#new' - - post '/', to: 'searches#create', as: 'found_recipes' - - get ':searches/new', to: 'searches#new', as: 'search' + root 'searches#root' get ':searches/index', to: 'searches#index', as: 'results' - get ':searches/:id', to: 'searches#show', as: 'recipe' + get 'searches/:id', to: 'searches#show', as: 'recipe' end diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index b204e8fa5..a2f54bc55 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -1,9 +1,10 @@ require 'httparty' class EdamamApiWrapper + RECIPE_URI = "http%3A%2F%2Fwww.edamam.com%2Fontologies%2Fedamam.owl%23recipe_" BASE_URL = "https://api.edamam.com/search" - ID = ENV[APP_ID] - KEY = ENV[APP_KEY] + ID = ENV["APP_ID"] + KEY = ENV["APP_KEY"] def self.search_recipes(query) url = BASE_URL + "?app_id=#{ID}" + "&app_key=#{KEY}" + "&q=#{query}" @@ -14,25 +15,44 @@ def self.search_recipes(query) recipe_list = [] - if response["hits"] - response["hits"].each do |hit| + if response["hits"]["recipe"] + response["hits"]["recipe"].each do |hit| recipe_list << create_recipe(hit) - end + else + return [] + end + return recipe_list + end + + + def self.show_recipe(id) + url = BASE_URL + "?app_id=#{ID}" + "&app_key=#{KEY}" + "&r=" + RECIPE_URI + "#{id}" + + response = HTTParty.get(url) + if response.success? + recipe = EdamamApiWrapper.create_recipe(response) + binding.pry + return recipe end - return search_list end private + def self.id_from_uri(uri) + return uri.split("_")[1] + end + def self.create_recipe(api_params) return Recipe.new( + api_params[0]["label"], + api_params[0]["image"], + api_params[0]["uri"], + api_params[0]["url"], { - label: api_params["recipe"]["label"], - image: api_params["recipe"]["label"], - url: api_params["recipe"]["url"], - ingredientLines: api_params["recipe"]["ingredientLines"], - healthLabels: api_params["recipe"]["healthLabels"] + id: self.id_from_uri(api_params[0]["uri"]), + ingredientLines: api_params[0]["ingredientLines"], + ehalthLabels: api_params[0]["healthLabels"] } ) end diff --git a/lib/recipe.rb b/lib/recipe.rb index be848ac76..83164b1d8 100644 --- a/lib/recipe.rb +++ b/lib/recipe.rb @@ -1,23 +1,15 @@ class Recipe -<<<<<<< HEAD - attr_reader :label, :image, :url, :ingredientLines, :healthLabels + attr_reader :label, :image, :uri, :url, :id, :ingredientLines, :healthLabels - def initialize(options = {} ) - raise ArgumentError if options[:label] == nil || options[:label] == "" || options[:url] == nil || options[:url] == "" || options[:image] == nil || options[:image] == "" - - @label = options[:label] - @image = options[:image] - @url = options[:url] -======= - attr_reader :label, :image, :url, :ingredientLines, :healthlabels - - def initialize(label, image, url, ingredients, options = {} ) - raise ArgumentError if label == nil || label == "" || url == nil || url == "" || image == nil || image == "" + def initialize(label, image, uri, url, id, options = {} ) + raise ArgumentError if label == nil || label == "" || uri == nil || uri == "" || image == nil || image == "" @label = label @image = image + @uri = uri @url = url ->>>>>>> 273789d7df17bf7c77e9864cfca23e94f8566734 + @id = uri.split("_")[1] + @ingredientLines = options[:ingredientLines] @healthLabels = options[:healthLabels] end From a5c2cdaf8717635b060e050ebb045cc440ada3de Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Sun, 4 Nov 2018 23:51:54 -0800 Subject: [PATCH 10/11] updated show and index html so that they were working independently. Updated Api Wrapper --- app/views/searches/index.html.erb | 2 -- app/views/searches/show.html.erb | 20 ++++++++++---------- lib/edamam_api_wrapper.rb | 25 +++++++++++++++++++------ 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/app/views/searches/index.html.erb b/app/views/searches/index.html.erb index 99b3919df..c5fb94080 100644 --- a/app/views/searches/index.html.erb +++ b/app/views/searches/index.html.erb @@ -5,11 +5,9 @@
    <% @recipes.each do |recipe| %>
  • Recipe Title: <%= recipe.label %>
    • -
  • Image: <%= recipe.image %>
    • <%= link_to recipe_path(recipe.id) do %> <%= image_tag(recipe.image, alt: "food-porn") %> <% end %> -
  • Origin: <%= recipe.uri %>
  • Ingredients:
      diff --git a/app/views/searches/show.html.erb b/app/views/searches/show.html.erb index 8c646fa7f..eb29ec189 100644 --- a/app/views/searches/show.html.erb +++ b/app/views/searches/show.html.erb @@ -1,30 +1,30 @@

      Recipe Details

      -
        -
      • Recipe Title: <%= @recipe.label %>
        • -
      • Image: <%= image_tag(@recipe.image, alt: "food-porn") %>
        • -
      • Origin: <%= @recipe.uri %>
        • +
        <%= @recipe.label %>
        + <%= image_tag(@recipe.image, alt: "food-porn") %> +
        Origin: <%= link_to @recipe.url, @recipe.url, :target => "_blank" %>
        -
      • Ingredients: +
          +
        • Recipe Ingredients(all the good stuff you'll need): + <% if @recipe.ingredientLines %>
            - <% if @recipe.ingredientLines %> <% @recipe.ingredientLines.length.times do |i| %>
          • <%= @recipe.ingredientLines[i] %>
            • <% else %> -
          • N/A
            • +

          • N/A

            • <% end %>
          <% end %>
          • -
        • Dietary Restrictions: +
        • Dietary Restrictions(your guide to allergens): + <% if @recipe.healthLabels %>
            - <% if @recipe.healthLabels %> <% @recipe.healthLabels.length.times do |i| %>
          • <%= @recipe.healthLabels[i] %>
            • <% else %> -
          • N/A
            • +

          • N/A

            • <% end %>
          <% end %> diff --git a/lib/edamam_api_wrapper.rb b/lib/edamam_api_wrapper.rb index a2f54bc55..44b28e33e 100644 --- a/lib/edamam_api_wrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -15,8 +15,8 @@ def self.search_recipes(query) recipe_list = [] - if response["hits"]["recipe"] - response["hits"]["recipe"].each do |hit| + if response["hits"] + response["hits"].each do |hit| recipe_list << create_recipe(hit) end else @@ -31,12 +31,12 @@ def self.show_recipe(id) response = HTTParty.get(url) if response.success? - recipe = EdamamApiWrapper.create_recipe(response) - binding.pry + recipe = EdamamApiWrapper.build_a_recipe(response) return recipe end end + private def self.id_from_uri(uri) @@ -44,6 +44,20 @@ def self.id_from_uri(uri) end def self.create_recipe(api_params) + return Recipe.new( + api_params["recipe"]["label"], + api_params["recipe"]["image"], + api_params["recipe"]["uri"], + api_params["recipe"]["url"], + { + id: self.id_from_uri(api_params["recipe"]["uri"]), + ingredientLines: api_params["recipe"]["ingredientLines"], + healthLabels: api_params["recipe"]["healthLabels"] + } + ) + end + + def self.build_a_recipe(api_params) return Recipe.new( api_params[0]["label"], api_params[0]["image"], @@ -52,10 +66,9 @@ def self.create_recipe(api_params) { id: self.id_from_uri(api_params[0]["uri"]), ingredientLines: api_params[0]["ingredientLines"], - ehalthLabels: api_params[0]["healthLabels"] + healthLabels: api_params[0]["healthLabels"] } ) end - end From 70b778dce7b3cdafeb824632c66847d3af06765c Mon Sep 17 00:00:00 2001 From: Amber Lynn Date: Sun, 4 Nov 2018 23:58:41 -0800 Subject: [PATCH 11/11] updated small changes --- app/views/searches/index.html.erb | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/app/views/searches/index.html.erb b/app/views/searches/index.html.erb index c5fb94080..7241c5d66 100644 --- a/app/views/searches/index.html.erb +++ b/app/views/searches/index.html.erb @@ -8,30 +8,8 @@ <%= link_to recipe_path(recipe.id) do %> <%= image_tag(recipe.image, alt: "food-porn") %> <% end %> - -
        • Ingredients: -
            - <% if recipe.ingredientLines %> - <% @recipe.ingredientLines.length.times do |i| %> -
          • <%= @recipe.ingredientLines[i] %>
            • - <% end %> -
          - <% end %> -
          • - -
        • Dietary Restrictions: -
            - <% if recipe.healthLabels %> - <% @recipe.healthLabels.length.times do |i| %> -
          • <%= @recipe.healthLabels[i] %>
            • - <% end %> -
          - <% end %> -
          • <% end %> -
        - <% end %>