From 900a8335e26ea4b86780394f1d4b6865d201f4e2 Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 14:50:41 -0700 Subject: [PATCH 01/50] Initial rails setup --- .gitignore | 27 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 277 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 20 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.scss | 18 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 15 + app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 36 +++ bin/spring | 17 ++ bin/update | 31 ++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 61 ++++ config/environments/production.rb | 94 ++++++ config/environments/test.rb | 46 +++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 ++ config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 +++ config/puma.rb | 34 +++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 +++++ public/422.html | 67 +++++ public/500.html | 66 +++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + storage/.keep | 0 test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 10 + tmp/.keep | 0 vendor/.keep | 0 80 files changed, 1392 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.scss create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 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..6219256bd8 --- /dev/null +++ b/Gemfile @@ -0,0 +1,81 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-rails' +gem 'jquery-turbolinks' +gem 'bootstrap', '~> 4.1.3' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..2ed655c894 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,277 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.11.0) + io-like (~> 0.3.0) + arel (9.0.0) + autoprefixer-rails (9.1.4) + execjs + better_errors (2.5.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.3.2) + msgpack (~> 1.0) + bootstrap (4.1.3) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.9, < 2) + sass (>= 3.5.2) + builder (3.2.3) + byebug (10.0.2) + capybara (3.9.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.25) + formatador (0.2.5) + globalid (0.4.1) + activesupport (>= 4.2.0) + guard (2.14.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.1.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.3) + popper_js (1.14.3) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.6.0) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.14.1) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + shellany (0.0.1) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.19) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.1.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + bootstrap (~> 4.1.3) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.2 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..4f73c21a7d --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,20 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. + //= require jquery3 + //= require popper + //= require bootstrap-sprockets + +// +//= require rails-ujs +//= require activestorage +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 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..8b1701e581 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,18 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + */ + +/* Custom bootstrap variables must be set or imported *before* bootstrap. */ +@import "bootstrap"; +/* Import scss content */ +@import "**/*"; diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 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..cf132cd095 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +DGZmZ1wfFYXvc3ZCQeWcTnXRUqfrYUrXkPRopMqqQ4TiNIYeF/c7XI2EKRmOa0KDJrSj6lEKfsg1jluMsn44SxswGrx0GI7ejqY+BqkxJN0VQchEyZeYh3FWjbT5W1W/lam8ZQQqI6sr9g4m5M8kaxzEWHNAjatJk2WHBVA2W6cRCuqhwNf1LPQ9vyQDCNiOfrNn2rqJdeNpEKJCnPocdsfI8WyiRrHB4ouoq5XnXZOwWlC76FxY2RBuDPx+JKp1+YwUB78m6vIZUE4PLAhc2PdO2hz2dk40HH0vaawf6iCJByxp8HtSti1GTXT2Aot8Hf+sFAKmJx2xEfuv8WtIb/FMPjjAMFHjDTNcUP+S/Sao8CQBumRLi1LSRVcy75KGmtj1PzOGWVIpOcwHLB08Zdt90haNQCa2cWP5--z/fIqibPOb5flRMY--EtOVBUQC3wbZHxz4EhzUHg== \ 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/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..3ab84e3d14 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From 9a359af703305e892819ba992fbf49c0580573bf Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 14:54:34 -0700 Subject: [PATCH 02/50] Generated models --- app/models/user.rb | 2 ++ app/models/vote.rb | 2 ++ app/models/work.rb | 2 ++ db/migrate/20181008215305_create_votes.rb | 9 +++++++++ db/migrate/20181008215403_create_works.rb | 13 +++++++++++++ db/migrate/20181008215416_create_users.rb | 10 ++++++++++ test/fixtures/users.yml | 9 +++++++++ test/fixtures/votes.yml | 7 +++++++ test/fixtures/works.yml | 15 +++++++++++++++ test/models/user_test.rb | 9 +++++++++ test/models/vote_test.rb | 9 +++++++++ test/models/work_test.rb | 9 +++++++++ 12 files changed, 96 insertions(+) create mode 100644 app/models/user.rb create mode 100644 app/models/vote.rb create mode 100644 app/models/work.rb create mode 100644 db/migrate/20181008215305_create_votes.rb create mode 100644 db/migrate/20181008215403_create_works.rb create mode 100644 db/migrate/20181008215416_create_users.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/fixtures/votes.yml create mode 100644 test/fixtures/works.yml create mode 100644 test/models/user_test.rb create mode 100644 test/models/vote_test.rb create mode 100644 test/models/work_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/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..4c58e4f3d5 --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,2 @@ +class Vote < ApplicationRecord +end 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/20181008215305_create_votes.rb b/db/migrate/20181008215305_create_votes.rb new file mode 100644 index 0000000000..76b58165d3 --- /dev/null +++ b/db/migrate/20181008215305_create_votes.rb @@ -0,0 +1,9 @@ +class CreateVotes < ActiveRecord::Migration[5.2] + def change + create_table :votes do |t| + t.date :date + + t.timestamps + end + end +end diff --git a/db/migrate/20181008215403_create_works.rb b/db/migrate/20181008215403_create_works.rb new file mode 100644 index 0000000000..da8c57f5d3 --- /dev/null +++ b/db/migrate/20181008215403_create_works.rb @@ -0,0 +1,13 @@ +class CreateWorks < ActiveRecord::Migration[5.2] + def change + create_table :works do |t| + t.string :category + t.string :title + t.string :creator + t.date :publication_year + t.string :description + + t.timestamps + end + end +end diff --git a/db/migrate/20181008215416_create_users.rb b/db/migrate/20181008215416_create_users.rb new file mode 100644 index 0000000000..1ade2057f9 --- /dev/null +++ b/db/migrate/20181008215416_create_users.rb @@ -0,0 +1,10 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + t.string :username + t.date :joined + + t.timestamps + end + end +end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..3c0fbed2c3 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + username: MyString + joined: 2018-10-08 + +two: + username: MyString + joined: 2018-10-08 diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..9b1dd9f96b --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + date: 2018-10-08 + +two: + date: 2018-10-08 diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..c6bc766042 --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + category: MyString + title: MyString + creator: MyString + publication_year: 2018-10-08 + description: MyString + +two: + category: MyString + title: MyString + creator: MyString + publication_year: 2018-10-08 + description: 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 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 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 b6b53a83415f7ed5dd8b43b04d69acd72146acb7 Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 14:54:48 -0700 Subject: [PATCH 03/50] Setup seeds.rb --- db/seeds.rb | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..d40875f6e3 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,28 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) + +require 'csv' + +MEDIA_FILE = Rails.root.join('db', 'media_seeds.csv') +puts "Loading raw media data from #{MEDIA_FILE}" + +work_failures = [] +CSV.foreach(MEDIA_FILE, :headers => true) do |row| + work = Work.new + work.category = row['category'] + work.title = row['title'] + work.creator = row['creator'] + work.publication_year = row['publication_year'] + work.description = row['description'] + successful = work.save + if !successful + work_failures << work + puts "Failed to save work: #{work.inspect}" + else + puts "Created work: #{work.inspect}" + end +end + +puts "Added #{Work.count} work records" +puts "#{work_failures.length} works failed to save" From ada15715891970b8ea04ab0370d640469a4508e4 Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 14:58:41 -0700 Subject: [PATCH 04/50] Set up relationships --- app/models/user.rb | 3 ++ app/models/vote.rb | 2 + app/models/work.rb | 2 + .../20181008215738_add_references_to_votes.rb | 6 +++ db/schema.rb | 47 +++++++++++++++++++ 5 files changed, 60 insertions(+) create mode 100644 db/migrate/20181008215738_add_references_to_votes.rb create mode 100644 db/schema.rb diff --git a/app/models/user.rb b/app/models/user.rb index 379658a509..163daa0d6e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,5 @@ class User < ApplicationRecord + has_many :votes + has_many :works, through: :votes + # has_many :works # optional end diff --git a/app/models/vote.rb b/app/models/vote.rb index 4c58e4f3d5..b8b6f9f0aa 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,2 +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 95322dd45e..bf898977dc 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,2 +1,4 @@ class Work < ApplicationRecord + has_many :votes + # belongs_to :user # optional end diff --git a/db/migrate/20181008215738_add_references_to_votes.rb b/db/migrate/20181008215738_add_references_to_votes.rb new file mode 100644 index 0000000000..9485e980dd --- /dev/null +++ b/db/migrate/20181008215738_add_references_to_votes.rb @@ -0,0 +1,6 @@ +class AddReferencesToVotes < 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 new file mode 100644 index 0000000000..42a50fdc05 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,47 @@ +# 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: 2018_10_08_215738) 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.date "joined" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "votes", force: :cascade do |t| + t.date "date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "user_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| + t.string "category" + t.string "title" + t.string "creator" + t.date "publication_year" + t.string "description" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_foreign_key "votes", "users" + add_foreign_key "votes", "works" +end From 52e1bbab330c53a20780f14e675a9187aead2884 Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 15:04:24 -0700 Subject: [PATCH 05/50] Added controllers for Works and Users --- app/assets/javascripts/users.js | 2 ++ app/assets/javascripts/works.js | 2 ++ app/assets/stylesheets/users.scss | 3 ++ app/assets/stylesheets/works.scss | 3 ++ app/controllers/users_controller.rb | 13 ++++++++ app/controllers/works_controller.rb | 22 +++++++++++++ app/helpers/users_helper.rb | 2 ++ app/helpers/works_helper.rb | 2 ++ app/views/users/create.html.erb | 2 ++ app/views/users/index.html.erb | 2 ++ app/views/users/new.html.erb | 2 ++ app/views/users/show.html.erb | 2 ++ app/views/works/create.html.erb | 2 ++ app/views/works/destroy.html.erb | 2 ++ app/views/works/edit.html.erb | 2 ++ app/views/works/index.html.erb | 2 ++ app/views/works/new.html.erb | 2 ++ app/views/works/show.html.erb | 2 ++ app/views/works/update.html.erb | 2 ++ config/routes.rb | 11 +++++++ test/controllers/users_controller_test.rb | 24 ++++++++++++++ test/controllers/works_controller_test.rb | 39 +++++++++++++++++++++++ 22 files changed, 145 insertions(+) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/views/users/create.html.erb create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/new.html.erb create mode 100644 app/views/users/show.html.erb create mode 100644 app/views/works/create.html.erb create mode 100644 app/views/works/destroy.html.erb create mode 100644 app/views/works/edit.html.erb create mode 100644 app/views/works/index.html.erb create mode 100644 app/views/works/new.html.erb create mode 100644 app/views/works/show.html.erb create mode 100644 app/views/works/update.html.erb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/controllers/works_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/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/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/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/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..a36e270505 --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,13 @@ +class UsersController < ApplicationController + def index + end + + def show + end + + def new + end + + def create + end +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..f89371fa28 --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,22 @@ +class WorksController < ApplicationController + def index + end + + def show + end + + def new + end + + def create + end + + def edit + end + + def update + end + + def destroy + end +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/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/users/create.html.erb b/app/views/users/create.html.erb new file mode 100644 index 0000000000..48ea02e600 --- /dev/null +++ b/app/views/users/create.html.erb @@ -0,0 +1,2 @@ +

Users#create

+

Find me in app/views/users/create.html.erb

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..51968c88d2 --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,2 @@ +

Users#index

+

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

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb new file mode 100644 index 0000000000..c21a1adf19 --- /dev/null +++ b/app/views/users/new.html.erb @@ -0,0 +1,2 @@ +

Users#new

+

Find me in app/views/users/new.html.erb

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..e5fa3adf14 --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,2 @@ +

Users#show

+

Find me in app/views/users/show.html.erb

diff --git a/app/views/works/create.html.erb b/app/views/works/create.html.erb new file mode 100644 index 0000000000..5bc7fb6058 --- /dev/null +++ b/app/views/works/create.html.erb @@ -0,0 +1,2 @@ +

Works#create

+

Find me in app/views/works/create.html.erb

diff --git a/app/views/works/destroy.html.erb b/app/views/works/destroy.html.erb new file mode 100644 index 0000000000..0fb7649a57 --- /dev/null +++ b/app/views/works/destroy.html.erb @@ -0,0 +1,2 @@ +

Works#destroy

+

Find me in app/views/works/destroy.html.erb

diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..b717b97f84 --- /dev/null +++ b/app/views/works/edit.html.erb @@ -0,0 +1,2 @@ +

Works#edit

+

Find me in app/views/works/edit.html.erb

diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..e519642270 --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1,2 @@ +

Works#index

+

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

diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb new file mode 100644 index 0000000000..fad0dfea61 --- /dev/null +++ b/app/views/works/new.html.erb @@ -0,0 +1,2 @@ +

Works#new

+

Find me in app/views/works/new.html.erb

diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb new file mode 100644 index 0000000000..c096804302 --- /dev/null +++ b/app/views/works/show.html.erb @@ -0,0 +1,2 @@ +

Works#show

+

Find me in app/views/works/show.html.erb

diff --git a/app/views/works/update.html.erb b/app/views/works/update.html.erb new file mode 100644 index 0000000000..171f6d1516 --- /dev/null +++ b/app/views/works/update.html.erb @@ -0,0 +1,2 @@ +

Works#update

+

Find me in app/views/works/update.html.erb

diff --git a/config/routes.rb b/config/routes.rb index 787824f888..6ccef057c9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,14 @@ Rails.application.routes.draw do + get 'users/index' + get 'users/show' + get 'users/new' + get 'users/create' + get 'works/index' + get 'works/show' + get 'works/new' + get 'works/create' + get 'works/edit' + get 'works/update' + get 'works/destroy' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..dcbb88d675 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,24 @@ +require "test_helper" + +describe UsersController do + it "should get index" do + get users_index_url + value(response).must_be :success? + end + + it "should get show" do + get users_show_url + value(response).must_be :success? + end + + it "should get new" do + get users_new_url + value(response).must_be :success? + end + + it "should get create" do + get users_create_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..1d40ea64a0 --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,39 @@ +require "test_helper" + +describe WorksController do + it "should get index" do + get works_index_url + value(response).must_be :success? + end + + it "should get show" do + get works_show_url + value(response).must_be :success? + end + + it "should get new" do + get works_new_url + value(response).must_be :success? + end + + it "should get create" do + get works_create_url + value(response).must_be :success? + end + + it "should get edit" do + get works_edit_url + value(response).must_be :success? + end + + it "should get update" do + get works_update_url + value(response).must_be :success? + end + + it "should get destroy" do + get works_destroy_url + value(response).must_be :success? + end + +end From dc9561f561ae587daa132d91ca318e2d9ca6c978 Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 15:06:02 -0700 Subject: [PATCH 06/50] Generated HomeController --- app/assets/javascripts/home_controller.js | 2 ++ app/assets/stylesheets/home_controller.scss | 3 +++ app/controllers/home_controller_controller.rb | 4 ++++ app/helpers/home_controller_helper.rb | 2 ++ app/views/home_controller/index.html.erb | 2 ++ config/routes.rb | 1 + test/controllers/home_controller_controller_test.rb | 9 +++++++++ 7 files changed, 23 insertions(+) create mode 100644 app/assets/javascripts/home_controller.js create mode 100644 app/assets/stylesheets/home_controller.scss create mode 100644 app/controllers/home_controller_controller.rb create mode 100644 app/helpers/home_controller_helper.rb create mode 100644 app/views/home_controller/index.html.erb create mode 100644 test/controllers/home_controller_controller_test.rb diff --git a/app/assets/javascripts/home_controller.js b/app/assets/javascripts/home_controller.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/home_controller.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/home_controller.scss b/app/assets/stylesheets/home_controller.scss new file mode 100644 index 0000000000..ffa8bb5508 --- /dev/null +++ b/app/assets/stylesheets/home_controller.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the HomeController 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/home_controller_controller.rb b/app/controllers/home_controller_controller.rb new file mode 100644 index 0000000000..3e6b8e003a --- /dev/null +++ b/app/controllers/home_controller_controller.rb @@ -0,0 +1,4 @@ +class HomeControllerController < ApplicationController + def index + end +end diff --git a/app/helpers/home_controller_helper.rb b/app/helpers/home_controller_helper.rb new file mode 100644 index 0000000000..b77c516ad9 --- /dev/null +++ b/app/helpers/home_controller_helper.rb @@ -0,0 +1,2 @@ +module HomeControllerHelper +end diff --git a/app/views/home_controller/index.html.erb b/app/views/home_controller/index.html.erb new file mode 100644 index 0000000000..7486bcf404 --- /dev/null +++ b/app/views/home_controller/index.html.erb @@ -0,0 +1,2 @@ +

HomeController#index

+

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

diff --git a/config/routes.rb b/config/routes.rb index 6ccef057c9..e8acb47e80 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + get 'home_controller/index' get 'users/index' get 'users/show' get 'users/new' diff --git a/test/controllers/home_controller_controller_test.rb b/test/controllers/home_controller_controller_test.rb new file mode 100644 index 0000000000..3f4aaa9ad7 --- /dev/null +++ b/test/controllers/home_controller_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe HomeControllerController do + it "should get index" do + get home_controller_index_url + value(response).must_be :success? + end + +end From 594aa73ae016ff2d104c8b51e5170af91846f4ee Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 15:09:23 -0700 Subject: [PATCH 07/50] Fixed naming for Home controller --- app/assets/javascripts/{home_controller.js => home.js} | 0 .../stylesheets/{home_controller.scss => home.scss} | 2 +- app/controllers/home_controller.rb | 2 ++ app/controllers/home_controller_controller.rb | 4 ---- app/helpers/home_controller_helper.rb | 2 -- app/helpers/home_helper.rb | 2 ++ app/views/home_controller/index.html.erb | 2 -- test/controllers/home_controller_controller_test.rb | 9 --------- test/controllers/home_controller_test.rb | 7 +++++++ 9 files changed, 12 insertions(+), 18 deletions(-) rename app/assets/javascripts/{home_controller.js => home.js} (100%) rename app/assets/stylesheets/{home_controller.scss => home.scss} (61%) create mode 100644 app/controllers/home_controller.rb delete mode 100644 app/controllers/home_controller_controller.rb delete mode 100644 app/helpers/home_controller_helper.rb create mode 100644 app/helpers/home_helper.rb delete mode 100644 app/views/home_controller/index.html.erb delete mode 100644 test/controllers/home_controller_controller_test.rb create mode 100644 test/controllers/home_controller_test.rb diff --git a/app/assets/javascripts/home_controller.js b/app/assets/javascripts/home.js similarity index 100% rename from app/assets/javascripts/home_controller.js rename to app/assets/javascripts/home.js diff --git a/app/assets/stylesheets/home_controller.scss b/app/assets/stylesheets/home.scss similarity index 61% rename from app/assets/stylesheets/home_controller.scss rename to app/assets/stylesheets/home.scss index ffa8bb5508..7131aac4df 100644 --- a/app/assets/stylesheets/home_controller.scss +++ b/app/assets/stylesheets/home.scss @@ -1,3 +1,3 @@ -// Place all the styles related to the HomeController controller here. +// Place all the styles related to the Home 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/home_controller.rb b/app/controllers/home_controller.rb new file mode 100644 index 0000000000..fc0b4743ac --- /dev/null +++ b/app/controllers/home_controller.rb @@ -0,0 +1,2 @@ +class HomeController < ApplicationController +end diff --git a/app/controllers/home_controller_controller.rb b/app/controllers/home_controller_controller.rb deleted file mode 100644 index 3e6b8e003a..0000000000 --- a/app/controllers/home_controller_controller.rb +++ /dev/null @@ -1,4 +0,0 @@ -class HomeControllerController < ApplicationController - def index - end -end diff --git a/app/helpers/home_controller_helper.rb b/app/helpers/home_controller_helper.rb deleted file mode 100644 index b77c516ad9..0000000000 --- a/app/helpers/home_controller_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module HomeControllerHelper -end diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb new file mode 100644 index 0000000000..23de56ac60 --- /dev/null +++ b/app/helpers/home_helper.rb @@ -0,0 +1,2 @@ +module HomeHelper +end diff --git a/app/views/home_controller/index.html.erb b/app/views/home_controller/index.html.erb deleted file mode 100644 index 7486bcf404..0000000000 --- a/app/views/home_controller/index.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

HomeController#index

-

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

diff --git a/test/controllers/home_controller_controller_test.rb b/test/controllers/home_controller_controller_test.rb deleted file mode 100644 index 3f4aaa9ad7..0000000000 --- a/test/controllers/home_controller_controller_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require "test_helper" - -describe HomeControllerController do - it "should get index" do - get home_controller_index_url - value(response).must_be :success? - end - -end diff --git a/test/controllers/home_controller_test.rb b/test/controllers/home_controller_test.rb new file mode 100644 index 0000000000..cf3d56b45e --- /dev/null +++ b/test/controllers/home_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe HomeController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 347e704c6627ef921221cc95a29ad84ad077f397 Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 15:56:37 -0700 Subject: [PATCH 08/50] Implemented Works#index and Works#show with draft views --- app/controllers/works_controller.rb | 2 + app/models/work.rb | 12 ++++ app/views/works/index.html.erb | 86 ++++++++++++++++++++++++++++- app/views/works/show.html.erb | 16 +++++- config/routes.rb | 17 ++---- 5 files changed, 116 insertions(+), 17 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index f89371fa28..f8303904fa 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,8 +1,10 @@ class WorksController < ApplicationController def index + @works = Work.all end def show + @work = Work.find_by(id: params[:id].to_i) end def new diff --git a/app/models/work.rb b/app/models/work.rb index bf898977dc..a509ce4225 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,4 +1,16 @@ class Work < ApplicationRecord has_many :votes # belongs_to :user # optional + + def self.albums + return Work.select { |work| work.category == "album" } + end + + def self.books + return Work.select { |work| work.category == "book" } + end + + def self.movies + return Work.select { |work| work.category == "movie" } + end end diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index e519642270..03f628ff69 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,2 +1,84 @@ -

Works#index

-

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

+

List of Works

+ +
+

Albums

+ + + + + + + + + + + + <% Work.albums.each do |work| %> + + + + + + + + <% end %> + +
VotesTitleCreated ByPublishedUpvote
<%= work.votes.length %><%= link_to "#{work.title}", work_path(work.id) %><%= work.creator %><%= work.publication_year %><%= "UPVOTE" %>
+
+ +
+

Books

+ + + + + + + + + + + + <% Work.books.each do |work| %> + + + + + + + + <% end %> + +
VotesTitleCreated ByPublishedUpvote
<%= work.votes.length %><%= link_to "#{work.title}", work_path(work.id) %><%= work.creator %><%= work.publication_year %><%= "UPVOTE" %>
+
+ +
+

Movies

+ + + + + + + + + + + + <% Work.movies.each do |work| %> + + + + + + + + <% end %> + +
VotesTitleCreated ByPublishedUpvote
<%= work.votes.length %><%= link_to "#{work.title}", work_path(work.id) %><%= work.creator %><%= work.publication_year %><%= "UPVOTE" %>
+
+ +
+ LINK + LINK +
diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index c096804302..1ead868180 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,2 +1,14 @@ -

Works#show

-

Find me in app/views/works/show.html.erb

+
+

<%= @work.title %>

+

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

+

Published: <%= @work.publication_year %>

+

<%= @work.description %>

+
+ +
+ BUTTON LINKS +
+ +
+ VOTES FOR WORK +
diff --git a/config/routes.rb b/config/routes.rb index e8acb47e80..e909a273cd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,15 +1,6 @@ Rails.application.routes.draw do - get 'home_controller/index' - get 'users/index' - get 'users/show' - get 'users/new' - get 'users/create' - get 'works/index' - get 'works/show' - get 'works/new' - get 'works/create' - get 'works/edit' - get 'works/update' - get 'works/destroy' - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + # get 'home_controller/index' + + resources :works + resources :users, only: [:index, :show, :new, :create] end From 170c8dcd10724433684d01e60a72c2a7616a86bb Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 16:16:39 -0700 Subject: [PATCH 09/50] Implemented Works#new and Works#create with draft view for new --- app/controllers/works_controller.rb | 18 ++++++++++++++++ app/models/user.rb | 2 ++ app/models/work.rb | 5 +++++ app/views/works/_form.html.erb | 32 +++++++++++++++++++++++++++++ app/views/works/new.html.erb | 3 +-- app/views/works/notfound.html.erb | 1 + config/initializers/action_view.rb | 1 + 7 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 app/views/works/_form.html.erb create mode 100644 app/views/works/notfound.html.erb create mode 100644 config/initializers/action_view.rb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index f8303904fa..9050d0d5aa 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -5,12 +5,24 @@ def index def show @work = Work.find_by(id: params[:id].to_i) + + if @work.nil? + render :notfound, status: :not_found + end end def new + @work = Work.new end def create + @work = Work.new(work_params) + + if @work.save + redirect_to work_path + else + render :new + end end def edit @@ -21,4 +33,10 @@ def update def destroy end + + private + + def work_params + return params.require(:work).permit(:category, :title, :creator, :publication_year, :description) + end end diff --git a/app/models/user.rb b/app/models/user.rb index 163daa0d6e..4f575f2826 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,4 +2,6 @@ class User < ApplicationRecord has_many :votes has_many :works, through: :votes # has_many :works # optional + + validates :username, presence: true end diff --git a/app/models/work.rb b/app/models/work.rb index a509ce4225..2b030f2a31 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -2,6 +2,11 @@ class Work < ApplicationRecord has_many :votes # belongs_to :user # optional + validates :title, presence: true + + # validates :title, uniqueness: true + # only needs to be unique for the category + def self.albums return Work.select { |work| work.category == "album" } end diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb new file mode 100644 index 0000000000..243f20f2e9 --- /dev/null +++ b/app/views/works/_form.html.erb @@ -0,0 +1,32 @@ +

<%= action_name %>

+ +
+ <% if @work.errors.any? %> +
    + <% @work.errors.each do |column, message| %> +
  • + <%= column.capitalize %> <%= message %> +
    • + <% end %> +
+ <% end %> + + <%= 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_field :description %> + + <%= f.submit button_title %> + <% end %> +
diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index fad0dfea61..21d008067b 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -1,2 +1 @@ -

Works#new

-

Find me in app/views/works/new.html.erb

+<%= render partial: "form", locals: { action_name: "Add a new work", button_title: 'Create Work' } %> diff --git a/app/views/works/notfound.html.erb b/app/views/works/notfound.html.erb new file mode 100644 index 0000000000..4ae758c08c --- /dev/null +++ b/app/views/works/notfound.html.erb @@ -0,0 +1 @@ +

Work not found

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 From fe466d8506f2dc80ed20e67b97824e2a8c09b044 Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 16:29:07 -0700 Subject: [PATCH 10/50] Created home page and added header/nav to application layout --- app/controllers/home_controller.rb | 2 ++ app/views/home/index.html.erb | 1 + app/views/layouts/application.html.erb | 22 +++++++++++++++++++++- config/routes.rb | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 app/views/home/index.html.erb diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index fc0b4743ac..95f29929ca 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,2 +1,4 @@ class HomeController < ApplicationController + def index + end end diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb new file mode 100644 index 0000000000..bd45705ddf --- /dev/null +++ b/app/views/home/index.html.erb @@ -0,0 +1 @@ +

MEDIA RANKER

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f32268a271..3d4b9e0b8d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,26 @@ - <%= yield %> +
+

+ <%= link_to "Media Ranker", '/' %> + Ranking the Best of Everything +

+ +
+
+ <%= yield %> +
diff --git a/config/routes.rb b/config/routes.rb index e909a273cd..ce5a4e9ec0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Rails.application.routes.draw do - # get 'home_controller/index' + root 'home#index' resources :works resources :users, only: [:index, :show, :new, :create] From f7c2765dd947a2801103e1071398ad4851a9be51 Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 16:41:37 -0700 Subject: [PATCH 11/50] Created works fixtures --- test/fixtures/works.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index c6bc766042..5e5e97d263 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,15 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - category: MyString - title: MyString - creator: MyString - publication_year: 2018-10-08 - description: MyString +hp: + category: books + title: Harry Potter + creator: J.K. Rowling + publication_year: '1997' + description: A series of novels that chronicle the lives of a young wizard, Harry Potter, and his friends Hermione Granger and Ron Weasley, all of whom are students at Hogwarts School of Witchcraft and Wizardry. The main story arc concerns Harry's struggle against Lord Voldemort, a dark wizard who intends to become immortal, overthrow the wizard governing body known as the Ministry of Magic, and subjugate all wizards and Muggles (non-magical people). -two: - category: MyString - title: MyString - creator: MyString - publication_year: 2018-10-08 - description: MyString +interstellar: + category: movies + title: Interstellar + creator: Christopher Nolan + publication_year: '2014' + description: Set in a dystopian future where humanity is struggling to survive, the film follows a group of astronauts who travel through a wormhole in search of a new home for humanity. From 0ee85270c72b92cb47203aa02cdfa2f36328c01f Mon Sep 17 00:00:00 2001 From: jackie Date: Mon, 8 Oct 2018 17:01:09 -0700 Subject: [PATCH 12/50] Set up initial validation and test for work title --- test/models/work_test.rb | 39 ++++++++++++++++++++++++++++++++++++++- test/test_helper.rb | 10 ++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..1197d14fe8 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,9 +1,46 @@ require "test_helper" describe Work do - let(:work) { Work.new } + let(:work) { works(:hp) } it "must be valid" do value(work).must_be :valid? end + + describe 'relationships' do + it 'has many votes' do + # Arrange is done with let + + # Act & Assert + expect(work).must_be_instance_of Work + expect(work.votes).must_be_instance_of Array + expect(work.votes.first).must_be_instance_of Vote + end + end + + describe 'validations' do + it 'must have a title' do + # Arrange + work.title = nil + + # Act + valid = work.valid? # run validations + + # Assert + expect(valid).must_equal false + expect(work.errors.messages).must_include :title + expect(work.errors.messages[:title]).must_equal ["can't be blank"] + end + + # custom validation? only matters within the category + # it 'requires a unique title' do + # other_work = Work.new title: work.title, category: 'book' + # + # work.save + # valid = other_work.valid? + # + # expect(valid).must_equal false + # expect(other_work.errors.messages).must_include :title + # end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d14..9bda86c165 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,6 +1,16 @@ ENV['RAILS_ENV'] ||= 'test' require_relative '../config/environment' 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 +) + class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From 3a220e1d13eb46b7dee5db3538f977089fc83d5f Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 11:25:37 -0700 Subject: [PATCH 13/50] Created Sessions controller --- app/assets/javascripts/sessions.js | 2 ++ app/assets/stylesheets/sessions.scss | 3 +++ app/controllers/sessions_controller.rb | 24 ++++++++++++++++++++ app/controllers/users_controller.rb | 21 +++++++++++++++++ app/helpers/sessions_helper.rb | 2 ++ app/views/sessions/destroy.html.erb | 2 ++ app/views/sessions/login.html.erb | 2 ++ app/views/sessions/new.html.erb | 2 ++ config/routes.rb | 8 +++++++ test/controllers/sessions_controller_test.rb | 19 ++++++++++++++++ 10 files changed, 85 insertions(+) create mode 100644 app/assets/javascripts/sessions.js create mode 100644 app/assets/stylesheets/sessions.scss create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/helpers/sessions_helper.rb create mode 100644 app/views/sessions/destroy.html.erb create mode 100644 app/views/sessions/login.html.erb create mode 100644 app/views/sessions/new.html.erb create mode 100644 test/controllers/sessions_controller_test.rb diff --git a/app/assets/javascripts/sessions.js b/app/assets/javascripts/sessions.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/sessions.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/sessions.scss b/app/assets/stylesheets/sessions.scss new file mode 100644 index 0000000000..ccb1ed25b2 --- /dev/null +++ b/app/assets/stylesheets/sessions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Sessions 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/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..bd8874f02b --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,24 @@ +class SessionsController < ApplicationController + def login + user = User.find_by(name: params[:user][:username]) + + if user.nil? # Create a new user + user = User.create(name: params[:author][:username]) + # Else: login existing author, no need to do anything + end + + session[:user_id] = user.id + flash[:success] = "#{user.username} successfully logged in!" + redirect_to root_path + end + + def new + @user = User.new + end + + def destroy + session[:user_id] = nil + flash[:success] = "Successfully logged out" + redirect_back(fallback_location: root_path) + end +end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a36e270505..e198329315 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,13 +1,34 @@ class UsersController < ApplicationController def index + @users = User.all end def show + @users = User.find_by(id: params[:id].to_i) + + if @user.nil? + render :notfound, status: :not_found + end end def new + @user = User.new end def create + @user = User.new(user_params) + @user.joined = Date.today + + if @user.save + redirect_to user_path + else + render :new + end end + + private + + def user_params + return params.require(:user).permit(:username) + end end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb new file mode 100644 index 0000000000..309f8b2eb3 --- /dev/null +++ b/app/helpers/sessions_helper.rb @@ -0,0 +1,2 @@ +module SessionsHelper +end diff --git a/app/views/sessions/destroy.html.erb b/app/views/sessions/destroy.html.erb new file mode 100644 index 0000000000..d75237d982 --- /dev/null +++ b/app/views/sessions/destroy.html.erb @@ -0,0 +1,2 @@ +

Sessions#destroy

+

Find me in app/views/sessions/destroy.html.erb

diff --git a/app/views/sessions/login.html.erb b/app/views/sessions/login.html.erb new file mode 100644 index 0000000000..6fbfe54fd5 --- /dev/null +++ b/app/views/sessions/login.html.erb @@ -0,0 +1,2 @@ +

Sessions#login

+

Find me in app/views/sessions/login.html.erb

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb new file mode 100644 index 0000000000..b39a3bc951 --- /dev/null +++ b/app/views/sessions/new.html.erb @@ -0,0 +1,2 @@ +

Sessions#new

+

Find me in app/views/sessions/new.html.erb

diff --git a/config/routes.rb b/config/routes.rb index ce5a4e9ec0..33f50fca99 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,12 @@ Rails.application.routes.draw do + get 'sessions/login' + get 'sessions/new' + get 'sessions/destroy' + get 'sessions/index' + get 'sessions/new' + get 'sessions/destroy' + get 'login/new' + get 'login/destroy' root 'home#index' resources :works diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 0000000000..1516a4a7c1 --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe SessionsController do + it "should get login" do + get sessions_login_url + value(response).must_be :success? + end + + it "should get new" do + get sessions_new_url + value(response).must_be :success? + end + + it "should get destroy" do + get sessions_destroy_url + value(response).must_be :success? + end + +end From 8913bb4ac38d2718f88dbd2c13c0f6756f7eb1f1 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 15:04:04 -0700 Subject: [PATCH 14/50] Created routes for sessions and added content to views to track sessions --- app/models/work.rb | 4 ++ app/views/home/index.html.erb | 64 +++++++++++++++++++++++++- app/views/layouts/application.html.erb | 8 +++- app/views/sessions/new.html.erb | 10 +++- config/routes.rb | 12 ++--- 5 files changed, 86 insertions(+), 12 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 2b030f2a31..be7cfeaad4 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -7,6 +7,10 @@ class Work < ApplicationRecord # validates :title, uniqueness: true # only needs to be unique for the category + def self.spotlight + return Work.all.max_by { |work| work.votes.length } + end + def self.albums return Work.select { |work| work.category == "album" } end diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index bd45705ddf..ddfebb9076 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1 +1,63 @@ -

MEDIA RANKER

+
+

+ Media Spotlight: + <%= link_to Work.spotlight.title, work_path(Work.spotlight.id) %> + by <%= Work.spotlight.creator %> +

+

+ <%= Work.spotlight.votes.length %> votes - <%= Work.spotlight.description[0..20] %>... +

+
+ +
+ +
+

Top Movies

+
    + <% Work.movies[0..9].each do |movie| %> +
  • +

    + <%= link_to movie.title, work_path(movie.id) %> + by <%= movie.creator %> +

    +

    + <%= movie.votes.length %> votes +

    +
    • + <% end %> +
+
+ +
+

Top Books

+
    + <% Work.books[0..9].each do |book| %> +
  • +

    + <%= link_to book.title, work_path(book.id) %> + by <%= book.creator %> +

    +

    + <%= book.votes.length %> votes +

    +
    • + <% end %> +
+
+ +
+

Top Albums

+
    + <% Work.albums[0..9].each do |album| %> +
  • +

    + <%= link_to album.title, work_path(album.id) %> + by <%= album.creator %> +

    +

    + <%= album.votes.length %> votes +

    +
    • + <% end %> +
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3d4b9e0b8d..26da27d9b8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -24,7 +24,13 @@
    -
  • <%= link_to "Login", new_user_path %>
    • +
  • + <% if session[:user_id] %> + <%= link_to "Log Out", logout_path, method: :delete %> + <% else %> + <%= link_to "Login", login_path %> + <% end %> +
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index b39a3bc951..bc88a1ccec 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,2 +1,8 @@ -

Sessions#new

-

Find me in app/views/sessions/new.html.erb

+

Log In

+ +<%= form_with model: @user, url: login_path, method: :post do |f| %> + <%= f.label :username, 'Username' %> + <%= f.text_field :username, placeholder: 'username' %> + + <%= f.submit 'Login' %> +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 33f50fca99..923baed4b1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,14 +1,10 @@ Rails.application.routes.draw do - get 'sessions/login' - get 'sessions/new' - get 'sessions/destroy' - get 'sessions/index' - get 'sessions/new' - get 'sessions/destroy' - get 'login/new' - get 'login/destroy' root 'home#index' + post 'sessions/login', to: 'sessions#login', as: 'login' + get 'sessions/login', to: 'sessions#new' + delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' + resources :works resources :users, only: [:index, :show, :new, :create] end From 837331f063c86eb20180951764518df43740d9b7 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 15:07:24 -0700 Subject: [PATCH 15/50] Fixed bug in Works#create --- app/controllers/works_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 9050d0d5aa..3971b84ccd 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -19,7 +19,7 @@ def create @work = Work.new(work_params) if @work.save - redirect_to work_path + redirect_to work_path(@work.id) else render :new end From ab74ad82c9b2b075a79044fa13e6a7597606d06b Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 15:57:10 -0700 Subject: [PATCH 16/50] Created tests for Work model relationships, validations, and custom methods - passing all --- app/models/work.rb | 8 +- test/fixtures/works.yml | 11 ++- test/models/work_test.rb | 190 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 200 insertions(+), 9 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index be7cfeaad4..0002ddb582 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,7 +1,9 @@ +require 'pry' class Work < ApplicationRecord has_many :votes # belongs_to :user # optional + validates :category, presence: true validates :title, presence: true # validates :title, uniqueness: true @@ -12,14 +14,14 @@ def self.spotlight end def self.albums - return Work.select { |work| work.category == "album" } + return Work.all.select { |work| work.category == "album" } end def self.books - return Work.select { |work| work.category == "book" } + return Work.all.select { |work| work.category == "book" } end def self.movies - return Work.select { |work| work.category == "movie" } + return Work.all.select { |work| work.category == "movie" } end end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 5e5e97d263..e34d44c670 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,15 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html hp: - category: books + category: book title: Harry Potter creator: J.K. Rowling publication_year: '1997' description: A series of novels that chronicle the lives of a young wizard, Harry Potter, and his friends Hermione Granger and Ron Weasley, all of whom are students at Hogwarts School of Witchcraft and Wizardry. The main story arc concerns Harry's struggle against Lord Voldemort, a dark wizard who intends to become immortal, overthrow the wizard governing body known as the Ministry of Magic, and subjugate all wizards and Muggles (non-magical people). interstellar: - category: movies + category: movie title: Interstellar creator: Christopher Nolan publication_year: '2014' description: Set in a dystopian future where humanity is struggling to survive, the film follows a group of astronauts who travel through a wormhole in search of a new home for humanity. + +sgtpepper: + category: album + title: Sgt. Pepper's Lonely Hearts Club Band + creator: Beatles + publication_year: '1967' + description: The 8th studio album by The Beatles. Lauded by critics for its innovations in production, songwriting and graphic design, for bridging a cultural divide between popular music and high art, and for providing a musical representation of its generation and the contemporary counterculture. It won four Grammy Awards in 1968, including Album of the Year, the first rock LP to receive this honour. diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 1197d14fe8..994c8e3201 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -7,18 +7,56 @@ value(work).must_be :valid? end + it 'has required fields' do + fields = [:category, :title, :creator, :publication_year, + :description, :votes] + + fields.each do |field| + expect(work).must_respond_to field + end + end + describe 'relationships' do it 'has many votes' do # Arrange is done with let - # Act & Assert + # Act + work.votes << Vote.new + votes = work.votes + + # Assert expect(work).must_be_instance_of Work - expect(work.votes).must_be_instance_of Array - expect(work.votes.first).must_be_instance_of Vote + + expect(votes.length).must_be :>=, 1 + votes.each do |vote| + expect(vote).must_be_instance_of Vote + end end end describe 'validations' do + it 'must have a category' do + # Arrange + work.category = nil + + # Act + valid = work.valid? # run validations + + # Assert + expect(valid).must_equal false + expect(work.errors.messages).must_include :category + expect(work.errors.messages[:category]).must_equal ["can't be blank"] + + # Rearrange + work.category = "books" + + # Re-Act + valid = work.valid? # run validations + + # Reassert + expect(valid).must_equal true + end + it 'must have a title' do # Arrange work.title = nil @@ -30,9 +68,18 @@ expect(valid).must_equal false expect(work.errors.messages).must_include :title expect(work.errors.messages[:title]).must_equal ["can't be blank"] + + # Rearrange + work.title = "Harry Potter" + + # Re-Act + valid = work.valid? # run validations + + # Reassert + expect(valid).must_equal true end - # custom validation? only matters within the category + # TODO: custom validation? only matters within the category # it 'requires a unique title' do # other_work = Work.new title: work.title, category: 'book' # @@ -43,4 +90,139 @@ # expect(other_work.errors.messages).must_include :title # end end + + describe 'spotlight' do + it 'should return a work object' do + # Arrange & Act + work = Work.spotlight + + # Assert + expect(work).must_be_instance_of Work + end + + it 'should have the most votes of all work objects' do + # Arrange + 10.times do + Work.first.votes << Vote.new + end + + # Act + top_work = Work.spotlight + vote_count = top_work.votes.length + + # Assert + expect(vote_count).must_equal Work.all.max_by { |work| work.votes.length }.votes.length + end + + # TODO: tiebreakers + # it 'should return the one thats first alphabetically if theres a tie' do + # end + + # TODO: Need to account for this in the view + it 'should return nil if there are no works' do + # Arrange + Work.all.each do |work| + work.destroy + end + + # Act + top_work = Work.spotlight + + # Assert + expect(top_work).must_be_nil + end + end + + describe 'albums' do + it 'should return an array of only album works' do + # Act + works = Work.albums + + # Assert + expect(works).must_be_instance_of Array + + works.each do |work| + expect(work).must_be_instance_of Work + expect(work.category).must_equal "album" + end + end + + it 'should return an empty array when there are no albums' do + # Arrange + Work.all.each do |work| + if work.category == "album" + work.destroy + end + end + + # Act + works = Work.albums + + # Assert + expect(works).must_be_instance_of Array + expect(works.length).must_equal 0 + end + end + + describe 'books' do + it 'should return an array of only book works' do + # Act + works = Work.books + + # Assert + expect(works).must_be_instance_of Array + + works.each do |work| + expect(work).must_be_instance_of Work + expect(work.category).must_equal "book" + end + end + + it 'should return an empty array when there are no books' do + # Arrange + Work.all.each do |work| + if work.category == "book" + work.destroy + end + end + + # Act + works = Work.books + + # Assert + expect(works).must_be_instance_of Array + expect(works.length).must_equal 0 + end + end + + describe 'movies' do + it 'should return an array of only movie works' do + # Act + works = Work.movies + + # Assert + expect(works).must_be_instance_of Array + + works.each do |work| + expect(work).must_be_instance_of Work + expect(work.category).must_equal "movie" + end + end + + it 'should return an empty array when there are no movies' do + # Arrange + Work.all.each do |work| + if work.category == "movie" + work.destroy + end + end + + # Act + works = Work.movies + + # Assert + expect(works).must_be_instance_of Array + expect(works.length).must_equal 0 + end + end end From fbe45d6d83870c31777f941313f29b3c428a329d Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 16:25:36 -0700 Subject: [PATCH 17/50] Added Works#edit Works#update and Works#destroy and setup respective views --- app/controllers/works_controller.rb | 25 +++++++++++++++++++++++++ app/views/works/destroy.html.erb | 2 -- app/views/works/edit.html.erb | 4 ++-- app/views/works/show.html.erb | 7 ++++++- 4 files changed, 33 insertions(+), 5 deletions(-) delete mode 100644 app/views/works/destroy.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 3971b84ccd..10eb695106 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -19,19 +19,44 @@ def create @work = Work.new(work_params) if @work.save + flash[:success] = "Work added" redirect_to work_path(@work.id) else + flash.now[:error] = "Error: Work not added" + @work.errors.messages.each do |field, messages| + flash.now[field] = messages + end + render :new end end def edit + @work = Work.find_by(id: params[:id].to_i) end def update + @work = Work.find_by(id: params[:id].to_i) + if @work.update(work_params) + flash[:success] = "Changes saved" + redirect_to work_path(@work.id) + else + flash.now[:error] = "Error: Changes not saved" + @work.errors.messages.each do |field, messages| + flash.now[field] = messages + end + + render :edit + end end def destroy + work = Work.find_by(id: params[:id].to_i) + deleted_work = work.destroy + + flash[:success] = "#{deleted_work.title} deleted" + + redirect_to root_path end private diff --git a/app/views/works/destroy.html.erb b/app/views/works/destroy.html.erb deleted file mode 100644 index 0fb7649a57..0000000000 --- a/app/views/works/destroy.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Works#destroy

-

Find me in app/views/works/destroy.html.erb

diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index b717b97f84..a5d555d412 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -1,2 +1,2 @@ -

Works#edit

-

Find me in app/views/works/edit.html.erb

+ +<%= render partial: "form", locals: { action_name: "Edit this work", button_title: 'Update Work' } %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 1ead868180..6c6d70f9a8 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -6,7 +6,12 @@
- BUTTON LINKS + <%= link_to "Back to Media Ranks", root_path, class: "btn btn-primary", role: "button" %> + <%= link_to "Edit", edit_work_path(@work.id), class: "btn btn-primary", role: "button" %> + + <%= link_to "Upvote", work_path(@work.id), class: "btn btn-primary", role: "button" %> + <%= link_to "Delete", work_path(@work.id), class: "btn btn-danger", role: "button", method: :delete, + data: { confirm: 'Are you sure?'} %>
From aaee8ce863ee46f43bdf43ffdf315a3cc05aefcd Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 16:29:06 -0700 Subject: [PATCH 18/50] Added spacing for legibility in controller methods --- app/controllers/works_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 10eb695106..6eee52a861 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -23,6 +23,7 @@ def create redirect_to work_path(@work.id) else flash.now[:error] = "Error: Work not added" + @work.errors.messages.each do |field, messages| flash.now[field] = messages end @@ -42,6 +43,7 @@ def update redirect_to work_path(@work.id) else flash.now[:error] = "Error: Changes not saved" + @work.errors.messages.each do |field, messages| flash.now[field] = messages end From 23440827ebd3694a0119169a5596dae6d3e2a004 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 16:36:30 -0700 Subject: [PATCH 19/50] Added tests for title uniqueness validation within category - passing test --- app/models/work.rb | 4 +--- test/models/work_test.rb | 19 +++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 0002ddb582..59d2e34f54 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -5,9 +5,7 @@ class Work < ApplicationRecord validates :category, presence: true validates :title, presence: true - - # validates :title, uniqueness: true - # only needs to be unique for the category + validates :title, uniqueness: { scope: :category } def self.spotlight return Work.all.max_by { |work| work.votes.length } diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 994c8e3201..4032c92227 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -79,16 +79,15 @@ expect(valid).must_equal true end - # TODO: custom validation? only matters within the category - # it 'requires a unique title' do - # other_work = Work.new title: work.title, category: 'book' - # - # work.save - # valid = other_work.valid? - # - # expect(valid).must_equal false - # expect(other_work.errors.messages).must_include :title - # end + it 'requires a unique title' do + other_work = Work.new title: work.title, category: 'book' + + valid = other_work.valid? + + expect(valid).must_equal false + expect(other_work.errors.messages).must_include :title + expect(other_work.errors.messages[:title]).must_equal ["has already been taken"] + end end describe 'spotlight' do From 38a6b64789dbc985b9ff514aac3b0d311a3f3d26 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 16:51:32 -0700 Subject: [PATCH 20/50] Added user and vote yml data and relationship tests for work --- app/models/work.rb | 1 + test/fixtures/users.yml | 10 +++++----- test/fixtures/votes.yml | 12 ++++++++---- test/models/work_test.rb | 29 ++++++++++++++++++++++++++++- 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 59d2e34f54..ba12561a3f 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,6 +1,7 @@ require 'pry' class Work < ApplicationRecord has_many :votes + has_many :users, through: :votes # belongs_to :user # optional validates :category, presence: true diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 3c0fbed2c3..214aecb561 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,9 +1,9 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - username: MyString +jackie: + username: jackie joined: 2018-10-08 -two: - username: MyString - joined: 2018-10-08 +dan: + username: dan + joined: 2018-10-09 diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index 9b1dd9f96b..5fb2c94694 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -1,7 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - date: 2018-10-08 +vote_one: + date: '2018-10-08' + user: jackie + work: hp -two: - date: 2018-10-08 +vote_two: + date: '2018-10-06' + user: dan + work: sgtpepper diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 4032c92227..043d693430 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -2,6 +2,7 @@ describe Work do let(:work) { works(:hp) } + let(:vote) { votes(:vote_one) } it "must be valid" do value(work).must_be :valid? @@ -21,7 +22,6 @@ # Arrange is done with let # Act - work.votes << Vote.new votes = work.votes # Assert @@ -32,6 +32,21 @@ expect(vote).must_be_instance_of Vote end end + + it 'has many users through votes' do + # Arrange is done with let + + # Act + votes = work.votes + + # Assert + expect(work).must_be_instance_of Work + + expect(votes.length).must_be :>=, 1 + votes.each do |vote| + expect(vote.user).must_be_instance_of User + end + end end describe 'validations' do @@ -121,6 +136,9 @@ it 'should return nil if there are no works' do # Arrange Work.all.each do |work| + work.votes.each do |vote| + vote.destroy + end work.destroy end @@ -150,6 +168,9 @@ # Arrange Work.all.each do |work| if work.category == "album" + work.votes.each do |vote| + vote.destroy + end work.destroy end end @@ -181,6 +202,9 @@ # Arrange Work.all.each do |work| if work.category == "book" + work.votes.each do |vote| + vote.destroy + end work.destroy end end @@ -212,6 +236,9 @@ # Arrange Work.all.each do |work| if work.category == "movie" + work.votes.each do |vote| + vote.destroy + end work.destroy end end From ed6328263efe25a61211b3018dfc181b804bd009 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 17:05:45 -0700 Subject: [PATCH 21/50] Added session tracking to allow users to log in/out --- app/controllers/sessions_controller.rb | 8 ++++---- app/controllers/users_controller.rb | 9 +++++++++ app/controllers/works_controller.rb | 12 ++++++++++++ app/views/layouts/application.html.erb | 11 +++++++++++ app/views/works/create.html.erb | 2 -- app/views/works/update.html.erb | 2 -- 6 files changed, 36 insertions(+), 8 deletions(-) delete mode 100644 app/views/works/create.html.erb delete mode 100644 app/views/works/update.html.erb diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index bd8874f02b..e01750cc2e 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,14 +1,14 @@ class SessionsController < ApplicationController def login - user = User.find_by(name: params[:user][:username]) + user = User.find_by(username: params[:user][:username]) if user.nil? # Create a new user - user = User.create(name: params[:author][:username]) - # Else: login existing author, no need to do anything + user = User.create(username: params[:user][:username]) + # Else: login existing user, no need to do anything end session[:user_id] = user.id - flash[:success] = "#{user.username} successfully logged in!" + flash[:success] = "#{user.username} successfully logged in" redirect_to root_path end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e198329315..609172ec93 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,9 +1,15 @@ class UsersController < ApplicationController def index + @current_user = User.find_by(id: session[:user_id]) + # user id will be nil if not logged in or whole author model if they are logged in + @users = User.all end def show + @current_user = User.find_by(id: session[:user_id]) + # user id will be nil if not logged in or whole author model if they are logged in + @users = User.find_by(id: params[:id].to_i) if @user.nil? @@ -12,6 +18,9 @@ def show end def new + @current_user = User.find_by(id: session[:user_id]) + # user id will be nil if not logged in or whole author model if they are logged in + @user = User.new end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 6eee52a861..7cd101137e 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,9 +1,15 @@ class WorksController < ApplicationController def index + @current_user = User.find_by(id: session[:user_id]) + # user id will be nil if not logged in or whole author model if they are logged in + @works = Work.all end def show + @current_user = User.find_by(id: session[:user_id]) + # user id will be nil if not logged in or whole author model if they are logged in + @work = Work.find_by(id: params[:id].to_i) if @work.nil? @@ -12,6 +18,9 @@ def show end def new + @current_user = User.find_by(id: session[:user_id]) + # user id will be nil if not logged in or whole author model if they are logged in + @work = Work.new end @@ -33,6 +42,9 @@ def create end def edit + @current_user = User.find_by(id: session[:user_id]) + # user id will be nil if not logged in or whole author model if they are logged in + @work = Work.find_by(id: params[:id].to_i) end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 26da27d9b8..45a8ff8b05 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,6 +33,17 @@ +
+ <% flash.each do |name, message| %> + <% if message.class == Array %> + <% message.each do |msg| %> +
<%= "#{name}: #{msg}" %>
+ <% end %> + <% else %> +
<%= message %>
+ <% end %> + <% end %> +
<%= yield %> diff --git a/app/views/works/create.html.erb b/app/views/works/create.html.erb deleted file mode 100644 index 5bc7fb6058..0000000000 --- a/app/views/works/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Works#create

-

Find me in app/views/works/create.html.erb

diff --git a/app/views/works/update.html.erb b/app/views/works/update.html.erb deleted file mode 100644 index 171f6d1516..0000000000 --- a/app/views/works/update.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Works#update

-

Find me in app/views/works/update.html.erb

From 0409392b7e1bb9e5c1b32450faf4d9aad7f94c0a Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 18:44:50 -0700 Subject: [PATCH 22/50] Removed some unnecessary views --- app/controllers/users_controller.rb | 1 + app/views/users/create.html.erb | 2 -- app/views/users/new.html.erb | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 app/views/users/create.html.erb delete mode 100644 app/views/users/new.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 609172ec93..31da2a080b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -17,6 +17,7 @@ def show end end + # TODO: delete this method and associations def new @current_user = User.find_by(id: session[:user_id]) # user id will be nil if not logged in or whole author model if they are logged in diff --git a/app/views/users/create.html.erb b/app/views/users/create.html.erb deleted file mode 100644 index 48ea02e600..0000000000 --- a/app/views/users/create.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Users#create

-

Find me in app/views/users/create.html.erb

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb deleted file mode 100644 index c21a1adf19..0000000000 --- a/app/views/users/new.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

Users#new

-

Find me in app/views/users/new.html.erb

From a838aafbba925a5e000c18f04dfc586fea09fe09 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 20:00:49 -0700 Subject: [PATCH 23/50] Added feature to allow users to only vote once per work --- app/controllers/works_controller.rb | 40 +++++++++++++++++++++++++++++ app/views/works/index.html.erb | 12 ++++++--- config/routes.rb | 2 ++ 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 7cd101137e..ba34b0aeae 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -73,6 +73,46 @@ def destroy redirect_to root_path end + def upvote + work = Work.find_by(id: params[:id].to_i) + user = User.find_by(id: session[:user_id]) + + if user.nil? + flash[:error] = "A problem occurred: You must log in to vote" + + work.errors.messages.each do |field, messages| + flash[field] = messages + end + + redirect_back(fallback_location: root_path) + + elsif !user.works.include? work # user eligible to vote + vote = Vote.new(work: work, user: user) + + if vote.save + flash[:success] = "Successfully upvoted!" + redirect_back(fallback_location: root_path) + else + flash[:error] = "Error: Could not process vote" + + work.errors.messages.each do |field, messages| + flash[field] = messages + end + + redirect_back(fallback_location: root_path) + end + + else # user.votes.works.include? work # user ineligible to vote + flash[:error] = "A problem occurred: You've already voted on this work" + + work.errors.messages.each do |field, messages| + flash[field] = messages + end + + redirect_back(fallback_location: root_path) + end + end + private def work_params diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 03f628ff69..ebd8a090a0 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -19,7 +19,9 @@ <%= link_to "#{work.title}", work_path(work.id) %> <%= work.creator %> <%= work.publication_year %> - <%= "UPVOTE" %> + + <%= link_to "Upvote", upvote_path(work.id), class: "btn btn-primary", role: "button", method: :post %> + <% end %> @@ -45,7 +47,9 @@ <%= link_to "#{work.title}", work_path(work.id) %> <%= work.creator %> <%= work.publication_year %> - <%= "UPVOTE" %> + + <%= link_to "Upvote", upvote_path(work.id), class: "btn btn-primary", role: "button", method: :post %> + <% end %> @@ -71,7 +75,9 @@ <%= link_to "#{work.title}", work_path(work.id) %> <%= work.creator %> <%= work.publication_year %> - <%= "UPVOTE" %> + + <%= link_to "Upvote", upvote_path(work.id), class: "btn btn-primary", role: "button", method: :post %> + <% end %> diff --git a/config/routes.rb b/config/routes.rb index 923baed4b1..349cbb46aa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,5 +6,7 @@ delete 'sessions/destroy', to: 'sessions#destroy', as: 'logout' resources :works + post 'works/:id/upvote', to: 'works#upvote', as: 'upvote' + resources :users, only: [:index, :show, :new, :create] end From 81a5415e97bf3eae4b3dc898ad1d259a85ebb8d1 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 20:12:24 -0700 Subject: [PATCH 24/50] Added sorting by vote to work model methods --- app/models/work.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index ba12561a3f..b21d7eaa70 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,4 +1,3 @@ -require 'pry' class Work < ApplicationRecord has_many :votes has_many :users, through: :votes @@ -13,14 +12,20 @@ def self.spotlight end def self.albums - return Work.all.select { |work| work.category == "album" } + return sort_by_votes(Work.all.select { |work| work.category == "album" }) end def self.books - return Work.all.select { |work| work.category == "book" } + return sort_by_votes(Work.all.select { |work| work.category == "book" }) end def self.movies - return Work.all.select { |work| work.category == "movie" } + return sort_by_votes(Work.all.select { |work| work.category == "movie" }) end + + private + + def self.sort_by_votes(work_list) + return work_list.sort_by { |work| -work.votes.length } + end end From 5b532748a11f3ac3b835622436e8da869149c23e Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 20:24:33 -0700 Subject: [PATCH 25/50] Added users who upvoted to work show view --- app/views/works/show.html.erb | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 6c6d70f9a8..32093d1f7b 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -8,12 +8,27 @@
<%= link_to "Back to Media Ranks", root_path, class: "btn btn-primary", role: "button" %> <%= link_to "Edit", edit_work_path(@work.id), class: "btn btn-primary", role: "button" %> - - <%= link_to "Upvote", work_path(@work.id), class: "btn btn-primary", role: "button" %> + <%= link_to "Upvote", upvote_path(@work.id), class: "btn btn-primary", role: "button", method: :post %> <%= link_to "Delete", work_path(@work.id), class: "btn btn-danger", role: "button", method: :delete, data: { confirm: 'Are you sure?'} %>
- VOTES FOR WORK +

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

+ + + + + + + + + <% @work.users.each do |user| %> + + + + + <% end %> + +
UserDate
<%= link_to "#{user.username}", user_path(user.id) %><%= user.joined %>
From fa0c8fa22beaddc6a0d4bac9e9abd445051e1385 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 20:26:33 -0700 Subject: [PATCH 26/50] Fixed typo in Users#show --- app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 31da2a080b..96822657c9 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -10,7 +10,7 @@ def show @current_user = User.find_by(id: session[:user_id]) # user id will be nil if not logged in or whole author model if they are logged in - @users = User.find_by(id: params[:id].to_i) + @user = User.find_by(id: params[:id].to_i) if @user.nil? render :notfound, status: :not_found From a82446bb3759641db1c4b9560b66a97cc87e0b1d Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 20:38:21 -0700 Subject: [PATCH 27/50] Added content to user show view --- app/views/users/show.html.erb | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index e5fa3adf14..17357c459e 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,2 +1,28 @@ -

Users#show

-

Find me in app/views/users/show.html.erb

+

User summary: <%= link_to "#{@user.username}", user_path(@user.id) %>

+

Joined site <%= @user.joined %>

+ +
+

Votes

+ + + + + + + + + + + + <% @user.works.each do |work| %> + + + + + + + + <% end %> + +
Media TitleCreated ByPublishedCategoryVoted On
<%= link_to "#{work.title}", work_path(work.id) %><%= work.creator %><%= work.publication_year %><%= work.category.titleize %><%= @user.vote_date(work) %>
+
From 727a9330eab4c8da8943d068b3c3e6e179fd39cc Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 20:41:53 -0700 Subject: [PATCH 28/50] Added vote_date method to user model --- app/models/user.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 4f575f2826..67feb3959b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -4,4 +4,8 @@ class User < ApplicationRecord # has_many :works # optional validates :username, presence: true + + def vote_date(work) + return self.votes.find_by(work_id: work.id).date + end end From 700f8f74bfe9f99c0094ef3de859b5321153a750 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 20:45:49 -0700 Subject: [PATCH 29/50] Added setting of date when vote is instantiated --- app/controllers/works_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index ba34b0aeae..b58c40ed1b 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -87,7 +87,7 @@ def upvote redirect_back(fallback_location: root_path) elsif !user.works.include? work # user eligible to vote - vote = Vote.new(work: work, user: user) + vote = Vote.new(work: work, user: user, date: Date.today) if vote.save flash[:success] = "Successfully upvoted!" From 095aebb2ff3301e5edd41ef68daa17ea64b64a7d Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 20:53:24 -0700 Subject: [PATCH 30/50] Created users index view and fixed bug in work show view's table --- app/views/users/index.html.erb | 24 ++++++++++++++++++++++-- app/views/works/show.html.erb | 2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 51968c88d2..8d9db7b4de 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,2 +1,22 @@ -

Users#index

-

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

+

List of Users

+ +
+ + + + + + + + + + <% @users.each do |user| %> + + + + + + <% end %> + +
UserVotesJoined
<%= link_to "#{user.username}", user_path(user.id) %><%= user.votes.length %><%= user.joined %>
+
diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 32093d1f7b..4774e7af1c 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -26,7 +26,7 @@ <% @work.users.each do |user| %> <%= link_to "#{user.username}", user_path(user.id) %> - <%= user.joined %> + <%= user.vote_date(@work) %> <% end %> From 960ea8ab0e06a187c6af36a150376e015e28c468 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 22:28:12 -0700 Subject: [PATCH 31/50] Changed work publication_year to integer and modified seeds.rb to account for the change --- app/controllers/sessions_controller.rb | 2 +- app/controllers/users_controller.rb | 37 ++++++++++--------- ...change_work_publication_year_to_integer.rb | 6 +++ db/schema.rb | 4 +- db/seeds.rb | 2 +- 5 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 db/migrate/20181010045047_change_work_publication_year_to_integer.rb diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index e01750cc2e..fcedd062e7 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -3,7 +3,7 @@ def login user = User.find_by(username: params[:user][:username]) if user.nil? # Create a new user - user = User.create(username: params[:user][:username]) + user = User.create(username: params[:user][:username], joined: Date.today) # Else: login existing user, no need to do anything end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 96822657c9..814418d5a7 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -17,24 +17,25 @@ def show end end - # TODO: delete this method and associations - def new - @current_user = User.find_by(id: session[:user_id]) - # user id will be nil if not logged in or whole author model if they are logged in - - @user = User.new - end - - def create - @user = User.new(user_params) - @user.joined = Date.today - - if @user.save - redirect_to user_path - else - render :new - end - end + # TODO: delete these methods and associations + # def new + # @current_user = User.find_by(id: session[:user_id]) + # # user id will be nil if not logged in or whole author model if they are logged in + # + # @user = User.new + # end + + # def create + # @user = User.new(user_params) + # @user.joined = Date.today + # raise + # + # if @user.save + # redirect_to user_path + # else + # render :new + # end + # end private diff --git a/db/migrate/20181010045047_change_work_publication_year_to_integer.rb b/db/migrate/20181010045047_change_work_publication_year_to_integer.rb new file mode 100644 index 0000000000..856932dafe --- /dev/null +++ b/db/migrate/20181010045047_change_work_publication_year_to_integer.rb @@ -0,0 +1,6 @@ +class ChangeWorkPublicationYearToInteger < ActiveRecord::Migration[5.2] + def change + remove_column :works, :publication_year + add_column :works, :publication_year, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 42a50fdc05..cebf63d59e 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: 2018_10_08_215738) do +ActiveRecord::Schema.define(version: 2018_10_10_045047) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,10 +36,10 @@ t.string "category" t.string "title" t.string "creator" - t.date "publication_year" t.string "description" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "publication_year" end add_foreign_key "votes", "users" diff --git a/db/seeds.rb b/db/seeds.rb index d40875f6e3..82c655524a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -17,7 +17,7 @@ work.category = row['category'] work.title = row['title'] work.creator = row['creator'] - work.publication_year = row['publication_year'] + work.publication_year = row['publication_year'].to_i work.description = row['description'] successful = work.save if !successful From 9da24ce3cb5d9957c4a6d705a4953d6b6504f901 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 22:58:48 -0700 Subject: [PATCH 32/50] Removed unnecessary user controller methods and routes --- app/controllers/users_controller.rb | 26 -------------------------- config/routes.rb | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 814418d5a7..ed23fbff3f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -16,30 +16,4 @@ def show render :notfound, status: :not_found end end - - # TODO: delete these methods and associations - # def new - # @current_user = User.find_by(id: session[:user_id]) - # # user id will be nil if not logged in or whole author model if they are logged in - # - # @user = User.new - # end - - # def create - # @user = User.new(user_params) - # @user.joined = Date.today - # raise - # - # if @user.save - # redirect_to user_path - # else - # render :new - # end - # end - - private - - def user_params - return params.require(:user).permit(:username) - end end diff --git a/config/routes.rb b/config/routes.rb index 349cbb46aa..dddaff504a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,5 +8,5 @@ resources :works post 'works/:id/upvote', to: 'works#upvote', as: 'upvote' - resources :users, only: [:index, :show, :new, :create] + resources :users, only: [:index, :show] end From d9144c670e516d37b3b0a52276e589d5a68f8327 Mon Sep 17 00:00:00 2001 From: jackie Date: Tue, 9 Oct 2018 23:02:25 -0700 Subject: [PATCH 33/50] Forgot to save this file in the previous commit --- test/controllers/users_controller_test.rb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index dcbb88d675..d4193554f6 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -10,15 +10,4 @@ get users_show_url value(response).must_be :success? end - - it "should get new" do - get users_new_url - value(response).must_be :success? - end - - it "should get create" do - get users_create_url - value(response).must_be :success? - end - end From 5c4fa666b0cd5d07e7ecf27e9632f8c45d415317 Mon Sep 17 00:00:00 2001 From: jackie Date: Wed, 10 Oct 2018 09:07:18 -0700 Subject: [PATCH 34/50] DRYed up Work model methods --- app/models/work.rb | 12 ++---------- app/views/home/index.html.erb | 6 +++--- app/views/works/index.html.erb | 6 +++--- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index b21d7eaa70..ab6fbc8cd4 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -11,16 +11,8 @@ def self.spotlight return Work.all.max_by { |work| work.votes.length } end - def self.albums - return sort_by_votes(Work.all.select { |work| work.category == "album" }) - end - - def self.books - return sort_by_votes(Work.all.select { |work| work.category == "book" }) - end - - def self.movies - return sort_by_votes(Work.all.select { |work| work.category == "movie" }) + def self.list_of(work_category) + return sort_by_votes(Work.all.select { |work| work.category == work_category }) end private diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index ddfebb9076..a054ab55f2 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -14,7 +14,7 @@

Top Movies

    - <% Work.movies[0..9].each do |movie| %> + <% Work.list_of("movie")[0..9].each do |movie| %>

  • <%= link_to movie.title, work_path(movie.id) %> @@ -31,7 +31,7 @@

    Top Books

      - <% Work.books[0..9].each do |book| %> + <% Work.list_of("book")[0..9].each do |book| %>

    • <%= link_to book.title, work_path(book.id) %> @@ -48,7 +48,7 @@

      Top Albums

        - <% Work.albums[0..9].each do |album| %> + <% Work.list_of("album")[0..9].each do |album| %>

      • <%= link_to album.title, work_path(album.id) %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index ebd8a090a0..c418232de7 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -13,7 +13,7 @@ - <% Work.albums.each do |work| %> + <% Work.list_of("album").each do |work| %> <%= work.votes.length %> <%= link_to "#{work.title}", work_path(work.id) %> @@ -41,7 +41,7 @@ - <% Work.books.each do |work| %> + <% Work.list_of("book").each do |work| %> <%= work.votes.length %> <%= link_to "#{work.title}", work_path(work.id) %> @@ -69,7 +69,7 @@ - <% Work.movies.each do |work| %> + <% Work.list_of("movie").each do |work| %> <%= work.votes.length %> <%= link_to "#{work.title}", work_path(work.id) %> From 0f082c703fee77ea9452f287b058104e0fb0c492 Mon Sep 17 00:00:00 2001 From: jackie Date: Wed, 10 Oct 2018 09:29:37 -0700 Subject: [PATCH 35/50] DRYed up tests to go along with DRYing of model method --- test/models/work_test.rb | 70 +++++++--------------------------------- 1 file changed, 12 insertions(+), 58 deletions(-) diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 043d693430..51749fb5f3 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -150,10 +150,10 @@ end end - describe 'albums' do - it 'should return an array of only album works' do + describe 'list_of' do + it 'should return an array of only album, movie, or book works' do # Act - works = Work.albums + works = Work.list_of("album") # Assert expect(works).must_be_instance_of Array @@ -162,68 +162,22 @@ expect(work).must_be_instance_of Work expect(work.category).must_equal "album" end - end - - it 'should return an empty array when there are no albums' do - # Arrange - Work.all.each do |work| - if work.category == "album" - work.votes.each do |vote| - vote.destroy - end - work.destroy - end - end - # Act - works = Work.albums - - # Assert - expect(works).must_be_instance_of Array - expect(works.length).must_equal 0 - end - end - - describe 'books' do - it 'should return an array of only book works' do - # Act - works = Work.books + # Re-Act + works = Work.list_of("book") - # Assert + # Reassert expect(works).must_be_instance_of Array works.each do |work| expect(work).must_be_instance_of Work expect(work.category).must_equal "book" end - end - - it 'should return an empty array when there are no books' do - # Arrange - Work.all.each do |work| - if work.category == "book" - work.votes.each do |vote| - vote.destroy - end - work.destroy - end - end - - # Act - works = Work.books - # Assert - expect(works).must_be_instance_of Array - expect(works.length).must_equal 0 - end - end + # Re-act + works = Work.list_of("movie") - describe 'movies' do - it 'should return an array of only movie works' do - # Act - works = Work.movies - - # Assert + # Reassert expect(works).must_be_instance_of Array works.each do |work| @@ -232,10 +186,10 @@ end end - it 'should return an empty array when there are no movies' do + it 'should return an empty array when there are none of the designated type of work' do # Arrange Work.all.each do |work| - if work.category == "movie" + if work.category == "album" work.votes.each do |vote| vote.destroy end @@ -244,7 +198,7 @@ end # Act - works = Work.movies + works = Work.list_of("album") # Assert expect(works).must_be_instance_of Array From eda99edaa1c9db315d8a8bc302b2e848e184af40 Mon Sep 17 00:00:00 2001 From: jackie Date: Wed, 10 Oct 2018 09:39:33 -0700 Subject: [PATCH 36/50] Added relationship tests for vote model -- passing tests --- test/models/vote_test.rb | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..b7ceb86b1e 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,9 +1,39 @@ require "test_helper" describe Vote do - let(:vote) { Vote.new } + let(:vote) { votes(:vote_one) } it "must be valid" do value(vote).must_be :valid? end + + it 'has required fields' do + fields = [:date, :work, :user] + + fields.each do |field| + expect(vote).must_respond_to field + end + end + + describe 'relationships' do + it 'belongs to a user' do + # Arrange is done with let + + # Act + user = vote.user + + # Assert + expect(user).must_be_instance_of User + end + + it 'belongs to a work' do + # Arrange is done with let + + # Act + work = vote.work + + # Assert + expect(work).must_be_instance_of Work + end + end end From 858d5132c21f4243ee61edb8efc93eb2dab8f405 Mon Sep 17 00:00:00 2001 From: jackie Date: Wed, 10 Oct 2018 10:49:34 -0700 Subject: [PATCH 37/50] Created relationships and validation tests for user model -- passing tests --- app/models/user.rb | 1 + test/fixtures/users.yml | 4 +- test/models/user_test.rb | 95 +++++++++++++++++++++++++++++++++++++++- test/models/vote_test.rb | 2 + 4 files changed, 99 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 67feb3959b..62059fa22d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -4,6 +4,7 @@ class User < ApplicationRecord # has_many :works # optional validates :username, presence: true + validates :joined, presence: true def vote_date(work) return self.votes.find_by(work_id: work.id).date diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 214aecb561..6da1dbb03a 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -2,8 +2,8 @@ jackie: username: jackie - joined: 2018-10-08 + joined: '2018-10-08' dan: username: dan - joined: 2018-10-09 + joined: '2018-10-09' diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..d688e7f887 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,102 @@ require "test_helper" describe User do - let(:user) { User.new } + let(:user) { users(:jackie) } it "must be valid" do value(user).must_be :valid? end + + it 'has required fields' do + fields = [:username, :joined, :votes, :works] + + fields.each do |field| + expect(user).must_respond_to field + end + end + + describe 'relationships' do + it 'has many votes' do + # Arrange is done with let + + # Act + votes = user.votes + + # Assert + expect(user).must_be_instance_of User + + expect(votes.length).must_be :>=, 1 + votes.each do |vote| + expect(vote).must_be_instance_of Vote + end + end + + it 'has many works through votes' do + # Arrange is done with let + + # Act + works = user.works + + # Assert + expect(user).must_be_instance_of User + + expect(works.length).must_be :>=, 1 + works.each do |work| + expect(work).must_be_instance_of Work + end + end + end + + describe 'validations' do + it 'must have a username' do + # Arrange + user.username = nil + + # Act + valid = user.valid? # run validations + + # Assert + expect(valid).must_equal false + expect(user.errors.messages).must_include :username + expect(user.errors.messages[:username]).must_equal ["can't be blank"] + + # Rearrange + user.username = "jackie" + + # Re-Act + valid = user.valid? # run validations + + # Reassert + expect(valid).must_equal true + end + + it 'must have a joined date' do + # Arrange + user.joined = nil + + # Act + valid = user.valid? # run validations + + # Assert + expect(valid).must_equal false + expect(user.errors.messages).must_include :joined + expect(user.errors.messages[:joined]).must_equal ["can't be blank"] + + # Rearrange + user.joined = "2018-10-10" + + # Re-Act + valid = user.valid? # run validations + + # Reassert + expect(valid).must_equal true + end + end + + #TODO custom method test +=begin + def vote_date(work) + return self.votes.find_by(work_id: work.id).date + end +=end end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index b7ceb86b1e..ba8474e3c7 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -23,6 +23,7 @@ user = vote.user # Assert + expect(vote).must_be_instance_of Vote expect(user).must_be_instance_of User end @@ -33,6 +34,7 @@ work = vote.work # Assert + expect(vote).must_be_instance_of Vote expect(work).must_be_instance_of Work end end From f99594165c64143c623a7851b0dbde63ccca2d41 Mon Sep 17 00:00:00 2001 From: jackie Date: Wed, 10 Oct 2018 15:43:20 -0700 Subject: [PATCH 38/50] Added vote_count method to user and work models; added tests for custom methods --- app/controllers/works_controller.rb | 2 +- app/models/user.rb | 7 ++- app/models/work.rb | 10 ++-- app/views/home/index.html.erb | 22 ++++---- app/views/works/_form.html.erb | 10 ---- test/fixtures/votes.yml | 2 +- test/models/user_test.rb | 44 +++++++++++++-- test/models/work_test.rb | 84 +++++++++++++++++++++++++++-- 8 files changed, 145 insertions(+), 36 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index b58c40ed1b..d0642e9fc1 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -76,7 +76,7 @@ def destroy def upvote work = Work.find_by(id: params[:id].to_i) user = User.find_by(id: session[:user_id]) - + if user.nil? flash[:error] = "A problem occurred: You must log in to vote" diff --git a/app/models/user.rb b/app/models/user.rb index 62059fa22d..a3b6709c5a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,6 +7,11 @@ class User < ApplicationRecord validates :joined, presence: true def vote_date(work) - return self.votes.find_by(work_id: work.id).date + vote = self.votes.find_by(work_id: work.id) + return vote ? vote.date : nil + end + + def vote_count + return self.votes.length end end diff --git a/app/models/work.rb b/app/models/work.rb index ab6fbc8cd4..b55fcfa69e 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -8,16 +8,20 @@ class Work < ApplicationRecord validates :title, uniqueness: { scope: :category } def self.spotlight - return Work.all.max_by { |work| work.votes.length } + return sort_by_votes(Work.all).first end def self.list_of(work_category) return sort_by_votes(Work.all.select { |work| work.category == work_category }) end + def vote_count + return self.votes.length + end + private - def self.sort_by_votes(work_list) - return work_list.sort_by { |work| -work.votes.length } + def self.sort_by_votes(work_list) # ties are displayed in alphabetical order + return work_list.sort_by { |work| [-work.votes.length, work.title] } end end diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index a054ab55f2..4be50f6dac 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,13 +1,15 @@ -
        -

        - Media Spotlight: - <%= link_to Work.spotlight.title, work_path(Work.spotlight.id) %> - by <%= Work.spotlight.creator %> -

        -

        - <%= Work.spotlight.votes.length %> votes - <%= Work.spotlight.description[0..20] %>... -

        -
        +<% if Work.spotlight %> +
        +

        + Media Spotlight: + <%= link_to Work.spotlight.title, work_path(Work.spotlight.id) %> + by <%= Work.spotlight.creator %> +

        +

        + <%= Work.spotlight.votes.length %> votes - <%= Work.spotlight.description[0..20] %>... +

        +
        +<% end %>
        diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 243f20f2e9..0e03cc0fa5 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -1,16 +1,6 @@

        <%= action_name %>

        - <% if @work.errors.any? %> -
          - <% @work.errors.each do |column, message| %> -
        • - <%= column.capitalize %> <%= message %> -
          • - <% end %> -
        - <% end %> - <%= form_with model: @work do |f|%> <%= f.label :category %> <%= f.select :category, ["album", "book", "movie"] %> diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index 5fb2c94694..98fec6264c 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -7,5 +7,5 @@ vote_one: vote_two: date: '2018-10-06' - user: dan + user: jackie work: sgtpepper diff --git a/test/models/user_test.rb b/test/models/user_test.rb index d688e7f887..e7a8fb0947 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -2,6 +2,7 @@ describe User do let(:user) { users(:jackie) } + let(:work) { works(:hp) } it "must be valid" do value(user).must_be :valid? @@ -93,10 +94,43 @@ end end - #TODO custom method test -=begin - def vote_date(work) - return self.votes.find_by(work_id: work.id).date + describe 'vote_date' do + it 'must return the date the user voted on the designated work' do + # Arrange in fixture + # Act + date = user.vote_date(work) + + # Assert + expect(date).must_equal Date.parse('2018-10-08') + end + + it 'returns nil when the user has not voted on that work' do + date = user.vote_date(works(:interstellar)) + + # Assert + expect(date).must_be_nil + end + end + + describe 'vote_count' do + it 'must return the total number of votes a user has made' do + # Arrange in fixture + # Act + count = user.vote_count + + # Assert + expect(count).must_equal 2 + end + + it 'returns 0 when the user has not voted on anything' do + # Arrange + new_user = users(:dan) + + # Act + count = new_user.vote_count + + # Assert + expect(count).must_equal 0 + end end -=end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 51749fb5f3..17582dd232 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -3,6 +3,7 @@ describe Work do let(:work) { works(:hp) } let(:vote) { votes(:vote_one) } + let(:user) { users(:jackie) } it "must be valid" do value(work).must_be :valid? @@ -117,7 +118,7 @@ it 'should have the most votes of all work objects' do # Arrange 10.times do - Work.first.votes << Vote.new + Work.first.votes << Vote.new(user: user, work: work) end # Act @@ -128,11 +129,30 @@ expect(vote_count).must_equal Work.all.max_by { |work| work.votes.length }.votes.length end - # TODO: tiebreakers - # it 'should return the one thats first alphabetically if theres a tie' do - # end + it 'should return the first work alphabetically if there is a vote tie' do + # Arrange + 15.times do + works(:sgtpepper).votes << Vote.new(user: user, work: work) + end + + # Act + top_work = Work.spotlight + + # Assert + expect(top_work).must_equal works(:sgtpepper) + + # Re-Arrange + # 16 times because sgtpepper has existing extra vote from fixture + 16.times do + works(:interstellar).votes << Vote.new(user: user, work: work) + end + # Act + top_work = Work.spotlight + + # Assert + expect(top_work).must_equal works(:interstellar) + end - # TODO: Need to account for this in the view it 'should return nil if there are no works' do # Arrange Work.all.each do |work| @@ -186,6 +206,38 @@ end end + it 'should return the works ordered by vote count and then alphabetically' do + # Arrange + works(:sgtpepper).category = "book" + works(:sgtpepper).save + works(:interstellar).category = "book" + works(:interstellar).save + + # Act + works = Work.list_of("book") + + # Assert + expect(works[0].vote_count >= works[1].vote_count).must_equal true + expect(works[1].vote_count >= works[2].vote_count).must_equal true + + # Re-Arrange + 15.times do + works(:sgtpepper).votes << Vote.new(user: user, work: work) + end + + # 16 times because sgtpepper has existing extra vote from fixture + 16.times do + works(:interstellar).votes << Vote.new(user: user, work: work) + end + # Act + works = Work.list_of("book") + + # Assert + expect(works.first).must_equal works(:interstellar) + expect(works[0].vote_count >= works[1].vote_count).must_equal true + expect(works[1].vote_count >= works[2].vote_count).must_equal true + end + it 'should return an empty array when there are none of the designated type of work' do # Arrange Work.all.each do |work| @@ -205,4 +257,26 @@ expect(works.length).must_equal 0 end end + + describe 'vote_count' do + it 'must return the total number of votes on a work' do + # Arrange in fixture + # Act + count = work.vote_count + + # Assert + expect(count).must_equal 1 + end + + it 'returns 0 when the work has no votes on anything' do + # Arrange + interstellar = works(:interstellar) + + # Act + count = interstellar.vote_count + + # Assert + expect(count).must_equal 0 + end + end end From a2f8e6824ae57d751cae1d61e5bbd42b35f5284b Mon Sep 17 00:00:00 2001 From: jackie Date: Wed, 10 Oct 2018 15:51:44 -0700 Subject: [PATCH 39/50] Added validations and tests for vote model --- app/models/vote.rb | 4 +++ test/models/vote_test.rb | 68 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/app/models/vote.rb b/app/models/vote.rb index b8b6f9f0aa..9e4b18b07a 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,8 @@ class Vote < ApplicationRecord belongs_to :user belongs_to :work + + validates :user, presence: true + validates :work, presence: true + validates :date, presence: true end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index ba8474e3c7..601b852331 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -38,4 +38,72 @@ expect(work).must_be_instance_of Work end end + + describe 'validations' do + it 'must have a user' do + # Arrange + vote.user = nil + + # Act + valid = vote.valid? # run validations + + # Assert + expect(valid).must_equal false + expect(vote.errors.messages).must_include :user + expect(vote.errors.messages[:user]).must_equal ["must exist", "can't be blank"] + + # Rearrange + vote.user = users(:jackie) + + # Re-Act + valid = vote.valid? # run validations + + # Reassert + expect(valid).must_equal true + end + + it 'must have a work' do + # Arrange + vote.work = nil + + # Act + valid = vote.valid? # run validations + + # Assert + expect(valid).must_equal false + expect(vote.errors.messages).must_include :work + expect(vote.errors.messages[:work]).must_equal ["must exist", "can't be blank"] + + # Rearrange + vote.work = works(:hp) + + # Re-Act + valid = vote.valid? # run validations + + # Reassert + expect(valid).must_equal true + end + + it 'must have a date' do + # Arrange + vote.date = nil + + # Act + valid = vote.valid? # run validations + + # Assert + expect(valid).must_equal false + expect(vote.errors.messages).must_include :date + expect(vote.errors.messages[:date]).must_equal ["can't be blank"] + + # Rearrange + vote.date = Date.today + + # Re-Act + valid = vote.valid? # run validations + + # Reassert + expect(valid).must_equal true + end + end end From 5b5f3e8e69249a56ed9d66ff77b910601ff7b2a6 Mon Sep 17 00:00:00 2001 From: jackie Date: Wed, 10 Oct 2018 21:03:54 -0700 Subject: [PATCH 40/50] Created eligible_to_vote User model method to DRY up Works controller --- app/controllers/application_controller.rb | 15 +++ app/controllers/users_controller.rb | 6 -- app/controllers/works_controller.rb | 123 ++++++++++------------ app/models/user.rb | 4 + app/views/works/_form.html.erb | 2 +- test/models/user_test.rb | 25 +++++ 6 files changed, 99 insertions(+), 76 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12ab..cc04be872f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,17 @@ class ApplicationController < ActionController::Base + before_action :set_cache_headers + before_action :find_user + + private + + def find_user + @current_user = User.find_by(id: session[:user_id]) + # user id will be nil if not logged in or whole author model if they are logged in + end + + def set_cache_headers + response.headers["Cache-Control"] = "no-cache, no-store" + response.headers["Pragma"] = "no-cache" + response.headers["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT" + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ed23fbff3f..7ac4090be4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,15 +1,9 @@ class UsersController < ApplicationController def index - @current_user = User.find_by(id: session[:user_id]) - # user id will be nil if not logged in or whole author model if they are logged in - @users = User.all end def show - @current_user = User.find_by(id: session[:user_id]) - # user id will be nil if not logged in or whole author model if they are logged in - @user = User.find_by(id: params[:id].to_i) if @user.nil? diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index d0642e9fc1..bf9dfbf83b 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,26 +1,13 @@ class WorksController < ApplicationController - def index - @current_user = User.find_by(id: session[:user_id]) - # user id will be nil if not logged in or whole author model if they are logged in + before_action :find_work, except: [:index, :new, :create] + def index @works = Work.all end - def show - @current_user = User.find_by(id: session[:user_id]) - # user id will be nil if not logged in or whole author model if they are logged in - - @work = Work.find_by(id: params[:id].to_i) - - if @work.nil? - render :notfound, status: :not_found - end - end + def show; end def new - @current_user = User.find_by(id: session[:user_id]) - # user id will be nil if not logged in or whole author model if they are logged in - @work = Work.new end @@ -28,94 +15,92 @@ def create @work = Work.new(work_params) if @work.save - flash[:success] = "Work added" - redirect_to work_path(@work.id) + success_redirect("Work added", work_path(@work.id)) else - flash.now[:error] = "Error: Work not added" - - @work.errors.messages.each do |field, messages| - flash.now[field] = messages - end - - render :new + error_render(:new) end end - def edit - @current_user = User.find_by(id: session[:user_id]) - # user id will be nil if not logged in or whole author model if they are logged in - - @work = Work.find_by(id: params[:id].to_i) - end + def edit; end def update - @work = Work.find_by(id: params[:id].to_i) if @work.update(work_params) - flash[:success] = "Changes saved" - redirect_to work_path(@work.id) + success_redirect("Changes saved", work_path(@work.id)) else - flash.now[:error] = "Error: Changes not saved" - - @work.errors.messages.each do |field, messages| - flash.now[field] = messages - end - - render :edit + error_render(:edit) end end def destroy - work = Work.find_by(id: params[:id].to_i) - deleted_work = work.destroy + unless @work.nil? + @work.votes.each do |vote| + vote.destroy + end - flash[:success] = "#{deleted_work.title} deleted" + deleted_work = @work.destroy - redirect_to root_path + success_redirect("#{deleted_work.title} deleted", root_path) + end end def upvote - work = Work.find_by(id: params[:id].to_i) user = User.find_by(id: session[:user_id]) - - if user.nil? - flash[:error] = "A problem occurred: You must log in to vote" - - work.errors.messages.each do |field, messages| - flash[field] = messages - end - redirect_back(fallback_location: root_path) - - elsif !user.works.include? work # user eligible to vote - vote = Vote.new(work: work, user: user, date: Date.today) + if user.nil? + error_redirect("A problem occurred: You must log in to vote") + elsif user.eligible_to_vote?(@work) + vote = Vote.new(work: @work, user: user, date: Date.today) if vote.save flash[:success] = "Successfully upvoted!" redirect_back(fallback_location: root_path) else - flash[:error] = "Error: Could not process vote" + error_redirect("Error: Could not process vote") + end + else # user logged in but ineligible to vote + error_redirect("A problem occurred: You've already voted on this work") + end + end - work.errors.messages.each do |field, messages| - flash[field] = messages - end + private - redirect_back(fallback_location: root_path) + def work_params + return params.require(:work).permit(:category, :title, :creator, :publication_year, :description) + end + + def find_work + @work = Work.find_by(id: params[:id].to_i) + + if @work.nil? + flash.now[:warning] = "Cannot find the work" + render :notfound, status: :not_found end + end + + def success_redirect(message, path) + flash[:success] = message + redirect_to path + end - else # user.votes.works.include? work # user ineligible to vote - flash[:error] = "A problem occurred: You've already voted on this work" + def error_redirect(message) + find_work + flash[:error] = message - work.errors.messages.each do |field, messages| + @work.errors.messages.each do |field, messages| flash[field] = messages end redirect_back(fallback_location: root_path) end - end - private + def error_render(view) + find_work + flash.now[:error] = "Error: Work not saved" - def work_params - return params.require(:work).permit(:category, :title, :creator, :publication_year, :description) + @work.errors.messages.each do |field, messages| + flash.now[field] = messages + end + + render view end end diff --git a/app/models/user.rb b/app/models/user.rb index a3b6709c5a..edbf030b8b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -14,4 +14,8 @@ def vote_date(work) def vote_count return self.votes.length end + + def eligible_to_vote?(work) + return !(works.include? work) # true if work not already in users votes + end end diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 0e03cc0fa5..a1aa337d4d 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -1,7 +1,7 @@

        <%= action_name %>

        - <%= form_with model: @work do |f|%> + <%= form_with model: @work, locals: true do |f|%> <%= f.label :category %> <%= f.select :category, ["album", "book", "movie"] %> diff --git a/test/models/user_test.rb b/test/models/user_test.rb index e7a8fb0947..122a748bcb 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,4 +1,5 @@ require "test_helper" +require 'pry' describe User do let(:user) { users(:jackie) } @@ -133,4 +134,28 @@ expect(count).must_equal 0 end end + + describe 'eligible_to_vote' do + let(:work2) { Work.new(category: "movie", title: "Up") } + + it 'must return true unless a user has already voted on a work (then false)' do + # Act + eligible = users(:dan).eligible_to_vote? work2 + + # Assert + expect(eligible).must_equal true + end + + it 'must return false if a user has already voted on a work' do + # Arrange + new_vote = Vote.new(user: users(:dan), work: work2, date: Date.today) + new_vote.save + + # Act + eligible = users(:dan).eligible_to_vote? work2 + + # Assert + expect(eligible).must_equal false + end + end end From 2ec5fbf9443c057461ab7f3da6174424633f302b Mon Sep 17 00:00:00 2001 From: jackie Date: Wed, 10 Oct 2018 21:13:09 -0700 Subject: [PATCH 41/50] Fixed bug with error messages --- app/controllers/works_controller.rb | 4 ++-- app/views/layouts/application.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index bf9dfbf83b..5983b288db 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -84,7 +84,7 @@ def success_redirect(message, path) def error_redirect(message) find_work - flash[:error] = message + flash[:warning] = message @work.errors.messages.each do |field, messages| flash[field] = messages @@ -95,7 +95,7 @@ def error_redirect(message) def error_render(view) find_work - flash.now[:error] = "Error: Work not saved" + flash.now[:warning] = "Error: Work not saved" @work.errors.messages.each do |field, messages| flash.now[field] = messages diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 45a8ff8b05..92fa5f2821 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -37,10 +37,10 @@ <% flash.each do |name, message| %> <% if message.class == Array %> <% message.each do |msg| %> -
        <%= "#{name}: #{msg}" %>
        +
        <%= "#{name}: #{msg}" %>
        <% end %> <% else %> -
        <%= message %>
        +
        <%= message %>
        <% end %> <% end %>
        From 827f60a5a6afb1e162c8caff0d14d1d967bfc72d Mon Sep 17 00:00:00 2001 From: jackie Date: Wed, 10 Oct 2018 22:25:56 -0700 Subject: [PATCH 42/50] Bootstrap class additions to lists, buttons, nav --- app/views/home/index.html.erb | 114 +++++++++++++------------ app/views/layouts/application.html.erb | 29 +++---- app/views/users/show.html.erb | 5 ++ app/views/works/_form.html.erb | 24 ++++-- app/views/works/index.html.erb | 4 +- 5 files changed, 97 insertions(+), 79 deletions(-) diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 4be50f6dac..e1138718bf 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,65 +1,69 @@ <% if Work.spotlight %> -
        -

        - Media Spotlight: - <%= link_to Work.spotlight.title, work_path(Work.spotlight.id) %> - by <%= Work.spotlight.creator %> -

        -

        - <%= Work.spotlight.votes.length %> votes - <%= Work.spotlight.description[0..20] %>... -

        +
        +
        +

        + Media Spotlight: + <%= link_to Work.spotlight.title, work_path(Work.spotlight.id) %> + by <%= Work.spotlight.creator %> +

        +

        + <%= Work.spotlight.votes.length %> votes - <%= Work.spotlight.description[0..20] %>... +

        +
        <% end %>
        -

        Top Movies

        -
          - <% Work.list_of("movie")[0..9].each do |movie| %> -
        • -

          - <%= link_to movie.title, work_path(movie.id) %> - by <%= movie.creator %> -

          -

          - <%= movie.votes.length %> votes -

          -
          • - <% end %> -
        -
        +
        +

        Top Movies

        +
          + <% Work.list_of("movie")[0..9].each do |movie| %> +
        • +

          + <%= link_to movie.title, work_path(movie.id) %> + by <%= movie.creator %> +

          +

          + <%= movie.votes.length %> votes +

          +
          • + <% end %> +
        +
        -
        -

        Top Books

        -
          - <% Work.list_of("book")[0..9].each do |book| %> -
        • -

          - <%= link_to book.title, work_path(book.id) %> - by <%= book.creator %> -

          -

          - <%= book.votes.length %> votes -

          -
          • - <% end %> -
        -
        +
        +

        Top Books

        +
          + <% Work.list_of("book")[0..9].each do |book| %> +
        • +

          + <%= link_to book.title, work_path(book.id) %> + by <%= book.creator %> +

          +

          + <%= book.votes.length %> votes +

          +
          • + <% end %> +
        +
        -
        -

        Top Albums

        -
          - <% Work.list_of("album")[0..9].each do |album| %> -
        • -

          - <%= link_to album.title, work_path(album.id) %> - by <%= album.creator %> -

          -

          - <%= album.votes.length %> votes -

          -
          • - <% end %> -
        +
        +

        Top Albums

        +
          + <% Work.list_of("album")[0..9].each do |album| %> +
        • +

          + <%= link_to album.title, work_path(album.id) %> + by <%= album.creator %> +

          +

          + <%= album.votes.length %> votes +

          +
          • + <% end %> +
        +
        diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 92fa5f2821..f868ebf02c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,27 +10,26 @@ -
        +

        <%= link_to "Media Ranker", '/' %> Ranking the Best of Everything

        -
        - LINK - LINK + <%= link_to "View top media", root_path, class: "btn btn-secondary", role: "button" %> + <%= link_to "Add a new work", new_work_path, class: "btn btn-primary", role: "button" %>
        From 673c212bf5dceee481991e3e03f4373d0835e8ba Mon Sep 17 00:00:00 2001 From: jackie Date: Wed, 10 Oct 2018 23:31:48 -0700 Subject: [PATCH 43/50] Styling for headers, use of grid, card, and list groups on home page --- app/assets/stylesheets/application.scss | 52 ++++++++++++ app/views/home/index.html.erb | 100 ++++++++++++------------ app/views/users/index.html.erb | 2 +- app/views/users/show.html.erb | 2 +- app/views/works/show.html.erb | 2 +- 5 files changed, 106 insertions(+), 52 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8b1701e581..f293922665 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,3 +16,55 @@ @import "bootstrap"; /* Import scss content */ @import "**/*"; + +main { + padding: 2rem; +} + +.app-header { + padding: 2rem 1rem 0.5rem 1rem; + background-color: #B2DFDB; +} + +.app-header h1 { + margin: 1.5rem auto 3rem auto; + text-align: center; +} + +.app-header h1 > a { + padding-right: 1.5rem; + border-right: 2px solid; + margin-right: 1rem; +} + +.nav { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.site-nav-container .nav-item { + margin-top: 1rem; + margin-right: 2rem; +} + +.user-nav-container .nav-item { + margin-top: 1rem; + margin-left: 2rem; +} + +.votes-container { + margin-top: 2rem; +} + +h2.top-ten { + border-bottom: 2px solid #B2DFDB; +} + +a, h2 { + color: #26A69A; +} + +.card, .list-group-item { + border: none; +} diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index e1138718bf..d7fff0cae4 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -15,55 +15,57 @@
        -
        -
        -

        Top Movies

        -
          - <% Work.list_of("movie")[0..9].each do |movie| %> -
        • -

          - <%= link_to movie.title, work_path(movie.id) %> - by <%= movie.creator %> -

          -

          - <%= movie.votes.length %> votes -

          -
          • - <% end %> -
        -
        +
        +
        +
        +

        Top Movies

        +
          + <% Work.list_of("movie")[0..9].each do |movie| %> +
        • +

          + <%= link_to movie.title, work_path(movie.id) %> + by <%= movie.creator %> +

          +

          + <%= movie.votes.length %> votes +

          +
          • + <% end %> +
        +
        -
        -

        Top Books

        -
          - <% Work.list_of("book")[0..9].each do |book| %> -
        • -

          - <%= link_to book.title, work_path(book.id) %> - by <%= book.creator %> -

          -

          - <%= book.votes.length %> votes -

          -
          • - <% end %> -
        -
        +
        +

        Top Books

        +
          + <% Work.list_of("book")[0..9].each do |book| %> +
        • +

          + <%= link_to book.title, work_path(book.id) %> + by <%= book.creator %> +

          +

          + <%= book.votes.length %> votes +

          +
          • + <% end %> +
        +
        -
        -

        Top Albums

        -
          - <% Work.list_of("album")[0..9].each do |album| %> -
        • -

          - <%= link_to album.title, work_path(album.id) %> - by <%= album.creator %> -

          -

          - <%= album.votes.length %> votes -

          -
          • - <% end %> -
        +
        +

        Top Albums

        +
          + <% Work.list_of("album")[0..9].each do |album| %> +
        • +

          + <%= link_to album.title, work_path(album.id) %> + by <%= album.creator %> +

          +

          + <%= album.votes.length %> votes +

          +
          • + <% end %> +
        +
        -
        +
        diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 8d9db7b4de..faa96f0f1c 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -4,7 +4,7 @@ - + diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index c54f6c1da6..ff4caddd74 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,7 +1,7 @@

        User summary: <%= link_to "#{@user.username}", user_path(@user.id) %>

        Joined site <%= @user.joined %>

        -
        +

        Votes

        UserUsername Votes Joined
        diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 4774e7af1c..3d0c4ce128 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -13,7 +13,7 @@ data: { confirm: 'Are you sure?'} %> -
        +

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

        From a005810409d4f1c5102cc9fe6f60636b4b9d8c15 Mon Sep 17 00:00:00 2001 From: jackie Date: Thu, 11 Oct 2018 13:45:10 -0700 Subject: [PATCH 44/50] CSS font styling --- app/assets/stylesheets/application.scss | 14 +++++++++++++- app/views/layouts/application.html.erb | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f293922665..a67843739e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -17,6 +17,8 @@ /* Import scss content */ @import "**/*"; +$dark-teal: #26A69A; + main { padding: 2rem; } @@ -62,7 +64,17 @@ h2.top-ten { } a, h2 { - color: #26A69A; + color: $dark-teal; + font-weight: 700; +} + +.btn-primary { + background-color: $dark-teal; + border-color: $dark-teal; +} + +body { + font-family: "Gudea", sans-serif; } .card, .list-group-item { diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f868ebf02c..c3ba8d7e2d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,6 +7,8 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + From 965c29ec135971624d37a18b37425c57655b5a45 Mon Sep 17 00:00:00 2001 From: jackie Date: Thu, 11 Oct 2018 15:38:12 -0700 Subject: [PATCH 45/50] Homepage styling --- app/assets/stylesheets/application.scss | 34 ++++++++++++++++++++++--- app/views/home/index.html.erb | 8 +++--- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a67843739e..cb0f126564 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -23,20 +23,21 @@ main { padding: 2rem; } -.app-header { +header.app-header { padding: 2rem 1rem 0.5rem 1rem; background-color: #B2DFDB; } -.app-header h1 { +.app-header > h1 { margin: 1.5rem auto 3rem auto; text-align: center; } -.app-header h1 > a { +.app-header > h1 > a { padding-right: 1.5rem; - border-right: 2px solid; + border-right: 2px solid white; margin-right: 1rem; + color: #FF5722; } .nav { @@ -50,6 +51,10 @@ main { margin-right: 2rem; } +.site-nav-container .nav-item .btn-link { + color: #00796B; +} + .user-nav-container .nav-item { margin-top: 1rem; margin-left: 2rem; @@ -80,3 +85,24 @@ body { .card, .list-group-item { border: none; } + +.card a { + text-decoration: underline; +} + +.header .spotlight-prefix { + color: #424242; +} + +small { + font-size: 80%; + font-weight: 400; +} + +h1 > small { + color: white; +} + +small.creator { + color: slategrey; +} diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index d7fff0cae4..e6a54d5cc3 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -2,7 +2,7 @@

        - Media Spotlight: + Media Spotlight: <%= link_to Work.spotlight.title, work_path(Work.spotlight.id) %> by <%= Work.spotlight.creator %>

        @@ -24,7 +24,7 @@

      • <%= link_to movie.title, work_path(movie.id) %> - by <%= movie.creator %> + by <%= movie.creator %>

        <%= movie.votes.length %> votes @@ -41,7 +41,7 @@

      • <%= link_to book.title, work_path(book.id) %> - by <%= book.creator %> + by <%= book.creator %>

        <%= book.votes.length %> votes @@ -58,7 +58,7 @@

      • <%= link_to album.title, work_path(album.id) %> - by <%= album.creator %> + by <%= album.creator %>

        <%= album.votes.length %> votes From 8d0b1d842ebf9ddbac5324b8308fc85640053738 Mon Sep 17 00:00:00 2001 From: jackie Date: Thu, 11 Oct 2018 20:19:11 -0700 Subject: [PATCH 46/50] Finished styling to make site look like example site --- app/assets/stylesheets/application.scss | 19 ++++++++++++++----- app/views/layouts/application.html.erb | 8 +++++--- app/views/sessions/destroy.html.erb | 2 -- app/views/sessions/login.html.erb | 2 -- app/views/sessions/new.html.erb | 12 +++++++----- app/views/works/index.html.erb | 6 +++--- 6 files changed, 29 insertions(+), 20 deletions(-) delete mode 100644 app/views/sessions/destroy.html.erb delete mode 100644 app/views/sessions/login.html.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index cb0f126564..c34bed7c16 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -38,6 +38,7 @@ header.app-header { border-right: 2px solid white; margin-right: 1rem; color: #FF5722; + font-weight: 700; } .nav { @@ -68,11 +69,6 @@ h2.top-ten { border-bottom: 2px solid #B2DFDB; } -a, h2 { - color: $dark-teal; - font-weight: 700; -} - .btn-primary { background-color: $dark-teal; border-color: $dark-teal; @@ -94,6 +90,10 @@ body { color: #424242; } +a, h2 { + color: $dark-teal; +} + small { font-size: 80%; font-weight: 400; @@ -106,3 +106,12 @@ h1 > small { small.creator { color: slategrey; } + +h2, h3, h4.media-table, h4 > a { + font-weight: 700; +} + +section.flash { + margin-top: 2rem; + margin-bottom: 1rem; +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c3ba8d7e2d..9676c2032d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -34,18 +34,20 @@ <% end %> + + <% if flash.count > 0 %>

        <% flash.each do |name, message| %> <% if message.class == Array %> <% message.each do |msg| %> -
        <%= "#{name}: #{msg}" %>
        +
        <%= "#{name}: #{msg}" %>
        <% end %> <% else %> -
        <%= message %>
        +
        <%= message %>
        <% end %> <% end %>
        - + <% end %>
        <%= yield %>
        diff --git a/app/views/sessions/destroy.html.erb b/app/views/sessions/destroy.html.erb deleted file mode 100644 index d75237d982..0000000000 --- a/app/views/sessions/destroy.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

        Sessions#destroy

        -

        Find me in app/views/sessions/destroy.html.erb

        diff --git a/app/views/sessions/login.html.erb b/app/views/sessions/login.html.erb deleted file mode 100644 index 6fbfe54fd5..0000000000 --- a/app/views/sessions/login.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

        Sessions#login

        -

        Find me in app/views/sessions/login.html.erb

        diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index bc88a1ccec..33659fa53c 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,8 +1,10 @@ -

        Log In

        +

        Log In

        -<%= form_with model: @user, url: login_path, method: :post do |f| %> - <%= f.label :username, 'Username' %> - <%= f.text_field :username, placeholder: 'username' %> +<%= form_with model: @user, url: login_path, method: :post, class: "form" do |f| %> +
        + <%= f.label :username, 'Username' %> + <%= f.text_field :username, class: 'form-control' %> +
        - <%= f.submit 'Login' %> + <%= f.submit 'Log In', class: "btn btn-primary" %> <% end %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 36b79a169a..d767482681 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,7 +1,7 @@

        List of Works

        -

        Albums

        +

        Albums

        • @@ -29,7 +29,7 @@
        -

        Books

        +

        Books

        @@ -57,7 +57,7 @@
        -

        Movies

        +

        Movies

        From 87af2b695084e95ce7f5af73f1394e882ef34f52 Mon Sep 17 00:00:00 2001 From: jackie Date: Fri, 12 Oct 2018 15:45:49 -0700 Subject: [PATCH 47/50] Added final tests around sorting lists, checking for 0 votes; DRYed up tests and forms --- app/assets/stylesheets/application.scss | 5 + app/controllers/sessions_controller.rb | 13 ++- app/controllers/works_controller.rb | 28 ++---- app/models/user.rb | 2 +- app/models/work.rb | 5 +- app/views/layouts/application.html.erb | 22 +++-- app/views/works/_form.html.erb | 4 +- app/views/works/edit.html.erb | 5 +- app/views/works/new.html.erb | 4 +- test/fixtures/users.yml | 8 ++ test/fixtures/votes.yml | 15 +++ test/fixtures/works.yml | 7 ++ test/models/user_test.rb | 16 ++- test/models/vote_test.rb | 26 +++++ test/models/work_test.rb | 123 +++++++++++------------- 15 files changed, 179 insertions(+), 104 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index c34bed7c16..e0b677b078 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -115,3 +115,8 @@ section.flash { margin-top: 2rem; margin-bottom: 1rem; } + +#error-messages + { + margin-bottom: 0; + } diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index fcedd062e7..556fed445d 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -8,8 +8,17 @@ def login end session[:user_id] = user.id - flash[:success] = "#{user.username} successfully logged in" - redirect_to root_path + + if user.valid? + flash[:success] = "#{user.username} successfully logged in" + redirect_to root_path + else + flash[:warning] = "A problem occurred: Could not log in" + user.errors.messages.each do |field, messages| + flash[field] = messages + end + redirect_back(fallback_location: root_path) + end end def new diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 5983b288db..60a5a3b40b 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -17,7 +17,7 @@ def create if @work.save success_redirect("Work added", work_path(@work.id)) else - error_render(:new) + error_render(@work, :new) end end @@ -27,18 +27,13 @@ def update if @work.update(work_params) success_redirect("Changes saved", work_path(@work.id)) else - error_render(:edit) + error_render(@work, :edit) end end def destroy unless @work.nil? - @work.votes.each do |vote| - vote.destroy - end - deleted_work = @work.destroy - success_redirect("#{deleted_work.title} deleted", root_path) end end @@ -47,7 +42,7 @@ def upvote user = User.find_by(id: session[:user_id]) if user.nil? - error_redirect("A problem occurred: You must log in to vote") + error_redirect(@work, "A problem occurred: You must log in to vote") elsif user.eligible_to_vote?(@work) vote = Vote.new(work: @work, user: user, date: Date.today) @@ -55,10 +50,10 @@ def upvote flash[:success] = "Successfully upvoted!" redirect_back(fallback_location: root_path) else - error_redirect("Error: Could not process vote") + error_redirect(@work, "Error: Could not process vote") end else # user logged in but ineligible to vote - error_redirect("A problem occurred: You've already voted on this work") + error_redirect(@work, "A problem occurred: You've already voted on this work") end end @@ -73,7 +68,6 @@ def find_work if @work.nil? flash.now[:warning] = "Cannot find the work" - render :notfound, status: :not_found end end @@ -82,22 +76,20 @@ def success_redirect(message, path) redirect_to path end - def error_redirect(message) - find_work + def error_redirect(work, message) flash[:warning] = message - @work.errors.messages.each do |field, messages| - flash[field] = messages + work.errors.messages.each do |field, messages| + flash[:errors] = messages end redirect_back(fallback_location: root_path) end - def error_render(view) - find_work + def error_render(work, view) flash.now[:warning] = "Error: Work not saved" - @work.errors.messages.each do |field, messages| + work.errors.messages.each do |field, messages| flash.now[field] = messages end diff --git a/app/models/user.rb b/app/models/user.rb index edbf030b8b..23dae9c59c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ class User < ApplicationRecord - has_many :votes + has_many :votes, dependent: :delete_all has_many :works, through: :votes # has_many :works # optional diff --git a/app/models/work.rb b/app/models/work.rb index b55fcfa69e..3e83128d81 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,5 +1,5 @@ class Work < ApplicationRecord - has_many :votes + has_many :votes, dependent: :delete_all has_many :users, through: :votes # belongs_to :user # optional @@ -12,7 +12,8 @@ def self.spotlight end def self.list_of(work_category) - return sort_by_votes(Work.all.select { |work| work.category == work_category }) + work_list = Work.all.select { |work| work.category == work_category } + return sort_by_votes(work_list) end def vote_count diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9676c2032d..62c01bf44c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -35,19 +35,27 @@ + <% if flash.count > 0 %>
        - <% flash.each do |name, message| %> - <% if message.class == Array %> - <% message.each do |msg| %> -
        <%= "#{name}: #{msg}" %>
        + <% type = "warning" if flash[:warning] %> + <% type = "success" if flash[:success] %> +
        + <% flash.each do |name, message| %> + <% if message.class == Array %> +
          + <% message.each do |msg| %> +
        • <%= "#{name}: #{msg}" %>
          • + <% end %> +
        + <% else %> + <%= message %> <% end %> - <% else %> -
        <%= message %>
        <% end %> - <% end %> +
        <% end %> +
        <%= yield %>
        diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index 0de62969a5..59e48d85a2 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -1,10 +1,8 @@ -

        <%= action_name %>

        -
        <%= form_with model: @work, class: "form", locals: true do |f|%>
        <%= f.label :category %> - <%= f.select :category, ["album", "book", "movie"], class: "form-control" %> + <%= f.select :category, ["album", "book", "movie"], {}, class: "form-control" %>
        diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb index a5d555d412..12b166aa28 100644 --- a/app/views/works/edit.html.erb +++ b/app/views/works/edit.html.erb @@ -1,2 +1,3 @@ - -<%= render partial: "form", locals: { action_name: "Edit this work", button_title: 'Update Work' } %> +

        Edit this <%= @work.category %>

        + +<%= render partial: "form", locals: { button_title: 'Update Work' } %> diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index 21d008067b..c60c07c799 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -1 +1,3 @@ -<%= render partial: "form", locals: { action_name: "Add a new work", button_title: 'Create Work' } %> +

        Add a new work

        + +<%= render partial: "form", locals: { button_title: 'Create Work' } %> diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 6da1dbb03a..8d8dc8f222 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -7,3 +7,11 @@ jackie: dan: username: dan joined: '2018-10-09' + +garrett: + username: garrett + joined: '2018-10-09' + +emily: + username: emily + joined: '2018-10-09' diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index 98fec6264c..540ed4a2a2 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -9,3 +9,18 @@ vote_two: date: '2018-10-06' user: jackie work: sgtpepper + +vote_three: + date: '2018-10-06' + user: garrett + work: sgtpepper + +vote_four: + date: '2018-10-06' + user: jackie + work: startrek + +vote_five: + date: '2018-10-06' + user: garrett + work: startrek diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index e34d44c670..b484e49546 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -20,3 +20,10 @@ sgtpepper: creator: Beatles publication_year: '1967' description: The 8th studio album by The Beatles. Lauded by critics for its innovations in production, songwriting and graphic design, for bridging a cultural divide between popular music and high art, and for providing a musical representation of its generation and the contemporary counterculture. It won four Grammy Awards in 1968, including Album of the Year, the first rock LP to receive this honour. + +startrek: + category: movie + title: Star Trek + creator: JJ Abrams + publication_year: '2009' + description: Aboard the USS Enterprise, the most-sophisticated starship ever built, a novice crew embarks on its maiden voyage. Their path takes them on a collision course with Nero (Eric Bana), a Romulan commander whose mission of vengeance threatens all mankind. diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 122a748bcb..183c667e0d 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -33,6 +33,20 @@ end end + it 'can have 0 votes' do + # Arrange + dan = users(:dan) + + # Act + votes = dan.votes + + # Assert + expect(dan).must_be_instance_of User + + expect(votes.length).must_equal 0 + expect(dan.valid?).must_equal true + end + it 'has many works through votes' do # Arrange is done with let @@ -120,7 +134,7 @@ count = user.vote_count # Assert - expect(count).must_equal 2 + expect(count).must_equal 3 end it 'returns 0 when the user has not voted on anything' do diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index 601b852331..005493936f 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -2,6 +2,8 @@ describe Vote do let(:vote) { votes(:vote_one) } + let(:dan) { users(:dan) } + let(:interstellar) { works(:interstellar) } it "must be valid" do value(vote).must_be :valid? @@ -27,6 +29,18 @@ expect(user).must_be_instance_of User end + it 'can set a user' do + # Arrange is done with let + + # Act + vote.update(user: dan) + + # Assert + expect(vote).must_be_instance_of Vote + expect(vote.user).must_equal dan + expect(vote.valid?).must_equal true + end + it 'belongs to a work' do # Arrange is done with let @@ -37,6 +51,18 @@ expect(vote).must_be_instance_of Vote expect(work).must_be_instance_of Work end + + it 'can set a work' do + # Arrange is done with let + + # Act + vote.update(work: interstellar) + + # Assert + expect(vote).must_be_instance_of Vote + expect(vote.work).must_equal interstellar + expect(vote.valid?).must_equal true + end end describe 'validations' do diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 17582dd232..7ac0c75139 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,12 +1,16 @@ require "test_helper" +require 'pry' describe Work do - let(:work) { works(:hp) } let(:vote) { votes(:vote_one) } let(:user) { users(:jackie) } + let(:hp) { works(:hp) } + let(:startrek) { works(:startrek) } + let(:interstellar) { works(:interstellar) } + let(:sgtpepper) { works(:sgtpepper) } it "must be valid" do - value(work).must_be :valid? + value(hp).must_be :valid? end it 'has required fields' do @@ -14,7 +18,7 @@ :description, :votes] fields.each do |field| - expect(work).must_respond_to field + expect(hp).must_respond_to field end end @@ -23,10 +27,10 @@ # Arrange is done with let # Act - votes = work.votes + votes = hp.votes # Assert - expect(work).must_be_instance_of Work + expect(hp).must_be_instance_of Work expect(votes.length).must_be :>=, 1 votes.each do |vote| @@ -34,14 +38,23 @@ end end - it 'has many users through votes' do - # Arrange is done with let + it 'can have 0 votes' do + # Act + votes = interstellar.votes + + # Assert + expect(interstellar).must_be_instance_of Work + + expect(votes.length).must_equal 0 + expect(interstellar.valid?).must_equal true + end + it 'has many users through votes' do # Act - votes = work.votes + votes = hp.votes # Assert - expect(work).must_be_instance_of Work + expect(hp).must_be_instance_of Work expect(votes.length).must_be :>=, 1 votes.each do |vote| @@ -53,21 +66,21 @@ describe 'validations' do it 'must have a category' do # Arrange - work.category = nil + hp.category = nil # Act - valid = work.valid? # run validations + valid = hp.valid? # run validations # Assert expect(valid).must_equal false - expect(work.errors.messages).must_include :category - expect(work.errors.messages[:category]).must_equal ["can't be blank"] + expect(hp.errors.messages).must_include :category + expect(hp.errors.messages[:category]).must_equal ["can't be blank"] # Rearrange - work.category = "books" + hp.category = "books" # Re-Act - valid = work.valid? # run validations + valid = hp.valid? # run validations # Reassert expect(valid).must_equal true @@ -75,28 +88,28 @@ it 'must have a title' do # Arrange - work.title = nil + hp.title = nil # Act - valid = work.valid? # run validations + valid = hp.valid? # run validations # Assert expect(valid).must_equal false - expect(work.errors.messages).must_include :title - expect(work.errors.messages[:title]).must_equal ["can't be blank"] + expect(hp.errors.messages).must_include :title + expect(hp.errors.messages[:title]).must_equal ["can't be blank"] # Rearrange - work.title = "Harry Potter" + hp.title = "Harry Potter" # Re-Act - valid = work.valid? # run validations + valid = hp.valid? # run validations # Reassert expect(valid).must_equal true end - it 'requires a unique title' do - other_work = Work.new title: work.title, category: 'book' + it 'requires a unique title within a category' do + other_work = Work.new title: hp.title, category: 'book' valid = other_work.valid? @@ -104,6 +117,14 @@ expect(other_work.errors.messages).must_include :title expect(other_work.errors.messages[:title]).must_equal ["has already been taken"] end + + it 'can have the same title as a work in a different category' do + other_work = Work.new title: hp.title, category: 'movie' + + valid = other_work.valid? + + expect(valid).must_equal true + end end describe 'spotlight' do @@ -115,44 +136,28 @@ expect(work).must_be_instance_of Work end - it 'should have the most votes of all work objects' do - # Arrange - 10.times do - Work.first.votes << Vote.new(user: user, work: work) - end - + it 'should return a work with the most votes of all work objects' do # Act top_work = Work.spotlight vote_count = top_work.votes.length # Assert + expect(top_work).must_be_instance_of Work expect(vote_count).must_equal Work.all.max_by { |work| work.votes.length }.votes.length end it 'should return the first work alphabetically if there is a vote tie' do # Arrange - 15.times do - works(:sgtpepper).votes << Vote.new(user: user, work: work) - end + # sgtpepper and startrek tied for votes in fixtures # Act top_work = Work.spotlight # Assert - expect(top_work).must_equal works(:sgtpepper) - - # Re-Arrange - # 16 times because sgtpepper has existing extra vote from fixture - 16.times do - works(:interstellar).votes << Vote.new(user: user, work: work) - end - # Act - top_work = Work.spotlight - - # Assert - expect(top_work).must_equal works(:interstellar) + expect(top_work).must_equal sgtpepper end + it 'should return nil if there are no works' do # Arrange Work.all.each do |work| @@ -208,34 +213,18 @@ it 'should return the works ordered by vote count and then alphabetically' do # Arrange - works(:sgtpepper).category = "book" - works(:sgtpepper).save - works(:interstellar).category = "book" - works(:interstellar).save + hp.update(category: "movie") + sgtpepper.update(category: "movie") # Act - works = Work.list_of("book") - - # Assert - expect(works[0].vote_count >= works[1].vote_count).must_equal true - expect(works[1].vote_count >= works[2].vote_count).must_equal true - - # Re-Arrange - 15.times do - works(:sgtpepper).votes << Vote.new(user: user, work: work) - end - - # 16 times because sgtpepper has existing extra vote from fixture - 16.times do - works(:interstellar).votes << Vote.new(user: user, work: work) - end - # Act - works = Work.list_of("book") + works = Work.list_of("movie") # Assert - expect(works.first).must_equal works(:interstellar) expect(works[0].vote_count >= works[1].vote_count).must_equal true expect(works[1].vote_count >= works[2].vote_count).must_equal true + expect(works.first).must_equal sgtpepper + expect(works[1]).must_equal startrek + expect(works[2]).must_equal hp end it 'should return an empty array when there are none of the designated type of work' do @@ -262,7 +251,7 @@ it 'must return the total number of votes on a work' do # Arrange in fixture # Act - count = work.vote_count + count = hp.vote_count # Assert expect(count).must_equal 1 From bd69742296c774c8085a0895d77b9edd99070ed2 Mon Sep 17 00:00:00 2001 From: jackie Date: Fri, 12 Oct 2018 16:07:00 -0700 Subject: [PATCH 48/50] Favicon --- app/assets/images/{owl.jpg => owl.png} | Bin app/views/layouts/application.html.erb | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename app/assets/images/{owl.jpg => owl.png} (100%) diff --git a/app/assets/images/owl.jpg b/app/assets/images/owl.png similarity index 100% rename from app/assets/images/owl.jpg rename to app/assets/images/owl.png diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 62c01bf44c..507f838af4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,6 +9,8 @@ <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + @@ -55,7 +57,7 @@
        <% end %> - +
        <%= yield %>
        From fb6b7d1e7b7a7b06233c077e424426bd872b52d8 Mon Sep 17 00:00:00 2001 From: jackie Date: Fri, 12 Oct 2018 16:16:01 -0700 Subject: [PATCH 49/50] Used rails favicon path --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 507f838af4..416694471e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,7 +10,7 @@ - + <%= favicon_link_tag asset_path('owl.png'), :rel => 'icon', :type => 'image/png' %> From eb36770201d57c80589831faa48e23450836e809 Mon Sep 17 00:00:00 2001 From: jackie Date: Sun, 14 Oct 2018 22:32:51 -0700 Subject: [PATCH 50/50] DRYed up index views --- app/views/home/index.html.erb | 68 ++++++--------------- app/views/works/index.html.erb | 108 +++++++++------------------------ 2 files changed, 45 insertions(+), 131 deletions(-) diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index e6a54d5cc3..64d538240c 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -17,55 +17,23 @@
        -
        -

        Top Movies

        -
          - <% Work.list_of("movie")[0..9].each do |movie| %> -
        • -

          - <%= link_to movie.title, work_path(movie.id) %> - by <%= movie.creator %> -

          -

          - <%= movie.votes.length %> votes -

          -
          • - <% end %> -
        -
        - -
        -

        Top Books

        -
          - <% Work.list_of("book")[0..9].each do |book| %> -
        • -

          - <%= link_to book.title, work_path(book.id) %> - by <%= book.creator %> -

          -

          - <%= book.votes.length %> votes -

          -
          • - <% end %> -
        -
        - -
        -

        Top Albums

        -
          - <% Work.list_of("album")[0..9].each do |album| %> -
        • -

          - <%= link_to album.title, work_path(album.id) %> - by <%= album.creator %> -

          -

          - <%= album.votes.length %> votes -

          -
          • - <% end %> -
        -
        + <% ["movie", "book", "album"].each do |category| %> +
        +

        Top <%= category.titleize %>s

        +
          + <% Work.list_of(category)[0..9].each do |work| %> +
        • +

          + <%= link_to work.title, work_path(work.id) %> + by <%= work.creator %> +

          +

          + <%= work.votes.length %> votes +

          +
          • + <% end %> +
        +
        + <% end %>
        diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index d767482681..571513a428 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,88 +1,34 @@

        List of Works

        -
        -

        Albums

        -
        - - - - - - - - - - - <% Work.list_of("album").each do |work| %> +<% ["album", "book", "movie"].each do |category| %> +
        +

        <%= category.titleize %>s

        +
        VotesTitleCreated ByPublishedUpvote
        + - - - - - + + + + + - <% end %> - -
        <%= work.votes.length %><%= link_to "#{work.title}", work_path(work.id) %><%= work.creator %><%= work.publication_year %> - <%= link_to "Upvote", upvote_path(work.id), class: "btn btn-primary", role: "button", method: :post %> - VotesTitleCreated ByPublishedUpvote
        -
        - -
        -

        Books

        - - - - - - - - - - - - <% Work.list_of("book").each do |work| %> - - - - - - - - <% end %> - -
        VotesTitleCreated ByPublishedUpvote
        <%= work.votes.length %><%= link_to "#{work.title}", work_path(work.id) %><%= work.creator %><%= work.publication_year %> - <%= link_to "Upvote", upvote_path(work.id), class: "btn btn-primary", role: "button", method: :post %> -
        -
        - -
        -

        Movies

        - - - - - - - - - - - - <% Work.list_of("movie").each do |work| %> - - - - - - - - <% end %> - -
        VotesTitleCreated ByPublishedUpvote
        <%= work.votes.length %><%= link_to "#{work.title}", work_path(work.id) %><%= work.creator %><%= work.publication_year %> - <%= link_to "Upvote", upvote_path(work.id), class: "btn btn-primary", role: "button", method: :post %> -
        -
        + + + <% Work.list_of(category).each do |work| %> + + <%= work.votes.length %> + <%= link_to "#{work.title}", work_path(work.id) %> + <%= work.creator %> + <%= work.publication_year %> + + <%= link_to "Upvote", upvote_path(work.id), class: "btn btn-primary", role: "button", method: :post %> + + + <% end %> + + +
        +<% end %>
        <%= link_to "View top media", root_path, class: "btn btn-secondary", role: "button" %>