From ac97967bf3f076bfdd648c98c1a8d44e7f19921f Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Tue, 9 Oct 2018 12:20:54 -0700 Subject: [PATCH 01/12] initial rails setup --- .gitignore | 27 ++ .ruby-version | 1 + Gemfile | 81 +++++ Gemfile.lock | 277 ++++++++++++++++++ Guardfile | 9 + README.md | 122 +------- Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 20 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.scss | 18 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 15 + app/views/layouts/mailer.html.erb | 13 + app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 36 +++ bin/spring | 17 ++ bin/update | 31 ++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 61 ++++ config/environments/production.rb | 94 ++++++ config/environments/test.rb | 46 +++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 ++ config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 +++ config/puma.rb | 34 +++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 +++++ public/422.html | 67 +++++ public/500.html | 66 +++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + storage/.keep | 0 test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 24 ++ tmp/.keep | 0 vendor/.keep | 0 81 files changed, 1419 insertions(+), 109 deletions(-) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.scss create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100755 bin/yarn create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..18b43c9cd2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +/node_modules +/yarn-error.log + +/public/assets +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000000..25c81fe399 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..6219256bd8 --- /dev/null +++ b/Gemfile @@ -0,0 +1,81 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-rails' +gem 'jquery-turbolinks' +gem 'bootstrap', '~> 4.1.3' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..2ed655c894 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,277 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.1) + actionpack (= 5.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.1) + actionview (= 5.2.1) + activesupport (= 5.2.1) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.1) + activesupport (= 5.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.1) + activesupport (= 5.2.1) + globalid (>= 0.3.6) + activemodel (5.2.1) + activesupport (= 5.2.1) + activerecord (5.2.1) + activemodel (= 5.2.1) + activesupport (= 5.2.1) + arel (>= 9.0) + activestorage (5.2.1) + actionpack (= 5.2.1) + activerecord (= 5.2.1) + marcel (~> 0.3.1) + activesupport (5.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + archive-zip (0.11.0) + io-like (~> 0.3.0) + arel (9.0.0) + autoprefixer-rails (9.1.4) + execjs + better_errors (2.5.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.3.2) + msgpack (~> 1.0) + bootstrap (4.1.3) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.9, < 2) + sass (>= 3.5.2) + builder (3.2.3) + byebug (10.0.2) + capybara (3.9.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + debug_inspector (0.0.3) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.25) + formatador (0.2.5) + globalid (0.4.1) + activesupport (>= 4.2.0) + guard (2.14.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.1.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.5) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.4) + multi_json (1.13.1) + nenv (0.3.0) + nio4r (2.3.1) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + notiffany (0.1.1) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.3) + popper_js (1.14.3) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.1) + actioncable (= 5.2.1) + actionmailer (= 5.2.1) + actionpack (= 5.2.1) + actionview (= 5.2.1) + activejob (= 5.2.1) + activemodel (= 5.2.1) + activerecord (= 5.2.1) + activestorage (= 5.2.1) + activesupport (= 5.2.1) + bundler (>= 1.3.0) + railties (= 5.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.1) + actionpack (= 5.2.1) + activesupport (= 5.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.6.0) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.14.1) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + shellany (0.0.1) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.19) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.1.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + bootstrap (~> 4.1.3) + byebug + capybara (>= 2.15) + chromedriver-helper + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.1) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 0000000000..e34f706f4a --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/README.md b/README.md index 24ee1d9971..7db80e4ca1 100644 --- a/README.md +++ b/README.md @@ -1,120 +1,24 @@ -# Media Ranker +# README -## Introduction +This README would normally document whatever steps are necessary to get the +application up and running. -In this project, you will build a webapp where users can vote for their favorite pieces of media. +Things you may want to cover: -In contrast to previous projects, instead of implementing a pre-defined spec you will be imitating an existing site: http://media-ranker-2-0.herokuapp.com. Your job is to match the functionality and styling of this site as closely as possible. +* Ruby version -This is an individual, [stage 2](https://github.com/Ada-Developers-Academy/pedagogy/blob/master/rule-of-three.md) project. +* System dependencies -This project is due **Monday October 15th**. +* Configuration -## Learning Goals +* Database creation -The purpose of this assignment is to reinforce the following concepts: +* Database initialization -- Previous Rails learning, including MVC, RESTful routing, and the request cycle -- Testing Rails applications -- Building complex model logic -- Using `session` and `flash` to track data between requests -- DRYing up Rails code +* How to run the test suite -## Before You Begin +* Services (job queues, cache servers, search engines, etc.) -### Provided Files +* Deployment instructions -- `db/media_seeds.csv`: Some starter media to work with -- `app/assets/images/owl.jpg`: The owl picture from the site - -### Regarding the Word "Media" - -The Rails inflector considers "media" to be the plural of "medium", which is not really what we mean here. You may want to choose a different word to represent "a book, movie or album" internally. The instructor-proved example site uses the word "work". - -## Project Requirements - -### Core Requirements - -Regardless of how you choose to implement this project or how much of it gets done, you should exhibit - -- Squeaky-clean **git hygiene**, including - - A fresh branch for each new feature - - Regular commits - - Descriptive commit messages -- Fanatical devotion to **test-driven development** - - Pseudocode first, then write the tests, then write code to make them pass -- Steadfast adherence to **agile development practices** - - User stories should be listed and prioritized using a Trello board - - The finished application should be deployed to Heroku (deploy early, deploy often) -- Unrelenting use of **semantic HTML** - -### Baseline - -We will begin with some in-class work, exploring the site and pondering implementation details. Before you start writing _any_ code, you should: - -- Explore the existing Media Ranker site to become familiar with the necessary functionality -- Create a Trello board to manage user stories -- Create an ERD for the models - -Then, once you have a solid plan for how to structure your project: - -- Fork and clone the repo -- Use `rails new .` to generate a new Rails project in the cloned directory - - Verify that the changes we've made to Rails' defaults (postgres as the DB, spec-style testing) have been applied -- `git add .` and `git commit -m "Initial Rails setup"` - -### Wave 1 - -In this wave, you should build some functionality, and then build the tests for that functionality. We recommend doing the read and create operations first, then writing tests, then completing the update and delete operations. - -Mimic the site's basic functionality around Media, without worrying (yet) about Users or Votes: -- Build a main page, with a list of the media for each category, as well as a spotlight section for the top media overall (don't worry about the top 10 part right now) -- Build an index page with a list of all works for each category -- Allow users to add new works -- Build a details page for each piece of media -- Allow users to edit and delete works - -#### Testing -**Before** moving on to Wave 2 you need to have model tests for: -- Presence of required attributes -- Uniqueness of attributes -- Valid values for specific attributes - -### Wave 2 - -Mimic the site's functionality around Users and Voting: -- Allow users to "log in" to the site, and use the `session` to keep track of which user is currently logged in for a given browser -- Allow users to vote for media, and sort media by vote count whenever a list of media is displayed -- Don't allow a user to vote for the same media more than once -- Allow the users to see the top 10 for each media type on the main page - -#### Testing -**Before** moving on to Wave 3 you need to have: -- Tests from Wave 1 passing -- Presence and uniqueness validation tests for any new models -- Relationship tests - -Focus on testing voting logic since this is the most complex part of Wave 2. - -#### A note on logging in - -Passwords and security are tricky! We'll talk about that sort of thing a little in the coming weeks, but for now you don't need to provide any sort of security. The user gives you a username, and your site should just trust them. - -### Wave 3 -- Add a list of voting users to the details page for each media -- Add a page for each user, as well as a page showing a summary of all users - -### Optional Enhancement Ideas - -Use Bootstrap and CSS to style the site to match the example. The layout as well as the look and feel should match as close as possible. - -Once your test coverage is comprehensive, your HTML is semantic, your user stories have all been moved to the `Done` column and your application has been deployed to Heroku, you may consider the following enhancements. - -1. DRY up your code as much as you can! Techniques worth investigating: - - Helper methods - - Controller filters -1. Build category-specific pages for `index` and `new` (e.g. `/books` or `/movies/new`). These should be as DRY as possible. You might be interested in investigating _polymorphic routes_. -1. Add a [recommendation system](https://www.toptal.com/algorithms/predicting-likes-inside-a-simple-recommendation-engine) that suggests media to a user based on what they have previously voted for. - -## What we're looking for -You can find what instructors will be looking for in the [feedback](feedback.md) markdown document. +* ... 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..68b11d0bf5 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +0yycj9+/D+41hiud2rM+zLb5sX8QPpnBQU8mbLb0lGpCqhf6DOOQJG7nhOzysebIYS91Pi5zX2sjvcyxVa1AWs2Xew60/fGh4Zim0ethK9cP3qXbYW3lwOYo68+ph5jwmvLbsjTjfFnI3tziWcNMow+tHbSr2nJd8Rur7meTm0X/E2+NuSRQ47eioZAJ4g5QJgcnG4EyXYPZjWNJsXwGWs+Z5nF0eDMYlAUvlNIttDkvI7I7FOrsevNE6Mbxm256P+oczCO1SKValI51FoS3ll0r1SmCezeXakBhWZ59kx6CesvSU8uRfe8Tb6IpnQmjPFIZhAjPk0gxp6dcHWjvI4UaI8dKCJLDmsb/g6+6S3iIV8EnDlUjPKf6FlcnOWdXAVwF5Jmd4Je264QmjVXcZLUfqqxE7IVyEVJ6--ibX3DWh9B6CpvIcg--tN8ZkEUOKRITCsYhXtxXaw== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000000..0bd2511123 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: MediaRanker_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: MediaRanker + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: MediaRanker_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: MediaRanker_production + username: MediaRanker + password: <%= ENV['MEDIARANKER_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 0000000000..426333bb46 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 0000000000..1311e3e4ef --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000000..bd39d9d752 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "MediaRanker_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 0000000000..0a38fd3ce9 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000000..89d2efab2b --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000000..4b828e80cb --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000000..59385cdf37 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 0000000000..d3bcaa5ec8 --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 0000000000..5a6a32d371 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 0000000000..4a994e1e7b --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 0000000000..ac033bf9dc --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 0000000000..dc1899682b --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000000..bbfc3961bf --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 0000000000..decc5a8573 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 0000000000..a5eccf816b --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000000..787824f888 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000000..9fa7863f99 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 0000000000..d32f76e8fb --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000000..1beea2accd --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/log/.keep b/log/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/package.json b/package.json new file mode 100644 index 0000000000..625900f9d8 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "MediaRanker", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000000..2be3af26fc --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

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

+
+

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

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

The change you wanted was rejected.

+

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

+
+

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

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

We're sorry, but something went wrong.

+
+

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

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000000..37b576a4a0 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/system/.keep b/test/system/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000000..2b5172a7d6 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From 64c4ac162eb4f6f334255963b6d4feef563f905f Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Tue, 9 Oct 2018 15:09:56 -0700 Subject: [PATCH 02/12] set up models and controllers --- app/assets/javascripts/users.js | 2 + app/assets/javascripts/votes.js | 2 + app/assets/javascripts/works.js | 2 + app/assets/stylesheets/users.scss | 3 ++ app/assets/stylesheets/votes.scss | 3 ++ app/assets/stylesheets/works.scss | 3 ++ app/controllers/users_controller.rb | 2 + app/controllers/votes_controller.rb | 2 + app/controllers/works_controller.rb | 38 ++++++++++++++++ app/helpers/users_helper.rb | 2 + app/helpers/votes_helper.rb | 2 + app/helpers/works_helper.rb | 2 + app/models/user.rb | 3 ++ app/models/vote.rb | 4 ++ app/models/work.rb | 3 ++ config/routes.rb | 3 ++ db/migrate/20181009215727_create_users.rb | 8 ++++ db/migrate/20181009215902_create_works.rb | 12 ++++++ db/migrate/20181009215926_create_votes.rb | 8 ++++ ...0181009220004_remove_username_from_work.rb | 5 +++ .../20181009220049_add_username_to_user.rb | 5 +++ .../20181009220337_add_user_id_to_vote.rb | 5 +++ .../20181009220423_add_work_id_to_vote.rb | 5 +++ db/schema.rb | 43 +++++++++++++++++++ test/controllers/users_controller_test.rb | 7 +++ test/controllers/votes_controller_test.rb | 7 +++ test/controllers/works_controller_test.rb | 7 +++ test/fixtures/users.yml | 11 +++++ test/fixtures/votes.yml | 11 +++++ test/fixtures/works.yml | 13 ++++++ test/models/user_test.rb | 9 ++++ test/models/vote_test.rb | 9 ++++ test/models/work_test.rb | 9 ++++ 33 files changed, 250 insertions(+) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/javascripts/votes.js create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/assets/stylesheets/votes.scss create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/controllers/votes_controller.rb create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/helpers/votes_helper.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/models/user.rb create mode 100644 app/models/vote.rb create mode 100644 app/models/work.rb create mode 100644 db/migrate/20181009215727_create_users.rb create mode 100644 db/migrate/20181009215902_create_works.rb create mode 100644 db/migrate/20181009215926_create_votes.rb create mode 100644 db/migrate/20181009220004_remove_username_from_work.rb create mode 100644 db/migrate/20181009220049_add_username_to_user.rb create mode 100644 db/migrate/20181009220337_add_user_id_to_vote.rb create mode 100644 db/migrate/20181009220423_add_work_id_to_vote.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/controllers/votes_controller_test.rb create mode 100644 test/controllers/works_controller_test.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/fixtures/votes.yml create mode 100644 test/fixtures/works.yml create mode 100644 test/models/user_test.rb create mode 100644 test/models/vote_test.rb create mode 100644 test/models/work_test.rb diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/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/javascripts/works.js b/app/assets/javascripts/works.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/works.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..31a2eacb84 --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/votes.scss b/app/assets/stylesheets/votes.scss new file mode 100644 index 0000000000..9a6720f80e --- /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/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss new file mode 100644 index 0000000000..5618452f3e --- /dev/null +++ b/app/assets/stylesheets/works.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Works controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..3e74dea87f --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,2 @@ +class UsersController < ApplicationController +end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb new file mode 100644 index 0000000000..ffdb2760e0 --- /dev/null +++ b/app/controllers/votes_controller.rb @@ -0,0 +1,2 @@ +class VotesController < ApplicationController +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..9bd7909b05 --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,38 @@ +class WorksController < ApplicationController + def index + @works = Work.all + end + + def edit + @work = Work.find_by(id: params[:id]) + end + + def new + @work = Work.new + end + + def destroy + work = Work.find_by(id: params[:id]) + work.destroy + redirect_to root_path + end + + def create + end + + def show + work_id = params[:id] + @work= Work.find_by(id: work_id) + if @work.nil? + head :not_found + end + end + + def update + @work = Work.find(params[:id]) + @work.update(work_params) + redirect_to works_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/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/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/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..db11855600 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,3 @@ +class User < ApplicationRecord + has_many :votes +end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..b8b6f9f0aa --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,4 @@ +class Vote < ApplicationRecord + belongs_to :user + belongs_to :work +end diff --git a/app/models/work.rb b/app/models/work.rb new file mode 100644 index 0000000000..0ee427352c --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,3 @@ +class Work < ApplicationRecord + has_many :votes +end diff --git a/config/routes.rb b/config/routes.rb index 787824f888..75b6f2d00b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + resources :works + end diff --git a/db/migrate/20181009215727_create_users.rb b/db/migrate/20181009215727_create_users.rb new file mode 100644 index 0000000000..8006900e1a --- /dev/null +++ b/db/migrate/20181009215727_create_users.rb @@ -0,0 +1,8 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20181009215902_create_works.rb b/db/migrate/20181009215902_create_works.rb new file mode 100644 index 0000000000..bfbeab2103 --- /dev/null +++ b/db/migrate/20181009215902_create_works.rb @@ -0,0 +1,12 @@ +class CreateWorks < ActiveRecord::Migration[5.2] + def change + create_table :works do |t| + t.string :username + t.integer :published_year + t.string :description + t.string :category + + t.timestamps + end + end +end diff --git a/db/migrate/20181009215926_create_votes.rb b/db/migrate/20181009215926_create_votes.rb new file mode 100644 index 0000000000..aa134a1296 --- /dev/null +++ b/db/migrate/20181009215926_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/20181009220004_remove_username_from_work.rb b/db/migrate/20181009220004_remove_username_from_work.rb new file mode 100644 index 0000000000..460146896f --- /dev/null +++ b/db/migrate/20181009220004_remove_username_from_work.rb @@ -0,0 +1,5 @@ +class RemoveUsernameFromWork < ActiveRecord::Migration[5.2] + def change + remove_column :works, :username + end +end diff --git a/db/migrate/20181009220049_add_username_to_user.rb b/db/migrate/20181009220049_add_username_to_user.rb new file mode 100644 index 0000000000..3eaae16607 --- /dev/null +++ b/db/migrate/20181009220049_add_username_to_user.rb @@ -0,0 +1,5 @@ +class AddUsernameToUser < ActiveRecord::Migration[5.2] + def change + add_column :users, :username, :string + end +end diff --git a/db/migrate/20181009220337_add_user_id_to_vote.rb b/db/migrate/20181009220337_add_user_id_to_vote.rb new file mode 100644 index 0000000000..7749413a50 --- /dev/null +++ b/db/migrate/20181009220337_add_user_id_to_vote.rb @@ -0,0 +1,5 @@ +class AddUserIdToVote < ActiveRecord::Migration[5.2] + def change + add_reference :votes, :user, foreign_key: true + end +end diff --git a/db/migrate/20181009220423_add_work_id_to_vote.rb b/db/migrate/20181009220423_add_work_id_to_vote.rb new file mode 100644 index 0000000000..d9ec58ed5a --- /dev/null +++ b/db/migrate/20181009220423_add_work_id_to_vote.rb @@ -0,0 +1,5 @@ +class AddWorkIdToVote < ActiveRecord::Migration[5.2] + def change + add_reference :votes, :work, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..377dce8f39 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,43 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2018_10_09_220423) 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "username" + 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.integer "published_year" + t.string "description" + t.string "category" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + add_foreign_key "votes", "users" + add_foreign_key "votes", "works" +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 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/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..d95073c22e --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe WorksController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..dc3ee79b5d --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/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/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..30ce0ff593 --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + username: MyString + published_year: 1 + description: MyString + category: MyString + +two: + username: MyString + published_year: 1 + description: MyString + category: MyString diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..cc862ac2d9 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe User do + let(:user) { User.new } + + it "must be valid" do + value(user).must_be :valid? + end +end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb new file mode 100644 index 0000000000..fc15947bd3 --- /dev/null +++ b/test/models/vote_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Vote do + let(:vote) { Vote.new } + + it "must be valid" do + value(vote).must_be :valid? + end +end diff --git a/test/models/work_test.rb b/test/models/work_test.rb new file mode 100644 index 0000000000..f6fba7104d --- /dev/null +++ b/test/models/work_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Work do + let(:work) { Work.new } + + it "must be valid" do + value(work).must_be :valid? + end +end From 4369046fd0d0b5b9000a77850b5a0ea7bbfc7d6e Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Wed, 10 Oct 2018 15:52:06 -0700 Subject: [PATCH 03/12] add new, edit, show for works --- app/controllers/works_controller.rb | 25 ++++++++++++++-- app/views/layouts/application.html.erb | 30 +++++++++++++------ app/views/works/_work_form.html.erb | 23 ++++++++++++++ app/views/works/edit.html.erb | 7 +++++ app/views/works/index.html.erb | 10 +++++++ app/views/works/new.html.erb | 7 +++++ app/views/works/show.html.erb | 19 ++++++++++++ config/routes.rb | 2 +- .../20181009222035_add_creator_to_works.rb | 5 ++++ ...222418_remove_published_year_from_works.rb | 5 ++++ ...009222509_add_publication_year_to_works.rb | 5 ++++ .../20181009230535_add_title_to_works.rb | 5 ++++ db/schema.rb | 6 ++-- db/seeds.rb | 21 +++++++++++++ 14 files changed, 155 insertions(+), 15 deletions(-) create mode 100644 app/views/works/_work_form.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 db/migrate/20181009222035_add_creator_to_works.rb create mode 100644 db/migrate/20181009222418_remove_published_year_from_works.rb create mode 100644 db/migrate/20181009222509_add_publication_year_to_works.rb create mode 100644 db/migrate/20181009230535_add_title_to_works.rb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 9bd7909b05..cc953e8f85 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -17,9 +17,6 @@ def destroy redirect_to root_path end - def create - end - def show work_id = params[:id] @work= Work.find_by(id: work_id) @@ -34,5 +31,27 @@ def update redirect_to works_path end + def create + filtered_params = work_params() + @work = Work.new(filtered_params) + save_success = @work.save + if save_success + redirect_to works_path + else + render :new + end + end + private + + def work_params + return params.require(:work).permit( + :title, + :creator, + :description, + :publication_year, + :category, + ) + end + end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f32268a271..afcad7ba5b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,15 +1,27 @@ - - MediaRanker - <%= csrf_meta_tags %> - <%= csp_meta_tag %> + + 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' %> - + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + - + +
+ +
+
<%= yield %> - +
+
+
+ diff --git a/app/views/works/_work_form.html.erb b/app/views/works/_work_form.html.erb new file mode 100644 index 0000000000..f41497ebbc --- /dev/null +++ b/app/views/works/_work_form.html.erb @@ -0,0 +1,23 @@ +<%= form_with model: @work, class: 'work-form' do |f| %> + +

<%= form_with %>

+ + <%= f.label :category %> + <%= f.select :from, [ 'album ','book','tv' ], :prompt => 'Select One' %> + + <%= f.label :title %> + <%= f.text_field :title %> + + <%= f.label :creator %> + <%= f.text_field :creator %> + + <%= f.label :publication_year %> + <%= f.text_field :publication_year %> + + <%= f.label :description %> + <%= f.text_field :description %> + + + <%= f.submit action_type, class: "work-form-submit-button" %> + +<% end %> diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..8dc701f310 --- /dev/null +++ b/app/views/works/edit.html.erb @@ -0,0 +1,7 @@ +

<%= "Edit This #{@work.category}" %>

+ +<%= render partial: "work_form", locals: { + action_type: "Submit Changes", + form_title: "Update work" + } +%> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..e4b9fd8b04 --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1,10 @@ +
+

WORKS

+
    + <%@works.each_with_index do |work, index| %> +
  • + <%=link_to "#{index +1}. " + work.title, work_path(work.id)%> +
    • + <% end %> +
+
diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb new file mode 100644 index 0000000000..9c78c6f45a --- /dev/null +++ b/app/views/works/new.html.erb @@ -0,0 +1,7 @@ +

Add a new work

+ +<%= render partial: "work_form", locals: { + action_type: "Submit", + form_title: "New!" + } +%> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb new file mode 100644 index 0000000000..abac5b67b4 --- /dev/null +++ b/app/views/works/show.html.erb @@ -0,0 +1,19 @@ +

<%= "#{@work.title}"%>

+ + +

+ +

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

+

Published: <%= @work.publication_year %>

+

<%= @work.description %>

+ + +

+
+ + <%= link_to "Back to media ranks", root_path %> + <%= link_to "Edit", edit_work_path(@work.id) %> + <%= link_to "Delete", @work, method: :delete, data: { confirm: "Are you sure that you want to delete?" } %> + + +
diff --git a/config/routes.rb b/config/routes.rb index 75b6f2d00b..df3e30527b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root 'works#index' resources :works - end diff --git a/db/migrate/20181009222035_add_creator_to_works.rb b/db/migrate/20181009222035_add_creator_to_works.rb new file mode 100644 index 0000000000..236b7393bc --- /dev/null +++ b/db/migrate/20181009222035_add_creator_to_works.rb @@ -0,0 +1,5 @@ +class AddCreatorToWorks < ActiveRecord::Migration[5.2] + def change + add_column :works, :creator, :string + end +end diff --git a/db/migrate/20181009222418_remove_published_year_from_works.rb b/db/migrate/20181009222418_remove_published_year_from_works.rb new file mode 100644 index 0000000000..5aff4f3555 --- /dev/null +++ b/db/migrate/20181009222418_remove_published_year_from_works.rb @@ -0,0 +1,5 @@ +class RemovePublishedYearFromWorks < ActiveRecord::Migration[5.2] + def change + remove_column :works, :published_year + end +end diff --git a/db/migrate/20181009222509_add_publication_year_to_works.rb b/db/migrate/20181009222509_add_publication_year_to_works.rb new file mode 100644 index 0000000000..a073f069d9 --- /dev/null +++ b/db/migrate/20181009222509_add_publication_year_to_works.rb @@ -0,0 +1,5 @@ +class AddPublicationYearToWorks < ActiveRecord::Migration[5.2] + def change + add_column :works, :publication_year, :integer + end +end diff --git a/db/migrate/20181009230535_add_title_to_works.rb b/db/migrate/20181009230535_add_title_to_works.rb new file mode 100644 index 0000000000..c701c346e3 --- /dev/null +++ b/db/migrate/20181009230535_add_title_to_works.rb @@ -0,0 +1,5 @@ +class AddTitleToWorks < ActiveRecord::Migration[5.2] + def change + add_column :works, :title, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 377dce8f39..cb4c056d86 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_10_09_220423) do +ActiveRecord::Schema.define(version: 2018_10_09_230535) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -31,11 +31,13 @@ end create_table "works", force: :cascade do |t| - t.integer "published_year" t.string "description" t.string "category" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "creator" + t.integer "publication_year" + t.string "title" end add_foreign_key "votes", "users" diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..6f9bbd8851 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,24 @@ # # 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 driver data from #{WORKS_FILE}" + +work_failures = [] +CSV.foreach(WORKS_FILE, :headers => true) do |row| + work = Work.new + work.id = row['id'] + work.title = row['title'] + work.category = row['category'] + 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 From 5bfa63ab66701382f97fb180d09e8af1110c58e0 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Fri, 12 Oct 2018 14:36:41 -0700 Subject: [PATCH 04/12] add validations and tests for works --- app/controllers/users_controller.rb | 60 ++++++++++++++++++++++++++++- app/controllers/votes_controller.rb | 51 ++++++++++++++++++++++++ app/controllers/works_controller.rb | 8 ++++ app/models/user.rb | 1 + app/models/vote.rb | 2 + app/models/work.rb | 8 +++- app/views/works/show.html.erb | 5 ++- config/routes.rb | 7 +++- test/fixtures/works.yml | 8 ++-- test/models/work_test.rb | 19 +++++++-- test/test_helper.rb | 3 +- 11 files changed, 159 insertions(+), 13 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3e74dea87f..6dabc3fd55 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,2 +1,60 @@ class UsersController < ApplicationController -end + def create + @vote = Vote.new(vote_params) + @vote.work = Work.find(params[:work_id]) + if @vote.save + respond_to do |format| + format.html { redirect_to @vote.work } + end + end + end + + + # def create + # vote = Vote.new(vote_params) + # if vote.save + # #do something + # else + # # flash that something went wrong + # end + # end + + def index + @votes = Vote.all + end + + def edit + @vote = Vote.find_by(id: params[:id]) + end + + def new + @vote = Vote.new + end + + def destroy + vote = Vote.find_by(id: params[:id]) + vote.destroy + redirect_to root_path + end + + def show + vote_id = params[:id] + @vote= Vote.find_by(id: work_id) + if @vote.nil? + head :not_found + end + end + + def update + @vote = Vote.find(params[:id]) + @vote.update(work_params) + redirect_to works_path + end + + private + + def user_params + return params.require(:user).permit( + :vote) + end + end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index ffdb2760e0..e83a29eae7 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,2 +1,53 @@ class VotesController < ApplicationController + + def create + @vote = Vote.new(vote_params) + @vote.work = Work.find(params[:work_id]) + if @vote.save + respond_to do |format| + format.html { redirect_to @vote.work } + end + end + end + + def index + @votes = Vote.all + end + + def edit + @vote = Vote.find_by(id: params[:id]) + end + + def new + @vote = Vote.new + end + + def destroy + vote = Vote.find_by(id: params[:id]) + vote.destroy + redirect_to root_path + end + + def show + vote_id = params[:id] + @vote= Vote.find_by(id: work_id) + if @vote.nil? + head :not_found + end + end + + def update + @vote = Vote.find(params[:id]) + @vote.update(work_params) + redirect_to works_path + end + + private + + def vote_params + return params.permit( + :user, + :work_id) + end + end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index cc953e8f85..d3801fc0fa 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -41,6 +41,13 @@ def create render :new end end + + def vote + @work = Work.find(params[:id]) + @work.votes.create + redirect_to(works_path) + end + private def work_params @@ -50,6 +57,7 @@ def work_params :description, :publication_year, :category, + :vote ) end diff --git a/app/models/user.rb b/app/models/user.rb index db11855600..94b4a8dca3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,3 +1,4 @@ class User < ApplicationRecord has_many :votes + has_many :liked_posts, through: :votes end diff --git a/app/models/vote.rb b/app/models/vote.rb index b8b6f9f0aa..fdddcc4117 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,4 +1,6 @@ class Vote < ApplicationRecord belongs_to :user belongs_to :work + validates :work, uniqueness: { scope: :user } + validates :user, uniqueness: { scope: :work } end diff --git a/app/models/work.rb b/app/models/work.rb index 0ee427352c..3a4e3a71bd 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,3 +1,9 @@ class Work < ApplicationRecord - has_many :votes + has_many :votes, dependent: :destroy + validates :title, presence: true + + def score + votes.count + end + end diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index abac5b67b4..38afa263a2 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -10,10 +10,11 @@

- <%= link_to "Back to media ranks", root_path %> <%= link_to "Edit", edit_work_path(@work.id) %> <%= link_to "Delete", @work, method: :delete, data: { confirm: "Are you sure that you want to delete?" } %> - +<%= form_for @work.votes.build do |f| %> + <%= f.submit 'Vote', class: 'vote-submit' %> +<% end %>
diff --git a/config/routes.rb b/config/routes.rb index df3e30527b..5c343f1fd8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,5 +2,10 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root 'works#index' - resources :works + resources :works do + resources :votes, only: [:create, :destroy] + end + + resources :votes + end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 30ce0ff593..35c37b5b18 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - username: MyString - published_year: 1 + title: MyString + publication_year: 1 description: MyString category: MyString two: - username: MyString - published_year: 1 + title: MyString + publication_year: 1 description: MyString category: MyString diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..e73afa8ee8 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,9 +1,22 @@ require "test_helper" describe Work do - let(:work) { Work.new } + describe 'validations' do + before do + # Arrange + @work = Work.new(title: 'test') + end - it "must be valid" do - value(work).must_be :valid? + it 'is invalid without a title' do + # Arrange + @work.title = nil + + # Act + result = @work.valid? + + # Assert + expect(result).must_equal false + expect(@work.errors.messages).must_include :title + end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d6..fb7dd505e2 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 8fc16aeed22b016248118d43e50876c7dc84fb8a Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Fri, 12 Oct 2018 14:46:14 -0700 Subject: [PATCH 05/12] add validation tests for user, pass --- app/models/user.rb | 2 ++ test/models/user_test.rb | 47 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 94b4a8dca3..7d19ea840c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,4 +1,6 @@ class User < ApplicationRecord has_many :votes + has_many :works has_many :liked_posts, through: :votes + validates :username, presence: true, uniqueness: true end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..6147660986 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,50 @@ require "test_helper" describe User do - let(:user) { User.new } + describe 'validations' do + before do + @user = User.new(username: 'test') + end - it "must be valid" do - value(user).must_be :valid? + it 'is invalid without a username' do + @user.username = nil + + result = @user.valid? + + expect(result).must_equal false + expect( @user.errors.messages ).must_include :username + + end + + it 'is invalid with a non-unique username' do + @user.username = User.first.username + result = @user.valid? + expect(result).must_equal false + expect( @user.errors.messages ).must_include :username + end end end + + +# require "test_helper" +# +# describe Work do +# describe 'validations' do +# before do +# # Arrange +# @work = Work.new(title: 'test') +# end +# +# it 'is invalid without a title' do +# # Arrange +# @work.title = nil +# +# # Act +# result = @work.valid? +# +# # Assert +# expect(result).must_equal false +# expect(@work.errors.messages).must_include :title +# end +# end +# end From 39ca8a59a96da5dfce0f794584d193fa10eac0e4 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Fri, 12 Oct 2018 17:31:15 -0700 Subject: [PATCH 06/12] add user functionality --- app/assets/javascripts/sessions.js | 2 + app/assets/stylesheets/sessions.scss | 3 ++ app/controllers/application_controller.rb | 9 ++++ app/controllers/sessions_controller.rb | 26 +++++++++++ app/controllers/users_controller.rb | 45 ++++---------------- app/helpers/sessions_helper.rb | 2 + app/views/layouts/application.html.erb | 23 +++++++++- app/views/sessions/new.html.erb | 7 +++ app/views/users/edit.html.erb | 0 app/views/users/index.html.erb | 10 +++++ app/views/users/new.html.erb | 1 + app/views/users/show.html.erb | 2 + config/routes.rb | 6 +++ test/controllers/sessions_controller_test.rb | 7 +++ 14 files changed, 106 insertions(+), 37 deletions(-) create mode 100644 app/assets/javascripts/sessions.js create mode 100644 app/assets/stylesheets/sessions.scss create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/helpers/sessions_helper.rb create mode 100644 app/views/sessions/new.html.erb create mode 100644 app/views/users/edit.html.erb create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/new.html.erb create mode 100644 app/views/users/show.html.erb create mode 100644 test/controllers/sessions_controller_test.rb diff --git a/app/assets/javascripts/sessions.js b/app/assets/javascripts/sessions.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/sessions.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/sessions.scss new file mode 100644 index 0000000000..ccb1ed25b2 --- /dev/null +++ b/app/assets/stylesheets/sessions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Sessions controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12ab..ec0921d04b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,11 @@ class ApplicationController < ActionController::Base + + before_action :find_logged_in_user + + private + + def find_logged_in_user + @logged_in_user = User.find_by(id: session[:user_id]) + end + end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..5d7c1de7c3 --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,26 @@ +class SessionsController < ApplicationController + def new + @user = User.new + end + + def create + name = params[:username] + @user = User.find_by(username: name) + + if @user + flash[:success] = "Successfully logged in as #{name}" + session[:user_id] = @user.id + redirect_to root_path + else + @user = User.new(username: name) + @user.save + redirect_to root_path + end + end + + def logout + session[:user_id] = nil + flash[:success] = "Successfully logged out" + redirect_to root_path + end +end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6dabc3fd55..dc8ae3502b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,53 +1,26 @@ class UsersController < ApplicationController - def create - @vote = Vote.new(vote_params) - @vote.work = Work.find(params[:work_id]) - if @vote.save - respond_to do |format| - format.html { redirect_to @vote.work } - end - end - end - - - # def create - # vote = Vote.new(vote_params) - # if vote.save - # #do something - # else - # # flash that something went wrong - # end - # end - def index - @votes = Vote.all + @users = User.all end def edit - @vote = Vote.find_by(id: params[:id]) - end - - def new - @vote = Vote.new + @user = User.find_by(id: params[:id]) end def destroy - vote = Vote.find_by(id: params[:id]) - vote.destroy + @user = User.find_by(id: params[:id]) + @user.destroy redirect_to root_path end def show - vote_id = params[:id] - @vote= Vote.find_by(id: work_id) - if @vote.nil? - head :not_found - end + @user = User.find_by(id: params[:id]) + user_id = params[:id] end def update - @vote = Vote.find(params[:id]) - @vote.update(work_params) + @user = User.find(params[:id]) + @user.update(work_params) redirect_to works_path end @@ -55,6 +28,6 @@ def update def user_params return params.require(:user).permit( - :vote) + :username) end end diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb new file mode 100644 index 0000000000..309f8b2eb3 --- /dev/null +++ b/app/helpers/sessions_helper.rb @@ -0,0 +1,2 @@ +module SessionsHelper +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index afcad7ba5b..885662e3ba 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -15,9 +15,30 @@ <%= link_to "View top media ", root_path %> <%= link_to "View all media ", root_path %> <%= link_to "Add a new work", new_work_path %> - <%= link_to "View all users", root_path %> + <%= link_to "View all users", users_path %> + + + +
+ <% flash.each do |key, message| %> + <% alert_class = key == "error" ? "danger" : key %> +

+ <%= message %> +

+ <% end %> +
<%= yield %>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb new file mode 100644 index 0000000000..99660de5dc --- /dev/null +++ b/app/views/sessions/new.html.erb @@ -0,0 +1,7 @@ + +<%= form_with method: :post, url: sessions_path do |f| %> + <%= f.label :username %> + <%= f.text_field :username %> + + <%= f.submit %> +<% end %> diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..3b5750d405 --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1,10 @@ +
+

List of users

+
    + <% @users.each_with_index do |user, index| %> +
  • + <%=link_to "#{index +1}. " + user.username, user_path(user.id)%> +
    • + <% end %> +
+
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb new file mode 100644 index 0000000000..ffcaf65f68 --- /dev/null +++ b/app/views/users/new.html.erb @@ -0,0 +1 @@ +

New User

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

User Summary: <%="#{@user.username}"%>

+

Joined site since: <%="#{@user.created_at.strftime("%b %d, %Y")}" %>

diff --git a/config/routes.rb b/config/routes.rb index 5c343f1fd8..8d761c2176 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,4 +8,10 @@ resources :votes + resources :sessions, only: [:new, :create] + post '/sessions/logout', to: 'sessions#logout', as: 'logout' + + resources :users + + get '/login', to: 'users#new' end diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb new file mode 100644 index 0000000000..c2632a720b --- /dev/null +++ b/test/controllers/sessions_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe SessionsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 631b7159d579a74c47c8c3018ebd2c40540344ec Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Fri, 12 Oct 2018 17:46:03 -0700 Subject: [PATCH 07/12] add fixtures for users and work --- app/models/user.rb | 2 -- test/fixtures/users.yml | 8 +++----- test/fixtures/works.yml | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 7d19ea840c..ae233d1ae1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,4 @@ class User < ApplicationRecord has_many :votes - has_many :works - has_many :liked_posts, through: :votes validates :username, presence: true, uniqueness: true end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index dc3ee79b5d..d942975c52 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -4,8 +4,6 @@ # 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 +user_1: { + username: user_1 + } diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 35c37b5b18..48dd5e84ca 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - publication_year: 1 - description: MyString - category: MyString +work_one: + title: work_one + publication_year: 2000 + description: A description of my work + category: Album -two: - title: MyString - publication_year: 1 - description: MyString - category: MyString +work_two: + title: work_two + publication_year: 2001 + description: A description of my second work + category: Movie From 1869d6a9a765b10af7e834ee5cb860221b423684 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Sun, 14 Oct 2018 21:13:55 -0700 Subject: [PATCH 08/12] implement voting --- app/controllers/votes_controller.rb | 48 -------------------------- app/controllers/works_controller.rb | 25 ++++++++++---- app/models/work.rb | 4 --- app/views/layouts/application.html.erb | 2 +- app/views/works/show.html.erb | 6 ++-- config/routes.rb | 9 ++--- 6 files changed, 25 insertions(+), 69 deletions(-) diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index e83a29eae7..201625717d 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,53 +1,5 @@ class VotesController < ApplicationController - - def create - @vote = Vote.new(vote_params) - @vote.work = Work.find(params[:work_id]) - if @vote.save - respond_to do |format| - format.html { redirect_to @vote.work } - end - end - end - def index @votes = Vote.all end - - def edit - @vote = Vote.find_by(id: params[:id]) - end - - def new - @vote = Vote.new - end - - def destroy - vote = Vote.find_by(id: params[:id]) - vote.destroy - redirect_to root_path - end - - def show - vote_id = params[:id] - @vote= Vote.find_by(id: work_id) - if @vote.nil? - head :not_found - end - end - - def update - @vote = Vote.find(params[:id]) - @vote.update(work_params) - redirect_to works_path - end - - private - - def vote_params - return params.permit( - :user, - :work_id) - end - end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index d3801fc0fa..fff17f07bc 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,4 +1,6 @@ class WorksController < ApplicationController + before_action :find_work, only: [:show, :edit, :update, :destroy, :vote] + def index @works = Work.all end @@ -43,13 +45,23 @@ def create end def vote - @work = Work.find(params[:id]) - @work.votes.create - redirect_to(works_path) + if @logged_in_user + if @logged_in_user.votes.find_by(work_id: @work.id) + flash[:warning] = "A problem occurred: cannot vote twice" + redirect_back fallback_location: work_path + else + @vote = Vote.create(user_id: @logged_in_user.id, work_id: @work.id) + @vote = @vote.save + flash[:success] = "success" + redirect_back fallback_location: work_path + end + else flash[:warning] = "A problem occurred: You must log in to do that" + end end private + def work_params return params.require(:work).permit( :title, @@ -57,9 +69,10 @@ def work_params :description, :publication_year, :category, - :vote + ) end - - + def find_work + @work = Work.find_by(id: params[:id]) + end end diff --git a/app/models/work.rb b/app/models/work.rb index 3a4e3a71bd..e90346ede6 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -2,8 +2,4 @@ class Work < ApplicationRecord has_many :votes, dependent: :destroy validates :title, presence: true - def score - votes.count - end - end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 885662e3ba..6de7a6f31d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -26,7 +26,7 @@ <%= link_to "Log out", logout_path, method: :post, class: "btn btn-outline-info" %>

<% else %> - <%= link_to "Log in", new_session_path, class: "btn btn-outline-info" %> + <%= link_to "Log in", login_path, class: "btn btn-outline-info" %> <% end %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 38afa263a2..4fb53fd10d 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -13,8 +13,6 @@ <%= link_to "Back to media ranks", root_path %> <%= link_to "Edit", edit_work_path(@work.id) %> <%= link_to "Delete", @work, method: :delete, data: { confirm: "Are you sure that you want to delete?" } %> - -<%= form_for @work.votes.build do |f| %> - <%= f.submit 'Vote', class: 'vote-submit' %> -<% end %> + <%= button_to '+1', vote_work_path(@work.id) %> + <%= @work.votes.length %> votes for this <%= @work.category %> diff --git a/config/routes.rb b/config/routes.rb index 8d761c2176..d486ba3017 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,16 +2,13 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root 'works#index' - resources :works do - resources :votes, only: [:create, :destroy] - end - - resources :votes + resources :works + post '/works/:id/vote', to: 'works#vote', as: 'vote_work' resources :sessions, only: [:new, :create] post '/sessions/logout', to: 'sessions#logout', as: 'logout' resources :users - get '/login', to: 'users#new' + get '/login', to: 'sessions#new' end From 045630a620e405292050eb6def75d363671d8cd4 Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Mon, 15 Oct 2018 18:14:07 -0700 Subject: [PATCH 09/12] implement sorting methods in work model --- app/controllers/works_controller.rb | 7 +++++++ app/models/work.rb | 16 ++++++++++++++++ app/views/works/index.html.erb | 4 ++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index fff17f07bc..a2dd693664 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -59,6 +59,12 @@ def vote end end + def sort + @album = sort_works.album + + end + + private @@ -72,6 +78,7 @@ def work_params ) end + def find_work @work = Work.find_by(id: params[:id]) end diff --git a/app/models/work.rb b/app/models/work.rb index e90346ede6..10f111bf0f 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -2,4 +2,20 @@ class Work < ApplicationRecord has_many :votes, dependent: :destroy validates :title, presence: true + def sort_works(category) + works = Work.where(category: category) + sorted_works = works.sort_by {|work| work.votes.count} + return sorted.works.reverse + end + + def list_top_ten(category) + works = Work.sort_works(category) + return works[0..9] + end + + def find_top_work + works = Work.all + work = works.sort_by {|work| work.votes.count} + return work[-1] + end end diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index e4b9fd8b04..5af3211897 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,9 +1,9 @@

WORKS

    - <%@works.each_with_index do |work, index| %> + <%@albums.each do |work| %>
  • - <%=link_to "#{index +1}. " + work.title, work_path(work.id)%> + <%=link_to "1" + work.title, work_path(work.id)%>
    • <% end %>
From e231a22853c7f6ca3bd93d8d9e1a5090c10c3fef Mon Sep 17 00:00:00 2001 From: Naheed Arang Date: Mon, 15 Oct 2018 19:02:44 -0700 Subject: [PATCH 10/12] add home controller, add some styling --- app/assets/javascripts/home.js | 2 + app/assets/stylesheets/home.scss | 3 + app/controllers/home_controller.rb | 4 + app/helpers/home_helper.rb | 2 + app/models/work.rb | 8 +- app/views/home/index.html.erb | 64 ++++++++++++++++ app/views/layouts/application.html.erb | 9 ++- app/views/works/index.html.erb | 97 +++++++++++++++++++++--- config/routes.rb | 2 +- test/controllers/home_controller_test.rb | 7 ++ 10 files changed, 180 insertions(+), 18 deletions(-) create mode 100644 app/assets/javascripts/home.js create mode 100644 app/assets/stylesheets/home.scss create mode 100644 app/controllers/home_controller.rb create mode 100644 app/helpers/home_helper.rb create mode 100644 app/views/home/index.html.erb create mode 100644 test/controllers/home_controller_test.rb diff --git a/app/assets/javascripts/home.js b/app/assets/javascripts/home.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/home.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss new file mode 100644 index 0000000000..7131aac4df --- /dev/null +++ b/app/assets/stylesheets/home.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Home controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb new file mode 100644 index 0000000000..95f29929ca --- /dev/null +++ b/app/controllers/home_controller.rb @@ -0,0 +1,4 @@ +class HomeController < ApplicationController + def index + end +end diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb new file mode 100644 index 0000000000..23de56ac60 --- /dev/null +++ b/app/helpers/home_helper.rb @@ -0,0 +1,2 @@ +module HomeHelper +end diff --git a/app/models/work.rb b/app/models/work.rb index 10f111bf0f..ca41be3fc6 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -2,18 +2,18 @@ class Work < ApplicationRecord has_many :votes, dependent: :destroy validates :title, presence: true - def sort_works(category) + def self.sort_works(category) works = Work.where(category: category) sorted_works = works.sort_by {|work| work.votes.count} - return sorted.works.reverse + return sorted_works.reverse end - def list_top_ten(category) + def self.list_top_ten(category) works = Work.sort_works(category) return works[0..9] end - def find_top_work + def self.find_top_work works = Work.all work = works.sort_by {|work| work.votes.count} return work[-1] diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb new file mode 100644 index 0000000000..796b5ff2b5 --- /dev/null +++ b/app/views/home/index.html.erb @@ -0,0 +1,64 @@ +
+
+

+ Media Spotlight: + + <%= link_to "#{Work.find_top_work.title}", work_path(Work.find_top_work.id) %> by <%= Work.find_top_work.creator %> +

+

<%= Work.find_top_work.votes.count %> votes - <%= Work.find_top_work.description %> +

+
+
+
+
+

+ Top Movies +

+
    +
  • + <% works = Work.list_top_ten("movie") %> + <% works.each do |movie| %> +

    +

    <%= link_to "#{movie.title}", work_path(movie.id) %>

    + <%= movie.creator %> +

    +

    <%= movie.votes.count %>

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

+ Top Books +

+
    +
  • + <% works = Work.list_top_ten("book") %> + <% works.each do |book| %> +

    +

    <%= link_to "#{book.title}", work_path(book.id) %>

    + <%= book.creator %> +

    +

    <%= book.votes.count %>

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

+ Top Albums +

+
    +
  • + <% works = Work.list_top_ten("album") %> + <% works.each do |album| %> +

    +

    <%= link_to "#{album.title}", work_path(album.id) %>

    + <%= album.creator %> +

    +

    <%= album.votes.count %>

    + <% end %> +
    • +
+
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6de7a6f31d..231de8d78d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,9 +11,13 @@
+

+ Media Ranker + Ranking the Best of Everything +

@@ -21,8 +25,7 @@