From 6e8863b8c833c36417352bb373023a534ae08926 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Mon, 22 Apr 2019 14:31:16 -0700 Subject: [PATCH 01/34] Initial Rails setup --- .gitignore | 27 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 279 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 19 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.scss | 17 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 15 + app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 36 +++ bin/spring | 17 ++ bin/update | 31 ++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 61 ++++ config/environments/production.rb | 94 ++++++ config/environments/test.rb | 46 +++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 ++ config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 +++ config/puma.rb | 34 +++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 +++++ public/422.html | 67 +++++ public/500.html | 66 +++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + storage/.keep | 0 test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 24 ++ tmp/.keep | 0 vendor/.keep | 0 81 files changed, 1407 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.scss create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..18b43c9cd2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +/node_modules +/yarn-error.log + +/public/assets +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..25c81fe399 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..80be142348 --- /dev/null +++ b/Gemfile @@ -0,0 +1,81 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-rails' +gem 'jquery-turbolinks' +gem 'bootstrap', '~> 4.1.3' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..fbee58ad54 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,279 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.12.0) + io-like (~> 0.3.0) + arel (9.0.0) + autoprefixer-rails (9.5.1) + execjs + better_errors (2.5.1) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.7.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.4.3) + msgpack (~> 1.0) + bootstrap (4.1.3) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.9, < 2) + sass (>= 3.5.2) + builder (3.2.3) + byebug (11.0.1) + capybara (3.18.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + childprocess (1.0.1) + rake (< 13.0) + chromedriver-helper (2.1.1) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.8.0) + execjs (2.7.0) + ffi (1.10.0) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.15.0) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.8.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.4) + popper_js (1.14.5) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + regexp_parser (1.4.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.141.5926) + childprocess (>= 0.5, < 2.0) + rubyzip (~> 1.2, >= 1.2.2) + shellany (0.0.1) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.9) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.20) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + bootstrap (~> 4.1.3) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.17.3 diff --git a/Guardfile b/Guardfile new file mode 100644 index 0000000000..e34f706f4a --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000000..e85f913914 --- /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 0000000000..b16e53d6d5 --- /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 0000000000..e69de29bb2 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000000..b0ef35b723 --- /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, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. //= require jquery3 + //= require popper + //= require bootstrap-sprockets + +// +//= require rails-ujs +//= require activestorage +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 0000000000..739aa5f022 --- /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 0000000000..e69de29bb2 diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000000..b4d20f5641 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -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, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + */ +/* Custom bootstrap variables must be set or imported *before* bootstrap. */ +@import "bootstrap"; +/* Import scss content */ +@import "**/*"; diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 0000000000..d672697283 --- /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 0000000000..0ff5442f47 --- /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 0000000000..09705d12ab --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000000..de6be7945c --- /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 0000000000..a009ace51c --- /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 0000000000..286b2239d1 --- /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 0000000000..10a4cba84d --- /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 0000000000..e69de29bb2 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000000..f32268a271 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + + MediaRanker + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 0000000000..cbd34d2e9d --- /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 0000000000..37f0bddbd7 --- /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 0000000000..f19acf5b5c --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 0000000000..5badb2fde0 --- /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 0000000000..d87d5f5781 --- /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 0000000000..94fd4d7977 --- /dev/null +++ b/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 0000000000..fb2ec2ebb4 --- /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 0000000000..58bfaed518 --- /dev/null +++ b/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 0000000000..460dd565b4 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 0000000000..f7ba0b527b --- /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 0000000000..08db79cb25 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,25 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module MediaRanker + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000000..b9e460cef3 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 0000000000..0b286f676e --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: MediaRanker_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 0000000000..1d1d36c69f --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +3jN767P619U9/7DkMgJZ+m4bYrR+TbhMLrezGyJxQ5Oe0uHLI5ODKjyqo8OJ2PS92SfPul0KCtgvkxyVobExuk+gk6H7EI6kaAydxwflvlZn76E4pgw1uI/MueiIkFcBl8We7rSQbBqvfXS6Kyvc+oBkeZOSwL7nKIq3pruRdbDYH97niaKynQrtqiRrhJ319+xUwWT+V23b91IksL6z5DxO3W/EfdTjuLJxgSe3D/7kPY5klde0a4OJHh2/WQyTuroxF5ZwNXZvyDpDrvPVsUUm9RS2tp6+awcOkMBDTzPXmJZ4OXtAGVEwdtydFnluSNNiLCY2gD1VItASRx5c54HCwlCG04ArwIE8iIs/I4JLNpbXGmofMUyV5oUhbJ85MzVnvBX/JYAfFwj33Zs5cukbNecAoDEyzoRI--ZYdd81zLsEJXYyD9--14T5kRadq60+IwSeVtmiQQ== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000000..0bd2511123 --- /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: MediaRanker_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: MediaRanker + + # 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: MediaRanker_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: MediaRanker_production + username: MediaRanker + password: <%= ENV['MEDIARANKER_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 0000000000..426333bb46 --- /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 0000000000..1311e3e4ef --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000000..bd39d9d752 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "MediaRanker_#{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 0000000000..0a38fd3ce9 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 0000000000..142d382f87 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000000..89d2efab2b --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000000..4b828e80cb --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000000..59385cdf37 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 0000000000..d3bcaa5ec8 --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 0000000000..5a6a32d371 --- /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 0000000000..4a994e1e7b --- /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 0000000000..ac033bf9dc --- /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 0000000000..dc1899682b --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000000..bbfc3961bf --- /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 0000000000..decc5a8573 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 0000000000..a5eccf816b --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000000..787824f888 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000000..9fa7863f99 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 0000000000..d32f76e8fb --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000000..1beea2accd --- /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 0000000000..e69de29bb2 diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/log/.keep b/log/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package.json b/package.json new file mode 100644 index 0000000000..625900f9d8 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "MediaRanker", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000000..2be3af26fc --- /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 0000000000..c08eac0d1d --- /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 0000000000..78a030af22 --- /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 0000000000..e69de29bb2 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000000..37b576a4a0 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000000..2b5172a7d6 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From db6685ec59616593ef26bc5409b760ee70b2c24b Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Tue, 23 Apr 2019 15:09:01 -0700 Subject: [PATCH 02/34] created homepages controller and added basic outline of homepage html --- app/assets/javascripts/homepages.js | 2 ++ app/assets/stylesheets/homepages.scss | 3 +++ app/controllers/homepages_controller.rb | 4 ++++ app/helpers/homepages_helper.rb | 2 ++ app/views/homepages/index.html.erb | 16 ++++++++++++++++ config/routes.rb | 2 ++ test/controllers/homepages_controller_test.rb | 7 +++++++ 7 files changed, 36 insertions(+) create mode 100644 app/assets/javascripts/homepages.js create mode 100644 app/assets/stylesheets/homepages.scss create mode 100644 app/controllers/homepages_controller.rb create mode 100644 app/helpers/homepages_helper.rb create mode 100644 app/views/homepages/index.html.erb create mode 100644 test/controllers/homepages_controller_test.rb diff --git a/app/assets/javascripts/homepages.js b/app/assets/javascripts/homepages.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/homepages.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/homepages.scss b/app/assets/stylesheets/homepages.scss new file mode 100644 index 0000000000..2305c36d10 --- /dev/null +++ b/app/assets/stylesheets/homepages.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Homepages 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/homepages_controller.rb b/app/controllers/homepages_controller.rb new file mode 100644 index 0000000000..f200c8ac2e --- /dev/null +++ b/app/controllers/homepages_controller.rb @@ -0,0 +1,4 @@ +class HomepagesController < ApplicationController + def index + end +end diff --git a/app/helpers/homepages_helper.rb b/app/helpers/homepages_helper.rb new file mode 100644 index 0000000000..4bd8098f37 --- /dev/null +++ b/app/helpers/homepages_helper.rb @@ -0,0 +1,2 @@ +module HomepagesHelper +end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb new file mode 100644 index 0000000000..308a48172a --- /dev/null +++ b/app/views/homepages/index.html.erb @@ -0,0 +1,16 @@ +
+

Media Spotlight: ADD MEDIA WORK HERE

+

Media work description here

+
+ +
+

Top Movies

+
+ +
+

Top Books

+
+ +
+

Top Albums

+
diff --git a/config/routes.rb b/config/routes.rb index 787824f888..04d3eb10b4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root "homepages#index" + resources :homepages, only: :index end diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb new file mode 100644 index 0000000000..5ba3024fa1 --- /dev/null +++ b/test/controllers/homepages_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe HomepagesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 0c0139fc169bab641196061cfce866e4fe433ccb Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Tue, 23 Apr 2019 15:56:47 -0700 Subject: [PATCH 03/34] Updated gemfile to fix rails console issue --- Gemfile | 5 +++++ Gemfile.lock | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Gemfile b/Gemfile index 80be142348..396859704c 100644 --- a/Gemfile +++ b/Gemfile @@ -41,6 +41,11 @@ group :development, :test do gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] end +group :development do + # Adding this for a readline issue that prevents rails console from opening + gem 'rb-readline' +end + group :development do # Access an interactive console on exception pages or by calling 'console' anywhere in the code. gem 'web-console', '>= 3.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index fbee58ad54..c57f26485a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,6 +188,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) + rb-readline (0.5.5) regexp_parser (1.4.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) @@ -263,6 +264,7 @@ DEPENDENCIES pry-rails puma (~> 3.11) rails (~> 5.2.3) + rb-readline sass-rails (~> 5.0) selenium-webdriver spring From a58224df6c750d5bde1f0c03c94c91198c89360b Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Tue, 23 Apr 2019 16:23:31 -0700 Subject: [PATCH 04/34] created work model and created db seed --- app/models/work.rb | 2 + db/migrate/20190423220801_create_works.rb | 13 +++ db/schema.rb | 28 +++++ db/seeds.rb | 133 ++++++++++++++++++++++ test/fixtures/works.yml | 15 +++ test/models/work_test.rb | 9 ++ 6 files changed, 200 insertions(+) create mode 100644 app/models/work.rb create mode 100644 db/migrate/20190423220801_create_works.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/works.yml create mode 100644 test/models/work_test.rb diff --git a/app/models/work.rb b/app/models/work.rb new file mode 100644 index 0000000000..95322dd45e --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,2 @@ +class Work < ApplicationRecord +end diff --git a/db/migrate/20190423220801_create_works.rb b/db/migrate/20190423220801_create_works.rb new file mode 100644 index 0000000000..a75f9ce289 --- /dev/null +++ b/db/migrate/20190423220801_create_works.rb @@ -0,0 +1,13 @@ +class CreateWorks < ActiveRecord::Migration[5.2] + def change + create_table :works do |t| + t.string :title + t.string :creator + t.string :description + t.string :category + t.integer :publication_year + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..4636402b7e --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,28 @@ +# 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: 2019_04_23_220801) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "works", force: :cascade do |t| + t.string "title" + t.string "creator" + t.string "description" + t.string "category" + t.integer "publication_year" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..7fe5a62f00 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,136 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) + +works = [ + { + title: "Harry Potter and the Socreror's Stone", + creator: "JK Rowling", + description: "The first one", + category: "book", + publication_year: 1997, + }, + { + title: "Harry Potter and the Chamber of Secrets", + creator: "JK Rowling", + description: "The second one", + category: "book", + publication_year: 1998, + }, + { + title: "Harry Potter and the Prisoner of Azkaban", + creator: "JK Rowling", + description: "The third one", + category: "book", + publication_year: 1999, + }, + { + title: "Harry Potter and the Goblet of Fire", + creator: "JK Rowling", + description: "The fourth one", + category: "book", + publication_year: 2000, + }, + { + title: "Harry Potter and the Order of Phoenix", + creator: "JK Rowling", + description: "The fifth one", + category: "book", + publication_year: 2003, + }, + { + title: "Harry Potter and the Half-Blood Prince", + creator: "JK Rowling", + description: "The sixth one", + category: "book", + publication_year: 2005, + }, + { + title: "Harry Potter and the Dealthy Hallows", + creator: "JK Rowling", + description: "The last one", + category: "book", + publication_year: 2007, + }, + { + title: "The Golden Compass", + creator: "Philip Pullman", + description: "A 10 year's Northern adventure", + category: "book", + publication_year: 1995, + }, + { + title: "Magic Mountain", + creator: "Thomas Mann", + description: "Seven years at Swedish medical retreat", + category: "book", + publication_year: 1924, + }, + { + title: "The Solitude of Prime Numbers", + creator: "Paolo Giordano", + description: "Two loners alone together", + category: "book", + publication_year: 2008, + }, + { + title: "Ventura", + creator: "Anderson .Paak", + description: "A pretty R&B/soul album", + category: "album", + publication_year: 2019, + }, + { + title: "A Seat at the Table", + creator: "Solange Knowles", + description: "A soulful ode to the Black experience", + category: "album", + publication_year: 2016, + }, + { + title: "Thank u, next", + creator: "Ariana Grande", + description: "A pop princess's journey forward", + category: "album", + publication_year: 2019, + }, + { + title: "AM", + creator: "Arctic Monkeys", + description: "Reflections through rock", + category: "album", + publication_year: 2013, + }, + { + title: "The Departed", + creator: "Martin Scorese", + description: "Every dies, except Wahlberg", + category: "movie", + publication_year: 2006, + }, + { + title: "Us", + creator: "Jordan Peele", + description: "Scary, spooky, and unsettling", + category: "movie", + publication_year: 2019, + }, + { + title: "The Tree of Life", + creator: "Terrence Mallick", + description: "No idea what's happening, but I like it", + category: "movie", + publication_year: 2011, + }, + { + title: "The Godfather", + creator: "Francis Ford Copolla", + description: "You come into my house on the day my daughter is to be married", + category: "movie", + publication_year: 1972, + }, +] + +works.each do |work| + Work.create(work) +end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..9bc78bf847 --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + creator: MyString + description: MyString + category: MyString + publication_year: 1 + +two: + title: MyString + creator: MyString + description: MyString + category: MyString + publication_year: 1 diff --git a/test/models/work_test.rb b/test/models/work_test.rb new file mode 100644 index 0000000000..f6fba7104d --- /dev/null +++ b/test/models/work_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Work do + let(:work) { Work.new } + + it "must be valid" do + value(work).must_be :valid? + end +end From 2673424adaacbba1ec575f018373cbb22cad62e3 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Tue, 23 Apr 2019 16:43:06 -0700 Subject: [PATCH 05/34] Updated homepage controller and html to include work data and featured work --- app/controllers/homepages_controller.rb | 4 ++++ app/views/homepages/index.html.erb | 28 +++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb index f200c8ac2e..20a64422d7 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -1,4 +1,8 @@ class HomepagesController < ApplicationController def index + @featured = Work.all.sample + @books = Work.where(category: "book") + @albums = Work.where(category: "album") + @movies = Work.where(category: "movie") end end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 308a48172a..a77647b9f4 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,16 +1,40 @@
-

Media Spotlight: ADD MEDIA WORK HERE

-

Media work description here

+

Media Spotlight: <%= @featured.title %> by <%= @featured.creator %>

+

<%= @featured.description %>

Top Movies

+
    + <% @movies.each do |movie| %> +
  • + <%= movie.title %> by <%= movie.creator %> + ADD votes +
    • + <% end %> +

Top Books

+
    + <% @books.each do |book| %> +
  • + <%= book.title %> by <%= book.creator %> + ADD votes +
    • + <% end %> +

Top Albums

+
    + <% @albums.each do |album| %> +
  • + <%= album.title %> by <%= album.creator %> + ADD votes +
    • + <% end %> +
From 604936fde54b82ca4e3478731ebf8d602ae09080 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Fri, 26 Apr 2019 11:13:38 -0700 Subject: [PATCH 06/34] Did work for works index page--added Works controller, updated routes, and added html --- app/assets/javascripts/works.js | 2 + app/assets/stylesheets/works.scss | 3 ++ app/controllers/works_controller.rb | 7 +++ app/helpers/works_helper.rb | 2 + app/views/works/index.html.erb | 60 +++++++++++++++++++++++ config/routes.rb | 2 + test/controllers/works_controller_test.rb | 7 +++ 7 files changed, 83 insertions(+) create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/views/works/index.html.erb create mode 100644 test/controllers/works_controller_test.rb diff --git a/app/assets/javascripts/works.js b/app/assets/javascripts/works.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/works.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss new file mode 100644 index 0000000000..5618452f3e --- /dev/null +++ b/app/assets/stylesheets/works.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Works 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/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..46ea9a0376 --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,7 @@ +class WorksController < ApplicationController + def index + @books = Work.where(category: "book") + @albums = Work.where(category: "album") + @movies = Work.where(category: "movie") + end +end diff --git a/app/helpers/works_helper.rb b/app/helpers/works_helper.rb new file mode 100644 index 0000000000..ccb78c2b73 --- /dev/null +++ b/app/helpers/works_helper.rb @@ -0,0 +1,2 @@ +module WorksHelper +end diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..7fedcf6622 --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1,60 @@ + + +

Albums

+ + + + + + + + <% @albums.each do |album| %> + + + + + + + + <% end %> +
VotesTitleCreated ByPublishedUpvote
Add Votes<%= album.title%><%= album.creator %><%= album.publication_year %>Add upvotes
+ + +

Books

+ + + + + + + + <% @books.each do |book| %> + + + + + + + + <% end %> +
VotesTitleCreated ByPublishedUpvote
Add Votes<%= book.title %><%= book.creator %><%= book.publication_year %>Add upvotes
+ + +

Movies

+ + + + + + + + <% @movies.each do |movie| %> + + + + + + + + <% end %> +
VotesTitleCreated ByPublishedUpvote
Add Votes<%= movie.title %><%= movie.creator %><%= movie.publication_year %>Add upvotes
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 04d3eb10b4..4d53fecb4c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,6 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root "homepages#index" resources :homepages, only: :index + + resources :works, only: :index end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..d95073c22e --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe WorksController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 59dcf3dabb093ae88c1ba5cc37b272bddc7a129d Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Fri, 26 Apr 2019 13:59:36 -0700 Subject: [PATCH 07/34] Created new work route, created work#new method and created new html using partial view --- app/controllers/works_controller.rb | 4 ++++ app/views/works/_form.html.erb | 19 +++++++++++++++++++ app/views/works/new.html.erb | 5 +++++ config/routes.rb | 2 +- 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 app/views/works/_form.html.erb create mode 100644 app/views/works/new.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 46ea9a0376..d4093a10b6 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -4,4 +4,8 @@ def index @albums = Work.where(category: "album") @movies = Work.where(category: "movie") end + + def new + @work = Work.new + end end diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb new file mode 100644 index 0000000000..aa764ada13 --- /dev/null +++ b/app/views/works/_form.html.erb @@ -0,0 +1,19 @@ +<%= form_with model: work do |f| %> + <%= f.label :category %> + <%= f.select :category, ["album", "book", "movie"] %> + + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :creator %> + <%= f.text_field :creator %> + + <%= f.label :publication_year %> + <%= f.text_field :publication_year %> + + <%= f.label :description %> + <%= f.text_area :description %> + + + <%= f.submit %> +<% end %> diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb new file mode 100644 index 0000000000..1f6de24347 --- /dev/null +++ b/app/views/works/new.html.erb @@ -0,0 +1,5 @@ +

Add a new work

+ +<%= render 'form', work: @work %> + + diff --git a/config/routes.rb b/config/routes.rb index 4d53fecb4c..6934c4b769 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,5 @@ root "homepages#index" resources :homepages, only: :index - resources :works, only: :index + resources :works, only: [:index, :new] end From 8b368d04609c11b533c9d3b1cee23ee104464266 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Fri, 26 Apr 2019 14:10:44 -0700 Subject: [PATCH 08/34] Created create method and route for Work--need to update redirect in create after details page is created --- app/controllers/works_controller.rb | 21 +++++++++++++++++++++ config/routes.rb | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index d4093a10b6..c78d467f3d 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -8,4 +8,25 @@ def index def new @work = Work.new end + + def create + @work = Work.new(work_params) + + successful = @work.save + if successful + flash[:status] = :success + flash[:message] = "Successfully created #{@work.category} #{@work.id}" + redirect_to root_path #update to details page once created! + else + flash.now[:status] = :error + flash.now[:message] = "A problem occurred: could not create #{@work.category}" + render :new, status: :bad_request + end + end + + private + + def work_params + return params.require(:work).permit(:title, :category, :creator, :publication_year, :description) + end end diff --git a/config/routes.rb b/config/routes.rb index 6934c4b769..827317d643 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,5 @@ root "homepages#index" resources :homepages, only: :index - resources :works, only: [:index, :new] + resources :works, only: [:index, :new, :create] end From fc0eed3d40d280b84fb596a19610a90df356839f Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Fri, 26 Apr 2019 14:26:01 -0700 Subject: [PATCH 09/34] Created some work fixture data --- test/fixtures/works.yml | 68 +++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 9bc78bf847..8cae8c2377 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,15 +1,57 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - creator: MyString - description: MyString - category: MyString - publication_year: 1 - -two: - title: MyString - creator: MyString - description: MyString - category: MyString - publication_year: 1 +hp1: + title: "Harry Potter and the Socreror's Stone", + creator: "JK Rowling", + description: "The first one", + category: "book", + publication_year: 1997 + +hp2: + title: "Harry Potter and the Chamber of Secrets", + creator: "JK Rowling", + description: "The second one", + category: "book", + publication_year: 1998 + +hp3: + title: "Harry Potter and the Prisoner of Azkaban", + creator: "JK Rowling", + description: "The third one", + category: "book", + publication_year: 1999 + +seat_table: + title: "A Seat at the Table", + creator: "Solange Knowles", + description: "A soulful ode to the Black experience", + category: "album", + publication_year: 2016 + +thank_u: + title: "Thank u, next", + creator: "Ariana Grande", + description: "A pop princess's journey forward", + category: "album", + publication_year: 2019 + +am: + title: "AM", + creator: "Arctic Monkeys", + description: "Reflections through rock", + category: "album", + publication_year: 2013 + +departed: + title: "The Departed", + creator: "Martin Scorese", + description: "Every dies, except Wahlberg", + category: "movie", + publication_year: 2006 + +us: + title: "Us", + creator: "Jordan Peele", + description: "Scary, spooky, and unsettling", + category: "movie", + publication_year: 2019 \ No newline at end of file From 55b235a1fbfd84a247237c02e3a0da4668f903a2 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Fri, 26 Apr 2019 15:05:21 -0700 Subject: [PATCH 10/34] Wrote tests for index, all passing, updated test_helper to fix bug --- test/controllers/works_controller_test.rb | 27 ++++++++-- test/fixtures/works.yml | 64 +++++++++++------------ test/test_helper.rb | 4 +- 3 files changed, 57 insertions(+), 38 deletions(-) diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index d95073c22e..d0b65157d7 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,7 +1,26 @@ require "test_helper" -describe WorksController do - # it "must be a real test" do - # flunk "Need real tests" - # end +describe "WorksController" do + describe "index" do + it "renders without crashing" do + # Arrange + + # Act + get works_path + + # Assert + must_respond_with :ok + end + + it "renders even if there are zero books" do + # Arrange + Work.destroy_all + + # Act + get works_path + + # Assert + must_respond_with :ok + end + end end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 8cae8c2377..65cc546814 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,57 +1,57 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html hp1: - title: "Harry Potter and the Socreror's Stone", - creator: "JK Rowling", - description: "The first one", - category: "book", + title: "Harry Potter and the Socreror's Stone" + creator: "JK Rowling" + description: "The first one" + category: "book" publication_year: 1997 hp2: - title: "Harry Potter and the Chamber of Secrets", - creator: "JK Rowling", - description: "The second one", - category: "book", + title: "Harry Potter and the Chamber of Secrets" + creator: "JK Rowling" + description: "The second one" + category: "book" publication_year: 1998 hp3: - title: "Harry Potter and the Prisoner of Azkaban", - creator: "JK Rowling", - description: "The third one", - category: "book", + title: "Harry Potter and the Prisoner of Azkaban" + creator: "JK Rowling" + description: "The third one" + category: "book" publication_year: 1999 seat_table: - title: "A Seat at the Table", - creator: "Solange Knowles", - description: "A soulful ode to the Black experience", - category: "album", + title: "A Seat at the Table" + creator: "Solange Knowles" + description: "A soulful ode to the Black experience" + category: "album" publication_year: 2016 thank_u: - title: "Thank u, next", - creator: "Ariana Grande", - description: "A pop princess's journey forward", - category: "album", + title: "Thank u next" + creator: "Ariana Grande" + description: "A pop princess's journey forward" + category: "album" publication_year: 2019 am: - title: "AM", - creator: "Arctic Monkeys", - description: "Reflections through rock", - category: "album", + title: "AM" + creator: "Arctic Monkeys" + description: "Reflections through rock" + category: "album" publication_year: 2013 departed: - title: "The Departed", - creator: "Martin Scorese", - description: "Every dies, except Wahlberg", - category: "movie", + title: "The Departed" + creator: "Martin Scorese" + description: "Every dies, except Wahlberg" + category: "movie" publication_year: 2006 us: - title: "Us", - creator: "Jordan Peele", - description: "Scary, spooky, and unsettling", - category: "movie", + title: "Us" + creator: "Jordan Peele" + description: "Scary, spooky, and unsettling" + category: "movie" publication_year: 2019 \ No newline at end of file diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d6..3f7dc7d3ed 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, @@ -9,7 +10,6 @@ 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" From 1ab3ee87124e28c150a81f5e535072ac28ee4b5b Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Fri, 26 Apr 2019 15:06:57 -0700 Subject: [PATCH 11/34] Added test for work#new --- test/controllers/works_controller_test.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index d0b65157d7..dd0605b131 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -23,4 +23,11 @@ must_respond_with :ok end end + + describe "new" do + it "retruns status code 200" do + get new_work_path + must_respond_with :ok + end + end end From e3d0714721ab81aba2996df86b387de36ea083c4 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Fri, 26 Apr 2019 15:23:08 -0700 Subject: [PATCH 12/34] added work#create test, updated work and work test as need to get all tests to pass --- app/models/work.rb | 1 + test/controllers/works_controller_test.rb | 52 +++++++++++++++++++++++ test/models/work_test.rb | 2 +- test/test_helper.rb | 5 +++ 4 files changed, 59 insertions(+), 1 deletion(-) diff --git a/app/models/work.rb b/app/models/work.rb index 95322dd45e..f352a7f572 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,2 +1,3 @@ class Work < ApplicationRecord + validates :title, presence: :true end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index dd0605b131..48c83e5525 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -30,4 +30,56 @@ must_respond_with :ok end end + + describe "create" do + it "creates a new work" do + # Arrange + work_data = { + work: { + title: "Becoming", + creator: "Michelle Obama", + description: "The memoir of the former first lady", + category: "book", + publication_year: 2018, + }, + } + + # Act + expect { + post works_path, params: work_data + }.must_change "Work.count", +1 + + # Assert + must_respond_with :redirect + # must_redirect_to work_path (add once details page is added) + + check_flash + + work = Work.last + expect(work.title).must_equal work_data[:work][:title] + expect(work.creator).must_equal work_data[:work][:creator] + expect(work.description).must_equal work_data[:work][:description] + expect(work.category).must_equal work_data[:work][:category] + expect(work.publication_year).must_equal work_data[:work][:publication_year] + end + + it "sends back bad_request if no work data is sent" do + work_data = { + work: { + title: "", + }, + } + expect(Work.new(work_data[:work])).wont_be :valid? + + # Act + expect { + post works_path, params: work_data + }.wont_change "Work.count" + + # Assert + must_respond_with :bad_request + + check_flash(:error) + end + end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..a6b7f20067 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Work do - let(:work) { Work.new } + let(:work) { Work.new(title: "Test Book") } it "must be valid" do value(work).must_be :valid? diff --git a/test/test_helper.rb b/test/test_helper.rb index 3f7dc7d3ed..4e13531859 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -21,4 +21,9 @@ 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... + + def check_flash(expected_status = :success) + expect(flash[:status]).must_equal(expected_status) + expect(flash[:message]).wont_be_nil + end end From ccdede4535c21152d8adfe809cf7ab650d36767a Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sat, 27 Apr 2019 13:07:32 -0700 Subject: [PATCH 13/34] Created details page, including show test, show route, show method, and show view --- app/controllers/works_controller.rb | 9 +++++++++ app/views/works/show.html.erb | 19 +++++++++++++++++++ config/routes.rb | 2 +- test/controllers/works_controller_test.rb | 19 +++++++++++++++++++ 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 app/views/works/show.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index c78d467f3d..97c27d5fe0 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -24,6 +24,15 @@ def create end end + def show + @work = Work.find_by(id: params[:id]) + + unless @work + head :not_found + return + end + end + private def work_params diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb new file mode 100644 index 0000000000..9b93ff778c --- /dev/null +++ b/app/views/works/show.html.erb @@ -0,0 +1,19 @@ +

<%= @work.title %>

+

Created by: <%= @work.creator %>

+

Published: <%= @work.publication_year %>

+

<%= @work.description %>

+ + + +Back to media ranks +Edit +<%# Upvote +Delete %> + + +

ADD Votes for this <%= @work.category %>

+ + + + +
UserDate
diff --git a/config/routes.rb b/config/routes.rb index 827317d643..07c0b47aeb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,5 @@ root "homepages#index" resources :homepages, only: :index - resources :works, only: [:index, :new, :create] + resources :works, only: [:index, :new, :create, :show] end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 48c83e5525..8f46fd8ae3 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -82,4 +82,23 @@ check_flash(:error) end end + + describe "show" do + it "returns a 404 status code if the work doesn't exist" do + # TODO come back to this + work_id = -1 + + get work_path(work_id) + + must_respond_with :not_found + end + + it "works for a work that exists" do + work = Work.first + get work_path(work.id) + + # Assert + must_respond_with :ok + end + end end From 089e57bffb58ca37e3680bedce5da2e4e72a5f9d Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sat, 27 Apr 2019 13:25:37 -0700 Subject: [PATCH 14/34] Wrote test for work#edit, added corresponding route, method and view --- app/controllers/works_controller.rb | 9 +++++++++ app/views/works/edit.html.erb | 4 ++++ config/routes.rb | 2 +- test/controllers/works_controller_test.rb | 14 ++++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 app/views/works/edit.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 97c27d5fe0..606a1dddc6 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -33,6 +33,15 @@ def show end end + def edit + @work = Work.find_by(id: params[:id]) + + unless @work + head :not_found + return + end + end + private def work_params diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..58f84ae01f --- /dev/null +++ b/app/views/works/edit.html.erb @@ -0,0 +1,4 @@ +

Edit this <%= @work.category %>

+ +<%= render 'form', work: @work %> + diff --git a/config/routes.rb b/config/routes.rb index 07c0b47aeb..e6292f7ffd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,5 @@ root "homepages#index" resources :homepages, only: :index - resources :works, only: [:index, :new, :create, :show] + resources :works, only: [:index, :new, :create, :show, :edit] end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 8f46fd8ae3..57260dbae2 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -101,4 +101,18 @@ must_respond_with :ok end end + + describe "edit" do + it "responds with OK for a real work" do + work = Work.first + get edit_work_path(work) + must_respond_with :ok + end + + it "responds with NOT FOUND for a fake work" do + work_id = Work.last.id + 1 + get edit_work_path(work_id) + must_respond_with :not_found + end + end end From 51d66943248ef16f4cb6e6e7cf3e635db02cdbd1 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sat, 27 Apr 2019 13:47:03 -0700 Subject: [PATCH 15/34] wrote tests for work#update --- test/controllers/works_controller_test.rb | 59 +++++++++++++++++++++-- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 57260dbae2..b652bde77f 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,6 +1,10 @@ require "test_helper" describe "WorksController" do + before do + @work = Work.first + end + describe "index" do it "renders without crashing" do # Arrange @@ -94,8 +98,7 @@ end it "works for a work that exists" do - work = Work.first - get work_path(work.id) + get work_path(@work.id) # Assert must_respond_with :ok @@ -104,8 +107,7 @@ describe "edit" do it "responds with OK for a real work" do - work = Work.first - get edit_work_path(work) + get edit_work_path(@work) must_respond_with :ok end @@ -115,4 +117,53 @@ must_respond_with :not_found end end + + describe "update" do + let (:work_data) { + { + work: { + title: "Updated Title", + }, + } + } + + it "changes the data on the work given valid info" do + @work.assign_attributes(work_data[:work]) + expect(@work).must_be :valid? + @work.reload + + patch work_path(@work), params: work_data + + must_respond_with :redirect + must_redirect_to work_path(@work) + + check_flash + + @work.reload + expect(@work.title).must_equal(work_data[:work][:title]) + end + + it "responds with NOT FOUND for a fake work" do + work_id = Work.last.id + 1 + patch work_path(work_id), params: work_data + must_respond_with :not_found + end + + it "responds with BAD REQUEST for bad data" do + work_data[:work][:title] = "" + + # Assumptions + @work.assign_attributes(work_data[:work]) + expect(@work).wont_be :valid? + @work.reload + + # Act + patch work_path(@work), params: work_data + + # Assert + must_respond_with :bad_request + + check_flash(:error) + end + end end From 5d263a8e74a7649a95db3f0b47e0407f83c2fa01 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sat, 27 Apr 2019 13:50:46 -0700 Subject: [PATCH 16/34] Added update route and method for Work --- app/controllers/works_controller.rb | 19 +++++++++++++++++++ config/routes.rb | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 606a1dddc6..bae85775c5 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -42,6 +42,25 @@ def edit end end + def update + @work = Work.find_by(id: params[:id]) + + unless @work + head :not_found + return + end + + if @work.update(work_params) + flash[:status] = :success + flash[:message] = "Successfully updated work #{@work.id}" + redirect_to work_path(@work) + else + flash.now[:status] = :error + flash.now[:message] = "Could not save work #{@work.id}" + render :edit, status: :bad_request + end + end + private def work_params diff --git a/config/routes.rb b/config/routes.rb index e6292f7ffd..064582e99f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,5 @@ root "homepages#index" resources :homepages, only: :index - resources :works, only: [:index, :new, :create, :show, :edit] + resources :works, only: [:index, :new, :create, :show, :edit, :update] end From e7a3ed485036fbc0a4ac0b6015d75a168d06815f Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sat, 27 Apr 2019 19:16:21 -0700 Subject: [PATCH 17/34] Added tests for destroy and corresponding route and method --- app/controllers/works_controller.rb | 15 ++++++++++++ config/routes.rb | 2 +- test/controllers/works_controller_test.rb | 28 +++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index bae85775c5..30f5f42fcf 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -61,6 +61,21 @@ def update end end + def destroy + @work = Work.find_by(id: params[:id]) + + unless @work + head :not_found + return + end + + @work.destroy + + flash[:status] = :success + flash[:message] = "Successfully deleted work #{@work.id}" + redirect_to works_path + end + private def work_params diff --git a/config/routes.rb b/config/routes.rb index 064582e99f..40a434a987 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,5 @@ root "homepages#index" resources :homepages, only: :index - resources :works, only: [:index, :new, :create, :show, :edit, :update] + resources :works end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index b652bde77f..88717df572 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -166,4 +166,32 @@ check_flash(:error) end end + + describe "destroy" do + it "removes the books from the database" do + expect { + delete work_path(@work) + }.must_change "Work.count", -1 + + must_respond_with :redirect + must_redirect_to works_path + + check_flash + + after_work = Work.find_by(id: @work.id) + expect(after_work).must_be_nil + end + + it "returns a 404 if the book does not exist" do + work_id = -1 + + expect(Work.find_by(id: work_id)).must_be_nil + + expect { + delete work_path(work_id) + }.wont_change "Work.count" + + must_respond_with :not_found + end + end end From bba49089661315c8324893ebb04dee37037d5b3b Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sat, 27 Apr 2019 19:46:01 -0700 Subject: [PATCH 18/34] DRYed up code --- app/controllers/works_controller.rb | 49 +++++---------- app/views/works/index.html.erb | 77 ++++++----------------- test/controllers/works_controller_test.rb | 16 +---- 3 files changed, 37 insertions(+), 105 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 30f5f42fcf..1f6a06796c 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,8 +1,8 @@ class WorksController < ApplicationController + before_action :find_work, only: [:show, :edit, :update, :destroy] + def index - @books = Work.where(category: "book") - @albums = Work.where(category: "album") - @movies = Work.where(category: "movie") + @works = Work.all end def new @@ -16,7 +16,7 @@ def create if successful flash[:status] = :success flash[:message] = "Successfully created #{@work.category} #{@work.id}" - redirect_to root_path #update to details page once created! + redirect_to work_path(@work.id) else flash.now[:status] = :error flash.now[:message] = "A problem occurred: could not create #{@work.category}" @@ -24,32 +24,11 @@ def create end end - def show - @work = Work.find_by(id: params[:id]) - - unless @work - head :not_found - return - end - end + def show; end - def edit - @work = Work.find_by(id: params[:id]) - - unless @work - head :not_found - return - end - end + def edit; end def update - @work = Work.find_by(id: params[:id]) - - unless @work - head :not_found - return - end - if @work.update(work_params) flash[:status] = :success flash[:message] = "Successfully updated work #{@work.id}" @@ -62,13 +41,6 @@ def update end def destroy - @work = Work.find_by(id: params[:id]) - - unless @work - head :not_found - return - end - @work.destroy flash[:status] = :success @@ -81,4 +53,13 @@ def destroy def work_params return params.require(:work).permit(:title, :category, :creator, :publication_year, :description) end + + def find_work + @work = Work.find_by(id: params[:id]) + + unless @work + head :not_found + return + end + end end diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 7fedcf6622..12d98b145e 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,60 +1,21 @@ - - -

Albums

- - - - - - - - <% @albums.each do |album| %> +<% ["album", "book", "movie"].each do |type| %> +
VotesTitleCreated ByPublishedUpvote
+

<%= type.capitalize %>s

- - - - - + + + + + - <% end %> -
Add Votes<%= album.title%><%= album.creator %><%= album.publication_year %>Add upvotesVotesTitleCreated ByPublishedUpvote
- - -

Books

- - - - - - - - <% @books.each do |book| %> - - - - - - - - <% end %> -
VotesTitleCreated ByPublishedUpvote
Add Votes<%= book.title %><%= book.creator %><%= book.publication_year %>Add upvotes
- - -

Movies

- - - - - - - - <% @movies.each do |movie| %> - - - - - - - - <% end %> -
VotesTitleCreated ByPublishedUpvote
Add Votes<%= movie.title %><%= movie.creator %><%= movie.publication_year %>Add upvotes
\ No newline at end of file + <% @works.where(category: type).each do |work| %> + + Add Votes + <%= work.title%> + <%= work.creator %> + <%= work.publication_year %> + Add upvotes + + <% end %> + +<% end %> diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 88717df572..0bb02f8323 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -7,23 +7,14 @@ describe "index" do it "renders without crashing" do - # Arrange - - # Act get works_path - - # Assert must_respond_with :ok end it "renders even if there are zero books" do - # Arrange Work.destroy_all - # Act get works_path - - # Assert must_respond_with :ok end end @@ -54,12 +45,13 @@ }.must_change "Work.count", +1 # Assert + work = Work.last + must_respond_with :redirect - # must_redirect_to work_path (add once details page is added) + must_redirect_to work_path(work.id) check_flash - work = Work.last expect(work.title).must_equal work_data[:work][:title] expect(work.creator).must_equal work_data[:work][:creator] expect(work.description).must_equal work_data[:work][:description] @@ -89,7 +81,6 @@ describe "show" do it "returns a 404 status code if the work doesn't exist" do - # TODO come back to this work_id = -1 get work_path(work_id) @@ -100,7 +91,6 @@ it "works for a work that exists" do get work_path(@work.id) - # Assert must_respond_with :ok end end From 594de7f485563cf9df4c9d87fa600167502eec60 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 28 Apr 2019 16:09:54 -0700 Subject: [PATCH 19/34] Created user model --- app/models/user.rb | 2 ++ db/migrate/20190428230736_create_users.rb | 9 +++++++++ db/schema.rb | 8 +++++++- test/fixtures/users.yml | 7 +++++++ test/models/user_test.rb | 9 +++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 app/models/user.rb create mode 100644 db/migrate/20190428230736_create_users.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..379658a509 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,2 @@ +class User < ApplicationRecord +end diff --git a/db/migrate/20190428230736_create_users.rb b/db/migrate/20190428230736_create_users.rb new file mode 100644 index 0000000000..9c711e759b --- /dev/null +++ b/db/migrate/20190428230736_create_users.rb @@ -0,0 +1,9 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + t.string :username + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 4636402b7e..45d788bb17 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,17 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_04_23_220801) do +ActiveRecord::Schema.define(version: 2019_04_28_230736) 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "works", force: :cascade do |t| t.string "title" t.string "creator" diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..952febd97d --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + username: MyString + +two: + username: MyString diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..cc862ac2d9 --- /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 From d890b51729ffd5f2497d10e5bf9989d47091f122 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 28 Apr 2019 16:11:24 -0700 Subject: [PATCH 20/34] Created user controller --- app/assets/javascripts/users.js | 2 ++ app/assets/stylesheets/users.scss | 3 +++ app/controllers/users_controller.rb | 2 ++ app/helpers/users_helper.rb | 2 ++ test/controllers/users_controller_test.rb | 7 +++++++ 5 files changed, 16 insertions(+) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 test/controllers/users_controller_test.rb diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..31a2eacb84 --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Users 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/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..3e74dea87f --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,2 @@ +class UsersController < ApplicationController +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..89decb54e0 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe UsersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 3b9302a4182d399702582dedf66ed9c1dcefa392 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 28 Apr 2019 16:28:52 -0700 Subject: [PATCH 21/34] wrote tests and user controller methods --- app/controllers/users_controller.rb | 38 +++++++++++++++++++++++ app/views/users/current.html.erb | 5 +++ app/views/users/login_form.html.erb | 5 +++ config/routes.rb | 5 +++ test/controllers/users_controller_test.rb | 29 ++++++++++++++--- test/fixtures/users.yml | 4 +-- 6 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 app/views/users/current.html.erb create mode 100644 app/views/users/login_form.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3e74dea87f..bf87418200 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,2 +1,40 @@ class UsersController < ApplicationController + def login_form + @user = User.new + end + + def login + username = params[:user][:username] + user = User.find_by(username: username) + if user + session[:user_id] = user.id + flash[:success] = "Successfully logged in as existing user #{username}" + else + user = User.create(username: username) + session[:user_id] = user.id + flash[:success] = "Successfully logged in as new user #{username}" + end + + redirect_to root_path + end + + def logout + session[:user_id] = nil + + flash[:status] = :success + flash[:message] = "Successfully logged out" + + redirect_to root_path + end + + def current + @user = User.find_by(id: session[:user_id]) + + unless @user + flash[:status] = :error + flash[:message] = "You must be logged in to see this page" + redirect_to login_path + return + end + end end diff --git a/app/views/users/current.html.erb b/app/views/users/current.html.erb new file mode 100644 index 0000000000..c4485bf1a1 --- /dev/null +++ b/app/views/users/current.html.erb @@ -0,0 +1,5 @@ +

+ You are logged in as user + "<%= @user.username %>" + (ID <%= @user.id %>) +

\ No newline at end of file diff --git a/app/views/users/login_form.html.erb b/app/views/users/login_form.html.erb new file mode 100644 index 0000000000..edef28f0be --- /dev/null +++ b/app/views/users/login_form.html.erb @@ -0,0 +1,5 @@ +<%= form_with model: @user, url: login_path do |f| %> + <%= f.label :username %> + <%= f.text_field :username %> + <%= f.submit "Log In" %> +<% end %> \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 40a434a987..8fd674c418 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,9 @@ resources :homepages, only: :index resources :works + + get "/login", to: "users#login_form", as: "login" + post "/login", to: "users#login" + post "/logout", to: "users#logout", as: "logout" + get "/users/current", to: "users#current", as: "current_user" end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 89decb54e0..878ae22226 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,7 +1,28 @@ require "test_helper" -describe UsersController do - # it "must be a real test" do - # flunk "Need real tests" - # end +describe "UsersController" do + describe "login_form" do + it "can render the login form" do + get login_path + must_respond_with :ok + end + end + + describe "current" do + it "returns 200 OK for a logged-in user" do + user = User.first + login_data = { + user: { + username: user.username, + }, + } + post login_path, params: login_data + + expect(session[:user_id]).must_equal user.id + + get current_user_path + + must_respond_with :success + end + end end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 952febd97d..8ee702d207 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - username: MyString + username: thefirstone two: - username: MyString + username: mysecondusername From cc6a16e38a28e694da3bc9923248ebed1b4c4c10 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 28 Apr 2019 16:39:49 -0700 Subject: [PATCH 22/34] Added test coverage for user controller --- test/controllers/users_controller_test.rb | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 878ae22226..ba0a519172 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -8,6 +8,39 @@ end end + describe "login" do + it "logs in an user" do + new_user = User.create(username: "newuser") + + login_data = { + user: { + username: new_user.username, + }, + } + + post login_path, params: login_data + expect(session[:user_id]).must_equal new_user.id + end + end + + describe "login" do + it "logs out an user" do + user = User.create(username: "logmeout") + + login_data = { + user: { + username: user.username, + }, + } + + post login_path, params: login_data + expect(session[:user_id]).must_equal user.id + + post logout_path, params: login_data + expect(session[:user_id]).must_be_nil + end + end + describe "current" do it "returns 200 OK for a logged-in user" do user = User.first From 71ba78b70a837a9f14420d29ad990623990917b6 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 28 Apr 2019 20:58:25 -0700 Subject: [PATCH 23/34] Migration to create join table for user and work --- db/migrate/20190429035530_create_works_users_join.rb | 8 ++++++++ db/schema.rb | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190429035530_create_works_users_join.rb diff --git a/db/migrate/20190429035530_create_works_users_join.rb b/db/migrate/20190429035530_create_works_users_join.rb new file mode 100644 index 0000000000..7df0d4e84e --- /dev/null +++ b/db/migrate/20190429035530_create_works_users_join.rb @@ -0,0 +1,8 @@ +class CreateWorksUsersJoin < ActiveRecord::Migration[5.2] + def change + create_table :votes do |t| + t.belongs_to :work, index: true + t.belongs_to :user, index: true + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 45d788bb17..0b80781ab1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_04_28_230736) do +ActiveRecord::Schema.define(version: 2019_04_29_035530) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,6 +21,13 @@ t.datetime "updated_at", null: false end + create_table "votes", force: :cascade do |t| + t.bigint "work_id" + t.bigint "user_id" + t.index ["user_id"], name: "index_votes_on_user_id" + t.index ["work_id"], name: "index_votes_on_work_id" + end + create_table "works", force: :cascade do |t| t.string "title" t.string "creator" From 7bef241436653009c9ce5b657d034d2689b2f812 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 28 Apr 2019 21:37:05 -0700 Subject: [PATCH 24/34] created upvote method for works --- app/controllers/works_controller.rb | 21 ++++++++++++++++++- app/models/user.rb | 1 + app/models/work.rb | 1 + app/views/works/show.html.erb | 11 +++++----- config/routes.rb | 1 + .../20190429035530_create_works_users_join.rb | 2 +- db/schema.rb | 6 +++--- test/controllers/works_controller_test.rb | 14 +++++++++++++ 8 files changed, 47 insertions(+), 10 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 1f6a06796c..3d7b6ae880 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,5 +1,5 @@ class WorksController < ApplicationController - before_action :find_work, only: [:show, :edit, :update, :destroy] + before_action :find_work, only: [:show, :edit, :update, :destroy, :upvote] def index @works = Work.all @@ -48,6 +48,25 @@ def destroy redirect_to works_path end + def upvote + if session[:user_id] + current_user = User.find(session[:user_id]) + + if @work.users.include?(current_user) + flash[:status] = :error + flash[:message] = "Cannot vote more than once" + else + @work.users.push(current_user) + flash[:status] = :success + flash[:message] = "Successfully upvoted" + redirect_to work_path(@work) + end + else + flash[:status] = :error + flash[:message] = "Must be logged in to vote" + end + end + private def work_params diff --git a/app/models/user.rb b/app/models/user.rb index 379658a509..1b8faf48ab 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,3 @@ class User < ApplicationRecord + has_and_belongs_to_many :works end diff --git a/app/models/work.rb b/app/models/work.rb index f352a7f572..13463179fc 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,3 +1,4 @@ class Work < ApplicationRecord validates :title, presence: :true + has_and_belongs_to_many :users end diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 9b93ff778c..b2bf756e47 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -4,14 +4,15 @@

<%= @work.description %>

+<%= link_to "Back to media ranks", root_path %> +<%= link_to "Edit", edit_work_path(@work) %> +<%= link_to "Upvote", upvote_path(@work), method: :post %> +<%= link_to "Delete", work_path(@work), method: :delete, data: { confirm: "Are you sure?" } %> -Back to media ranks -Edit -<%# Upvote -Delete %> +<%= link_to "Log In", login_path %> -

ADD Votes for this <%= @work.category %>

+

<%= @work.users.length %> Votes for this <%= @work.category %>

diff --git a/config/routes.rb b/config/routes.rb index 8fd674c418..a580e9f7e5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,7 @@ resources :homepages, only: :index resources :works + post "/works/:id/upvote", to: "works#upvote", as: "upvote" get "/login", to: "users#login_form", as: "login" post "/login", to: "users#login" diff --git a/db/migrate/20190429035530_create_works_users_join.rb b/db/migrate/20190429035530_create_works_users_join.rb index 7df0d4e84e..3d2bb5452f 100644 --- a/db/migrate/20190429035530_create_works_users_join.rb +++ b/db/migrate/20190429035530_create_works_users_join.rb @@ -1,6 +1,6 @@ class CreateWorksUsersJoin < ActiveRecord::Migration[5.2] def change - create_table :votes do |t| + create_table :users_works do |t| t.belongs_to :work, index: true t.belongs_to :user, index: true end diff --git a/db/schema.rb b/db/schema.rb index 0b80781ab1..fb12d08af2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -21,11 +21,11 @@ t.datetime "updated_at", null: false end - create_table "votes", force: :cascade do |t| + create_table "users_works", force: :cascade do |t| t.bigint "work_id" t.bigint "user_id" - t.index ["user_id"], name: "index_votes_on_user_id" - t.index ["work_id"], name: "index_votes_on_work_id" + t.index ["user_id"], name: "index_users_works_on_user_id" + t.index ["work_id"], name: "index_users_works_on_work_id" end create_table "works", force: :cascade do |t| diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 0bb02f8323..d89be9cadb 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -184,4 +184,18 @@ must_respond_with :not_found end end + + describe "upvote" do + it "flashes an error if user is not logged in" do + #code + end + + it "adds the user to works if new vote" do + #code + end + + it "flashes an error if user already voted" do + #code + end + end end From 716b84dcaabe8efd8d32cb2a6e158ffd0fd53e6d Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 28 Apr 2019 22:40:57 -0700 Subject: [PATCH 25/34] html work, updating to include votes --- app/views/homepages/index.html.erb | 12 ++++++------ app/views/layouts/application.html.erb | 16 ++++++++++++++++ app/views/works/_form.html.erb | 15 +++++++++++++++ app/views/works/index.html.erb | 13 +++++++++---- app/views/works/show.html.erb | 6 ++++++ config/routes.rb | 1 + 6 files changed, 53 insertions(+), 10 deletions(-) diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index a77647b9f4..cd5733eda8 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -8,8 +8,8 @@
    <% @movies.each do |movie| %>
  • - <%= movie.title %> by <%= movie.creator %> - ADD votes + <%= link_to movie.title, work_path(movie) %> by <%= movie.creator %> + <%= movie.users.length%> votes
    • <% end %>
@@ -20,8 +20,8 @@
    <% @books.each do |book| %>
  • - <%= book.title %> by <%= book.creator %> - ADD votes + <%= link_to book.title, work_path(book) %> by <%= book.creator %> + <%= book.users.length%> votes
    • <% end %>
@@ -32,8 +32,8 @@
    <% @albums.each do |album| %>
  • - <%= album.title %> by <%= album.creator %> - ADD votes + <%= link_to album.title, work_path(album) %> by <%= album.creator %> + <%= album.users.length%> votes
    • <% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f32268a271..6916c4db72 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,7 +8,23 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> +
+ <%= link_to "MediaRanker | Ranking the Best of Everything", root_path%> +
+ + <%= yield %> diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index aa764ada13..8f4b541e8c 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -1,3 +1,18 @@ +<% if @work.errors.messages.any? %> +
+ There were some issues with your submission +
    + <% @work.errors.messages.each do |column, problem_list| %> + <% problem_list.each do |problem| %> +
  • + <%= column %>: <%= problem %> +
    • + <% end %> + <% end %> +
+
+<% end %> + <%= form_with model: work do |f| %> <%= f.label :category %> <%= f.select :category, ["album", "book", "movie"] %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 12d98b145e..6ae8a802b4 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -8,13 +8,18 @@ - <% @works.where(category: type).each do |work| %> + <% selected_works = @works.where(category: type)%> + <% ordered_works = selected_works.sort_by do |work| %> + <% work.users.length %> + <% end %> + <% ordered_works.reverse! %> + <% ordered_works.each do |work| %> - - + + - + <% end %>
User DatePublished Upvote
Add Votes<%= work.title%><%= work.users.length %><%= link_to work.title, work_path(work) %> <%= work.creator %> <%= work.publication_year %>Add upvotes<%= link_to "Upvote", upvote_path(work), method: :post %>
diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index b2bf756e47..473bd14e72 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -17,4 +17,10 @@ User Date + <% @work.users.each do |user| %> + + <%= user.username %> + date + + <% end %> diff --git a/config/routes.rb b/config/routes.rb index a580e9f7e5..e26b2397aa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,6 +6,7 @@ resources :works post "/works/:id/upvote", to: "works#upvote", as: "upvote" + resources :users, only: [:index, :show] get "/login", to: "users#login_form", as: "login" post "/login", to: "users#login" post "/logout", to: "users#logout", as: "logout" From af911f0e3dda07fb328ad50c6faf3562d0a89544 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 28 Apr 2019 23:03:20 -0700 Subject: [PATCH 26/34] Updated work to include top ten and featured to respect vote count --- app/controllers/homepages_controller.rb | 6 ++---- app/models/work.rb | 21 +++++++++++++++++++++ app/views/homepages/index.html.erb | 6 +++--- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb index 20a64422d7..a8a380099d 100644 --- a/app/controllers/homepages_controller.rb +++ b/app/controllers/homepages_controller.rb @@ -1,8 +1,6 @@ class HomepagesController < ApplicationController def index - @featured = Work.all.sample - @books = Work.where(category: "book") - @albums = Work.where(category: "album") - @movies = Work.where(category: "movie") + @featured = Work.featured + @works = Work.all end end diff --git a/app/models/work.rb b/app/models/work.rb index 13463179fc..0b0b8f147d 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,4 +1,25 @@ class Work < ApplicationRecord validates :title, presence: :true has_and_belongs_to_many :users + + def self.top_ten(category) + selected_works = Work.where(category: category) + + ordered_works = selected_works.sort_by do |work| + work.users.length + end + + ordered_works.reverse! + + until ordered_works.length <= 10 + ordered_works.pop + end + + return ordered_works + end + + def self.featured + all_works = Work.all + return all_works.max_by { |work| work.users.length } + end end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index cd5733eda8..ada0ecdea5 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -6,7 +6,7 @@

Top Movies

    - <% @movies.each do |movie| %> + <% Work.top_ten("movie").each do |movie| %>
  • <%= link_to movie.title, work_path(movie) %> by <%= movie.creator %> <%= movie.users.length%> votes @@ -18,7 +18,7 @@

    Top Books

      - <% @books.each do |book| %> + <% Work.top_ten("book").each do |book| %>
    • <%= link_to book.title, work_path(book) %> by <%= book.creator %> <%= book.users.length%> votes @@ -30,7 +30,7 @@

      Top Albums

        - <% @albums.each do |album| %> + <% Work.top_ten("album").each do |album| %>
      • <%= link_to album.title, work_path(album) %> by <%= album.creator %> <%= album.users.length%> votes From fef4273dc34e16bee4fc2ba8d326373129fa6de1 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 28 Apr 2019 23:08:15 -0700 Subject: [PATCH 27/34] DRYed up homepage html --- app/views/homepages/index.html.erb | 48 ++++++++---------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index ada0ecdea5..a2a76da8ac 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -3,38 +3,16 @@

        <%= @featured.description %>

      -
      -

      Top Movies

      -
        - <% Work.top_ten("movie").each do |movie| %> -
      • - <%= link_to movie.title, work_path(movie) %> by <%= movie.creator %> - <%= movie.users.length%> votes -
        • - <% end %> -
      -
      - -
      -

      Top Books

      -
        - <% Work.top_ten("book").each do |book| %> -
      • - <%= link_to book.title, work_path(book) %> by <%= book.creator %> - <%= book.users.length%> votes -
        • - <% end %> -
      -
      - -
      -

      Top Albums

      -
        - <% Work.top_ten("album").each do |album| %> -
      • - <%= link_to album.title, work_path(album) %> by <%= album.creator %> - <%= album.users.length%> votes -
        • - <% end %> -
      -
      +<% ["movie", "book", "album"].each do |type| %> +
      +

      Top <%= type.capitalize%>s

      +
        + <% Work.top_ten(type).each do |work| %> +
      • + <%= link_to work.title, work_path(work) %> by <%= work.creator %> + <%= work.users.length%> votes +
        • + <% end %> +
      +
      +<% end %> \ No newline at end of file From 894b54d5d7592541af39fed1e0da4a9cbcb9abad Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Mon, 29 Apr 2019 07:54:08 -0700 Subject: [PATCH 28/34] Added test coverage for work controller --- app/controllers/works_controller.rb | 3 +- test/controllers/users_controller_test.rb | 2 +- test/controllers/works_controller_test.rb | 48 +++++++++++++++++++++-- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 3d7b6ae880..1fa03bfe73 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -59,12 +59,13 @@ def upvote @work.users.push(current_user) flash[:status] = :success flash[:message] = "Successfully upvoted" - redirect_to work_path(@work) end else flash[:status] = :error flash[:message] = "Must be logged in to vote" end + + redirect_to work_path(@work) end private diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index ba0a519172..4224f6fb68 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -36,7 +36,7 @@ post login_path, params: login_data expect(session[:user_id]).must_equal user.id - post logout_path, params: login_data + post logout_path expect(session[:user_id]).must_be_nil end end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index d89be9cadb..59d2520e57 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -186,16 +186,58 @@ end describe "upvote" do + before do + @user = User.create(username: "generic_name") + + @login_data = { + user: { + username: @user.username, + }, + } + end + it "flashes an error if user is not logged in" do - #code + post logout_path + expect(session[:user_id]).must_be_nil + + post upvote_path(@work) + + check_flash(expected_status = :error) + + must_respond_with :redirect + must_redirect_to work_path(@work) end it "adds the user to works if new vote" do - #code + post login_path, params: @login_data + expect(session[:user_id]).must_equal @user.id + + expect { + post upvote_path(@work) + }.must_change "@work.users.count", +1 + + check_flash + + must_respond_with :redirect + must_redirect_to work_path(@work) end it "flashes an error if user already voted" do - #code + post login_path, params: @login_data + expect(session[:user_id]).must_equal @user.id + + expect { + post upvote_path(@work) + }.must_change "@work.users.count", +1 + + check_flash + + post upvote_path(@work) + + check_flash(expected_status = :error) + + must_respond_with :redirect + must_redirect_to work_path(@work) end end end From a6b0fbc59313ed95f2630a75640d213b1381608f Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Mon, 29 Apr 2019 14:16:17 -0700 Subject: [PATCH 29/34] Added some test coverage to work --- app/models/work.rb | 2 +- config/routes.rb | 1 - test/controllers/users_controller_test.rb | 18 ------------ test/fixtures/works.yml | 1 + test/models/work_test.rb | 36 +++++++++++++++++++++++ 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 0b0b8f147d..0842856e9c 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,6 +1,6 @@ class Work < ApplicationRecord - validates :title, presence: :true has_and_belongs_to_many :users + validates :title, presence: :true def self.top_ten(category) selected_works = Work.where(category: category) diff --git a/config/routes.rb b/config/routes.rb index e26b2397aa..6b30caa1bf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,5 +10,4 @@ get "/login", to: "users#login_form", as: "login" post "/login", to: "users#login" post "/logout", to: "users#logout", as: "logout" - get "/users/current", to: "users#current", as: "current_user" end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 4224f6fb68..868ff61a37 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -40,22 +40,4 @@ expect(session[:user_id]).must_be_nil end end - - describe "current" do - it "returns 200 OK for a logged-in user" do - user = User.first - login_data = { - user: { - username: user.username, - }, - } - post login_path, params: login_data - - expect(session[:user_id]).must_equal user.id - - get current_user_path - - must_respond_with :success - end - end end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 65cc546814..66bac4325a 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -6,6 +6,7 @@ hp1: description: "The first one" category: "book" publication_year: 1997 + users: one, two hp2: title: "Harry Potter and the Chamber of Secrets" diff --git a/test/models/work_test.rb b/test/models/work_test.rb index a6b7f20067..352729b979 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -6,4 +6,40 @@ it "must be valid" do value(work).must_be :valid? end + + describe "validations" do + it "passes validations with good data" do + expect(work).must_be :valid? + end + end + + describe "relations" do + it "has users" do + hp1 = works(:hp1) + expect(hp1.users.length).must_equal 2 + + user = users(:one) + expect(user.works.length).must_equal 1 + end + end + + describe "top_ten" do + it "returns an ordered array with top ten" do + #code + end + + it "returns an empty array if no works" do + #code + end + end + + describe "featured" do + it "returns the work with the most votes" do + #code + end + + it "returns nil if no works" do + #code + end + end end From 7d36f51c114af68c8b2c04d7f3700c501a881efb Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Mon, 29 Apr 2019 14:27:33 -0700 Subject: [PATCH 30/34] Migration to delete join table, migration to add vote model and references to work and user --- app/models/user.rb | 2 +- app/models/vote.rb | 4 ++++ app/models/work.rb | 2 +- .../20190429035530_create_works_users_join.rb | 8 -------- db/migrate/20190429211919_create_votes.rb | 7 +++++++ ...90429212215_add_user_id_and_work_id_to_votes.rb | 6 ++++++ db/schema.rb | 14 +++++++++----- test/fixtures/votes.yml | 11 +++++++++++ test/models/vote_test.rb | 9 +++++++++ 9 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 app/models/vote.rb delete mode 100644 db/migrate/20190429035530_create_works_users_join.rb create mode 100644 db/migrate/20190429211919_create_votes.rb create mode 100644 db/migrate/20190429212215_add_user_id_and_work_id_to_votes.rb create mode 100644 test/fixtures/votes.yml create mode 100644 test/models/vote_test.rb diff --git a/app/models/user.rb b/app/models/user.rb index 1b8faf48ab..db11855600 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,3 +1,3 @@ class User < ApplicationRecord - has_and_belongs_to_many :works + has_many :votes end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..b8b6f9f0aa --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,4 @@ +class Vote < ApplicationRecord + belongs_to :user + belongs_to :work +end diff --git a/app/models/work.rb b/app/models/work.rb index 0842856e9c..1ce08b059f 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,5 @@ class Work < ApplicationRecord - has_and_belongs_to_many :users + has_many :votes validates :title, presence: :true def self.top_ten(category) diff --git a/db/migrate/20190429035530_create_works_users_join.rb b/db/migrate/20190429035530_create_works_users_join.rb deleted file mode 100644 index 3d2bb5452f..0000000000 --- a/db/migrate/20190429035530_create_works_users_join.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateWorksUsersJoin < ActiveRecord::Migration[5.2] - def change - create_table :users_works do |t| - t.belongs_to :work, index: true - t.belongs_to :user, index: true - end - end -end diff --git a/db/migrate/20190429211919_create_votes.rb b/db/migrate/20190429211919_create_votes.rb new file mode 100644 index 0000000000..d04f731358 --- /dev/null +++ b/db/migrate/20190429211919_create_votes.rb @@ -0,0 +1,7 @@ +class CreateVotes < ActiveRecord::Migration[5.2] + def change + create_table :votes do |t| + t.timestamps + end + end +end diff --git a/db/migrate/20190429212215_add_user_id_and_work_id_to_votes.rb b/db/migrate/20190429212215_add_user_id_and_work_id_to_votes.rb new file mode 100644 index 0000000000..e5b7f65012 --- /dev/null +++ b/db/migrate/20190429212215_add_user_id_and_work_id_to_votes.rb @@ -0,0 +1,6 @@ +class AddUserIdAndWorkIdToVotes < ActiveRecord::Migration[5.2] + def change + add_reference :votes, :user, foreign_key: true + add_reference :votes, :work, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index fb12d08af2..7e86a8ecad 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_04_29_035530) do +ActiveRecord::Schema.define(version: 2019_04_29_212215) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,11 +21,13 @@ t.datetime "updated_at", null: false end - create_table "users_works", force: :cascade do |t| - t.bigint "work_id" + create_table "votes", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.bigint "user_id" - t.index ["user_id"], name: "index_users_works_on_user_id" - t.index ["work_id"], name: "index_users_works_on_work_id" + t.bigint "work_id" + t.index ["user_id"], name: "index_votes_on_user_id" + t.index ["work_id"], name: "index_votes_on_work_id" end create_table "works", force: :cascade do |t| @@ -38,4 +40,6 @@ t.datetime "updated_at", null: false end + add_foreign_key "votes", "users" + add_foreign_key "votes", "works" end diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..dc3ee79b5d --- /dev/null +++ b/test/fixtures/votes.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/models/vote_test.rb b/test/models/vote_test.rb new file mode 100644 index 0000000000..fc15947bd3 --- /dev/null +++ b/test/models/vote_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Vote do + let(:vote) { Vote.new } + + it "must be valid" do + value(vote).must_be :valid? + end +end From 3de93fdb913d1eede8ece029167a16846fc9b2fc Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 5 May 2019 20:59:35 -0700 Subject: [PATCH 31/34] Updated controllers, models, and views after adding vote model and removing join table --- app/controllers/works_controller.rb | 5 +++-- app/views/works/index.html.erb | 4 ++-- app/views/works/show.html.erb | 8 ++++---- test/controllers/works_controller_test.rb | 4 ++-- test/fixtures/works.yml | 1 - test/models/vote_test.rb | 5 ----- test/models/work_test.rb | 8 +------- 7 files changed, 12 insertions(+), 23 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 1fa03bfe73..438a278098 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -52,11 +52,12 @@ def upvote if session[:user_id] current_user = User.find(session[:user_id]) - if @work.users.include?(current_user) + vote = Vote.find_by(user_id: session[:user_id], work_id: @work.id) + if vote flash[:status] = :error flash[:message] = "Cannot vote more than once" else - @work.users.push(current_user) + Vote.create(user_id: session[:user_id], work_id: @work.id) flash[:status] = :success flash[:message] = "Successfully upvoted" end diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 6ae8a802b4..d64098b190 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -10,12 +10,12 @@ <% selected_works = @works.where(category: type)%> <% ordered_works = selected_works.sort_by do |work| %> - <% work.users.length %> + <% work.votes.length %> <% end %> <% ordered_works.reverse! %> <% ordered_works.each do |work| %> - <%= work.users.length %> + <%= work.votes.length %> <%= link_to work.title, work_path(work) %> <%= work.creator %> <%= work.publication_year %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 473bd14e72..9143a0eb86 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -12,15 +12,15 @@ <%= link_to "Log In", login_path %> -

      <%= @work.users.length %> Votes for this <%= @work.category %>

      +

      <%= @work.votes.length %> Votes for this <%= @work.category %>

      - <% @work.users.each do |user| %> + <% @work.votes.each do |vote| %> - - + + <% end %>
      User Date
      <%= user.username %>date<%= vote.user.username %>vote.date
      diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 59d2520e57..2666bc47e1 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -214,7 +214,7 @@ expect { post upvote_path(@work) - }.must_change "@work.users.count", +1 + }.must_change "@work.votes.count", +1 check_flash @@ -228,7 +228,7 @@ expect { post upvote_path(@work) - }.must_change "@work.users.count", +1 + }.must_change "@work.votes.count", +1 check_flash diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 66bac4325a..65cc546814 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -6,7 +6,6 @@ hp1: description: "The first one" category: "book" publication_year: 1997 - users: one, two hp2: title: "Harry Potter and the Chamber of Secrets" diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..a595ddc5e5 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,9 +1,4 @@ require "test_helper" describe Vote do - let(:vote) { Vote.new } - - it "must be valid" do - value(vote).must_be :valid? - end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 352729b979..5243a8a9ee 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -14,13 +14,7 @@ end describe "relations" do - it "has users" do - hp1 = works(:hp1) - expect(hp1.users.length).must_equal 2 - - user = users(:one) - expect(user.works.length).must_equal 1 - end + #code end describe "top_ten" do From afa12210cc931e517360c3408551306f7ee622f2 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 5 May 2019 21:07:43 -0700 Subject: [PATCH 32/34] more fixes for adding in vote model --- app/models/work.rb | 4 ++-- app/views/homepages/index.html.erb | 2 +- app/views/works/show.html.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 1ce08b059f..b1f04cd582 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -6,7 +6,7 @@ def self.top_ten(category) selected_works = Work.where(category: category) ordered_works = selected_works.sort_by do |work| - work.users.length + work.votes.length end ordered_works.reverse! @@ -20,6 +20,6 @@ def self.top_ten(category) def self.featured all_works = Work.all - return all_works.max_by { |work| work.users.length } + return all_works.max_by { |work| work.votes.length } end end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index a2a76da8ac..dea4df7d04 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -10,7 +10,7 @@ <% Work.top_ten(type).each do |work| %>
    • <%= link_to work.title, work_path(work) %> by <%= work.creator %> - <%= work.users.length%> votes + <%= work.votes.length%> votes
      • <% end %>
    diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 9143a0eb86..dda3033f44 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -20,7 +20,7 @@ <% @work.votes.each do |vote| %> <%= vote.user.username %> - vote.date + <%= vote.created_at %> <% end %> From d6cf7cfc80f4aede46de4a35f791e0cc2114e517 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 5 May 2019 21:27:21 -0700 Subject: [PATCH 33/34] Added error handling to view --- app/views/layouts/application.html.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6916c4db72..a1a3a85e4e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -26,6 +26,10 @@ + <% alert_type = flash[:status] == :error ? :danger : flash[:status] %> +
    + <%= flash[:message] %> +
    <%= yield %> From a3c4b06779b254d39f037ecf45aa9a908d7742e1 Mon Sep 17 00:00:00 2001 From: Erica Norris Date: Sun, 5 May 2019 22:14:38 -0700 Subject: [PATCH 34/34] added users index --- app/controllers/users_controller.rb | 4 ++++ app/views/users/index.html.erb | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 app/views/users/index.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index bf87418200..d91886d188 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -37,4 +37,8 @@ def current return end end + + def index + @users = User.all + end end diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..8a0d5e4f27 --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,17 @@ + +

    List of Users

    + + + + + + <% @users.each do |user| %> + + + + + + <% end %> +
    UsernameVotesJoined
    <%= user.username %><%= user.votes.length %><%= user.created_at %>
    + +<%= link_to "Back to media ranks", root_path %> \ No newline at end of file