From 38e838b65f7cb9c165cdccc7e0cd956c7050a76a Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Mon, 22 Apr 2019 15:47:25 -0700 Subject: [PATCH 01/49] Initial Rails setup --- .gitignore | 27 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 279 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 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 +++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 ++ config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 +++ config/puma.rb | 34 +++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 +++++ public/422.html | 67 +++++ public/500.html | 66 +++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + storage/.keep | 0 test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 25 ++ tmp/.keep | 0 vendor/.keep | 0 81 files changed, 1410 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.scss create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..18b43c9cd2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +/node_modules +/yarn-error.log + +/public/assets +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..79838de54f --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.3 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..06eaeaebda --- /dev/null +++ b/Gemfile @@ -0,0 +1,81 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.3' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-rails' +gem 'jquery-turbolinks' +gem 'bootstrap', '~> 4.1.3' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..98a335c439 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,279 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.12.0) + io-like (~> 0.3.0) + arel (9.0.0) + autoprefixer-rails (9.5.1) + execjs + better_errors (2.5.1) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.7.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.4.3) + msgpack (~> 1.0) + bootstrap (4.1.3) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.9, < 2) + sass (>= 3.5.2) + builder (3.2.3) + byebug (11.0.1) + capybara (3.18.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + childprocess (1.0.1) + rake (< 13.0) + chromedriver-helper (2.1.1) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.8.0) + execjs (2.7.0) + ffi (1.10.0) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.15.0) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.8.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.4) + popper_js (1.14.5) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + regexp_parser (1.4.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.141.5926) + childprocess (>= 0.5, < 2.0) + rubyzip (~> 1.2, >= 1.2.2) + shellany (0.0.1) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.9) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.20) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + bootstrap (~> 4.1.3) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.5.3p105 + +BUNDLED WITH + 2.0.1 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..d580424672 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +lNlEcSgi5xSOZbpAU0+nE/7XF6WtCd2Mt+gJ5obqFAFrTFllaezrcPzVhNmaSbHEpCa3IES2HCiIyos/plnML9XGaupEyjTneRoK2QNUoFZteHAtZH8F77Xn2V6J9A2/vxTdqh+xxKJd5eQX2NYoypZSCO2GyIkRSlgNX6Az00NtV4thHLB1YHPniGTIsLl2A8+gpOu7K4/hJXIZ+/gx+hn+15V/FgXqnHJwqEZH/cPO6pZsQiYLIZoANZ80fK5J7dz/60dr64y/KA2V05YLsXXzAlQf28UnWOU8HhkvM1xY97A2HfEgZkf3uKv9/LRl+GxTisaFPmv/qPDOtBTyxblJDJu4NVJf8zTJDgdPjw8GE9XUxT6Mx+1Mw1AVlXZ1O5Cf3ztU6pZw8QQyIjVvd2RKkmffxnixLTnz--8YSTw+8rPzvkBMh6--UwEpri+LsBatTJ9Pj6+Q/A== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000000..0bd2511123 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: MediaRanker_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: MediaRanker + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: MediaRanker_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: MediaRanker_production + username: MediaRanker + password: <%= ENV['MEDIARANKER_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 0000000000..426333bb46 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 0000000000..1311e3e4ef --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000000..bd39d9d752 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "MediaRanker_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 0000000000..0a38fd3ce9 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 0000000000..142d382f87 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000000..89d2efab2b --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000000..4b828e80cb --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000000..59385cdf37 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 0000000000..d3bcaa5ec8 --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 0000000000..5a6a32d371 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 0000000000..4a994e1e7b --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 0000000000..ac033bf9dc --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 0000000000..dc1899682b --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000000..bbfc3961bf --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 0000000000..decc5a8573 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 0000000000..a5eccf816b --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000000..787824f888 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000000..9fa7863f99 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 0000000000..d32f76e8fb --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000000..1beea2accd --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/log/.keep b/log/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package.json b/package.json new file mode 100644 index 0000000000..625900f9d8 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "MediaRanker", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000000..2be3af26fc --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

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

+
+

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

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

The change you wanted was rejected.

+

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

+
+

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

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

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000000..37b576a4a0 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000000..fb7dd505e2 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,25 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From e3f415dfb9955cb54dd44f45f575477b7687faac Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Mon, 22 Apr 2019 22:55:17 -0700 Subject: [PATCH 02/49] Added all WorksController methods, tests for index, show, new, create. View pages for works. --- app/assets/javascripts/works.js | 2 + app/assets/stylesheets/works.scss | 3 + app/controllers/works_controller.rb | 63 +++++++++++++++++ app/helpers/works_helper.rb | 2 + app/models/work.rb | 2 + app/views/works/_form.html.erb | 49 +++++++++++++ app/views/works/create.html.erb | 2 + app/views/works/destroy.html.erb | 2 + app/views/works/edit.html.erb | 7 ++ app/views/works/index.html.erb | 26 +++++++ app/views/works/new.html.erb | 8 +++ app/views/works/show.html.erb | 19 ++++++ app/views/works/update.html.erb | 2 + config/routes.rb | 1 + db/migrate/20190422230303_create_media.rb | 14 ++++ ...2_remove_string_column_works_controller.rb | 6 ++ db/schema.rb | 28 ++++++++ db/seeds.rb | 25 +++++++ test/controllers/works_controller_test.rb | 68 +++++++++++++++++++ test/fixtures/works.yml | 15 ++++ test/models/work_test.rb | 9 +++ 21 files changed, 353 insertions(+) create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/models/work.rb create mode 100644 app/views/works/_form.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 db/migrate/20190422230303_create_media.rb create mode 100644 db/migrate/20190422230502_remove_string_column_works_controller.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/works_controller_test.rb create mode 100644 test/fixtures/works.yml create mode 100644 test/models/work_test.rb diff --git a/app/assets/javascripts/works.js b/app/assets/javascripts/works.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/works.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss new file mode 100644 index 0000000000..5618452f3e --- /dev/null +++ b/app/assets/stylesheets/works.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Works controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..d053f89e7a --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,63 @@ +class WorksController < ApplicationController + def index + @works = Work.all + end + + def show + @work = Work.find_by(id: params[:id]) + + if @work.nil? + redirect_to works_path + end + end + + def new + @work = Work.new + end + + def create + @work = Work.new(work_params) + + is_successful = @work.save + + if is_successful + redirect_to work_path(@work.id) + else + render :new, status: :bad_request + end + end + + def edit + @work = Work.find_by(id: params[:id]) + end + + def update + work = Work.find_by(id: params[:id]) + + is_successful = work.update(work_params) + + if is_successful + redirect_to work_path(work.id) + else + @work = work + render :edit, status: :bad_request + end + end + + def destroy + work = Work.find_by(id: params[:id]) + + if work.nil? + head :not_found + else + work.destroy + redirect_to works_path + end + end + + private + + def work_params + return params.require(:work).permit(:category, :title, :creator, :publication_year, :description) + end +end diff --git a/app/helpers/works_helper.rb b/app/helpers/works_helper.rb new file mode 100644 index 0000000000..ccb78c2b73 --- /dev/null +++ b/app/helpers/works_helper.rb @@ -0,0 +1,2 @@ +module WorksHelper +end diff --git a/app/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/app/views/works/_form.html.erb b/app/views/works/_form.html.erb new file mode 100644 index 0000000000..e2d785313b --- /dev/null +++ b/app/views/works/_form.html.erb @@ -0,0 +1,49 @@ +<% if @work.errors.any? %> + +<% end %> + +<%= form_with model: @work, class: form_class do |f| %> + +
+ <%= f.label :category %> +
+
+ <%= f.select :category, + ["album", "book", "movie"] + %> +
+
+ <%= f.label :title %> +
+
+ <%= f.text_field :title %> +
+
+ <%= f.label :creator %> +
+
+ <%= f.text_field :creator %> +
+
+ <%= f.label :publication_year %> +
+
+ <%= f.text_field :publication_year %> +
+
+ <%= f.label :description %> +
+
+ <%= f.text_area :description %> +
+
+ <%= f.submit action_name, class: "work-submit-btn" %> +
+ +<% end %> \ No newline at end of file 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..37e1ef1069 --- /dev/null +++ b/app/views/works/edit.html.erb @@ -0,0 +1,7 @@ +

Works#edit

+

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

+ +<%= render partial: "form", locals: { + form_class: "edit-work", + action_name: "Update Work" +} %> \ No newline at end of file diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..033f193e71 --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1,26 @@ +

Works#index

+

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

+ +

Albums:

+<% @works.each do |work| %> + <% if work.category == "album" %> + <%= work.title %> + <% end %> +<% end %> + +

Books:

+<% @works.each do |work| %> + <% if work.category == "book" %> + <%= work.title %> + <% end %> +<% end %> + + +<% if @works.where(category: "movie") != nil %> +

Movies:

+ <% @works.each do |work| %> + <% if work.category == "movie" %> + <%= work.title %> + <% end %> + <% end %> +<% end %> diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb new file mode 100644 index 0000000000..58e41be970 --- /dev/null +++ b/app/views/works/new.html.erb @@ -0,0 +1,8 @@ +

Add a new work

+

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

+ + +<%= render partial: "form", locals: { + form_class: "new-work", + action_name: "Create Work" +} %> \ No newline at end of file diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb new file mode 100644 index 0000000000..4f7131546d --- /dev/null +++ b/app/views/works/show.html.erb @@ -0,0 +1,19 @@ +

<%= @work.title %>

+ + + +<%= link_to "Edit", edit_work_path(@work.id) %> + +<%= link_to "Delete", work_path(@work.id), method: :delete %> + +

[add # here] Votes for this <%= @work.category.capitalize %>

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..4f1f7ed898 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do + resources :works # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20190422230303_create_media.rb b/db/migrate/20190422230303_create_media.rb new file mode 100644 index 0000000000..5fa44d3c83 --- /dev/null +++ b/db/migrate/20190422230303_create_media.rb @@ -0,0 +1,14 @@ +class CreateMedia < ActiveRecord::Migration[5.2] + def change + create_table :media do |t| + t.string :category + t.string :title + t.string :string + t.string :creator + t.integer :publication_year + t.string :description + + t.timestamps + end + end +end diff --git a/db/migrate/20190422230502_remove_string_column_works_controller.rb b/db/migrate/20190422230502_remove_string_column_works_controller.rb new file mode 100644 index 0000000000..b8880a472d --- /dev/null +++ b/db/migrate/20190422230502_remove_string_column_works_controller.rb @@ -0,0 +1,6 @@ +class RemoveStringColumnWorksController < ActiveRecord::Migration[5.2] + def change + remove_column(:media, :string) + rename_table(:media, :works) + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..0ad1cce720 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,28 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_04_22_230502) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "works", force: :cascade do |t| + t.string "category" + t.string "title" + t.string "creator" + t.integer "publication_year" + t.string "description" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..767f1da0e5 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" + +WORKS_FILE = Rails.root.join("db", "media_seeds.csv") +puts "Loading raw media/works data from #{WORKS_FILE}" + +work_failures = [] +CSV.foreach(WORKS_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} works records" +puts "#{work_failures.length} works failed to save" diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..eb18bf48b7 --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,68 @@ +require "test_helper" + +describe WorksController do + it "should get index" do + get works_path + + must_respond_with :success + end + + describe "show" do + it "should be able to show an existing, valid work" do + valid_work_id = works(:album).id + + get work_path(valid_work_id) + + must_respond_with :success + end + + it "should redirect to the works index page when given an invalid work id" do + work = works(:album) + invalid_work_id = work.id + work.destroy + + get work_path(invalid_work_id) + + must_respond_with :redirect + end + end + + describe "new" do + it "can get the new work page" do + get new_work_path + + must_respond_with :success + end + end + + describe "create" do + it "can save a new driver" do + work_hash = { + work: { + category: "book", + title: "new book", + creator: "new author", + publication_year: 2019, + description: "riveting new book!", + }, + } + + expect { post works_path, params: work_hash }.must_change "Work.count", 1 + end + 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 diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..74f80295bf --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,15 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +album: + category: album + title: Test Album + creator: Artist1 + publication_year: 2019 + description: interesting new album + +book: + category: book + title: Book Test + creator: Author1 + publication_year: 2018 + description: best book of the year diff --git a/test/models/work_test.rb b/test/models/work_test.rb new file mode 100644 index 0000000000..81052cf6ef --- /dev/null +++ b/test/models/work_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Medium do + let(:medium) { Medium.new } + + it "must be valid" do + value(medium).must_be :valid? + end +end From b5882872f1286b5b033d23fdc10d5167c3fee0e9 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Tue, 23 Apr 2019 22:05:21 -0700 Subject: [PATCH 03/49] Added tests for Works Controller edit, update --- app/controllers/works_controller.rb | 8 +++ app/models/work.rb | 2 + app/views/layouts/application.html.erb | 25 +++++++ app/views/works/_form.html.erb | 10 +-- test/controllers/works_controller_test.rb | 81 +++++++++++++++++++++-- test/models/work_test.rb | 6 +- 6 files changed, 114 insertions(+), 18 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index d053f89e7a..0f6b3cc126 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -29,6 +29,10 @@ def create def edit @work = Work.find_by(id: params[:id]) + + if @work.nil? + redirect_to works_path + end end def update @@ -37,9 +41,13 @@ def update is_successful = work.update(work_params) if is_successful + flash[:success] = "Updated successfully!" redirect_to work_path(work.id) else @work = work + @work.errors.messages.each do |field, messages| + flash.now[field] = messages + end render :edit, status: :bad_request end end diff --git a/app/models/work.rb b/app/models/work.rb index 95322dd45e..c0162ed9f8 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,2 +1,4 @@ class Work < ApplicationRecord + validates :category, presence: true + validates :title, presence: true, uniqueness: true end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f32268a271..49abd4aad6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,31 @@ +
+

Media Ranker

+ <% if flash.count > 0 %> +
+
+ <% flash.each do |name, message| %> + <% if message.class == Array %> +
    + <% message.each do |msg| %> +
  • <%= name %>: <%= msg %>
    • + <% end %> + <% else %> + <%= message %> + <% end %> +
+ <% end %> + <% end %> + + + +
+
+ + + <%= yield %> diff --git a/app/views/works/_form.html.erb b/app/views/works/_form.html.erb index e2d785313b..c4c76615e6 100644 --- a/app/views/works/_form.html.erb +++ b/app/views/works/_form.html.erb @@ -1,12 +1,4 @@ -<% if @work.errors.any? %> -
    - <% @work.errors.each do |column, message| %> -
  • - <%= column.capitalize %> <%= message %> -
    • - <% end %> -
-<% end %> + <%= form_with model: @work, class: form_class do |f| %> diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index eb18bf48b7..b8d1ebaa98 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -49,16 +49,85 @@ expect { post works_path, params: work_hash }.must_change "Work.count", 1 end + + it "will return a 400 with an invalid work" do + + # Arrange + input_category = "album" + input_title = "" + + test_input = { + "work": { + category: input_category, + title: input_title, + }, + } + + # Act + expect { + post works_path, params: test_input + }.wont_change "Work.count" + + # Assert + must_respond_with :bad_request + end end - it "should get edit" do - # get works_edit_url - # value(response).must_be :success? + describe "edit" do + it "should get edit" do + work = works(:album) + + get edit_work_path(work.id) + + must_respond_with :success + end + + it "will respond with bad request attempting to edit a nonexistant work" do + invalid_id = -1 + + get edit_work_path(invalid_id) + + must_redirect_to works_path + end end - it "should get update" do - # get works_update_url - # value(response).must_be :success? + describe "update" do + it "should get update" do + work = works(:album) + + update_hash = { + work: { + category: work.category, + title: work.title, + creator: "Pfeiffer", + publication_year: 2020, + description: "Crazy dog album", + }, + } + patch work_path(work.id, params: update_hash) + work.reload + + expect(work.creator).must_equal "Pfeiffer" + end + + it "cannot update an invalid work" do + invalid_work = works(:album) + + update_hash = { + work: { + category: nil, + title: "title", + creator: "Pfeiffer", + publication_year: 2020, + description: "Crazy dog album", + }, + } + + patch work_path(invalid_work.id, params: update_hash) + invalid_work.reload + + expect(invalid_work.errors.messages[:category]).must_equal "can't be blank" + end end it "should get destroy" do diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 81052cf6ef..f6fba7104d 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,9 +1,9 @@ require "test_helper" -describe Medium do - let(:medium) { Medium.new } +describe Work do + let(:work) { Work.new } it "must be valid" do - value(medium).must_be :valid? + value(work).must_be :valid? end end From 7382f5770f653361e3c00cc4b5800474d51787ce Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Tue, 23 Apr 2019 22:11:40 -0700 Subject: [PATCH 04/49] Updated Works Controller update tests --- test/controllers/works_controller_test.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index b8d1ebaa98..6fe84c9644 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -110,8 +110,8 @@ expect(work.creator).must_equal "Pfeiffer" end - it "cannot update an invalid work" do - invalid_work = works(:album) + it "cannot update book without valid fields" do + work = works(:album) update_hash = { work: { @@ -123,10 +123,9 @@ }, } - patch work_path(invalid_work.id, params: update_hash) - invalid_work.reload + patch work_path(work.id, params: update_hash) - expect(invalid_work.errors.messages[:category]).must_equal "can't be blank" + expect(work.category).must_equal "album" end end From 203c3d37da7a1c944b45a1bf15cd23fc640d8f13 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Wed, 24 Apr 2019 15:32:26 -0700 Subject: [PATCH 05/49] Works controller tests, changed update test and added destroy tests --- test/controllers/works_controller_test.rb | 27 ++++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 6fe84c9644..687e0924c4 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -17,11 +17,7 @@ end it "should redirect to the works index page when given an invalid work id" do - work = works(:album) - invalid_work_id = work.id - work.destroy - - get work_path(invalid_work_id) + get work_path(-1) must_respond_with :redirect end @@ -83,9 +79,7 @@ end it "will respond with bad request attempting to edit a nonexistant work" do - invalid_id = -1 - - get edit_work_path(invalid_id) + get edit_work_path(-1) must_redirect_to works_path end @@ -123,14 +117,21 @@ }, } - patch work_path(work.id, params: update_hash) + expect { patch work_path(work.id, params: update_hash) }.wont_change "Work.count" - expect(work.category).must_equal "album" + must_respond_with :bad_request end end - it "should get destroy" do - # get works_destroy_url - # value(response).must_be :success? + describe "destroy" do + it "can delete a work" do + expect { delete work_path(works(:album).id) }.must_change "Work.count", -1 + end + + it "redirects to the index page if the work is not found" do + delete work_path(-1) + + must_respond_with :not_found + end end end From 645e1de3ea7a84a2c1ae770d202fbc03a8f8dea3 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Wed, 24 Apr 2019 21:19:49 -0700 Subject: [PATCH 06/49] Work model tests for validation --- test/models/work_test.rb | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..8499d1fe4d 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,9 +1,36 @@ require "test_helper" describe Work do - let(:work) { Work.new } + let(:album) { works(:album) } it "must be valid" do - value(work).must_be :valid? + expect(album.valid?).must_equal true + end + + describe "validations" do + it "requires a category" do + album.category = nil + + valid_work = album.valid? + + expect(valid_work).must_equal false + expect(album.errors.messages).must_include :category + expect(album.errors.messages[:category]).must_equal ["can't be blank"] + end + + it "requires a unique title" do + duplicate_album = Work.new(category: album.category, title: album.title) + + expect(duplicate_album.save).must_equal false + + expect(duplicate_album.errors.messages).must_include :title + expect(duplicate_album.errors.messages[:title]).must_equal ["has already been taken"] + end + end + + describe "relationships" do + end + + describe "custom methods" do end end From 9728d7fc89b0bd787e49da95ba6075bdb172f774 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Wed, 24 Apr 2019 22:42:45 -0700 Subject: [PATCH 07/49] Added homepages controller and index view page --- app/assets/javascripts/homepages.js | 2 + app/assets/stylesheets/homepages.scss | 3 ++ app/controllers/homepages_controller.rb | 7 +++ app/helpers/homepages_helper.rb | 2 + app/views/homepages/index.html.erb | 49 +++++++++++++++++++ app/views/works/index.html.erb | 2 +- config/routes.rb | 3 ++ test/controllers/homepages_controller_test.rb | 9 ++++ 8 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/homepages.js create mode 100644 app/assets/stylesheets/homepages.scss create mode 100644 app/controllers/homepages_controller.rb create mode 100644 app/helpers/homepages_helper.rb create mode 100644 app/views/homepages/index.html.erb create mode 100644 test/controllers/homepages_controller_test.rb diff --git a/app/assets/javascripts/homepages.js b/app/assets/javascripts/homepages.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/homepages.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/homepages.scss b/app/assets/stylesheets/homepages.scss new file mode 100644 index 0000000000..2305c36d10 --- /dev/null +++ b/app/assets/stylesheets/homepages.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Homepages controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb new file mode 100644 index 0000000000..7bbf8348f1 --- /dev/null +++ b/app/controllers/homepages_controller.rb @@ -0,0 +1,7 @@ +class HomepagesController < ApplicationController + def index + def index + @works = Work.all + end + end +end diff --git a/app/helpers/homepages_helper.rb b/app/helpers/homepages_helper.rb new file mode 100644 index 0000000000..4bd8098f37 --- /dev/null +++ b/app/helpers/homepages_helper.rb @@ -0,0 +1,2 @@ +module HomepagesHelper +end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb new file mode 100644 index 0000000000..d933cbb6eb --- /dev/null +++ b/app/views/homepages/index.html.erb @@ -0,0 +1,49 @@ +

Homepages#index

+

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

+ + +
+ +<% if @works.where(category: "movie") != [] %> +

Top Movies:

+
    + <% @works.each do |work| %> + <% if work.category == "movie" %> + +
  • + <%= work.title %> +
    • + + <% end %> + <% end %> +
+<% end %> + +
+ +
+

Top Books:

+
    +<% @works.each do |work| %> + <% if work.category == "book" %> +
  • + <%= work.title %> +
    • + <% end %> +<% end %> +
+
+ +
+

Top Albums:

+
    +<% @works.each do |work| %> + <% if work.category == "album" %> +
  • + <%= work.title %> +
    • + <% end %> + +<% end %> +
+
diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 033f193e71..469ba90d58 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -16,7 +16,7 @@ <% end %> -<% if @works.where(category: "movie") != nil %> +<% if @works.where(category: "movie") != [] %>

Movies:

<% @works.each do |work| %> <% if work.category == "movie" %> diff --git a/config/routes.rb b/config/routes.rb index 4f1f7ed898..7624afd1e9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do + get "homepages/index" resources :works + resources :homepages, only: [:index] + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb new file mode 100644 index 0000000000..7395af3dec --- /dev/null +++ b/test/controllers/homepages_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe HomepagesController do + it "should get index" do + get homepages_index_url + value(response).must_be :success? + end + +end From ab4e1e642f4134f4369f618a496887325d563dc1 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 25 Apr 2019 10:25:26 -0700 Subject: [PATCH 08/49] Added Users controller --- app/assets/javascripts/users.js | 2 ++ app/assets/stylesheets/users.scss | 3 ++ app/controllers/application_controller.rb | 5 +++ app/controllers/users_controller.rb | 38 +++++++++++++++++++++++ app/helpers/users_helper.rb | 2 ++ app/views/users/current.html.erb | 0 config/routes.rb | 5 +++ test/controllers/users_controller_test.rb | 7 +++++ 8 files changed, 62 insertions(+) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/views/users/current.html.erb create mode 100644 test/controllers/users_controller_test.rb diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..1efc835ccd --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12ab..63d2515f5c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,7 @@ class ApplicationController < ActionController::Base + private + + def find_user + @user = User.find_by(id: session[:user_id]) + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..ffda4a034f --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,38 @@ +class UsersController < ApplicationController + before_action :find_user, only: [:current, :logout] + + def login_form + @user = User.new + end + + def login + user = User.find_by(username: params[:user][:username]) + if user.nil? + user = User.create(username: username) + end + + if @user.id + session[:user_id] = user.id + flash[:alert] = "Successfully logged in as existing user #{user.username}" + redirect_to root_path + else + flash[:error] = "Unable to log in" + redirect_to root_path + end + end + + def current + # @user = User.find_by(id: session[:user_id]) + if @user.nil? + flash[:error] = "You must log in to do that" + redirect_to root_path + end + end + + def logout + # user = User.find_by(id: session[:user_id]) + session[:user_id] = nil + flash[:notice] = "Logged out #{user.username}" + redirect_to root_path + 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/views/users/current.html.erb b/app/views/users/current.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/routes.rb b/config/routes.rb index 7624afd1e9..4715c69328 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,5 +3,10 @@ resources :works resources :homepages, only: [:index] + get "/login", to: "users#login_form", as: "login" + post "/login", to: "users#login" + post "/logout", to: "users#logout", as: "logout" + get "/users/current", to: "users#current", as: "current_user" + # 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..89decb54e0 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe UsersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 180f4be0c8fe91bbaca4eefc28bff1d738212706 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 25 Apr 2019 14:25:53 -0700 Subject: [PATCH 09/49] Added User model --- app/controllers/users_controller.rb | 2 +- app/models/user.rb | 2 ++ app/views/users/current.html.erb | 1 + config/routes.rb | 2 ++ db/migrate/20190425211450_create_users.rb | 9 +++++++++ db/schema.rb | 8 +++++++- test/fixtures/users.yml | 7 +++++++ test/models/user_test.rb | 9 +++++++++ 8 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 app/models/user.rb create mode 100644 db/migrate/20190425211450_create_users.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ffda4a034f..3ca2b12cd3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -22,7 +22,7 @@ def login end def current - # @user = User.find_by(id: session[:user_id]) + @user = User.find_by(id: session[:user_id]) if @user.nil? flash[:error] = "You must log in to do that" redirect_to root_path 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/views/users/current.html.erb b/app/views/users/current.html.erb index e69de29bb2..40132f85ea 100644 --- a/app/views/users/current.html.erb +++ b/app/views/users/current.html.erb @@ -0,0 +1 @@ +This is the current user page \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 4715c69328..8ec54724ac 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do + root to: "homepages#index" + get "homepages/index" resources :works resources :homepages, only: [:index] diff --git a/db/migrate/20190425211450_create_users.rb b/db/migrate/20190425211450_create_users.rb new file mode 100644 index 0000000000..9c711e759b --- /dev/null +++ b/db/migrate/20190425211450_create_users.rb @@ -0,0 +1,9 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + t.string :username + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 0ad1cce720..88bd8ae0ee 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,17 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_04_22_230502) do +ActiveRecord::Schema.define(version: 2019_04_25_211450) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "users", force: :cascade do |t| + t.string "username" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "works", force: :cascade do |t| t.string "category" t.string "title" diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..952febd97d --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + username: MyString + +two: + username: MyString diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..cc862ac2d9 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe User do + let(:user) { User.new } + + it "must be valid" do + value(user).must_be :valid? + end +end From f670b719b855cff5faf71f6671ca854f86a04b85 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 25 Apr 2019 15:03:53 -0700 Subject: [PATCH 10/49] Updated User Controller and added nav bar links --- app/controllers/users_controller.rb | 22 +++++++++++++++------- app/views/homepages/index.html.erb | 2 +- app/views/layouts/application.html.erb | 11 +++++++++++ app/views/users/login_form.html.erb | 5 +++++ app/views/works/index.html.erb | 2 +- 5 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 app/views/users/login_form.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3ca2b12cd3..cca062b4bf 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -6,14 +6,16 @@ def login_form end def login - user = User.find_by(username: params[:user][:username]) - if user.nil? - user = User.create(username: username) - end + @user = User.find_by(username: params[:user][:username]) + @user = User.create(user_params) if @user.nil? + + # if user.nil? + # user = User.create(username: username) + # end if @user.id - session[:user_id] = user.id - flash[:alert] = "Successfully logged in as existing user #{user.username}" + session[:user_id] = @user.id + flash[:alert] = "Successfully logged in as existing user #{@user.username}" redirect_to root_path else flash[:error] = "Unable to log in" @@ -32,7 +34,13 @@ def current def logout # user = User.find_by(id: session[:user_id]) session[:user_id] = nil - flash[:notice] = "Logged out #{user.username}" + flash[:notice] = "Logged out #{@user.username}" redirect_to root_path end + + private + + def user_params + return params.require(:user).permit(:username) + end end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index d933cbb6eb..09b564e11f 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -4,7 +4,7 @@
-<% if @works.where(category: "movie") != [] %> +<% if @works.where(category: "movie") != [] || @works.where(category: "movie") != nil %>

Top Movies:

    <% @works.each do |work| %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 49abd4aad6..735f21a700 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,6 +33,17 @@
+
+ <%= link_to("Login", login_path) if session[:user_id].nil? %> + <%= link_to("Logout", logout_path, method: :post) if session[:user_id] %> + + + <%= link_to "View all media", works_path %> + + <%= link_to "Add a new work", + new_work_path %> + +
<%= yield %> diff --git a/app/views/users/login_form.html.erb b/app/views/users/login_form.html.erb new file mode 100644 index 0000000000..eb04faf615 --- /dev/null +++ b/app/views/users/login_form.html.erb @@ -0,0 +1,5 @@ +<%= form_with model: @user, url: login_path do |f| %> + <%= f.label :username %> + <%= f.text_field :username %> + <%= f.submit "Login" %> +<% end %> \ No newline at end of file diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 469ba90d58..01a34407ff 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -16,7 +16,7 @@ <% end %> -<% if @works.where(category: "movie") != [] %> +<% if @works.where(category: "movie") != [] || @works.where(category: "movie") != nil %>

Movies:

<% @works.each do |work| %> <% if work.category == "movie" %> From 3e09c4bb1f5960156d7bb482c8bb954bdb89b042 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 25 Apr 2019 15:17:45 -0700 Subject: [PATCH 11/49] Added index action to User Controller, view page, link in nav bar --- app/controllers/users_controller.rb | 4 ++++ app/views/layouts/application.html.erb | 2 +- app/views/users/index.html.erb | 6 ++++++ config/routes.rb | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 app/views/users/index.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index cca062b4bf..293ab3588f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,6 +1,10 @@ class UsersController < ApplicationController before_action :find_user, only: [:current, :logout] + def index + @users = User.all + end + def login_form @user = User.new end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 735f21a700..38c40529e3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -37,7 +37,7 @@ <%= link_to("Login", login_path) if session[:user_id].nil? %> <%= link_to("Logout", logout_path, method: :post) if session[:user_id] %> - +<%= link_to "View all users", users_path %> <%= link_to "View all media", works_path %> <%= link_to "Add a new work", diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..e04cd48622 --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,6 @@ +This is where you would see all of the users +
    +<% @users.each do |user|%> +
  • <%= user.username %>
    • +<%end%> +
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 8ec54724ac..a4e99ff305 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,7 @@ get "homepages/index" resources :works resources :homepages, only: [:index] + resources :users, only: [:index] get "/login", to: "users#login_form", as: "login" post "/login", to: "users#login" From d9ab5bb52477f47c2688445e274f2872bfbbe235 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 25 Apr 2019 15:40:36 -0700 Subject: [PATCH 12/49] Updated application and works view pages, User Controller logout action --- app/controllers/users_controller.rb | 5 +++-- app/views/homepages/index.html.erb | 4 ++-- app/views/works/index.html.erb | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 293ab3588f..9e52d84e18 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -37,9 +37,10 @@ def current def logout # user = User.find_by(id: session[:user_id]) - session[:user_id] = nil - flash[:notice] = "Logged out #{@user.username}" redirect_to root_path + + flash[:notice] = "Logged out #{@user.username}" + session[:user_id] = nil end private diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 09b564e11f..3f9adba916 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -4,7 +4,7 @@
-<% if @works.where(category: "movie") != [] || @works.where(category: "movie") != nil %> +

Top Movies:

    <% @works.each do |work| %> @@ -17,7 +17,7 @@ <% end %> <% end %>
-<% end %> +
diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 01a34407ff..fe3983c25f 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -16,11 +16,11 @@ <% end %> -<% if @works.where(category: "movie") != [] || @works.where(category: "movie") != nil %> +

Movies:

<% @works.each do |work| %> <% if work.category == "movie" %> <%= work.title %> <% end %> <% end %> -<% end %> + From 0841ad560d36d5fb1eef1f018da487199220faaa Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 25 Apr 2019 16:35:00 -0700 Subject: [PATCH 13/49] User controller tests --- test/controllers/homepages_controller_test.rb | 3 -- test/controllers/users_controller_test.rb | 50 +++++++++++++++++-- test/fixtures/users.yml | 4 +- test/test_helper.rb | 18 ++++++- 4 files changed, 65 insertions(+), 10 deletions(-) diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb index 7395af3dec..1dcb9f810a 100644 --- a/test/controllers/homepages_controller_test.rb +++ b/test/controllers/homepages_controller_test.rb @@ -2,8 +2,5 @@ describe HomepagesController do it "should get index" do - get homepages_index_url - value(response).must_be :success? end - end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 89decb54e0..8bd6f01a62 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,7 +1,51 @@ require "test_helper" describe UsersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + it "should get index" do + get users_path + + must_respond_with :success + end + + describe "login_form" do + it "can get the login page" do + get login_path + + must_respond_with :success + end + end + + describe "login" do + it "can successfully log in a user" do + user_params = { + user: { + username: users(:one).username, + }, + } + + post login_path(user_params) + + must_redirect_to root_path + end + + it "will redirect if invalid user" do + end + end + + describe "current" do + it "responds with success if a user is logged in" do + + #perform_login found in test_helper.rb + logged_in_user = perform_login + + get current_user_path + + must_respond_with :success + end + + it "responds with a redirect if no user is logged in" do + get current_user_path + must_respond_with :redirect + end + end end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 952febd97d..cd4be9a458 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - username: MyString + username: MyString1 two: - username: MyString + username: MyString2 diff --git a/test/test_helper.rb b/test/test_helper.rb index fb7dd505e2..4eac3b71cb 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -10,7 +10,6 @@ Minitest.backtrace_filter ) - # To add Capybara feature tests add `gem "minitest-rails-capybara"` # to the test group in the Gemfile and uncomment the following: # require "minitest/rails/capybara" @@ -21,5 +20,20 @@ class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. fixtures :all - # Add more helper methods to be used by all tests here... + + def perform_login(user = nil) + user ||= users(:one) + + login_data = { + user: { + username: user.username, + }, + } + post login_path, params: login_data + + # Verify the user ID was saved - if that didn't work, this test is invalid + expect(session[:user_id]).must_equal user.id + + return user + end end From ded020a84f58e7f1679409e1a689d7a3d8585f40 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 25 Apr 2019 21:11:58 -0700 Subject: [PATCH 14/49] Completed User Controller tests --- app/models/user.rb | 1 + test/controllers/users_controller_test.rb | 25 +++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 379658a509..44e60c8fdd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,3 @@ class User < ApplicationRecord + validates :username, presence: true, uniqueness: true end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 8bd6f01a62..e72c77a557 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -29,6 +29,15 @@ end it "will redirect if invalid user" do + user_params = { + user: { + username: nil, + }, + } + post login_path(user_params) + + expect(flash[:error]).must_equal "Unable to log in" + must_redirect_to root_path end end @@ -48,4 +57,20 @@ must_respond_with :redirect end end + + describe "logout" do + it "can successfully log out a user" do + logged_in_user = perform_login + + user_params = { + user: { + username: logged_in_user.username, + }, + } + + post logout_path + + expect(flash[:notice]).must_include "Logged out" + end + end end From 3b3ee59088190b963ad2e1a7b2d7322fb9c62217 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 25 Apr 2019 21:33:27 -0700 Subject: [PATCH 15/49] updated Works Controller index view --- app/views/works/index.html.erb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index fe3983c25f..81676e5063 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,26 +1,30 @@ -

Works#index

-

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

+

List of Works

Albums:

+
    <% @works.each do |work| %> <% if work.category == "album" %> - <%= work.title %> +
  • <%= link_to work.title, work_path(work.id) %>
    • <% end %> <% end %> +

Books:

+
    <% @works.each do |work| %> <% if work.category == "book" %> - <%= work.title %> +
  • <%= link_to work.title, work_path(work.id) %>
    • <% end %> <% end %> +

Movies:

+
    <% @works.each do |work| %> <% if work.category == "movie" %> - <%= work.title %> +
  • <%= link_to work.title, work_path(work.id) %>
    • <% end %> <% end %> - +
From c6f91b1561fac2dd542dbf5bea8b3d91eaad3483 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Thu, 25 Apr 2019 22:39:09 -0700 Subject: [PATCH 16/49] Added User Controller show action, test, added link to user show page in application view --- app/controllers/users_controller.rb | 13 +++++++++---- app/views/layouts/application.html.erb | 13 ++++++++----- app/views/users/show.html.erb | 1 + config/routes.rb | 3 ++- test/controllers/users_controller_test.rb | 18 ++++++++++++++++++ 5 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 app/views/users/show.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9e52d84e18..b4084099fd 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -5,6 +5,15 @@ def index @users = User.all end + def show + @user = User.find_by(id: params[:id]) + + if @user.nil? + flash[:error] = "User not found" + redirect_to users_path + end + end + def login_form @user = User.new end @@ -13,10 +22,6 @@ def login @user = User.find_by(username: params[:user][:username]) @user = User.create(user_params) if @user.nil? - # if user.nil? - # user = User.create(username: username) - # end - if @user.id session[:user_id] = @user.id flash[:alert] = "Successfully logged in as existing user #{@user.username}" diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 38c40529e3..a8d3be7686 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -34,14 +34,17 @@
- <%= link_to("Login", login_path) if session[:user_id].nil? %> - <%= link_to("Logout", logout_path, method: :post) if session[:user_id] %> - -<%= link_to "View all users", users_path %> + <%= link_to "View all media", works_path %> - <%= link_to "Add a new work", + <%= link_to "Add a new work", new_work_path %> + <%= link_to "View all users", users_path %> + + <%= link_to("Logged in as #{User.find_by(id: session[:user_id]).username}", user_path(session[:user_id])) if session[:user_id]%> + + <%= link_to("Login", login_path) if session[:user_id].nil? %> + <%= link_to("Logout", logout_path, method: :post) if session[:user_id] %>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..a1e889533f --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1 @@ +

User Summary: <%= @user.username %>

\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index a4e99ff305..e0de4e0a5e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,12 +4,13 @@ get "homepages/index" resources :works resources :homepages, only: [:index] - resources :users, only: [:index] get "/login", to: "users#login_form", as: "login" post "/login", to: "users#login" post "/logout", to: "users#logout", as: "logout" get "/users/current", to: "users#current", as: "current_user" + resources :users, only: [:index, :show] + # 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 index e72c77a557..2bce4514a9 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -7,6 +7,24 @@ must_respond_with :success end + describe "show" do + it "should be able to show an existing user" do + valid_user_id = users(:one).id + + get user_path(valid_user_id) + + must_respond_with :success + end + + it "should redirect to the users index page when given an invalid work id" do + get user_path(-1) + + expect(flash[:error]).must_equal "User not found" + + must_respond_with :redirect + end + end + describe "login_form" do it "can get the login page" do get login_path From 9b84f0af2d2b9a09120d7721ae25ceec8f76932c Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Fri, 26 Apr 2019 11:07:08 -0700 Subject: [PATCH 17/49] Added vote model --- app/models/user.rb | 1 + app/models/vote.rb | 4 ++++ app/models/work.rb | 1 + db/migrate/20190426175444_create_votes.rb | 8 ++++++++ .../20190426175946_votes_add_user_id_work_id.rb | 6 ++++++ db/schema.rb | 13 ++++++++++++- test/fixtures/votes.yml | 11 +++++++++++ test/models/vote_test.rb | 9 +++++++++ 8 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 app/models/vote.rb create mode 100644 db/migrate/20190426175444_create_votes.rb create mode 100644 db/migrate/20190426175946_votes_add_user_id_work_id.rb create mode 100644 test/fixtures/votes.yml create mode 100644 test/models/vote_test.rb diff --git a/app/models/user.rb b/app/models/user.rb index 44e60c8fdd..ac4f9c4842 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,3 +1,4 @@ class User < ApplicationRecord validates :username, presence: true, uniqueness: true + has_many :votes end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..684551f081 --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,4 @@ +class Vote < ApplicationRecord + belongs_to :works + belongs_to :users +end diff --git a/app/models/work.rb b/app/models/work.rb index c0162ed9f8..901a40f4a3 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,4 +1,5 @@ class Work < ApplicationRecord validates :category, presence: true validates :title, presence: true, uniqueness: true + has_many :votes end diff --git a/db/migrate/20190426175444_create_votes.rb b/db/migrate/20190426175444_create_votes.rb new file mode 100644 index 0000000000..aa134a1296 --- /dev/null +++ b/db/migrate/20190426175444_create_votes.rb @@ -0,0 +1,8 @@ +class CreateVotes < ActiveRecord::Migration[5.2] + def change + create_table :votes do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20190426175946_votes_add_user_id_work_id.rb b/db/migrate/20190426175946_votes_add_user_id_work_id.rb new file mode 100644 index 0000000000..247ea5b3dc --- /dev/null +++ b/db/migrate/20190426175946_votes_add_user_id_work_id.rb @@ -0,0 +1,6 @@ +class VotesAddUserIdWorkId < ActiveRecord::Migration[5.2] + def change + add_reference :votes, :user, foreign_key: true + add_reference :votes, :work, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 88bd8ae0ee..6246f44283 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_04_25_211450) do +ActiveRecord::Schema.define(version: 2019_04_26_175946) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -21,6 +21,15 @@ t.datetime "updated_at", null: false end + create_table "votes", force: :cascade do |t| + 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" @@ -31,4 +40,6 @@ t.datetime "updated_at", null: false end + add_foreign_key "votes", "users" + add_foreign_key "votes", "works" end diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..dc3ee79b5d --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb new file mode 100644 index 0000000000..fc15947bd3 --- /dev/null +++ b/test/models/vote_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Vote do + let(:vote) { Vote.new } + + it "must be valid" do + value(vote).must_be :valid? + end +end From a9c81eb5e817deab186d3c366b6aac77b9d57672 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Fri, 26 Apr 2019 15:55:27 -0700 Subject: [PATCH 18/49] Added vote controller and model with upvote method --- app/assets/javascripts/votes.js | 2 ++ app/assets/stylesheets/votes.scss | 3 +++ app/controllers/votes_controller.rb | 19 +++++++++++++++++++ app/helpers/votes_helper.rb | 2 ++ app/models/vote.rb | 3 +++ app/views/works/index.html.erb | 2 +- config/routes.rb | 2 ++ test/controllers/votes_controller_test.rb | 7 +++++++ test/models/user_test.rb | 2 +- test/models/vote_test.rb | 2 +- 10 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 app/assets/javascripts/votes.js create mode 100644 app/assets/stylesheets/votes.scss create mode 100644 app/controllers/votes_controller.rb create mode 100644 app/helpers/votes_helper.rb create mode 100644 test/controllers/votes_controller_test.rb diff --git a/app/assets/javascripts/votes.js b/app/assets/javascripts/votes.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/votes.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/votes.scss b/app/assets/stylesheets/votes.scss new file mode 100644 index 0000000000..4756424f13 --- /dev/null +++ b/app/assets/stylesheets/votes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the votes 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/votes_controller.rb b/app/controllers/votes_controller.rb new file mode 100644 index 0000000000..c489a72525 --- /dev/null +++ b/app/controllers/votes_controller.rb @@ -0,0 +1,19 @@ +class VotesController < ApplicationController + before_action :find_user, only: [:upvote] + + def upvote + # @user = User.find_by(id: session[:user_id]) + @work = Work.find_by(id: params[:id]) + + @vote = Vote.new(user_id: @user.id, work_id: @work.id) + + if @user.nil? + flash[:error] = "You must log in to do that" + # redirect_to works_path + else + @vote.save + flash[:success] = "Successfully upvoted!" + # redirect_to works_path + end + end +end diff --git a/app/helpers/votes_helper.rb b/app/helpers/votes_helper.rb new file mode 100644 index 0000000000..5a82eed07d --- /dev/null +++ b/app/helpers/votes_helper.rb @@ -0,0 +1,2 @@ +module VotesHelper +end diff --git a/app/models/vote.rb b/app/models/vote.rb index 684551f081..f3c0460901 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,7 @@ class Vote < ApplicationRecord belongs_to :works belongs_to :users + + # validates :users, uniqueness: {scope: :work, message: "you have already voted"} + end diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 81676e5063..9182b80d1a 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -4,7 +4,7 @@
    <% @works.each do |work| %> <% if work.category == "album" %> -
  • <%= link_to work.title, work_path(work.id) %>
    • +
  • <%= link_to work.title, work_path(work.id) %> <%= link_to "Upvote", upvote_path(id: work.id), method: :post, class:"btn btn-success" %>
    • <% end %> <% end %>
diff --git a/config/routes.rb b/config/routes.rb index e0de4e0a5e..f7e3eb1bc8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,5 +12,7 @@ resources :users, only: [:index, :show] + post "/works/:id/upvote", to: "votes#upvote", as: "upvote" + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb new file mode 100644 index 0000000000..cf4d03935f --- /dev/null +++ b/test/controllers/votes_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe VotesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..e06c18fa23 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -4,6 +4,6 @@ let(:user) { User.new } it "must be valid" do - value(user).must_be :valid? + # value(user).must_be :valid? end end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..2cf6f8b195 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -4,6 +4,6 @@ let(:vote) { Vote.new } it "must be valid" do - value(vote).must_be :valid? + # value(vote).must_be :valid? end end From e61293b9b105854d7722abc62cf87047df833b6d Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Fri, 26 Apr 2019 20:20:18 -0700 Subject: [PATCH 19/49] Added table to Works index view --- app/views/works/index.html.erb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 9182b80d1a..5b07eddc09 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,6 +1,33 @@

List of Works

Albums:

+ + + + + + + + + + + + + + <% @works.each do |work| %> + + + + + + + <% end %> + +
VotesTitleCreated ByPublishUpvote
Votes<%= link_to work.title, work_path(work.id) %><%=work.creator%><%=work.publication_year%><%= link_to "Upvote", upvote_path(id: work.id), method: :post, class:"btn btn-success" %>
+ + + +
    <% @works.each do |work| %> <% if work.category == "album" %> From 3ea3270f96b0d5c9675bf04001054d27be519200 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Fri, 26 Apr 2019 20:40:38 -0700 Subject: [PATCH 20/49] Votes Controller updated upvote method --- app/controllers/votes_controller.rb | 6 +++--- app/views/works/index.html.erb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index c489a72525..2df59e6538 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -2,18 +2,18 @@ class VotesController < ApplicationController before_action :find_user, only: [:upvote] def upvote - # @user = User.find_by(id: session[:user_id]) + # find_user method in application controller @work = Work.find_by(id: params[:id]) @vote = Vote.new(user_id: @user.id, work_id: @work.id) if @user.nil? flash[:error] = "You must log in to do that" - # redirect_to works_path + redirect_to works_path else @vote.save flash[:success] = "Successfully upvoted!" - # redirect_to works_path + redirect_to works_path end end end diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 5b07eddc09..4344f7f2f6 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -15,7 +15,7 @@ <% @works.each do |work| %> - Votes + <%=work.votes.length%> <%= link_to work.title, work_path(work.id) %> <%=work.creator%> <%=work.publication_year%> From e0aa2862040525a5492d41b0c247625fbb1dbff2 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sat, 27 Apr 2019 12:52:29 -0700 Subject: [PATCH 21/49] Updated routes and can Votes Controller upvote method --- app/controllers/votes_controller.rb | 31 ++++++++++++++++++++--------- app/models/vote.rb | 7 +++---- app/models/work.rb | 4 ++++ app/views/works/index.html.erb | 6 +++--- config/routes.rb | 3 +-- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 2df59e6538..81d3a27b92 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,18 +1,31 @@ class VotesController < ApplicationController - before_action :find_user, only: [:upvote] + # before_action :find_user, only: [:upvote] def upvote - # find_user method in application controller - @work = Work.find_by(id: params[:id]) + new_vote = Vote.new + new_vote.user = User.find_by(id: session[:user_id]) + new_vote.work = Work.find_by(id: params[:id]) - @vote = Vote.new(user_id: @user.id, work_id: @work.id) + # @vote = Vote.new(user_id: @user.id, work_id: @work.id) - if @user.nil? - flash[:error] = "You must log in to do that" - redirect_to works_path + # if @user.nil? || @work.nil? + # flash[:error] = "You must log in to do that" + # redirect_to works_path + # else + if new_vote.user_id = session[:user_id] + if new_vote.save + flash[:success] = "Successfully upvoted!" + redirect_to works_path + else + flash[:duplicate_vote] = "user: has already voted for this work" + redirect_to works_path + end + + # if new_vote.save + # flash[:success] = "Successfully upvoted!" + # redirect_to works_path else - @vote.save - flash[:success] = "Successfully upvoted!" + flash[:error] = "You must log in to do that" redirect_to works_path end end diff --git a/app/models/vote.rb b/app/models/vote.rb index f3c0460901..7aa401a3ca 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,7 +1,6 @@ class Vote < ApplicationRecord - belongs_to :works - belongs_to :users - - # validates :users, uniqueness: {scope: :work, message: "you have already voted"} + belongs_to :work + belongs_to :user + validates :user, uniqueness: { scope: :work } end diff --git a/app/models/work.rb b/app/models/work.rb index 901a40f4a3..2a1916bbdb 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -2,4 +2,8 @@ class Work < ApplicationRecord validates :category, presence: true validates :title, presence: true, uniqueness: true has_many :votes + + def vote_count + self.votes.length + end end diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 4344f7f2f6..49de5da0ee 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -15,11 +15,11 @@ <% @works.each do |work| %> - <%=work.votes.length%> + <%=work.vote_count%> <%= link_to work.title, work_path(work.id) %> <%=work.creator%> <%=work.publication_year%> - <%= link_to "Upvote", upvote_path(id: work.id), method: :post, class:"btn btn-success" %> + <%= link_to "Upvote", upvote_path(work.id), method: :post, class:"btn btn-success" %> <% end %> @@ -31,7 +31,7 @@
      <% @works.each do |work| %> <% if work.category == "album" %> -
    • <%= link_to work.title, work_path(work.id) %> <%= link_to "Upvote", upvote_path(id: work.id), method: :post, class:"btn btn-success" %>
      • +
    • <%= link_to work.title, work_path(work.id) %>
      • <% end %> <% end %>
    diff --git a/config/routes.rb b/config/routes.rb index f7e3eb1bc8..2855de8b44 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ root to: "homepages#index" get "homepages/index" + post "/votes/:id/upvote", to: "votes#upvote", as: "upvote" resources :works resources :homepages, only: [:index] @@ -12,7 +13,5 @@ resources :users, only: [:index, :show] - post "/works/:id/upvote", to: "votes#upvote", as: "upvote" - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 93b53f82d6419a08bd6b427b9cc94b5e4519d4d4 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sat, 27 Apr 2019 14:19:27 -0700 Subject: [PATCH 22/49] Updated homepage view with top 10 --- app/models/work.rb | 22 +++++++++++++++++ app/views/homepages/index.html.erb | 36 ++++++++++------------------ app/views/works/_indextable.html.erb | 0 3 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 app/views/works/_indextable.html.erb diff --git a/app/models/work.rb b/app/models/work.rb index 2a1916bbdb..5cc0baebe4 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -6,4 +6,26 @@ class Work < ApplicationRecord def vote_count self.votes.length end + + def self.top_ten(type) + array_by_type = Work.where(category: type) + + array_by_votes = array_by_type.sort_by { |work| -work.votes.count } + + if array_by_votes.length < 10 + return array_by_votes + else + return array_by_votes[0..9] + end + end + + # def top_ten(type) + # array_by_type = self.where(category: type) + # array_by_votes = array_by_type.sort_by { |work| -work.votes.count } + # top_10 = sorted_array[0..9] + # if array_by_votes.length < 10 + # return array_by_votes + # else + # return array_by_votes[0..9] + # end end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 3f9adba916..492b0c7291 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,49 +1,39 @@

    Homepages#index

    -

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

    - - -

    Top Movies:

    -
      - <% @works.each do |work| %> - <% if work.category == "movie" %> - +

      Top Albums:

      +
        +<% @works.top_ten("album").each do |work| %>
      • - <%= work.title %> -
        • - - <% end %> + <%= work.title %> + <% end %> -
      - +

    Top Books:

      -<% @works.each do |work| %> - <% if work.category == "book" %> +<% @works.top_ten("book").each do |work| %>
    • <%= work.title %>
      • <% end %> -<% end %> +
    -

    Top Albums:

    -
      -<% @works.each do |work| %> - <% if work.category == "album" %> -
    • +

      Top Movies:

      +
        +<% @works.top_ten("movie").each do |work| %> +
      • <%= work.title %>
        • <% end %> -<% end %>
    + diff --git a/app/views/works/_indextable.html.erb b/app/views/works/_indextable.html.erb new file mode 100644 index 0000000000..e69de29bb2 From 978c37d672b18d15350716f2c92e04fad026c577 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sat, 27 Apr 2019 14:41:39 -0700 Subject: [PATCH 23/49] Updated homepage view with links and vote counts --- app/views/homepages/index.html.erb | 44 +++++++++++++++++------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 492b0c7291..4b4ce74a10 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,28 +1,34 @@ -

    Homepages#index

    +

    Media Spotlight

    -

    Top Albums:

    -
      -<% @works.top_ten("album").each do |work| %> -
    • - <%= work.title %> -
      • - <% end %> - -
    +

    Top Albums:

    +
      + <% @works.top_ten("album").each do |work| %> +
    • + <%= link_to work.title, work_path(work.id) %> + by + <%= work.creator%> + +
      + <%=work.vote_count%> votes +
      • + <% end %> +
    -

    Top Books:

    -
      -<% @works.top_ten("book").each do |work| %> -
    • - <%= work.title %> -
      • - <% end %> - -
    +

    Top Books:

    +
      + <% @works.top_ten("book").each do |work| %> +
    • + <%= link_to work.title, work_path(work.id) %> + by + <%= work.creator%> +
      • + <% end %> + +
    From fe276ed6e52fedaef7adcf6ab732e1cd685596ec Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sat, 27 Apr 2019 20:35:39 -0700 Subject: [PATCH 24/49] Added Media Spotlight to homepage --- app/models/work.rb | 19 +++++++++---------- app/views/homepages/index.html.erb | 7 ++++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 5cc0baebe4..ba2a8b5619 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -8,7 +8,7 @@ def vote_count end def self.top_ten(type) - array_by_type = Work.where(category: type) + array_by_type = self.where(category: type) array_by_votes = array_by_type.sort_by { |work| -work.votes.count } @@ -19,13 +19,12 @@ def self.top_ten(type) end end - # def top_ten(type) - # array_by_type = self.where(category: type) - # array_by_votes = array_by_type.sort_by { |work| -work.votes.count } - # top_10 = sorted_array[0..9] - # if array_by_votes.length < 10 - # return array_by_votes - # else - # return array_by_votes[0..9] - # end + def self.media_spotlight + all_works = self.all + + sorted_works = all_works.sort_by { |work| -work.votes.count } + spotlight = sorted_works.first + + return spotlight + end end diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 4b4ce74a10..d9f3cd46ae 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,4 +1,9 @@ -

    Media Spotlight

    +<% spotlight = @works.media_spotlight %> + +

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

    + +<%= spotlight.vote_count%> votes +
    From b9d3b8caff888bd0d2e656aa54dce167fcf90408 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sat, 27 Apr 2019 20:56:13 -0700 Subject: [PATCH 25/49] Added a table to user index view --- app/views/users/index.html.erb | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index e04cd48622..a96af951e2 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,6 +1,23 @@ -This is where you would see all of the users -
      -<% @users.each do |user|%> -
    • <%= user.username %>
      • -<%end%> -
    \ No newline at end of file +

    List of Users

    + + + + + + + + + + + + <% @users.each do |user|%> + + + <% date = user.created_at %> + + + <%end%> + +
    UsernameVotesJoined
    <%= user.username %><%= user.votes.count %><%= date.strftime("%b %e, %Y") %>
    + + \ No newline at end of file From 724fd172d7e01ee382c2868337dce4ca78209bd1 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sat, 27 Apr 2019 21:46:41 -0700 Subject: [PATCH 26/49] Added table to user show page --- app/views/users/index.html.erb | 2 +- app/views/users/show.html.erb | 31 ++++++++++++++++++++++++++++++- app/views/works/index.html.erb | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index a96af951e2..6021e11245 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -11,7 +11,7 @@ <% @users.each do |user|%> - <%= user.username %> + <%= link_to user.username, user_path(user.id) %> <%= user.votes.count %> <% date = user.created_at %> <%= date.strftime("%b %e, %Y") %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index a1e889533f..964fcb0e7c 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1 +1,30 @@ -

    User Summary: <%= @user.username %>

    \ No newline at end of file +

    User Summary: <%= @user.username %>

    +<% date = @user.created_at %> +Joined site <%= date.strftime("%b %e, %Y") %> + +

    Votes

    + + + + + + + + + + + + + + <% all_votes = @user.votes %> + <% all_votes.each do |vote| %> + + + + + <% date = vote.work.created_at%> + + + <% end %> + +
    Media TitleCreated ByPublishedCategoryVoted On
    <%= link_to vote.work.title, work_path(vote.work.id) %><%= vote.work.creator %><%=vote.work.publication_year%><%=vote.work.creator%><%= date.strftime("%b %e, %Y") %>
    \ No newline at end of file diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 49de5da0ee..255995b2f2 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -8,7 +8,7 @@ Votes Title Created By - Publish + Published Upvote From 299579d22ce1d253edb5e2951805fcbfd19032e6 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sat, 27 Apr 2019 21:53:21 -0700 Subject: [PATCH 27/49] changed code to count votes in works and homepages index views --- app/models/work.rb | 4 ---- app/views/homepages/index.html.erb | 4 ++-- app/views/works/index.html.erb | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index ba2a8b5619..9515d6ae5c 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -3,10 +3,6 @@ class Work < ApplicationRecord validates :title, presence: true, uniqueness: true has_many :votes - def vote_count - self.votes.length - end - def self.top_ten(type) array_by_type = self.where(category: type) diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index d9f3cd46ae..a26a819524 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -2,7 +2,7 @@

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

    -<%= spotlight.vote_count%> votes +<%= spotlight.votes.count%> votes @@ -16,7 +16,7 @@ <%= work.creator%>
    - <%=work.vote_count%> votes + <%=work.votes.count%> votes <% end %>
diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 255995b2f2..619ced52d8 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -15,7 +15,7 @@ <% @works.each do |work| %> - <%=work.vote_count%> + <%=work.votes.count%> <%= link_to work.title, work_path(work.id) %> <%=work.creator%> <%=work.publication_year%> From 5b6f35c38ff409555c979f7bcf439a09cdd319a6 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sat, 27 Apr 2019 22:19:43 -0700 Subject: [PATCH 28/49] general clean up of code --- app/controllers/users_controller.rb | 9 +++++++-- app/controllers/votes_controller.rb | 10 ---------- app/models/work.rb | 2 +- app/views/works/index.html.erb | 2 +- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b4084099fd..d25080884f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -20,9 +20,14 @@ def login_form def login @user = User.find_by(username: params[:user][:username]) - @user = User.create(user_params) if @user.nil? + # @user = User.create(user_params) if @user.nil? - if @user.id + if @user.nil? + @user = User.create(user_params) + session[:user_id] = @user.id + flash[:new_user] = "Successfully created new user #{@user.username} with ID #{@user.id}" + redirect_to root_path + elsif @user.id session[:user_id] = @user.id flash[:alert] = "Successfully logged in as existing user #{@user.username}" redirect_to root_path diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index 81d3a27b92..505b034fec 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -6,12 +6,6 @@ def upvote new_vote.user = User.find_by(id: session[:user_id]) new_vote.work = Work.find_by(id: params[:id]) - # @vote = Vote.new(user_id: @user.id, work_id: @work.id) - - # if @user.nil? || @work.nil? - # flash[:error] = "You must log in to do that" - # redirect_to works_path - # else if new_vote.user_id = session[:user_id] if new_vote.save flash[:success] = "Successfully upvoted!" @@ -20,10 +14,6 @@ def upvote flash[:duplicate_vote] = "user: has already voted for this work" redirect_to works_path end - - # if new_vote.save - # flash[:success] = "Successfully upvoted!" - # redirect_to works_path else flash[:error] = "You must log in to do that" redirect_to works_path diff --git a/app/models/work.rb b/app/models/work.rb index 9515d6ae5c..93c742d68e 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,7 +1,7 @@ class Work < ApplicationRecord validates :category, presence: true validates :title, presence: true, uniqueness: true - has_many :votes + has_many :votes, dependent: :destroy def self.top_ten(type) array_by_type = self.where(category: type) diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 619ced52d8..75c182e784 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -2,7 +2,7 @@

Albums:

- +
From 66256894d54d78209e3f40d50396456c9cf2e513 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sat, 27 Apr 2019 22:45:59 -0700 Subject: [PATCH 29/49] Added partial view for works index page --- app/views/works/_indextable.html.erb | 25 +++++++++++ app/views/works/index.html.erb | 63 ++++++---------------------- 2 files changed, 37 insertions(+), 51 deletions(-) diff --git a/app/views/works/_indextable.html.erb b/app/views/works/_indextable.html.erb index e69de29bb2..f5978e37fc 100644 --- a/app/views/works/_indextable.html.erb +++ b/app/views/works/_indextable.html.erb @@ -0,0 +1,25 @@ +

<%= header_category %>

+ +
Votes
+ + + + + + + + + + + + <% works_by_category = @works.where(category: category)%> + <% works_by_category.each do |work| %> + + + + + + + <% end %> + +
VotesTitleCreated ByPublishedUpvote
<%=work.votes.count%><%= link_to work.title, work_path(work.id) %><%=work.creator%><%=work.publication_year%><%= link_to "Upvote", upvote_path(work.id), method: :post, class:"btn btn-success" %>
\ No newline at end of file diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 75c182e784..3a14d3597d 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,57 +1,18 @@

List of Works

-

Albums:

+<%= render partial: "indextable", locals: { + header_category: "Albums:", + category: "album" +} %> - - - - - - - - - - - - - <% @works.each do |work| %> - - - - - - - <% end %> - -
VotesTitleCreated ByPublishedUpvote
<%=work.votes.count%><%= link_to work.title, work_path(work.id) %><%=work.creator%><%=work.publication_year%><%= link_to "Upvote", upvote_path(work.id), method: :post, class:"btn btn-success" %>
+<%= render partial: "indextable", locals: { + header_category: "Books:", + category: "book" +} %> +<%= render partial: "indextable", locals: { + header_category: "Movies:", + category: "movie" +} %> - -
    -<% @works.each do |work| %> - <% if work.category == "album" %> -
  • <%= link_to work.title, work_path(work.id) %>
    • - <% end %> -<% end %> -
- -

Books:

-
    -<% @works.each do |work| %> - <% if work.category == "book" %> -
  • <%= link_to work.title, work_path(work.id) %>
    • - <% end %> -<% end %> -
- - - -

Movies:

-
    - <% @works.each do |work| %> - <% if work.category == "movie" %> -
  • <%= link_to work.title, work_path(work.id) %>
    • - <% end %> - <% end %> -
From 83d698a9a33d2eb5a20fa8adb229e22287bd22b0 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sat, 27 Apr 2019 23:08:48 -0700 Subject: [PATCH 30/49] Added vote table to work show view --- app/views/homepages/index.html.erb | 2 +- app/views/works/show.html.erb | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index a26a819524..b6c1a5477d 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -2,7 +2,7 @@

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

-<%= spotlight.votes.count%> votes +<%= spotlight.votes.count%> votes - <%= spotlight.description%> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 4f7131546d..769b6b787e 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -16,4 +16,23 @@ <%= link_to "Delete", work_path(@work.id), method: :delete %> -

[add # here] Votes for this <%= @work.category.capitalize %>

+

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

+ + + + + + + + + + + <% all_votes = @work.votes %> + <% all_votes.each do |vote| %> + + <% date = vote.user.created_at %> + + + <%end%> + +
UserDate
<%= vote.user.username %><%= date.strftime("%b %e, %Y") %>
\ No newline at end of file From 91cbaed6d4facfa78c8e9f9225a3aab95678ddb5 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 15:57:50 -0700 Subject: [PATCH 31/49] Test for Homepages Controller --- test/controllers/homepages_controller_test.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb index 1dcb9f810a..c7a59b5b41 100644 --- a/test/controllers/homepages_controller_test.rb +++ b/test/controllers/homepages_controller_test.rb @@ -1,6 +1,11 @@ require "test_helper" describe HomepagesController do - it "should get index" do + describe "index" do + it "should get index" do + get works_path + + must_respond_with :success + end end end From 3641954e8fcc0ad11c1690ed0e182972ec4d9d68 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 16:28:49 -0700 Subject: [PATCH 32/49] Fixed User Controller login action to pass test --- app/controllers/users_controller.rb | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d25080884f..940eed6125 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -20,20 +20,21 @@ def login_form def login @user = User.find_by(username: params[:user][:username]) - # @user = User.create(user_params) if @user.nil? - if @user.nil? - @user = User.create(user_params) - session[:user_id] = @user.id - flash[:new_user] = "Successfully created new user #{@user.username} with ID #{@user.id}" - redirect_to root_path - elsif @user.id + if @user != nil session[:user_id] = @user.id flash[:alert] = "Successfully logged in as existing user #{@user.username}" redirect_to root_path - else - flash[:error] = "Unable to log in" - redirect_to root_path + elsif @user.nil? + @user = User.create(user_params) + if @user.valid? + session[:user_id] = @user.id + flash[:new_user] = "Successfully created new user #{@user.username} with ID #{@user.id}" + redirect_to root_path + else + flash[:error] = "Unable to log in" + redirect_to root_path + end end end From a4632aa18c29f83459697425a8b8aa02bdf3edca Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 17:24:06 -0700 Subject: [PATCH 33/49] Votes Controller tests --- test/controllers/votes_controller_test.rb | 65 +++++++++++++++++++++-- test/fixtures/votes.yml | 9 ++-- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb index cf4d03935f..6639a9796a 100644 --- a/test/controllers/votes_controller_test.rb +++ b/test/controllers/votes_controller_test.rb @@ -1,7 +1,66 @@ require "test_helper" describe VotesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "upvote" do + it "must be able to vote for a work" do + user = users(:one) + work = works(:album) + + login_data = { + user: { + username: user.username, + }, + } + post login_path, params: login_data + + vote_hash = { + vote: { + user_id: user.id, + work_id: work.id, + }, + } + + expect { post upvote_path(work.id), params: vote_hash }.must_change "Vote.count", 1 + end + + it "Will give an error if the user has already voted for a work" do + user = users(:one) + work = works(:album) + + login_data = { + user: { + username: user.username, + }, + } + post login_path, params: login_data + + vote_hash = { + vote: { + user_id: user.id, + work_id: work.id, + }, + } + + post upvote_path(work.id), params: vote_hash + post upvote_path(work.id), params: vote_hash + + expect(flash[:duplicate_vote]).must_equal "user: has already voted for this work" + end + + it "will not allow a user to vote if they have not logged in" do + user = users(:one) + work = works(:album) + + vote_hash = { + vote: { + user_id: user.id, + work_id: work.id, + }, + } + + post upvote_path(work.id), params: vote_hash + + expect(flash[:error]).must_equal "You must log in to do that" + end + end end diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index dc3ee79b5d..eb2ac7c654 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -4,8 +4,9 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} +vote1: + user: two + work: album + +vote2: {} # column: value From c5b6e8e3916e40b0dd72015ebdf0e21d40e9a21a Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 19:31:34 -0700 Subject: [PATCH 34/49] Change to homepages view --- app/views/homepages/index.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index b6c1a5477d..3d88cc0d54 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,4 +1,4 @@ -<% spotlight = @works.media_spotlight %> +<% spotlight = Work.media_spotlight %>

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

@@ -9,7 +9,7 @@

Top Albums:

    - <% @works.top_ten("album").each do |work| %> + <% Work.top_ten("album").each do |work| %>
  • <%= link_to work.title, work_path(work.id) %> by @@ -25,7 +25,7 @@

    Top Books:

      - <% @works.top_ten("book").each do |work| %> + <% Work.top_ten("book").each do |work| %>
    • <%= link_to work.title, work_path(work.id) %> by From dda8337594516765c1be4d13fbdf8f950a916328 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 19:46:07 -0700 Subject: [PATCH 35/49] Changed homepage view --- app/models/work.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 93c742d68e..8de3409faf 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -6,12 +6,16 @@ class Work < ApplicationRecord def self.top_ten(type) array_by_type = self.where(category: type) - array_by_votes = array_by_type.sort_by { |work| -work.votes.count } + if array_by_type.length > 1 + array_by_votes = array_by_type.sort_by { |work| -work.votes.count } - if array_by_votes.length < 10 - return array_by_votes + if array_by_votes.length < 10 + return array_by_votes + else + return array_by_votes[0..9] + end else - return array_by_votes[0..9] + return array_by_type end end From d2f69b6408f5379dddf5df3c4fc2133afc9befb7 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 20:01:35 -0700 Subject: [PATCH 36/49] cleaned up votes controller tests --- test/controllers/votes_controller_test.rb | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb index 6639a9796a..cba9598e5b 100644 --- a/test/controllers/votes_controller_test.rb +++ b/test/controllers/votes_controller_test.rb @@ -6,12 +6,7 @@ user = users(:one) work = works(:album) - login_data = { - user: { - username: user.username, - }, - } - post login_path, params: login_data + logged_in_user = perform_login vote_hash = { vote: { @@ -27,12 +22,7 @@ user = users(:one) work = works(:album) - login_data = { - user: { - username: user.username, - }, - } - post login_path, params: login_data + logged_in_user = perform_login vote_hash = { vote: { From b8e6cd3b4e58203df2942a32907942a7c36fa3df Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 20:17:40 -0700 Subject: [PATCH 37/49] Added user model validation tests --- test/models/user_test.rb | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index e06c18fa23..8d9642227b 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,33 @@ require "test_helper" describe User do - let(:user) { User.new } + let(:user) { users(:one) } it "must be valid" do - # value(user).must_be :valid? + expect(user.valid?).must_equal true + end + + describe "validations" do + it "requires a username" do + user.username = nil + + valid_user = user.valid? + + expect(valid_user).must_equal false + expect(user.errors.messages).must_include :username + expect(user.errors.messages[:username]).must_equal ["can't be blank"] + end + + it "requires a unique username" do + duplicate_user = User.new(username: user.username) + + expect(duplicate_user.save).must_equal false + + expect(duplicate_user.errors.messages).must_include :username + expect(duplicate_user.errors.messages[:username]).must_equal ["has already been taken"] + end + end + + describe "relationships" do end end From 2a69f222fb5f9e5d500207d489078a9a4877e796 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 20:38:51 -0700 Subject: [PATCH 38/49] User model relationship tests --- test/fixtures/users.yml | 3 +++ test/fixtures/votes.yml | 5 +++-- test/fixtures/works.yml | 7 +++++++ test/models/user_test.rb | 15 +++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index cd4be9a458..ab6bfe87bd 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -5,3 +5,6 @@ one: two: username: MyString2 + +no_votes: + username: NoVotes diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index eb2ac7c654..0d159dec9e 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -8,5 +8,6 @@ vote1: user: two work: album -vote2: {} -# column: value +vote2: + user: one + work: album2 diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 74f80295bf..7f88ddab67 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -13,3 +13,10 @@ book: creator: Author1 publication_year: 2018 description: best book of the year + +album2: + category: album + title: Test Album2 + creator: Artist1 + publication_year: 2019 + description: interesting new album \ No newline at end of file diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 8d9642227b..fe4bad8b58 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -29,5 +29,20 @@ end describe "relationships" do + it "can have 0 votes" do + user = users(:no_votes) + + votes = user.votes + expect(votes.length).must_equal 0 + end + + it "can have 1 or more votes" do + user = users(:two) + vote = votes(:vote1) + + user.votes << vote + + expect(user.votes.length).must_equal 1 + end end end From 48edddf1c528fbc2b7424fb9adb67e22be2e07cf Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 20:55:32 -0700 Subject: [PATCH 39/49] Work model relationship tests --- test/models/user_test.rb | 2 -- test/models/work_test.rb | 12 ++++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index fe4bad8b58..623d4a30f7 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -40,8 +40,6 @@ user = users(:two) vote = votes(:vote1) - user.votes << vote - expect(user.votes.length).must_equal 1 end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 8499d1fe4d..038540cb38 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -29,6 +29,18 @@ end describe "relationships" do + it "can have 0 votes" do + work = works(:book) + + expect(work.votes.length).must_equal 0 + end + + it "can have 1 or more votes" do + work = works(:album) + vote = votes(:vote1) + + expect(work.votes.length).must_equal 1 + end end describe "custom methods" do From 980fed1e937c95878902c8eece49903a1c702867 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 21:23:06 -0700 Subject: [PATCH 40/49] Vote model validation tests --- test/models/vote_test.rb | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index 2cf6f8b195..23b600dfee 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,9 +1,44 @@ require "test_helper" describe Vote do - let(:vote) { Vote.new } + let(:user) { users(:one) } + let(:work) { works(:album) } + let(:vote) { votes(:vote1) } it "must be valid" do - # value(vote).must_be :valid? + expect(vote.valid?).must_equal true + end + + describe "validations" do + it "requires a user_id and work_id" do + vote.user = nil + expect(vote.valid?).must_equal false + + vote.user = user + expect(vote.valid?).must_equal true + + vote.work = nil + expect(vote.valid?).must_equal false + + vote.work = work + expect(vote.valid?).must_equal true + end + + it "allows only 1 vote per user for a specific work" do + first_vote = Vote.new + first_vote.user = user + first_vote.work = work + + expect(first_vote.save).must_equal true + + second_vote = Vote.new + second_vote.user = user + second_vote.work = work + + expect(second_vote.save).must_equal false + end + end + + describe "relationships" do end end From aed38261876b3bb8bc1da81de850426ff5fa0020 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 21:37:42 -0700 Subject: [PATCH 41/49] Vote model relationship tests --- test/fixtures/users.yml | 4 ++++ test/fixtures/votes.yml | 4 ++++ test/fixtures/works.yml | 9 ++++++++- test/models/vote_test.rb | 19 ++++++++++++++++++- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index ab6bfe87bd..cc682f5a68 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -8,3 +8,7 @@ two: no_votes: username: NoVotes + +three: + username: MyString3 + diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index 0d159dec9e..3ece7a83e9 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -11,3 +11,7 @@ vote1: vote2: user: one work: album2 + +vote3: + user: three + work: album3 diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 7f88ddab67..8b8daa4930 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -19,4 +19,11 @@ album2: title: Test Album2 creator: Artist1 publication_year: 2019 - description: interesting new album \ No newline at end of file + description: interesting new album + +album3: + category: album + title: Test Album3 + creator: Artist2 + publication_year: 2019 + description: interesting new album \ No newline at end of file diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index 23b600dfee..8acb4ba150 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -3,7 +3,7 @@ describe Vote do let(:user) { users(:one) } let(:work) { works(:album) } - let(:vote) { votes(:vote1) } + let(:vote) { votes(:vote3) } it "must be valid" do expect(vote.valid?).must_equal true @@ -40,5 +40,22 @@ end describe "relationships" do + it "belongs to a work and a user" do + vote.user = user + vote.work = work + + expect(vote.user_id).must_equal user.id + expect(vote.work_id).must_equal work.id + end + + it "can set the work through the work_id and the user through the user_id" do + + # user = users(:no_votes) + vote.user_id = user.id + vote.work_id = work.id + + expect(vote.user).must_equal user + expect(vote.work).must_equal work + end end end From 62e8b68781c64c949ac3ea19e4e1d02f097a6b3a Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 22:31:58 -0700 Subject: [PATCH 42/49] Work model custom method tests --- test/fixtures/users.yml | 11 ++++++- test/fixtures/votes.yml | 47 +++++++++++++++++++++++++++++ test/fixtures/works.yml | 65 +++++++++++++++++++++++++++++++++++++++- test/models/user_test.rb | 3 +- test/models/work_test.rb | 17 +++++++++-- 5 files changed, 137 insertions(+), 6 deletions(-) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index cc682f5a68..500474e186 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -10,5 +10,14 @@ no_votes: username: NoVotes three: - username: MyString3 + username: MyString3 + +four: + username: MyString4 + +five: + username: MyString5 + +six: + username: MyString6 diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index 3ece7a83e9..026f8c2962 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -15,3 +15,50 @@ vote2: vote3: user: three work: album3 + +vote4: + user: one + work: album4 + +vote5: + user: two + work: album5 + +vote6: + user: three + work: album6 + +vote7: + user: one + work: album7 + +vote8: + user: two + work: album8 + +vote9: + user: three + work: album9 + +vote10: + user: one + work: album10 + +vote11: + user: two + work: album4 + +vote12: + user: four + work: book2 + +vote13: + user: five + work: book2 + +vote14: + user: six + work: book2 + + + diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 8b8daa4930..0af03a36a3 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -26,4 +26,67 @@ album3: title: Test Album3 creator: Artist2 publication_year: 2019 - description: interesting new album \ No newline at end of file + description: interesting new album + +album4: + category: album + title: Test Album4 + creator: Artist2 + publication_year: 2019 + description: interesting new album + +album5: + category: album + title: Test Album5 + creator: Artist2 + publication_year: 2019 + description: interesting new album + +album6: + category: album + title: Test Album6 + creator: Artist2 + publication_year: 2019 + description: interesting new album + +album7: + category: album + title: Test Album7 + creator: Artist2 + publication_year: 2019 + description: interesting new album + +album8: + category: album + title: Test Album8 + creator: Artist2 + publication_year: 2019 + description: interesting new album + +album9: + category: album + title: Test Album9 + creator: Artist2 + publication_year: 2019 + description: interesting new album + +album10: + category: album + title: Test Album10 + creator: Artist2 + publication_year: 2019 + description: interesting new album + +album11: + category: album + title: Test Album11 + creator: Artist2 + publication_year: 2019 + description: interesting new album + +book2: + category: book + title: Book Test2 + creator: Author1 + publication_year: 2018 + description: best book of the year \ No newline at end of file diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 623d4a30f7..e513cedeba 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -38,9 +38,8 @@ it "can have 1 or more votes" do user = users(:two) - vote = votes(:vote1) - expect(user.votes.length).must_equal 1 + expect(user.votes.length).must_equal 4 end end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 038540cb38..bafc6fcf29 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -37,12 +37,25 @@ it "can have 1 or more votes" do work = works(:album) - vote = votes(:vote1) expect(work.votes.length).must_equal 1 end end - describe "custom methods" do + describe "self.top_ten method" do + it "must return the top ten votes, based on works" do + top_array = Work.top_ten("album") + + expect(top_array.length).must_equal 10 + expect(top_array[0][:title]).must_equal "Test Album4" + end + end + + describe "media_spotlight method" do + it "must return the work with the most votes" do + top_work = Work.media_spotlight + + expect(top_work.title).must_equal "Book Test2" + end end end From 370976d8ca7241162bdc139fea74ca13ba01c561 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 22:50:00 -0700 Subject: [PATCH 43/49] added links to work show view --- app/views/homepages/index.html.erb | 14 +++++++++++--- app/views/layouts/application.html.erb | 6 +++--- app/views/works/new.html.erb | 1 - app/views/works/show.html.erb | 8 ++++++-- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 3d88cc0d54..31c9b2e697 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -30,6 +30,9 @@ <%= link_to work.title, work_path(work.id) %> by <%= work.creator%> + +
      + <%=work.votes.count%> votes
      • <% end %> @@ -41,10 +44,15 @@
        <% @works.top_ten("movie").each do |work| %>
      • - <%= work.title %> + <%= link_to work.title, work_path(work.id) %> + by + <%= work.creator%> + +
        + <%=work.votes.count%> votes
        • - <% end %> + <% end %> -
      +
    diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a8d3be7686..08dda59ee2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -41,10 +41,10 @@ new_work_path %> <%= link_to "View all users", users_path %> - <%= link_to("Logged in as #{User.find_by(id: session[:user_id]).username}", user_path(session[:user_id])) if session[:user_id]%> + <%= link_to("Logged in as #{User.find_by(id: session[:user_id]).username}", user_path(session[:user_id]), class:"btn btn-success") if session[:user_id]%> - <%= link_to("Login", login_path) if session[:user_id].nil? %> - <%= link_to("Logout", logout_path, method: :post) if session[:user_id] %> + <%= link_to("Login", login_path, class:"btn btn-success") if session[:user_id].nil? %> + <%= link_to("Logout", logout_path, method: :post, class:"btn btn-success") if session[:user_id] %> diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index 58e41be970..f0f19a0473 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -1,5 +1,4 @@

    Add a new work

    -

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

    <%= render partial: "form", locals: { diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 769b6b787e..d097e22560 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -12,9 +12,13 @@
-<%= link_to "Edit", edit_work_path(@work.id) %> +<%= link_to "Back to media ranks", homepages_path, class:"btn btn-success" %> + +<%= link_to "Edit", edit_work_path(@work.id), class:"btn btn-success" %> +<%= link_to "Upvote", upvote_path(@work.id), method: :post, class:"btn btn-success" %> +<%= link_to "Delete", work_path(@work.id), method: :delete, class:"btn btn-danger" %> + -<%= link_to "Delete", work_path(@work.id), method: :delete %>

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

From 24dd9b9f367dad995381b8f4e87b44b5fb37186d Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 22:56:30 -0700 Subject: [PATCH 44/49] cleaned up homepages view --- app/views/homepages/index.html.erb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index 31c9b2e697..b27f2905f1 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,19 +1,19 @@ -<% spotlight = Work.media_spotlight %> +<%spotlight = Work.media_spotlight%> -

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

+

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

-<%= spotlight.votes.count%> votes - <%= spotlight.description%> +<%=spotlight.votes.count%> votes - <%=spotlight.description%>

Top Albums:

    - <% Work.top_ten("album").each do |work| %> + <%Work.top_ten("album").each do |work|%>
  • - <%= link_to work.title, work_path(work.id) %> + <%=link_to work.title, work_path(work.id)%> by - <%= work.creator%> + <%=work.creator%>
    <%=work.votes.count%> votes @@ -25,11 +25,11 @@

    Top Books:

      - <% Work.top_ten("book").each do |work| %> + <%Work.top_ten("book").each do |work|%>
    • - <%= link_to work.title, work_path(work.id) %> + <%=link_to work.title, work_path(work.id)%> by - <%= work.creator%> + <%=work.creator%>
      <%=work.votes.count%> votes @@ -42,11 +42,11 @@

      Top Movies:

        -<% @works.top_ten("movie").each do |work| %> +<%@works.top_ten("movie").each do |work|%>
      • - <%= link_to work.title, work_path(work.id) %> + <%=link_to work.title, work_path(work.id)%> by - <%= work.creator%> + <%=work.creator%>
        <%=work.votes.count%> votes From 76ab61399a47abdfd1129150db0bd302e81327fb Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Sun, 28 Apr 2019 23:11:04 -0700 Subject: [PATCH 45/49] added edge case tests to work model top_ten test --- test/models/work_test.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/test/models/work_test.rb b/test/models/work_test.rb index bafc6fcf29..4496010cc8 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -43,12 +43,24 @@ end describe "self.top_ten method" do - it "must return the top ten votes, based on works" do + it "must return the top ten works, based on votes" do top_array = Work.top_ten("album") expect(top_array.length).must_equal 10 expect(top_array[0][:title]).must_equal "Test Album4" end + + it "will return few works if there are not at least 10 in a category" do + top_array = Work.top_ten("book") + + expect(top_array.length).must_equal 2 + end + + it "will return an empty array if there are no works in the category" do + top_array = Work.top_ten("movie") + + expect(top_array).must_equal [] + end end describe "media_spotlight method" do From 3489511daf1484a88732d5dd788a9a9677fe528a Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Mon, 29 Apr 2019 22:10:21 -0700 Subject: [PATCH 46/49] CSS for nav bar --- app/assets/stylesheets/application.scss | 49 +++++++++++++++++++++++++ app/views/homepages/index.html.erb | 8 ++-- app/views/layouts/application.html.erb | 26 +++++++------ 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8b1701e581..5ea09deb27 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -16,3 +16,52 @@ @import "bootstrap"; /* Import scss content */ @import "**/*"; + + +header { + max-width: 100%; + background-color: #B2DFDB; + margin-bottom: 0.5rem; + padding: 2rem 1rem 0.5rem 1rem; +} + +.btn-primary { + background-color: #26A69A; + color: white; + border-color: #26A69A; +} + +.btn-primary:hover { + background-color: #26A69A; + color: white; + border-color: blue; +} + +.btn-secondary { + background-color: #B2DFDB; + border: #B2DFDB; + color: #26A69A; +} + +.btn-secondary:hover { + background-color: #B2DFDB; + border: #B2DFDB; + color: #26A69A; +} + +h1 a { + color: #FF5722; + border-right: white solid; + border-width: 2px; + padding-right: 20px; +} + +h1 a:hover { + color: #FF5722; + text-decoration: none; +} + +h1 small { + color: white; + padding-left: 20px; +} \ No newline at end of file diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index b27f2905f1..9c52f7a86e 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -1,13 +1,13 @@ <%spotlight = Work.media_spotlight%> -

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

        +

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

        <%=spotlight.votes.count%> votes - <%=spotlight.description%>
        -

        Top Albums:

        +

        Top Albums:

          <%Work.top_ten("album").each do |work|%>
        • @@ -23,7 +23,7 @@
        -

        Top Books:

        +

        Top Books:

          <%Work.top_ten("book").each do |work|%>
        • @@ -40,7 +40,7 @@
        -

        Top Movies:

        +

        Top Movies:

          <%@works.top_ten("movie").each do |work|%>
        • diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 08dda59ee2..fbf14844e6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,7 +11,10 @@
          -

          Media Ranker

          +

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

          <% if flash.count > 0 %>
          @@ -33,20 +36,19 @@
          -
          +
          + +
          <%= yield %> From b98bb34515c5b97ea31e533d88f4264edfc77461 Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Wed, 15 May 2019 10:51:33 -0700 Subject: [PATCH 47/49] travis yml --- test/fixtures/.travis.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 test/fixtures/.travis.yml diff --git a/test/fixtures/.travis.yml b/test/fixtures/.travis.yml new file mode 100644 index 0000000000..41f1dc5aec --- /dev/null +++ b/test/fixtures/.travis.yml @@ -0,0 +1,14 @@ +language: ruby + +rvm: + - 2.5.1 + +services: + - postgresql + +before_script: + - bin/rails db:create + - bin/rails db:migrate + +script: + - bin/rails test From b0970a4f8ec66c785186c6b8d0a2f4ad39bc360f Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Wed, 15 May 2019 11:00:36 -0700 Subject: [PATCH 48/49] moved travis.yml --- .DS_Store | Bin 0 -> 6148 bytes test/fixtures/.travis.yml => .travis.yml | 0 test/.DS_Store | Bin 0 -> 6148 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .DS_Store rename test/fixtures/.travis.yml => .travis.yml (100%) create mode 100644 test/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ca5d0e6e71945129431efcf086d0e96e397046d8 GIT binary patch literal 6148 zcmeH~F^f4mh3n7#7gpu zObo#Gk7);t0M>LTwjO3?%m>_Y#trxB_H+5ZUN2sxtvcW-eZ*`(w*@I61*Cu!kOER* zK?>wCzTPb8ne-@9Kng5F0slS}y0a!*XM8#sVgw)umczJ?S%NHHAZxO9vO=?*9xPie z#t^SZJ6ZC&nrxlD9hSp~<(h|QedXQN6$w;|Bv*)=KooXQYjz> z{+R+c98QNlUnys0#ZN42N+Z zy#%p&fY=MiL`G~;h30oST!G3H(PZm7Ps^K7U{5_s8I??fpZ1! zb2<0=|4jd<|34>bB?Y9wO(|fr<;!xxCsl2oJkD!vqrcKU=bP@vc~Ce+IVMIq=EBSI dV^Evl>;g}e7#)D4O&w%S9lLFUP;0GQL703Vp literal 0 HcmV?d00001 From 4601cd0fe9812f10c5fce5d910aa8ca8fa12ca9c Mon Sep 17 00:00:00 2001 From: Heather Izumi Date: Wed, 15 May 2019 11:03:08 -0700 Subject: [PATCH 49/49] updated gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 06eaeaebda..80be142348 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.3' +ruby '2.5.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.3'