From 530c5a12e2ffb447e2cbdb3f6a6a755f29ca20a3 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Tue, 2 May 2017 11:30:29 -0700 Subject: [PATCH 01/52] create new rails app --- .gitignore | 17 + Gemfile | 64 ++ Gemfile.lock | 213 ++++++ Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 19 + app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/_settings.scss | 620 ++++++++++++++++++ app/assets/stylesheets/application.css | 17 + .../stylesheets/foundation_and_overrides.scss | 53 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 3 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 19 + 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 | 34 + bin/spring | 17 + bin/update | 29 + config.ru | 5 + config/application.rb | 19 + config/boot.rb | 3 + config/cable.yml | 9 + config/database.yml | 85 +++ config/environment.rb | 5 + config/environments/development.rb | 54 ++ config/environments/production.rb | 86 +++ config/environments/test.rb | 42 ++ .../application_controller_renderer.rb | 6 + config/initializers/assets.rb | 11 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/new_framework_defaults.rb | 24 + config/initializers/session_store.rb | 3 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 23 + config/puma.rb | 47 ++ config/routes.rb | 3 + config/secrets.yml | 22 + config/spring.rb | 6 + db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 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 | 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/test_helper.rb | 26 + tmp/.keep | 0 vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 76 files changed, 1922 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/_settings.scss create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/assets/stylesheets/foundation_and_overrides.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 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/new_framework_defaults.rb create mode 100644 config/initializers/session_store.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/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/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/assets/javascripts/.keep create mode 100644 vendor/assets/stylesheets/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..48fb168f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# 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 Byebug command history file. +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..4c2fff2cd --- /dev/null +++ b/Gemfile @@ -0,0 +1,64 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.2' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.2' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platform: :mri +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development do + gem 'better_errors' + gem 'pry-rails' + gem 'foundation-rails' +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..31c2d4afc --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,213 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.2) + activesupport (= 5.0.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (7.1.4) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + bindex (0.5.0) + builder (3.2.3) + byebug (9.0.6) + coderay (1.1.1) + coffee-rails (4.2.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.2.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + foundation-rails (6.3.1.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + jbuilder (2.6.3) + activesupport (>= 3.0.0, < 5.2) + multi_json (~> 1.2) + jquery-rails (4.3.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.5) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.14) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + multi_json (1.12.1) + nio4r (2.0.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) + pg (0.20.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.8.2) + rack (2.0.1) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + ruby-progressbar (1.8.1) + sass (3.4.23) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + slop (3.6.0) + spring (2.0.1) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.7) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.1) + tzinfo (1.2.3) + thread_safe (~> 0.1) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) + web-console (3.5.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + byebug + coffee-rails (~> 4.2) + foundation-rails + jbuilder (~> 2.5) + jquery-rails + listen (~> 3.0.5) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.0) + rails (~> 5.0.2) + sass-rails (~> 5.0) + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 1.14.6 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..32980d96f --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,19 @@ +// 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, vendor/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 jquery +//= require jquery_ujs +//= require foundation +//= require turbolinks +//= require_tree . + +$(function(){ $(document).foundation(); }); diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 000000000..71ee1e66d --- /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/_settings.scss b/app/assets/stylesheets/_settings.scss new file mode 100644 index 000000000..af784b6d6 --- /dev/null +++ b/app/assets/stylesheets/_settings.scss @@ -0,0 +1,620 @@ +// Foundation for Sites Settings +// ----------------------------- +// +// Table of Contents: +// +// 1. Global +// 2. Breakpoints +// 3. The Grid +// 4. Base Typography +// 5. Typography Helpers +// 6. Abide +// 7. Accordion +// 8. Accordion Menu +// 9. Badge +// 10. Breadcrumbs +// 11. Button +// 12. Button Group +// 13. Callout +// 14. Card +// 15. Close Button +// 16. Drilldown +// 17. Dropdown +// 18. Dropdown Menu +// 19. Forms +// 20. Label +// 21. Media Object +// 22. Menu +// 23. Meter +// 24. Off-canvas +// 25. Orbit +// 26. Pagination +// 27. Progress Bar +// 28. Responsive Embed +// 29. Reveal +// 30. Slider +// 31. Switch +// 32. Table +// 33. Tabs +// 34. Thumbnail +// 35. Title Bar +// 36. Tooltip +// 37. Top Bar + +@import 'util/util'; + +// 1. Global +// --------- + +$global-font-size: 100%; +$global-width: rem-calc(1200); +$global-lineheight: 1.5; +$foundation-palette: ( + primary: #1779ba, + secondary: #767676, + success: #3adb76, + warning: #ffae00, + alert: #cc4b37, +); +$light-gray: #e6e6e6; +$medium-gray: #cacaca; +$dark-gray: #8a8a8a; +$black: #0a0a0a; +$white: #fefefe; +$body-background: $white; +$body-font-color: $black; +$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; +$body-antialiased: true; +$global-margin: 1rem; +$global-padding: 1rem; +$global-weight-normal: normal; +$global-weight-bold: bold; +$global-radius: 0; +$global-text-direction: ltr; +$global-flexbox: false; +$print-transparent-backgrounds: true; + +@include add-foundation-colors; + +// 2. Breakpoints +// -------------- + +$breakpoints: ( + small: 0, + medium: 640px, + large: 1024px, + xlarge: 1200px, + xxlarge: 1440px, +); +$print-breakpoint: large; +$breakpoint-classes: (small medium large); + +// 3. The Grid +// ----------- + +$grid-row-width: $global-width; +$grid-column-count: 12; +$grid-column-gutter: ( + small: 20px, + medium: 30px, +); +$grid-column-align-edge: true; +$block-grid-max: 8; + +// 4. Base Typography +// ------------------ + +$header-font-family: $body-font-family; +$header-font-weight: $global-weight-normal; +$header-font-style: normal; +$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; +$header-color: inherit; +$header-lineheight: 1.4; +$header-margin-bottom: 0.5rem; +$header-styles: ( + small: ( + 'h1': ('font-size': 24), + 'h2': ('font-size': 20), + 'h3': ('font-size': 19), + 'h4': ('font-size': 18), + 'h5': ('font-size': 17), + 'h6': ('font-size': 16), + ), + medium: ( + 'h1': ('font-size': 48), + 'h2': ('font-size': 40), + 'h3': ('font-size': 31), + 'h4': ('font-size': 25), + 'h5': ('font-size': 20), + 'h6': ('font-size': 16), + ), +); +$header-text-rendering: optimizeLegibility; +$small-font-size: 80%; +$header-small-font-color: $medium-gray; +$paragraph-lineheight: 1.6; +$paragraph-margin-bottom: 1rem; +$paragraph-text-rendering: optimizeLegibility; +$code-color: $black; +$code-font-family: $font-family-monospace; +$code-font-weight: $global-weight-normal; +$code-background: $light-gray; +$code-border: 1px solid $medium-gray; +$code-padding: rem-calc(2 5 1); +$anchor-color: $primary-color; +$anchor-color-hover: scale-color($anchor-color, $lightness: -14%); +$anchor-text-decoration: none; +$anchor-text-decoration-hover: none; +$hr-width: $global-width; +$hr-border: 1px solid $medium-gray; +$hr-margin: rem-calc(20) auto; +$list-lineheight: $paragraph-lineheight; +$list-margin-bottom: $paragraph-margin-bottom; +$list-style-type: disc; +$list-style-position: outside; +$list-side-margin: 1.25rem; +$list-nested-side-margin: 1.25rem; +$defnlist-margin-bottom: 1rem; +$defnlist-term-weight: $global-weight-bold; +$defnlist-term-margin-bottom: 0.3rem; +$blockquote-color: $dark-gray; +$blockquote-padding: rem-calc(9 20 0 19); +$blockquote-border: 1px solid $medium-gray; +$cite-font-size: rem-calc(13); +$cite-color: $dark-gray; +$cite-pseudo-content: '\2014 \0020'; +$keystroke-font: $font-family-monospace; +$keystroke-color: $black; +$keystroke-background: $light-gray; +$keystroke-padding: rem-calc(2 4 0); +$keystroke-radius: $global-radius; +$abbr-underline: 1px dotted $black; + +// 5. Typography Helpers +// --------------------- + +$lead-font-size: $global-font-size * 1.25; +$lead-lineheight: 1.6; +$subheader-lineheight: 1.4; +$subheader-color: $dark-gray; +$subheader-font-weight: $global-weight-normal; +$subheader-margin-top: 0.2rem; +$subheader-margin-bottom: 0.5rem; +$stat-font-size: 2.5rem; + +// 6. Abide +// -------- + +$abide-inputs: true; +$abide-labels: true; +$input-background-invalid: get-color(alert); +$form-label-color-invalid: get-color(alert); +$input-error-color: get-color(alert); +$input-error-font-size: rem-calc(12); +$input-error-font-weight: $global-weight-bold; + +// 7. Accordion +// ------------ + +$accordion-background: $white; +$accordion-plusminus: true; +$accordion-title-font-size: rem-calc(12); +$accordion-item-color: $primary-color; +$accordion-item-background-hover: $light-gray; +$accordion-item-padding: 1.25rem 1rem; +$accordion-content-background: $white; +$accordion-content-border: 1px solid $light-gray; +$accordion-content-color: $body-font-color; +$accordion-content-padding: 1rem; + +// 8. Accordion Menu +// ----------------- + +$accordionmenu-arrows: true; +$accordionmenu-arrow-color: $primary-color; +$accordionmenu-arrow-size: 6px; + +// 9. Badge +// -------- + +$badge-background: $primary-color; +$badge-color: $white; +$badge-color-alt: $black; +$badge-palette: $foundation-palette; +$badge-padding: 0.3em; +$badge-minwidth: 2.1em; +$badge-font-size: 0.6rem; + +// 10. Breadcrumbs +// --------------- + +$breadcrumbs-margin: 0 0 $global-margin 0; +$breadcrumbs-item-font-size: rem-calc(11); +$breadcrumbs-item-color: $primary-color; +$breadcrumbs-item-color-current: $black; +$breadcrumbs-item-color-disabled: $medium-gray; +$breadcrumbs-item-margin: 0.75rem; +$breadcrumbs-item-uppercase: true; +$breadcrumbs-item-slash: true; + +// 11. Button +// ---------- + +$button-padding: 0.85em 1em; +$button-margin: 0 0 $global-margin 0; +$button-fill: solid; +$button-background: $primary-color; +$button-background-hover: scale-color($button-background, $lightness: -15%); +$button-color: $white; +$button-color-alt: $black; +$button-radius: $global-radius; +$button-sizes: ( + tiny: 0.6rem, + small: 0.75rem, + default: 0.9rem, + large: 1.25rem, +); +$button-palette: $foundation-palette; +$button-opacity-disabled: 0.25; +$button-background-hover-lightness: -20%; +$button-hollow-hover-lightness: -50%; +$button-transition: background-color 0.25s ease-out, color 0.25s ease-out; + +// 12. Button Group +// ---------------- + +$buttongroup-margin: 1rem; +$buttongroup-spacing: 1px; +$buttongroup-child-selector: '.button'; +$buttongroup-expand-max: 6; +$buttongroup-radius-on-each: true; + +// 13. Callout +// ----------- + +$callout-background: $white; +$callout-background-fade: 85%; +$callout-border: 1px solid rgba($black, 0.25); +$callout-margin: 0 0 1rem 0; +$callout-padding: 1rem; +$callout-font-color: $body-font-color; +$callout-font-color-alt: $body-background; +$callout-radius: $global-radius; +$callout-link-tint: 30%; + +// 14. Card +// -------- + +$card-background: $white; +$card-font-color: $body-font-color; +$card-divider-background: $light-gray; +$card-border: 1px solid $light-gray; +$card-shadow: none; +$card-border-radius: $global-radius; +$card-padding: $global-padding; +$card-margin: $global-margin; + +// 15. Close Button +// ---------------- + +$closebutton-position: right top; +$closebutton-offset-horizontal: ( + small: 0.66rem, + medium: 1rem, +); +$closebutton-offset-vertical: ( + small: 0.33em, + medium: 0.5rem, +); +$closebutton-size: ( + small: 1.5em, + medium: 2em, +); +$closebutton-lineheight: 1; +$closebutton-color: $dark-gray; +$closebutton-color-hover: $black; + +// 16. Drilldown +// ------------- + +$drilldown-transition: transform 0.15s linear; +$drilldown-arrows: true; +$drilldown-arrow-color: $primary-color; +$drilldown-arrow-size: 6px; +$drilldown-background: $white; + +// 17. Dropdown +// ------------ + +$dropdown-padding: 1rem; +$dropdown-background: $body-background; +$dropdown-border: 1px solid $medium-gray; +$dropdown-font-size: 1rem; +$dropdown-width: 300px; +$dropdown-radius: $global-radius; +$dropdown-sizes: ( + tiny: 100px, + small: 200px, + large: 400px, +); + +// 18. Dropdown Menu +// ----------------- + +$dropdownmenu-arrows: true; +$dropdownmenu-arrow-color: $anchor-color; +$dropdownmenu-arrow-size: 6px; +$dropdownmenu-min-width: 200px; +$dropdownmenu-background: $white; +$dropdownmenu-border: 1px solid $medium-gray; + +// 19. Forms +// --------- + +$fieldset-border: 1px solid $medium-gray; +$fieldset-padding: rem-calc(20); +$fieldset-margin: rem-calc(18 0); +$legend-padding: rem-calc(0 3); +$form-spacing: rem-calc(16); +$helptext-color: $black; +$helptext-font-size: rem-calc(13); +$helptext-font-style: italic; +$input-prefix-color: $black; +$input-prefix-background: $light-gray; +$input-prefix-border: 1px solid $medium-gray; +$input-prefix-padding: 1rem; +$form-label-color: $black; +$form-label-font-size: rem-calc(14); +$form-label-font-weight: $global-weight-normal; +$form-label-line-height: 1.8; +$select-background: $white; +$select-triangle-color: $dark-gray; +$select-radius: $global-radius; +$input-color: $black; +$input-placeholder-color: $medium-gray; +$input-font-family: inherit; +$input-font-size: rem-calc(16); +$input-font-weight: $global-weight-normal; +$input-background: $white; +$input-background-focus: $white; +$input-background-disabled: $light-gray; +$input-border: 1px solid $medium-gray; +$input-border-focus: 1px solid $dark-gray; +$input-shadow: inset 0 1px 2px rgba($black, 0.1); +$input-shadow-focus: 0 0 5px $medium-gray; +$input-cursor-disabled: not-allowed; +$input-transition: box-shadow 0.5s, border-color 0.25s ease-in-out; +$input-number-spinners: true; +$input-radius: $global-radius; +$form-button-radius: $global-radius; + +// 20. Label +// --------- + +$label-background: $primary-color; +$label-color: $white; +$label-color-alt: $black; +$label-palette: $foundation-palette; +$label-font-size: 0.8rem; +$label-padding: 0.33333rem 0.5rem; +$label-radius: $global-radius; + +// 21. Media Object +// ---------------- + +$mediaobject-margin-bottom: $global-margin; +$mediaobject-section-padding: $global-padding; +$mediaobject-image-width-stacked: 100%; + +// 22. Menu +// -------- + +$menu-margin: 0; +$menu-margin-nested: 1rem; +$menu-item-padding: 0.7rem 1rem; +$menu-item-color-active: $white; +$menu-item-background-active: get-color(primary); +$menu-icon-spacing: 0.25rem; +$menu-item-background-hover: $light-gray; +$menu-border: $light-gray; + +// 23. Meter +// --------- + +$meter-height: 1rem; +$meter-radius: $global-radius; +$meter-background: $medium-gray; +$meter-fill-good: $success-color; +$meter-fill-medium: $warning-color; +$meter-fill-bad: $alert-color; + +// 24. Off-canvas +// -------------- + +$offcanvas-size: 250px; +$offcanvas-vertical-size: 250px; +$offcanvas-background: $light-gray; +$offcanvas-shadow: 0 0 10px rgba($black, 0.7); +$offcanvas-push-zindex: 1; +$offcanvas-overlap-zindex: 10; +$offcanvas-reveal-zindex: 1; +$offcanvas-transition-length: 0.5s; +$offcanvas-transition-timing: ease; +$offcanvas-fixed-reveal: true; +$offcanvas-exit-background: rgba($white, 0.25); +$maincontent-class: 'off-canvas-content'; + +// 25. Orbit +// --------- + +$orbit-bullet-background: $medium-gray; +$orbit-bullet-background-active: $dark-gray; +$orbit-bullet-diameter: 1.2rem; +$orbit-bullet-margin: 0.1rem; +$orbit-bullet-margin-top: 0.8rem; +$orbit-bullet-margin-bottom: 0.8rem; +$orbit-caption-background: rgba($black, 0.5); +$orbit-caption-padding: 1rem; +$orbit-control-background-hover: rgba($black, 0.5); +$orbit-control-padding: 1rem; +$orbit-control-zindex: 10; + +// 26. Pagination +// -------------- + +$pagination-font-size: rem-calc(14); +$pagination-margin-bottom: $global-margin; +$pagination-item-color: $black; +$pagination-item-padding: rem-calc(3 10); +$pagination-item-spacing: rem-calc(1); +$pagination-radius: $global-radius; +$pagination-item-background-hover: $light-gray; +$pagination-item-background-current: $primary-color; +$pagination-item-color-current: $white; +$pagination-item-color-disabled: $medium-gray; +$pagination-ellipsis-color: $black; +$pagination-mobile-items: false; +$pagination-mobile-current-item: false; +$pagination-arrows: true; + +// 27. Progress Bar +// ---------------- + +$progress-height: 1rem; +$progress-background: $medium-gray; +$progress-margin-bottom: $global-margin; +$progress-meter-background: $primary-color; +$progress-radius: $global-radius; + +// 28. Responsive Embed +// -------------------- + +$responsive-embed-margin-bottom: rem-calc(16); +$responsive-embed-ratios: ( + default: 4 by 3, + widescreen: 16 by 9, +); + +// 29. Reveal +// ---------- + +$reveal-background: $white; +$reveal-width: 600px; +$reveal-max-width: $global-width; +$reveal-padding: $global-padding; +$reveal-border: 1px solid $medium-gray; +$reveal-radius: $global-radius; +$reveal-zindex: 1005; +$reveal-overlay-background: rgba($black, 0.45); + +// 30. Slider +// ---------- + +$slider-width-vertical: 0.5rem; +$slider-transition: all 0.2s ease-in-out; +$slider-height: 0.5rem; +$slider-background: $light-gray; +$slider-fill-background: $medium-gray; +$slider-handle-height: 1.4rem; +$slider-handle-width: 1.4rem; +$slider-handle-background: $primary-color; +$slider-opacity-disabled: 0.25; +$slider-radius: $global-radius; + +// 31. Switch +// ---------- + +$switch-background: $medium-gray; +$switch-background-active: $primary-color; +$switch-height: 2rem; +$switch-height-tiny: 1.5rem; +$switch-height-small: 1.75rem; +$switch-height-large: 2.5rem; +$switch-radius: $global-radius; +$switch-margin: $global-margin; +$switch-paddle-background: $white; +$switch-paddle-offset: 0.25rem; +$switch-paddle-radius: $global-radius; +$switch-paddle-transition: all 0.25s ease-out; + +// 32. Table +// --------- + +$table-background: $white; +$table-color-scale: 5%; +$table-border: 1px solid smart-scale($table-background, $table-color-scale); +$table-padding: rem-calc(8 10 10); +$table-hover-scale: 2%; +$table-row-hover: darken($table-background, $table-hover-scale); +$table-row-stripe-hover: darken($table-background, $table-color-scale + $table-hover-scale); +$table-is-striped: true; +$table-striped-background: smart-scale($table-background, $table-color-scale); +$table-stripe: even; +$table-head-background: smart-scale($table-background, $table-color-scale / 2); +$table-head-row-hover: darken($table-head-background, $table-hover-scale); +$table-foot-background: smart-scale($table-background, $table-color-scale); +$table-foot-row-hover: darken($table-foot-background, $table-hover-scale); +$table-head-font-color: $body-font-color; +$table-foot-font-color: $body-font-color; +$show-header-for-stacked: false; + +// 33. Tabs +// -------- + +$tab-margin: 0; +$tab-background: $white; +$tab-color: $primary-color; +$tab-background-active: $light-gray; +$tab-active-color: $primary-color; +$tab-item-font-size: rem-calc(12); +$tab-item-background-hover: $white; +$tab-item-padding: 1.25rem 1.5rem; +$tab-expand-max: 6; +$tab-content-background: $white; +$tab-content-border: $light-gray; +$tab-content-color: $body-font-color; +$tab-content-padding: 1rem; + +// 34. Thumbnail +// ------------- + +$thumbnail-border: solid 4px $white; +$thumbnail-margin-bottom: $global-margin; +$thumbnail-shadow: 0 0 0 1px rgba($black, 0.2); +$thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, 0.5); +$thumbnail-transition: box-shadow 200ms ease-out; +$thumbnail-radius: $global-radius; + +// 35. Title Bar +// ------------- + +$titlebar-background: $black; +$titlebar-color: $white; +$titlebar-padding: 0.5rem; +$titlebar-text-font-weight: bold; +$titlebar-icon-color: $white; +$titlebar-icon-color-hover: $medium-gray; +$titlebar-icon-spacing: 0.25rem; + +// 36. Tooltip +// ----------- + +$has-tip-font-weight: $global-weight-bold; +$has-tip-border-bottom: dotted 1px $dark-gray; +$tooltip-background-color: $black; +$tooltip-color: $white; +$tooltip-padding: 0.75rem; +$tooltip-font-size: $small-font-size; +$tooltip-pip-width: 0.75rem; +$tooltip-pip-height: $tooltip-pip-width * 0.866; +$tooltip-radius: $global-radius; + +// 37. Top Bar +// ----------- + +$topbar-padding: 0.5rem; +$topbar-background: $light-gray; +$topbar-submenu-background: $topbar-background; +$topbar-title-spacing: 0.5rem 1rem 0.5rem 0; +$topbar-input-width: 200px; +$topbar-unstack-breakpoint: medium; diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..d89149d1b --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,17 @@ +/* + * 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, vendor/assets/stylesheets, + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + *= require foundation_and_overrides + + */ diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss new file mode 100644 index 000000000..206615508 --- /dev/null +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -0,0 +1,53 @@ +@charset 'utf-8'; + +@import 'settings'; +@import 'foundation'; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +// @import 'motion-ui/motion-ui'; + +// We include everything by default. To slim your CSS, remove components you don't use. + +@include foundation-global-styles; +@include foundation-grid; +@include foundation-typography; +@include foundation-button; +@include foundation-forms; +@include foundation-visibility-classes; +@include foundation-float-classes; +@include foundation-accordion; +@include foundation-accordion-menu; +@include foundation-badge; +@include foundation-breadcrumbs; +@include foundation-button-group; +@include foundation-callout; +@include foundation-card; +@include foundation-close-button; +@include foundation-drilldown-menu; +@include foundation-dropdown; +@include foundation-dropdown-menu; +@include foundation-responsive-embed; +@include foundation-label; +@include foundation-media-object; +@include foundation-menu; +@include foundation-menu-icon; +@include foundation-off-canvas; +@include foundation-orbit; +@include foundation-pagination; +@include foundation-progress-bar; +@include foundation-slider; +@include foundation-sticky; +@include foundation-reveal; +@include foundation-switch; +@include foundation-table; +@include foundation-tabs; +@include foundation-thumbnail; +@include foundation-title-bar; +@include foundation-tooltip; +@include foundation-top-bar; + +// If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. +// +// @include motion-ui-transitions; +// @include motion-ui-animations; diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..1c07694e9 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..cd6000489 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,19 @@ + + + + + + + <%= content_for?(:title) ? yield(:title) : "Untitled" %> + + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + + + <%= yield %> + + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..e620b4dad --- /dev/null +++ b/bin/setup @@ -0,0 +1,34 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/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..4844bd4c0 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,19 @@ +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 + # Force new test files to be generated in the minitest-spec style + config.generators do |g| + g.test_framework :minitest, spec: true + end + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0bbde6f74 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..1c5ce1b69 --- /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..6f7197045 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=172800' + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..2a3bd799e --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,86 @@ +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 + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "api-muncher_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..30587ef6d --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=3600' + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..51639b67a --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..01ef3e663 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,11 @@ +# 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 + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. +# Rails.application.config.assets.precompile += %w( search.js ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..5a6a32d37 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 000000000..671abb69a --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,24 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Enable per-form CSRF tokens. Previous versions had false. +Rails.application.config.action_controller.per_form_csrf_tokens = true + +# Enable origin-checking CSRF mitigation. Previous versions had false. +Rails.application.config.action_controller.forgery_protection_origin_check = true + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb new file mode 100644 index 000000000..6cc0e03e4 --- /dev/null +++ b/config/initializers/session_store.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.session_store :cookie_store, key: '_api-muncher_session' 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..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# 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. +# +# 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..c7f311f81 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,47 @@ +# 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 }.to_i +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted this block will be run, if you are using `preload_app!` +# option you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..0cebf7a09 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: 598b1252b67ac28a16aba0bf59eae8d4e7003c0bd37e8030b329980f3f4eb98cf4bbcf69d2f513794ef7831974618106a63a12877c6c93e8902a65112d4fd7fb + +test: + secret_key_base: 9920cce07b1fc3371d2b8d1cafbd478b9062e6846bddcdebfe1f0a55ea429b48595d4e04ee50ed2402db21b8a9ce2899033a7cd614425de7322e47fc1edd2a4e + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 000000000..1beea2acc --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..b612547fc --- /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..a21f82b3b --- /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..061abc587 --- /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..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / 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/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +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/assets/javascripts/.keep b/vendor/assets/javascripts/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep new file mode 100644 index 000000000..e69de29bb From ce5a66985186a6701a7c409975cc8e13460af687 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Tue, 2 May 2017 13:06:04 -0700 Subject: [PATCH 02/52] add simplecov to app --- .gitignore | 3 +++ test/test_helper.rb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 48fb168f6..2d074bec8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,6 @@ # Ignore Byebug command history file. .byebug_history + +.env +Coverage diff --git a/test/test_helper.rb b/test/test_helper.rb index 10594a324..5b04446ae 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,6 @@ +require 'simplecov' +SimpleCov.start 'rails' + ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" From abd7bed43d93a5382620847e9e305fd568610221 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Tue, 2 May 2017 13:20:57 -0700 Subject: [PATCH 03/52] add recipes controller --- app/assets/javascripts/recipes.coffee | 3 +++ app/assets/stylesheets/recipes.scss | 3 +++ app/controllers/recipes_controller.rb | 4 ++++ app/helpers/recipes_helper.rb | 2 ++ app/views/recipes/index.html.erb | 2 ++ config/routes.rb | 2 ++ test/controllers/recipes_controller_test.rb | 9 +++++++++ 7 files changed, 25 insertions(+) create mode 100644 app/assets/javascripts/recipes.coffee create mode 100644 app/assets/stylesheets/recipes.scss create mode 100644 app/controllers/recipes_controller.rb create mode 100644 app/helpers/recipes_helper.rb create mode 100644 app/views/recipes/index.html.erb create mode 100644 test/controllers/recipes_controller_test.rb diff --git a/app/assets/javascripts/recipes.coffee b/app/assets/javascripts/recipes.coffee new file mode 100644 index 000000000..24f83d18b --- /dev/null +++ b/app/assets/javascripts/recipes.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/recipes.scss b/app/assets/stylesheets/recipes.scss new file mode 100644 index 000000000..1e10ffa50 --- /dev/null +++ b/app/assets/stylesheets/recipes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the recipes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb new file mode 100644 index 000000000..923d5b9b0 --- /dev/null +++ b/app/controllers/recipes_controller.rb @@ -0,0 +1,4 @@ +class RecipesController < ApplicationController + def index + end +end diff --git a/app/helpers/recipes_helper.rb b/app/helpers/recipes_helper.rb new file mode 100644 index 000000000..f526316e2 --- /dev/null +++ b/app/helpers/recipes_helper.rb @@ -0,0 +1,2 @@ +module RecipesHelper +end diff --git a/app/views/recipes/index.html.erb b/app/views/recipes/index.html.erb new file mode 100644 index 000000000..a55bf9993 --- /dev/null +++ b/app/views/recipes/index.html.erb @@ -0,0 +1,2 @@ +

Recipes#index

+

Find me in app/views/recipes/index.html.erb

diff --git a/config/routes.rb b/config/routes.rb index 787824f88..8a914e1a1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do + get 'recipes/index' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/recipes_controller_test.rb b/test/controllers/recipes_controller_test.rb new file mode 100644 index 000000000..f8b68cdf9 --- /dev/null +++ b/test/controllers/recipes_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe RecipesController do + it "should get index" do + get recipes_index_url + value(response).must_be :success? + end + +end From dab9cde221a1f20d1f981f1bc42f9e6e107841d8 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Tue, 2 May 2017 13:24:50 -0700 Subject: [PATCH 04/52] add gems to dev-test --- Gemfile | 4 ++++ Gemfile.lock | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/Gemfile b/Gemfile index 4c2fff2cd..761f45279 100644 --- a/Gemfile +++ b/Gemfile @@ -38,6 +38,10 @@ gem 'jbuilder', '~> 2.5' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platform: :mri + gem 'binding_of_caller' + gem 'minitest-vcr' + gem 'webmock' + gem 'dotenv-rails' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 31c2d4afc..93c811b2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,8 @@ GEM i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) + addressable (2.5.1) + public_suffix (~> 2.0, >= 2.0.2) ansi (1.5.0) arel (7.1.4) babel-source (5.8.35) @@ -49,6 +51,8 @@ GEM erubis (>= 2.6.6) rack (>= 0.9.0) bindex (0.5.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) builder (3.2.3) byebug (9.0.6) coderay (1.1.1) @@ -60,6 +64,13 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) + crack (0.4.3) + safe_yaml (~> 1.0.0) + debug_inspector (0.0.2) + dotenv (2.2.0) + dotenv-rails (2.2.0) + dotenv (= 2.2.0) + railties (>= 3.2, < 5.1) erubis (2.7.0) execjs (2.7.0) ffi (1.9.18) @@ -69,6 +80,7 @@ GEM sprockets-es6 (>= 0.9.0) globalid (0.4.0) activesupport (>= 4.2.0) + hashdiff (0.3.4) i18n (0.8.1) jbuilder (2.6.3) activesupport (>= 3.0.0, < 5.2) @@ -89,6 +101,8 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mini_portile2 (2.1.0) + minispec-metadata (2.0.0) + minitest minitest (5.10.1) minitest-rails (3.0.0) minitest (~> 5.8) @@ -98,6 +112,10 @@ GEM builder minitest (>= 5.0) ruby-progressbar + minitest-vcr (1.4.0) + minispec-metadata (~> 2.0) + minitest (>= 4.7.5) + vcr (>= 2.9) multi_json (1.12.1) nio4r (2.0.0) nokogiri (1.7.1) @@ -109,6 +127,7 @@ GEM slop (~> 3.4) pry-rails (0.3.6) pry (>= 0.10.4) + public_suffix (2.0.5) puma (3.8.2) rack (2.0.1) rack-test (0.6.3) @@ -141,6 +160,7 @@ GEM rb-inotify (0.9.8) ffi (>= 0.5.0) ruby-progressbar (1.8.1) + safe_yaml (1.0.4) sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -175,11 +195,16 @@ GEM thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) + vcr (3.0.3) web-console (3.5.0) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) + webmock (3.0.1) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -189,14 +214,17 @@ PLATFORMS DEPENDENCIES better_errors + binding_of_caller byebug coffee-rails (~> 4.2) + dotenv-rails foundation-rails jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) minitest-rails minitest-reporters + minitest-vcr pg (~> 0.18) pry-rails puma (~> 3.0) @@ -208,6 +236,7 @@ DEPENDENCIES tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) + webmock BUNDLED WITH 1.14.6 From 3368e54456259f02f5eb0e34e3d6e030e9ed8106 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Tue, 2 May 2017 13:54:50 -0700 Subject: [PATCH 05/52] add simplcov to app --- Gemfile | 1 + Gemfile.lock | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/Gemfile b/Gemfile index 761f45279..51b776e22 100644 --- a/Gemfile +++ b/Gemfile @@ -65,4 +65,5 @@ end group :test do gem 'minitest-rails' gem 'minitest-reporters' + gem 'simplecov' end diff --git a/Gemfile.lock b/Gemfile.lock index 93c811b2a..7abe0ff6a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,6 +67,7 @@ GEM crack (0.4.3) safe_yaml (~> 1.0.0) debug_inspector (0.0.2) + docile (1.1.5) dotenv (2.2.0) dotenv-rails (2.2.0) dotenv (= 2.2.0) @@ -89,6 +90,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + json (2.1.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -168,6 +170,11 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + simplecov (0.13.0) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) slop (3.6.0) spring (2.0.1) activesupport (>= 4.2) @@ -230,6 +237,7 @@ DEPENDENCIES puma (~> 3.0) rails (~> 5.0.2) sass-rails (~> 5.0) + simplecov spring spring-watcher-listen (~> 2.0.0) turbolinks (~> 5) From 97c0e91a3f96337ba07ee71ecc44c22ac04241dc Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Tue, 2 May 2017 13:55:28 -0700 Subject: [PATCH 06/52] add tests with VCR for API testing --- test/controllers/recipes_controller_test.rb | 20 ++++++++++++++++++++ test/test_helper.rb | 14 ++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/test/controllers/recipes_controller_test.rb b/test/controllers/recipes_controller_test.rb index f8b68cdf9..2dcb726e2 100644 --- a/test/controllers/recipes_controller_test.rb +++ b/test/controllers/recipes_controller_test.rb @@ -6,4 +6,24 @@ value(response).must_be :success? end + describe "API functionality" do + it "Can get a list of recipes from the real site" do + skip + VCR.use_cassette("channels") do + search = "test search" + response = RecipesController.search("", search) + response["ok"].must_equal true + # response search must equal... + end + end + + it "Can get a list of recipes from the fake site" do + skip + VCR.use_cassette("channels") do + response = RecipesController.search("invalid search", "test search") + response["ok"].must_equal false + response["error"].wont_be_nil + end + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 5b04446ae..cba1ff640 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -6,6 +6,8 @@ require "rails/test_help" require "minitest/rails" require "minitest/reporters" # for Colorized output +require 'vcr' +require 'webmock/minitest' # For colorful output! Minitest::Reporters.use!( @@ -14,6 +16,18 @@ Minitest.backtrace_filter ) +VCR.configure do |config| + config.cassette_library_dir = 'test/cassettes' # folder where casettes will be located + config.hook_into :webmock # tie into this other tool called webmock + config.default_cassette_options = { + :record => :new_episodes, # record new data when we don't have it yet + :match_requests_on => [:method, :uri, :body] # The http method, URI and body of a request all need to match + } + # Don't leave our Slack token lying around in a cassette file. + config.filter_sensitive_data("") do + ENV['EDAMAM_TOKEN'] + end +end # To add Capybara feature tests add `gem "minitest-rails-capybara"` # to the test group in the Gemfile and uncomment the following: From a455d99c2d3b6af362a4642d0ea8be897878c2bc Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Tue, 2 May 2017 14:07:41 -0700 Subject: [PATCH 07/52] compress files with gzip --- config/application.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/application.rb b/config/application.rb index 4844bd4c0..fa0cbf647 100644 --- a/config/application.rb +++ b/config/application.rb @@ -8,6 +8,9 @@ module ApiMuncher class Application < Rails::Application + # compress files with gzip + config.middleware.use Rack::Deflater + # Force new test files to be generated in the minitest-spec style config.generators do |g| g.test_framework :minitest, spec: true From 63556bf767db7e65ecd03e70f9a4ddf1f0652c15 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Tue, 2 May 2017 14:18:42 -0700 Subject: [PATCH 08/52] add httparty --- Gemfile | 5 +++++ Gemfile.lock | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/Gemfile b/Gemfile index 51b776e22..409958747 100644 --- a/Gemfile +++ b/Gemfile @@ -38,10 +38,15 @@ gem 'jbuilder', '~> 2.5' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platform: :mri + # to test in browser gem 'binding_of_caller' + # to test API efficiently gem 'minitest-vcr' gem 'webmock' + # to access .env cntent gem 'dotenv-rails' + # to access external API + gem 'httparty' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 7abe0ff6a..d62cbac1d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,6 +82,8 @@ GEM globalid (0.4.0) activesupport (>= 4.2.0) hashdiff (0.3.4) + httparty (0.14.0) + multi_xml (>= 0.5.2) i18n (0.8.1) jbuilder (2.6.3) activesupport (>= 3.0.0, < 5.2) @@ -119,6 +121,7 @@ GEM minitest (>= 4.7.5) vcr (>= 2.9) multi_json (1.12.1) + multi_xml (0.6.0) nio4r (2.0.0) nokogiri (1.7.1) mini_portile2 (~> 2.1.0) @@ -226,6 +229,7 @@ DEPENDENCIES coffee-rails (~> 4.2) dotenv-rails foundation-rails + httparty jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) From 550980896e7b457838efffe4061f9fbf0a0cbc56 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Tue, 2 May 2017 15:19:46 -0700 Subject: [PATCH 09/52] create recipes#search method --- .gitignore | 2 ++ app/controllers/recipes_controller.rb | 28 ++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2d074bec8..5132dd5de 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,6 @@ .byebug_history .env +notes.rb + Coverage diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb index 923d5b9b0..dd73e318e 100644 --- a/app/controllers/recipes_controller.rb +++ b/app/controllers/recipes_controller.rb @@ -1,4 +1,30 @@ -class RecipesController < ApplicationController +class RecipesController +# < ApplicationController + require 'httparty' + require 'dotenv/load' + require 'awesome_print' + + BASE_URL = "https://api.edamam.com/search\?" + EDAMAM_ID = ENV["EDAMAM_ID"] + EDAMAM_KEY = ENV["EDAMAM_KEY"] + def index end + + # list of recipes that are returned from a user + def self.search(terms) + query_params = { + "q" => terms, + "id" => EDAMAM_ID, + "app_key" => EDAMAM_KEY, + "from" => 0, + "to" => 0, # first recipe + "health" => "dairy-free", + } + results = HTTParty.get(BASE_URL, query: query_params) + return results["hits"] + end end + +a = RecipesController.search("beets") +ap a From 8f2d250789a9a43210defce1236774560c8b2d14 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Tue, 2 May 2017 15:52:56 -0700 Subject: [PATCH 10/52] add route for recipes#index --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 8a914e1a1..5469c62e5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do - get 'recipes/index' + get '/recipes', to: 'recipes#index', as: 'recipes' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 48a651fa3d2372e3a4c957613778b49a40484fa1 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Tue, 2 May 2017 15:53:14 -0700 Subject: [PATCH 11/52] partial form for search --- app/views/layouts/_search.html.erb | 6 ++++++ app/views/layouts/application.html.erb | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 app/views/layouts/_search.html.erb diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb new file mode 100644 index 000000000..bf8a8072b --- /dev/null +++ b/app/views/layouts/_search.html.erb @@ -0,0 +1,6 @@ +<% form_tag recipes_path, :method => 'get' do %> +

+ <%= text_field_tag :search, params[:search] %> + <%= submit_tag "Search", class: "button" %> +

+<% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cd6000489..fa4e86462 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,8 +12,11 @@ - - <%= yield %> - +
+ <%= render :search %> +
+
+ <%= yield %> +
From 1134f30215aac2af49d33434325c2252667e0323 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Wed, 3 May 2017 09:16:30 -0700 Subject: [PATCH 12/52] move apiwrapper from controller to /lib --- lib/edamam_apiwrapper.rb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 lib/edamam_apiwrapper.rb diff --git a/lib/edamam_apiwrapper.rb b/lib/edamam_apiwrapper.rb new file mode 100644 index 000000000..8cf539608 --- /dev/null +++ b/lib/edamam_apiwrapper.rb @@ -0,0 +1,26 @@ +require 'httparty' +require 'dotenv-rails' + +class EdamamApiWrapper + attr_reader :response + + BASE_URL = "https://api.edamam.com/search\?" + EDAMAM_ID = ENV["EDAMAM_ID"] + EDAMAM_KEY = ENV["EDAMAM_KEY"] + + def initialize + end + + # list of recipes that are returned from a user search + def self.find_recipes(terms) + query_params = { + "q" => terms, + "id" => EDAMAM_ID, + "app_key" => EDAMAM_KEY, + "from" => 0, + "to" => 5, # first 5 recipes + "health" => "dairy-free", + } + @response = HTTParty.get(BASE_URL, query: query_params).parsed_response + end +end From e7d535bcc3e5b2ef406bd0955967df88f8b5e861 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Wed, 3 May 2017 09:17:27 -0700 Subject: [PATCH 13/52] reference new apiwrapper in search method --- app/controllers/recipes_controller.rb | 29 +++++---------------------- 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb index dd73e318e..6ddd0ab0a 100644 --- a/app/controllers/recipes_controller.rb +++ b/app/controllers/recipes_controller.rb @@ -1,30 +1,11 @@ -class RecipesController -# < ApplicationController - require 'httparty' - require 'dotenv/load' - require 'awesome_print' - - BASE_URL = "https://api.edamam.com/search\?" - EDAMAM_ID = ENV["EDAMAM_ID"] - EDAMAM_KEY = ENV["EDAMAM_KEY"] +require 'edamam_apiwrapper' +class RecipesController < ApplicationController def index + # @recipes = EdamamApiWrapper.random end - # list of recipes that are returned from a user - def self.search(terms) - query_params = { - "q" => terms, - "id" => EDAMAM_ID, - "app_key" => EDAMAM_KEY, - "from" => 0, - "to" => 0, # first recipe - "health" => "dairy-free", - } - results = HTTParty.get(BASE_URL, query: query_params) - return results["hits"] + def search + @recipes = EdamamApiWrapper.find_recipes(params[:q]) end end - -a = RecipesController.search("beets") -ap a From 2abeffeff5ed7feee2328521746489582c5fe2a3 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Wed, 3 May 2017 09:19:12 -0700 Subject: [PATCH 14/52] add search function as a form to the app header --- app/views/layouts/application.html.erb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index fa4e86462..2b28cfedf 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,8 +13,21 @@
- <%= render :search %> +
+ <%= form_tag(search_path, method: :get) do %> + <%= label_tag "Search for recipes:" %> + <%= text_field_tag :q %> + <%= submit_tag "Search", :name => nil, class: "button" %> + <% end %> +
+ +
+ <% flash.each do |name, message| %> +
<%= message %>
+ <% end %> +
+
<%= yield %>
From c39ac8b2178b0ad8abeee803d87efef141dbe02d Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Wed, 3 May 2017 09:20:58 -0700 Subject: [PATCH 15/52] modify routes for search function --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 5469c62e5..e5409a6c1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do + root 'recipes#index' + get '/search', to: 'recipes#search', as: 'search' get '/recipes', to: 'recipes#index', as: 'recipes' - - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 36f0932b23a3dc0ce9268c0560a88faf1a323d89 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Wed, 3 May 2017 09:22:13 -0700 Subject: [PATCH 16/52] search function for recipes added to views --- app/views/layouts/_search.html.erb | 6 ------ app/views/recipes/search.html.erb | 10 ++++++++++ config/routes.rb | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 app/views/layouts/_search.html.erb create mode 100644 app/views/recipes/search.html.erb diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb deleted file mode 100644 index bf8a8072b..000000000 --- a/app/views/layouts/_search.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -<% form_tag recipes_path, :method => 'get' do %> -

- <%= text_field_tag :search, params[:search] %> - <%= submit_tag "Search", class: "button" %> -

-<% end %> diff --git a/app/views/recipes/search.html.erb b/app/views/recipes/search.html.erb new file mode 100644 index 000000000..e753dab88 --- /dev/null +++ b/app/views/recipes/search.html.erb @@ -0,0 +1,10 @@ +

This is from the search page.

+ +<% if @recipes.empty? %> + <%= flash[:message] = "No recipes found with your search." %> +<% else %> + <%= flash[:message] = "Recipes found!" %> + <%= @recipes.each do |recipe| %> + <%= puts recipe %> + <% end %> +<% end %> diff --git a/config/routes.rb b/config/routes.rb index e5409a6c1..83e8f1047 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do root 'recipes#index' - get '/search', to: 'recipes#search', as: 'search' + get '/recipes/search', to: 'recipes#search', as: 'search' get '/recipes', to: 'recipes#index', as: 'recipes' end From f23a00de63b9205a0bb0217bf3df6af5281c12a2 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Wed, 3 May 2017 15:47:34 -0700 Subject: [PATCH 17/52] refactor apiwrapper --- app/assets/stylesheets/application.css | 4 ++++ app/views/layouts/application.html.erb | 22 ++++++++++++++-------- app/views/recipes/index.html.erb | 3 +-- app/views/recipes/search.html.erb | 15 +++++++++++++-- lib/edamam_apiwrapper.rb | 14 ++++++-------- 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d89149d1b..ba463cdfd 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -15,3 +15,7 @@ *= require foundation_and_overrides */ + + .search-bar div { + display: inline-block; + } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2b28cfedf..623b5eb11 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,5 +1,5 @@ - + @@ -13,13 +13,19 @@
-
- <%= form_tag(search_path, method: :get) do %> - <%= label_tag "Search for recipes:" %> - <%= text_field_tag :q %> - <%= submit_tag "Search", :name => nil, class: "button" %> - <% end %> -
+
<% flash.each do |name, message| %> diff --git a/app/views/recipes/index.html.erb b/app/views/recipes/index.html.erb index a55bf9993..ea940727d 100644 --- a/app/views/recipes/index.html.erb +++ b/app/views/recipes/index.html.erb @@ -1,2 +1 @@ -

Recipes#index

-

Find me in app/views/recipes/index.html.erb

+

Welcome to the top dairy-free recipes site for the good of the lactose-intolerant folks.

diff --git a/app/views/recipes/search.html.erb b/app/views/recipes/search.html.erb index e753dab88..194540291 100644 --- a/app/views/recipes/search.html.erb +++ b/app/views/recipes/search.html.erb @@ -1,10 +1,21 @@ -

This is from the search page.

+

Your Recipes

<% if @recipes.empty? %> <%= flash[:message] = "No recipes found with your search." %> <% else %> <%= flash[:message] = "Recipes found!" %> +

<%= "#{@recipes.count} recipes found for your search '#{params[:q]}'." %>

+ <%= @recipes.each do |recipe| %> - <%= puts recipe %> +

<%= recipe["recipe"]["label"] %>

+
    +
  • Full Recipe: <%= recipe["recipe"]["uri"] %>
  • +
  • ">
  • +
  • + <% recipe["recipe"]["ingredientLines"].each do |ingredient| %> + + <% end %> +
  • +
<% end %> <% end %> diff --git a/lib/edamam_apiwrapper.rb b/lib/edamam_apiwrapper.rb index 8cf539608..f3a125ef8 100644 --- a/lib/edamam_apiwrapper.rb +++ b/lib/edamam_apiwrapper.rb @@ -1,16 +1,13 @@ require 'httparty' require 'dotenv-rails' +BASE_URL = "https://api.edamam.com/search\?" +EDAMAM_ID = ENV["EDAMAM_ID"] +EDAMAM_KEY = ENV["EDAMAM_KEY"] + class EdamamApiWrapper attr_reader :response - BASE_URL = "https://api.edamam.com/search\?" - EDAMAM_ID = ENV["EDAMAM_ID"] - EDAMAM_KEY = ENV["EDAMAM_KEY"] - - def initialize - end - # list of recipes that are returned from a user search def self.find_recipes(terms) query_params = { @@ -21,6 +18,7 @@ def self.find_recipes(terms) "to" => 5, # first 5 recipes "health" => "dairy-free", } - @response = HTTParty.get(BASE_URL, query: query_params).parsed_response + response = HTTParty.get(BASE_URL, query: query_params) + return response["hits"] end end From 09051dafbd97a1de702e4cd7aa739e66f92450f5 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Wed, 3 May 2017 21:39:21 -0700 Subject: [PATCH 18/52] format API response hash in view --- app/views/recipes/search.html.erb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/recipes/search.html.erb b/app/views/recipes/search.html.erb index 194540291..b89683b9d 100644 --- a/app/views/recipes/search.html.erb +++ b/app/views/recipes/search.html.erb @@ -9,11 +9,10 @@ <%= @recipes.each do |recipe| %>

<%= recipe["recipe"]["label"] %>

    -
  • Full Recipe: <%= recipe["recipe"]["uri"] %>
  • +
  • Full Recipe: <%= recipe["recipe"]["url"] %>
  • ">
  • -
  • <% recipe["recipe"]["ingredientLines"].each do |ingredient| %> - + <% end %>
From 9570b9df78e591814709aea21416ed52865db134 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Thu, 4 May 2017 09:14:58 -0700 Subject: [PATCH 19/52] list ingredients in recipes#search --- app/views/recipes/search.html.erb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/views/recipes/search.html.erb b/app/views/recipes/search.html.erb index b89683b9d..132b84751 100644 --- a/app/views/recipes/search.html.erb +++ b/app/views/recipes/search.html.erb @@ -6,15 +6,14 @@ <%= flash[:message] = "Recipes found!" %>

<%= "#{@recipes.count} recipes found for your search '#{params[:q]}'." %>

- <%= @recipes.each do |recipe| %> -

<%= recipe["recipe"]["label"] %>

-
    -
  • Full Recipe: <%= recipe["recipe"]["url"] %>
  • -
  • ">
  • - <% recipe["recipe"]["ingredientLines"].each do |ingredient| %> - - <% end %> - -
+ <% @recipes.each do |recipe| %> +

<%= recipe["name"] %>

+

Full Recipe: <%= recipe["url"] %>

+ "> +
    + <% recipe["ingredients"].each do |ingredient| %> +
  • <%= ingredient %>
  • + <% end %> +
<% end %> <% end %> From ad6911e09027cda3c47914443425fe0b3a0e9c30 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Thu, 4 May 2017 10:14:12 -0700 Subject: [PATCH 20/52] get tests running --- app/controllers/recipes_controller.rb | 2 +- app/models/user.rb | 2 ++ db/migrate/20170504164518_create_users.rb | 10 ++++++++ db/schema.rb | 25 +++++++++++++++++++ ...am_apiwrapper.rb => edamam_api_wrapper.rb} | 19 ++++++++++++-- test/controllers/recipes_controller_test.rb | 25 ++----------------- test/fixtures/users.yml | 11 ++++++++ test/lib/edimam_api_wrapper_test.rb | 23 +++++++++++++++++ test/models/user_test.rb | 9 +++++++ test/test_helper.rb | 7 +++--- 10 files changed, 103 insertions(+), 30 deletions(-) create mode 100644 app/models/user.rb create mode 100644 db/migrate/20170504164518_create_users.rb create mode 100644 db/schema.rb rename lib/{edamam_apiwrapper.rb => edamam_api_wrapper.rb} (53%) create mode 100644 test/fixtures/users.yml create mode 100644 test/lib/edimam_api_wrapper_test.rb create mode 100644 test/models/user_test.rb diff --git a/app/controllers/recipes_controller.rb b/app/controllers/recipes_controller.rb index 6ddd0ab0a..e880268e7 100644 --- a/app/controllers/recipes_controller.rb +++ b/app/controllers/recipes_controller.rb @@ -1,4 +1,4 @@ -require 'edamam_apiwrapper' +require 'edamam_api_wrapper' class RecipesController < ApplicationController def index diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 000000000..379658a50 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,2 @@ +class User < ApplicationRecord +end diff --git a/db/migrate/20170504164518_create_users.rb b/db/migrate/20170504164518_create_users.rb new file mode 100644 index 000000000..4a6614335 --- /dev/null +++ b/db/migrate/20170504164518_create_users.rb @@ -0,0 +1,10 @@ +class CreateUsers < ActiveRecord::Migration[5.0] + def change + create_table :users do |t| + t.string :username + t.string :email + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..10ddff930 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,25 @@ +# 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: 20170504164518) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "users", force: :cascade do |t| + t.string "username" + t.string "email" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/lib/edamam_apiwrapper.rb b/lib/edamam_api_wrapper.rb similarity index 53% rename from lib/edamam_apiwrapper.rb rename to lib/edamam_api_wrapper.rb index f3a125ef8..495e2d62f 100644 --- a/lib/edamam_apiwrapper.rb +++ b/lib/edamam_api_wrapper.rb @@ -6,7 +6,6 @@ EDAMAM_KEY = ENV["EDAMAM_KEY"] class EdamamApiWrapper - attr_reader :response # list of recipes that are returned from a user search def self.find_recipes(terms) @@ -19,6 +18,22 @@ def self.find_recipes(terms) "health" => "dairy-free", } response = HTTParty.get(BASE_URL, query: query_params) - return response["hits"] + hash = recipes_hash(response["hits"]) + return hash + end + + private + + def self.recipes_hash(hits) + recipe_collection = Array.new + hits.each_with_index do |recipe, i| + recipe_collection[i] = { + "name" => recipe["recipe"]["label"], + "url" => recipe["recipe"]["url"], + "image" => recipe["recipe"]["image"], + "ingredients" => recipe["recipe"]["ingredientLines"], + } + end + return recipe_collection end end diff --git a/test/controllers/recipes_controller_test.rb b/test/controllers/recipes_controller_test.rb index 2dcb726e2..ec45d3c9a 100644 --- a/test/controllers/recipes_controller_test.rb +++ b/test/controllers/recipes_controller_test.rb @@ -1,29 +1,8 @@ require "test_helper" describe RecipesController do - it "should get index" do - get recipes_index_url + it "should get search" do + get search_path value(response).must_be :success? end - - describe "API functionality" do - it "Can get a list of recipes from the real site" do - skip - VCR.use_cassette("channels") do - search = "test search" - response = RecipesController.search("", search) - response["ok"].must_equal true - # response search must equal... - end - end - - it "Can get a list of recipes from the fake site" do - skip - VCR.use_cassette("channels") do - response = RecipesController.search("invalid search", "test search") - response["ok"].must_equal false - response["error"].wont_be_nil - end - end - end end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/lib/edimam_api_wrapper_test.rb b/test/lib/edimam_api_wrapper_test.rb new file mode 100644 index 000000000..eee290f7b --- /dev/null +++ b/test/lib/edimam_api_wrapper_test.rb @@ -0,0 +1,23 @@ +require "test_helper" + +describe 'EdimamApiWrapper' do + describe "API functionality" do + it "Can get a list of recipes from the real site" do + VCR.use_cassette("channels") do + search = "test search" + response = EdimamApiWrapper.search("", "", search) + response["ok"].must_equal true + # response search must equal... + end + end + + it "Can get a list of recipes from the fake site" do + skip + VCR.use_cassette("channels") do + response = EdimamApiWrapper.search("invalid search", "test search") + response["ok"].must_equal false + response["error"].wont_be_nil + end + end + end +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 000000000..cc862ac2d --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe User do + let(:user) { User.new } + + it "must be valid" do + value(user).must_be :valid? + end +end diff --git a/test/test_helper.rb b/test/test_helper.rb index cba1ff640..a3d19e7ed 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -23,10 +23,9 @@ :record => :new_episodes, # record new data when we don't have it yet :match_requests_on => [:method, :uri, :body] # The http method, URI and body of a request all need to match } - # Don't leave our Slack token lying around in a cassette file. - config.filter_sensitive_data("") do - ENV['EDAMAM_TOKEN'] - end + # Don't leave token lying around in a cassette file. + config.filter_sensitive_data("") { ENV['EDAMAM_ID'] } + config.filter_sensitive_data("") { ENV['EDAMAM_KEY'] } end # To add Capybara feature tests add `gem "minitest-rails-capybara"` From 576ecd243411ccf2852769c2f85e9c66244981c5 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Sun, 7 May 2017 10:19:36 -0700 Subject: [PATCH 21/52] add edamam logo --- app/assets/images/logo.jpg | Bin 0 -> 14603 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/logo.jpg diff --git a/app/assets/images/logo.jpg b/app/assets/images/logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6d12a01a6dc04b1de93d88673fc60d3efde93d1c GIT binary patch literal 14603 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%0D23}_v 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 Date: Sun, 7 May 2017 10:20:02 -0700 Subject: [PATCH 22/52] add footer with edamam credit --- app/assets/stylesheets/application.css | 5 +++++ app/views/layouts/application.html.erb | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index ba463cdfd..78f9c904d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -19,3 +19,8 @@ .search-bar div { display: inline-block; } + +.footer-bar { + border-top: 1px solid green; + margin: 0; +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 623b5eb11..52f9a1a24 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,7 +6,7 @@ <%= content_for?(:title) ? yield(:title) : "Untitled" %> - <%= stylesheet_link_tag "application" %> + <%= stylesheet_link_tag "application", media: "all" %> <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> @@ -16,6 +16,7 @@ @@ -37,19 +44,6 @@
<%= yield %> - - -
diff --git a/app/views/recipes/home.html.erb b/app/views/recipes/home.html.erb index ea940727d..6926f6528 100644 --- a/app/views/recipes/home.html.erb +++ b/app/views/recipes/home.html.erb @@ -1 +1,10 @@ -

Welcome to the top dairy-free recipes site for the good of the lactose-intolerant folks.

+ + +
+

Hey, you!

+

search your way to a happier tummy with NoMoo

+
+ <%= image_tag "cow.png" %> +
+ +
From f13a037c0a0bb95c19276557bca9b07442c97f61 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Fri, 12 May 2017 00:21:39 -0700 Subject: [PATCH 49/52] additional styling --- app/assets/stylesheets/application.css | 42 ++++++++++++++++-- app/views/layouts/application.html.erb | 12 +++--- app/views/recipes/home.html.erb | 6 +-- app/views/recipes/index.html.erb | 60 +++++++++++--------------- app/views/recipes/show.html.erb | 57 ++++++++++++++---------- 5 files changed, 107 insertions(+), 70 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 8d94c61da..fc357a6fa 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -16,12 +16,14 @@ */ +.hero-cow { + color: white; +} .search-bar div { display: inline-block; } .footer-bar { - border-top: 1px solid green; margin: 0; } @@ -30,8 +32,42 @@ vertical-align: middle; } -.html { +main { background-image: url(grassy_background.jpg); - background-repeat: no-repeat; +} + +.small-cow { + max-height: 280px; + max-width: 280px; +} + +.next-card { + text-align: center; + vertical-align: middle; +} + +.recipe-cards { + padding-top: 2rem; + padding-bottom: 2rem; +} + +.yellow { + background-color: yellow; +} + +.white { + background-color: white; +} + +.ingredients-box { + display: block; + align-items: center; +} + +.ingredients li { + list-style: none; +} +.recipe-photo { + margin-top: 1rem; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0215ba4bf..9931b4388 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,7 +21,7 @@
+ + +
+
+
.
+
+

Ingredients

+

(Recipe for <%= @recipe.yield.to_i %>)

+
    + <% @recipe.ingredients.each do |ingredient| %> +
  • <%= ingredient %>
  • + <% end %> +
- +

<%= @recipe.calories %> kcal

+
+
.
+
+
+ + + From eeb36c8052bbf93fc674a99747e46c69e4242364 Mon Sep 17 00:00:00 2001 From: Tamiko Terada Date: Fri, 12 May 2017 14:01:05 -0700 Subject: [PATCH 50/52] more styling for recipe cards --- app/assets/stylesheets/application.css | 10 ++++++++++ app/views/layouts/application.html.erb | 4 ++-- app/views/recipes/index.html.erb | 4 ++-- app/views/recipes/show.html.erb | 1 - 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index fc357a6fa..24d48c69e 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -25,6 +25,7 @@ .footer-bar { margin: 0; + background: none; } .menu li { @@ -32,8 +33,17 @@ vertical-align: middle; } +header { + background-color: yellow; +} + main { background-image: url(grassy_background.jpg); + opacity: 50%; +} + +.card { + border-radius: 1rem; } .small-cow { diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9931b4388..fb693c2e4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -19,7 +19,7 @@
-