From fa2f529085954ad809ed78afbef9a21004fa502d Mon Sep 17 00:00:00 2001 From: sairagula Date: Tue, 10 Oct 2017 15:17:00 -0700 Subject: [PATCH 01/36] initial Rails setup --- .gitignore | 19 ++ Gemfile | 66 ++++++ Gemfile.lock | 222 ++++++++++++++++++ README.md | 104 +------- Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 15 ++ app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.css | 15 ++ app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 3 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ 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 | 38 +++ bin/spring | 17 ++ bin/update | 29 +++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 25 ++ config/boot.rb | 3 + config/cable.yml | 10 + config/database.yml | 85 +++++++ config/environment.rb | 5 + config/environments/development.rb | 54 +++++ config/environments/production.rb | 91 +++++++ config/environments/test.rb | 42 ++++ .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 ++ config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 +++ config/puma.rb | 56 +++++ config/routes.rb | 3 + config/secrets.yml | 32 +++ config/spring.rb | 6 + 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 + 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 | 26 ++ tmp/.keep | 0 vendor/.keep | 0 76 files changed, 1304 insertions(+), 91 deletions(-) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.css 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/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 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 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..82701fedc8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +# 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 + +/node_modules +/yarn-error.log + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000000..88aee9dc96 --- /dev/null +++ b/Gemfile @@ -0,0 +1,66 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.4' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# 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 'therubyracer', 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', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '~> 2.13' + gem 'selenium-webdriver' +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 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 + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-turbolinks' +group :development do + gem 'better_errors' + gem 'pry-rails' + gem 'binding_of_caller' +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..69fae647c5 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,222 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.4) + actionpack (= 5.1.4) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.4) + activesupport (= 5.1.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.4) + activesupport (= 5.1.4) + globalid (>= 0.3.6) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) + arel (~> 8.0) + activesupport (5.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ansi (1.5.0) + arel (8.0.0) + better_errors (2.3.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.5.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (9.1.0) + capybara (2.15.4) + addressable + mini_mime (>= 0.1.3) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + childprocess (0.8.0) + ffi (~> 1.0, >= 1.0.11) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.2) + debug_inspector (0.0.3) + erubi (1.7.0) + execjs (2.7.0) + ffi (1.9.18) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.6) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + 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.1.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.6.6) + mime-types (>= 1.16, < 4) + method_source (0.9.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_mime (0.1.4) + mini_portile2 (2.3.0) + minitest (5.10.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.18) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + multi_json (1.12.2) + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + pg (0.21.0) + pry (0.11.1) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + public_suffix (3.0.0) + puma (3.10.0) + rack (2.0.3) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rails (5.1.4) + actioncable (= 5.1.4) + actionmailer (= 5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + activemodel (= 5.1.4) + activerecord (= 5.1.4) + activesupport (= 5.1.4) + bundler (>= 1.3.0) + railties (= 5.1.4) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.1.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + rubyzip (1.2.1) + sass (3.5.2) + 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.6) + 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.6.0) + childprocess (~> 0.5) + rubyzip (~> 1.0) + 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.1) + 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.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.3) + thread_safe (~> 0.1) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) + web-console (3.5.1) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + xpath (2.1.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + capybara (~> 2.13) + jbuilder (~> 2.5) + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.7) + rails (~> 5.1.4) + 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) + +BUNDLED WITH + 1.15.4 diff --git a/README.md b/README.md index 6d792f05ce..7db80e4ca1 100644 --- a/README.md +++ b/README.md @@ -1,102 +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 -## Learning Goals +* Configuration -The purpose of this assignment is to reinforce the following concepts: +* Database creation -- 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 -- Working with a CSS framework -- Styling a page based on an existing design +* Database initialization -## Before You Begin +* How to run the test suite -### Provided Files +* Services (job queues, cache servers, search engines, etc.) -- `db/media_seeds.csv`: Some starter media to work with -- `app/assets/images/owl.jpg`: The owl picture from the site +* Deployment instructions -### 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 - -Mimic the site's basic functionality around Media, without worrying (yet) about Users or Votes: -- Build a main page, with a list of the top 10 media of each category, as well as a spotlight section for the top media overall -- 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 -- Make sure any models and controllers you've built so far are well-tested - -### 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 -- Add a list of voting users to the details page for each media -- Don't allow a user to vote for the same media more than once -- Add a page for each user, as well as a page showing a summary of all users -- Make sure any models and controllers you've built so far are well-tested - -#### 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 - -Use Foundation 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. - -### Optional Enhancement Ideas - -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. +* ... 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..46b20359fa --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,15 @@ +// 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 rails-ujs +//= 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.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000000..d05ea0f511 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * 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. + * + *= require_tree . + *= require_self + */ 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..1c07694e9d --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 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..6af511b830 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + MediaRanker + <%= csrf_meta_tags %> + + <%= 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..66e9889e8b --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 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..78c4e861dc --- /dev/null +++ b/bin/setup @@ -0,0 +1,38 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # 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..a8e4462f20 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/yarn b/bin/yarn new file mode 100755 index 0000000000..c2bacef836 --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +VENDOR_PATH = File.expand_path('..', __dir__) +Dir.chdir(VENDOR_PATH) do + begin + exec "yarnpkg #{ARGV.join(" ")}" + 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..e73bab908f --- /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.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000000..30f5120df6 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 0000000000..3a27f13933 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: MediaRanker_production 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..5187e22186 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000000..d242dac65c --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,91 @@ +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 + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "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..8e5cbde533 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.seconds.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 + 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/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..1e19380dcb --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# 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. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 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/secrets.yml b/config/secrets.yml new file mode 100644 index 0000000000..7a2f1cf038 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: 39915897dc36741dd8cc4f09c64f126e3cdb9e4a39f112cf5813150ab4ff9a6d83b96926b00f17cd0b9434604842466ac906b824ea8cbb7bc36a87656ea03108 + +test: + secret_key_base: ebba44d6c26f40a73447d179d0476a35051a55aabbc971add150fbb7a2cf6c0b8bf05ce6894e74c594487dcb61017af245174e33d4daa61c681427156c4d35a5 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 0000000000..c9119b40c0 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 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/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..10594a3248 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 0000000000..e69de29bb2 From 9435971aa6a517781cca5755e106e52b53617cfc Mon Sep 17 00:00:00 2001 From: sairagula Date: Tue, 10 Oct 2017 16:24:45 -0700 Subject: [PATCH 02/36] Added routes for works, votes, users --- Gemfile | 1 + Gemfile.lock | 8 ++++++++ config/routes.rb | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/Gemfile b/Gemfile index 88aee9dc96..6d8a973aea 100644 --- a/Gemfile +++ b/Gemfile @@ -48,6 +48,7 @@ group :development do # 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' + gem 'rails-erd', require: false, group: :development end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index 69fae647c5..f91c9364f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,6 +60,7 @@ GEM xpath (~> 2.0) childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) + choice (0.2.0) coderay (1.1.2) concurrent-ruby (1.0.5) crass (1.0.2) @@ -130,6 +131,11 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) + rails-erd (1.5.2) + activerecord (>= 3.2) + activesupport (>= 3.2) + choice (~> 0.2.0) + ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.3) loofah (~> 2.0) railties (5.1.4) @@ -142,6 +148,7 @@ GEM rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) + ruby-graphviz (1.2.3) ruby-progressbar (1.9.0) ruby_dep (1.5.0) rubyzip (1.2.1) @@ -209,6 +216,7 @@ DEPENDENCIES pry-rails puma (~> 3.7) rails (~> 5.1.4) + rails-erd sass-rails (~> 5.0) selenium-webdriver spring diff --git a/config/routes.rb b/config/routes.rb index 787824f888..6b5059a05a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,21 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + ###### Works ###### + # # VERB PATH # CONTROLLERACTION PREFIX + # get "/works", to: "works#index", as: "works" + + # get "/works/new", to: "works#new", as: "new_work" + # post "/works", to: "works#create" YES + # + # get "/works/:id", to: "works#show", as: "work" + # + # get "/work/:id/edit", to: "works#edit", as: "edit_work" + # patch "/works/:id", to: "works#update" + # + # delete "/work/:id", to: "works#destroy" + resources :works + + resources :votes + + resources :users end From 52d6ef6e78b175d9e93df94ee7dfd60520b4e1f8 Mon Sep 17 00:00:00 2001 From: sairagula Date: Tue, 10 Oct 2017 16:51:11 -0700 Subject: [PATCH 03/36] generated controller, model and created db --- app/assets/javascripts/works.js | 2 ++ app/assets/stylesheets/works.scss | 3 +++ app/controllers/works_controller.rb | 30 +++++++++++++++++++++++ app/helpers/works_helper.rb | 2 ++ app/models/work.rb | 2 ++ app/views/works/index.html.erb | 1 + db/migrate/20171010233237_create_works.rb | 12 +++++++++ db/schema.rb | 27 ++++++++++++++++++++ db/seeds.rb | 20 +++++++++++++++ test/controllers/works_controller_test.rb | 7 ++++++ test/fixtures/works.yml | 11 +++++++++ test/models/work_test.rb | 9 +++++++ 12 files changed, 126 insertions(+) create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 app/models/work.rb create mode 100644 app/views/works/index.html.erb create mode 100644 db/migrate/20171010233237_create_works.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/works_controller_test.rb create mode 100644 test/fixtures/works.yml create mode 100644 test/models/work_test.rb diff --git a/app/assets/javascripts/works.js b/app/assets/javascripts/works.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/works.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss new file mode 100644 index 0000000000..5618452f3e --- /dev/null +++ b/app/assets/stylesheets/works.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Works controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..dcaa08090d --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,30 @@ +class WorksController < ApplicationController + def index + # @works = Work.all + end + + # def show + # + # end + # + # def new + # + # end + # + # def create + # + # end + # + # def edit + # + # end + # + # def update + # + # end + # + # def destroy + # + # end + +end diff --git a/app/helpers/works_helper.rb b/app/helpers/works_helper.rb new file mode 100644 index 0000000000..ccb78c2b73 --- /dev/null +++ b/app/helpers/works_helper.rb @@ -0,0 +1,2 @@ +module WorksHelper +end diff --git a/app/models/work.rb b/app/models/work.rb new file mode 100644 index 0000000000..95322dd45e --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,2 @@ +class Work < ApplicationRecord +end diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..1fd65690c8 --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1 @@ +

Works coming soon...

diff --git a/db/migrate/20171010233237_create_works.rb b/db/migrate/20171010233237_create_works.rb new file mode 100644 index 0000000000..0955ec8862 --- /dev/null +++ b/db/migrate/20171010233237_create_works.rb @@ -0,0 +1,12 @@ +class CreateWorks < ActiveRecord::Migration[5.1] + def change + create_table :works do |t| + t.string :title + t.string :author + t.integer :publication_date + t.string :category + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..04bc4d9842 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,27 @@ +# 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: 20171010233237) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "works", force: :cascade do |t| + t.string "title" + t.string "author" + t.integer "publication_date" + t.string "category" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..cc95cd2fd4 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,23 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) +require 'csv' + +WORK_FILE = Rails.root.join('db', 'media_seeds.csv') +puts "Loading raw driver data from #{DRIVER_FILE}" + +driver_failures = [] +CSV.foreach(DRIVER_FILE, :headers => true) do |row| + driver = Driver.new + driver.id = row['id'] + driver.name = row['name'] + driver.vin = row['vin'] + puts "Created driver: #{driver.inspect}" + successful = driver.save + if !successful + driver_failures << driver + end +end + +puts "Added #{Driver.count} driver records" +puts "#{driver_failures.length} drivers failed to save" diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..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/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..dc3ee79b5d --- /dev/null +++ b/test/fixtures/works.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/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 54a118c2126069cb3c442fc13034ba72f81a7a2d Mon Sep 17 00:00:00 2001 From: sairagula Date: Tue, 10 Oct 2017 21:05:48 -0700 Subject: [PATCH 04/36] Read from CSV, added index method --- app/controllers/works_controller.rb | 3 ++- app/models/work.rb | 7 +++++ app/views/main/index.html.erb | 2 ++ app/views/works/index.html.erb | 1 + .../20171010235543_change_column_names.rb | 6 +++++ .../20171011031002_add_column_description.rb | 5 ++++ db/schema.rb | 7 ++--- db/seeds.rb | 27 ++++++++++--------- 8 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 app/views/main/index.html.erb create mode 100644 db/migrate/20171010235543_change_column_names.rb create mode 100644 db/migrate/20171011031002_add_column_description.rb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index dcaa08090d..3bb3bc2c62 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,6 +1,6 @@ class WorksController < ApplicationController def index - # @works = Work.all + @works = Work.all end # def show @@ -26,5 +26,6 @@ def index # def destroy # # end + end diff --git a/app/models/work.rb b/app/models/work.rb index 95322dd45e..fa066d6b2e 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,2 +1,9 @@ class Work < ApplicationRecord + has_many :votes #, dependent: :destroy + + + def get_top_10_by_category + + end + end diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb new file mode 100644 index 0000000000..4710f11986 --- /dev/null +++ b/app/views/main/index.html.erb @@ -0,0 +1,2 @@ +

Media Ranker

+

Ranking the best of everything

diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 1fd65690c8..a8a347bf90 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1 +1,2 @@

Works coming soon...

+<%# @works.each do |work|%> diff --git a/db/migrate/20171010235543_change_column_names.rb b/db/migrate/20171010235543_change_column_names.rb new file mode 100644 index 0000000000..85b5660f55 --- /dev/null +++ b/db/migrate/20171010235543_change_column_names.rb @@ -0,0 +1,6 @@ +class ChangeColumnNames < ActiveRecord::Migration[5.1] + def change + rename_column(:works, :author, :creator) + rename_column(:works, :publication_date, :publication_year) + end +end diff --git a/db/migrate/20171011031002_add_column_description.rb b/db/migrate/20171011031002_add_column_description.rb new file mode 100644 index 0000000000..3276a51e37 --- /dev/null +++ b/db/migrate/20171011031002_add_column_description.rb @@ -0,0 +1,5 @@ +class AddColumnDescription < ActiveRecord::Migration[5.1] + def change + add_column :works, :description, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 04bc4d9842..36fe3b34ad 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,18 +10,19 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171010233237) do +ActiveRecord::Schema.define(version: 20171011031002) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" create_table "works", force: :cascade do |t| t.string "title" - t.string "author" - t.integer "publication_date" + t.string "creator" + t.integer "publication_year" t.string "category" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "description" end end diff --git a/db/seeds.rb b/db/seeds.rb index cc95cd2fd4..72611764eb 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -8,20 +8,23 @@ require 'csv' WORK_FILE = Rails.root.join('db', 'media_seeds.csv') -puts "Loading raw driver data from #{DRIVER_FILE}" +puts "Loading raw work data from #{WORK_FILE}" -driver_failures = [] -CSV.foreach(DRIVER_FILE, :headers => true) do |row| - driver = Driver.new - driver.id = row['id'] - driver.name = row['name'] - driver.vin = row['vin'] - puts "Created driver: #{driver.inspect}" - successful = driver.save +work_failures = [] +CSV.foreach(WORK_FILE, :headers => true) do |row| + work = Work.new + work.id = row['id'] + work.category = row['category'] + work.title = row['title'] + work.creator = row['creator'] + work.publication_year = row['publication_year'] + work.description = row['description'] + puts "Created work: #{work.inspect}" + successful = work.save if !successful - driver_failures << driver + work_failures << work end end -puts "Added #{Driver.count} driver records" -puts "#{driver_failures.length} drivers failed to save" +puts "Added #{Work.count} work records" +puts "#{work_failures.length} works failed to save" From ceb52f9169fe11687085d518d03ba13f86366585 Mon Sep 17 00:00:00 2001 From: sairagula Date: Tue, 10 Oct 2017 23:42:51 -0700 Subject: [PATCH 05/36] Index page added to work --- app/models/work.rb | 4 +-- app/views/works/index.html.erb | 57 ++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index fa066d6b2e..ec39086f37 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -3,7 +3,7 @@ class Work < ApplicationRecord def get_top_10_by_category - + end - + end diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index a8a347bf90..25330953a9 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,2 +1,55 @@ -

Works coming soon...

-<%# @works.each do |work|%> + + + Media Ranker 2.0 + + + + +
+

+ <%= link_to "Media ranker" %> + Ranking the Best of Everything +

+ + +
+ +

List of works

+

Albums

+ + + + + + + + + + + + + + <% @works.each do |work|%> + <% if work.category = "album" %> + + + + + + + + <% end %> + <% end %> + + +
VotesTitleCreated ByPublishedUpvote
3<%= link_to work.title, work_path(work.id) %><%= work.creator%> <%= work.publication_year%>Upvote
+ From c838a3071fcf548171d5b5a63ce5aee2b5eec37e Mon Sep 17 00:00:00 2001 From: sairagula Date: Wed, 11 Oct 2017 19:56:53 -0700 Subject: [PATCH 06/36] detail pages added for each work --- app/controllers/works_controller.rb | 50 ++++++++++++++------ app/views/works/index.html.erb | 71 ++++++++++++++++++++++++++--- app/views/works/show.html.erb | 16 +++++++ db/media_seeds.csv | 2 +- 4 files changed, 119 insertions(+), 20 deletions(-) create mode 100644 app/views/works/show.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 3bb3bc2c62..ee58870ce4 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -3,29 +3,53 @@ def index @works = Work.all end - # def show - # - # end - # + def show + @work = Work.find(params[:id]) + end + # def new - # + # @work = Work.new # end # # def create - # + # @work = Work.new(work_params) + # if @work.save + # redirect_to works_path + # else + # render :new + # end # end - # + # def edit - # + # @work = Work.find(params[:id]) # end - # + # def update - # + # @work = Work.find(params[:id]) + # result = @work.update_attributes(work_params) + # + # if result + # redirect_to work_path(params[:id]) + # else + # render :edit + # end # end - # + # def destroy - # + # work = Work.find(params[:id]) + # result = work.destroy + # if result + # redirect_to works_path + # else + # redirect_to work_path(params[:id]) + # end # end - + + private + + def work_params + return params.require(:work).permit(:title, :creator, :publication_year, :category, :description) + end + end diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 25330953a9..bd46410d82 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -7,15 +7,15 @@

- <%= link_to "Media ranker" %> + Media Ranker Ranking the Best of Everything

- <%= yield %> + +
+
+

+ <%= flash[:message] %> +

+ <% if flash[:details] %> +
    + <% flash[:details].each do |field, problems| %> + <% problems.each do |problem| %> +
  • + + <%= field %>: + + <%= problem %> +
    • + <% end %> + <% end %> +
+ <% end %> +
+ + <%= yield %> +
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 5a512267c6..67934558aa 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -7,5 +7,15 @@ Joined + + + <% @users.each do |user|%> + + <%= link_to user.username, user_path(user.id) %> + 3 + <%= user.created_at%> + + <% end %> + -Back to Media List +<%= link_to "Back to Media List", root_path%> diff --git a/app/views/users/login_form.html.erb b/app/views/users/login_form.html.erb new file mode 100644 index 0000000000..03be619c93 --- /dev/null +++ b/app/views/users/login_form.html.erb @@ -0,0 +1,6 @@ +<%= form_tag do %> + <%# collection_select(:user, :user_id, User.all, :id, :username) %> + <%= label_tag "Username" %> + <%= text_field :user, :username %> + <%= submit_tag "Log in" %> +<% end %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 56f4965bff..98e3f4fc34 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -19,7 +19,7 @@ 3 <%= link_to work.title, work_path(work.id) %> <%= work.creator%> - <%= work.publication_year%> + <%= work.publication_year%> Upvote <% end %> diff --git a/config/routes.rb b/config/routes.rb index fdf224d42f..e1a29ed56f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -21,8 +21,8 @@ resources :users - # get "login", to: "user#login_form", as: "login" - # post "login", to: "users#login" - # get "logout", to: "users#logout", as: "logout" + get "login", to: "users#login_form", as: "login" + post "login", to: "users#login" + get "logout", to: "users#logout", as: "logout" end From 519930b57f44a11a0ddf6a1f2af67cd2aa7e88bd Mon Sep 17 00:00:00 2001 From: sairagula Date: Fri, 13 Oct 2017 14:23:58 -0700 Subject: [PATCH 22/36] Login successful --- app/controllers/users_controller.rb | 31 +++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c5e2c50bd3..15954cd6ef 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4,25 +4,36 @@ def index @users = User.all end - def new - end - - def create + def show end def login_form - + @user = User.new + if params[:user_id] + @user.user_id = params[:user_id] + end end def login - username = params[:user][:username] - user = User.find(username: username) + @user = User.new(user_params) - if user - session[:logged_in_user] = user.id - flash[:success] = "#{ user.username } is successfully logged in" + if save_and_flash(@user) redirect_to root_path + else + render :new, status: :bad_request + end + end + + private + def user_params + return params.require(:user).permit(:username) + end + + def find_user_by_params_id + @user = User.find_by(id: params[:id]) + unless @user + head :not_found end end end From b16816768b12a354225a314d7fc93ef2d0883a4b Mon Sep 17 00:00:00 2001 From: sairagula Date: Fri, 13 Oct 2017 15:32:21 -0700 Subject: [PATCH 23/36] User details and Log Out added --- app/controllers/users_controller.rb | 36 ++++++++++++++++++++++------- app/views/users/show.html.erb | 8 +++++++ 2 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 app/views/users/show.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 15954cd6ef..c3d5e939d1 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4,10 +4,6 @@ def index @users = User.all end - def show - end - - def login_form @user = User.new if params[:user_id] @@ -16,16 +12,40 @@ def login_form end def login - @user = User.new(user_params) + username = params[:user][:username] + user = User.find_by(username: username) - if save_and_flash(@user) + if user + session[:logged_in_user] = user.id + flash[:status] = :success + flash[:message] = "Successfully logged in as an existing user #{username}" redirect_to root_path else - render :new, status: :bad_request + user = User.new(username: username, created_at: Date.today) + user.save + flash[:status] = :success + flash[:message] = "Successfully logged in as #{username}" + session[:logged_in_user] = user.id + redirect_to root_path end end - private + def logout + session[:logged_in_user] = nil + flash[:status] = :success + flash[:message] = "Successfully logged out" + redirect_to root_path + end + + def show + if find_user_by_params_id + redirect_to user_path + end + end + + +private + def user_params return params.require(:user).permit(:username) end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..9b4b2d8a45 --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,8 @@ +

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

+ +

Joined site <%= @user.created_at%>

+ +

Votes

+ +<%= link_to "See all users", users_path %> +<%= link_to "Back to media ranks", root_path %> From c1dd4192e9b12640e96dbdb43a1f7dc3ccb0bcfe Mon Sep 17 00:00:00 2001 From: sairagula Date: Sat, 14 Oct 2017 11:57:36 -0700 Subject: [PATCH 24/36] Vote model added --- test/controllers/users_controller_test.rb | 23 ++++++++++++++++------- test/controllers/votes_controller_test.rb | 7 +++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 test/controllers/votes_controller_test.rb diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index b1a0daa3c3..7e57ebc63e 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,13 +1,22 @@ require "test_helper" describe UsersController do - it " should return a success for all users" do - get users_path - must_respond_with :success + describe "index" do + it " should return success status for all users" do + get users_path + must_respond_with :success + end + it "should return success when theere are no users" do + User.destroy_all + get users_path + must_respond_with :success + end end - it "should return success when theere are no users" do - User.destroy_all - get users_path - must_respond_with :success + + describe "login_form" do + it "should return a success" do + get login_path + must_respond_with :success + end 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 From 336901e1ccc3595470ffaf7595b60be4daa4de57 Mon Sep 17 00:00:00 2001 From: sairagula Date: Sat, 14 Oct 2017 16:24:49 -0700 Subject: [PATCH 25/36] Some styling, minor changes to application page, better date format --- app/assets/javascripts/votes.js | 2 + app/assets/stylesheets/application.css | 93 +++++++++++++++++++++++ app/assets/stylesheets/votes.scss | 3 + app/controllers/users_controller.rb | 8 +- app/controllers/votes_controller.rb | 2 + app/controllers/works_controller.rb | 38 ++++++++- app/helpers/votes_helper.rb | 2 + app/models/vote.rb | 8 ++ app/views/layouts/application.html.erb | 2 +- app/views/users/index.html.erb | 4 +- app/views/users/show.html.erb | 12 +-- app/views/works/index.html.erb | 12 +-- config/routes.rb | 6 +- db/migrate/20171013230304_create_votes.rb | 10 +++ db/schema.rb | 9 ++- test/controllers/users_controller_test.rb | 14 ++++ test/fixtures/users.yml | 16 ++-- test/fixtures/votes.yml | 10 +++ test/models/user_test.rb | 6 +- test/models/vote_test.rb | 9 +++ 20 files changed, 229 insertions(+), 37 deletions(-) create mode 100644 app/assets/javascripts/votes.js create mode 100644 app/assets/stylesheets/votes.scss create mode 100644 app/controllers/votes_controller.rb create mode 100644 app/helpers/votes_helper.rb create mode 100644 app/models/vote.rb create mode 100644 db/migrate/20171013230304_create_votes.rb create mode 100644 test/fixtures/votes.yml create mode 100644 test/models/vote_test.rb diff --git a/app/assets/javascripts/votes.js b/app/assets/javascripts/votes.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/votes.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d05ea0f511..df8b2c263c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,3 +13,96 @@ *= require_tree . *= require_self */ + + ############## GENERAL ############*/ + .large-4 { + width: 33.33333%; + } + .small-12 { + width: 100%; + } + .large-6{ + width: 50% + } + .columns { + padding-right: 0.9375rem; + padding-left: 0.9375rem; + } + + .columns:last-child:not(:first-child) { + float: right; + } + + h1, h2, h3, h4, h5 { + font-weight: bold; + } + body, h1, h2, h3, h4, h5 { + font-family: "Gudea", sans-serif + } + /********************************* + ############## NAV ############*/ + .page-header { + max-width: 100%; + background-color: #B2DFDB; + border-bottom: 1px solid #EEEEEE; + margin-bottom: 10px; + padding: 25px 20px 10px 20px; + } + .page-header h2 a { + color: #FF5722; + padding-right: 25px; + margin-right: 15px; + border-right: white 2px solid; + } + .page-header h2 small { + color: white; + } + h2 { + text-align: center; + margin: 25px auto 40px auto; + } + .button { + background-color: #26A69A; + } + + /********************************* + ############## BODY MAIN PAGE ############*/ + .row .row { + margin-right: -0.625rem; + margin-left: -0.625rem; + } + section.spotlight>div { + padding: 0 2rem 2rem 2rem; + } + a, h3 { + color: #26A69A; + } + .media-spotlight-header { + color: #424242; + } + .spotlight a { + border-bottom: 2px solid; + } + .root-hr { + margin: 0px auto 75px auto; + color: #EEEEEE; + } + /********************************* + ############## MAIN PAGE COLUMNS ############*/ + .top-ten h3 { + border-bottom: 2px solid; + border-bottom-color: #B2DFDB; + } + .top-ten ul { + list-style-type: none; + margin-left: 0px; + } + body small { + color: slategrey; + } + p { + margin-bottom: 1rem; + font-size: inherit; + line-height: 1.6; + text-rendering: optimizeLegibility; + } diff --git a/app/assets/stylesheets/votes.scss b/app/assets/stylesheets/votes.scss new file mode 100644 index 0000000000..4756424f13 --- /dev/null +++ b/app/assets/stylesheets/votes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the votes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c3d5e939d1..31a4c7d551 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,14 +1,14 @@ class UsersController < ApplicationController def index - @users = User.all + @users = User.left_outer_joins(:votes).distinct.select('users.*, COUNT(votes.*) AS votes_count').group('users.id').order('votes_count') end def login_form @user = User.new - if params[:user_id] - @user.user_id = params[:user_id] - end + # if params[:user_id] + # @user.user_id = params[:user_id] + # end end def login 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 index e29a60c0f4..42b83a6da5 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -2,9 +2,11 @@ class WorksController < ApplicationController before_action :find_work_by_params_id, only: [:show, :edit, :update, :destroy] def index - @movies = Work.where(category: "movie") - @books = Work.where(category: "book") - @albums = Work.where(category: "album") + all_work = Work.left_outer_joins(:votes).distinct.select('works.*, COUNT(votes.*) AS votes_count').group('works.id').order('votes_count') + + @movies = all_work.where(category: "movie") + @books = all_work.where(category: "book") + @albums = all_work.where(category: "album") end def show ; end @@ -16,8 +18,13 @@ def new def create @work = Work.new(work_params) if @work.save - redirect_to works_path + flash[:status] = :success + flash[:message] = "Successfully created work #{@work.title}" + redirect_to work_path(@work) else + flash[:status] = :failure + flash[:message] = "Failed to created work" + flash[:details] = @work.errors.messages render :new, status: :bad_request end end @@ -42,12 +49,35 @@ def destroy # end end + def upvote + user_id = session[:logged_in_user] + work_id = params[:id] + if !user_id + flash[:status] = :failure + flash[:message] = "You must log in to do that" + redirect_to works_path + elsif + Vote.find_by_user_id_and_work_id(user_id,work_id) + flash[:status] = :failure + flash[:message] = "Coud not upvote. User has already voted for this work" + redirect_to works_path + elsif + # vote = Vote.new(vote_params) + @vote.save + flash[:status] = :success + flash[:message] = "Successfully upvoted" + end + end private def work_params return params.require(:work).permit(:title, :creator, :publication_year, :category, :description) end + # def vote_params + # return params.require(:vote).permit(:user_id, :work_id) + # end + def find_work_by_params_id @work = Work.find_by(id: params[:id]) # head :not_found and return if @work.nil? diff --git a/app/helpers/votes_helper.rb b/app/helpers/votes_helper.rb new file mode 100644 index 0000000000..5a82eed07d --- /dev/null +++ b/app/helpers/votes_helper.rb @@ -0,0 +1,2 @@ +module VotesHelper +end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..60c3e3f733 --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,8 @@ +class Vote < ApplicationRecord + belongs_to :work + + belongs_to :user + + validates :user_id, presence: true, uniqueness: {scope: :work_id } + validates :work_id, presence: true +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index aca964c565..c1c1502810 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -35,7 +35,7 @@ -
+

<%= flash[:message] %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 67934558aa..7d4b0800ae 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -12,8 +12,8 @@ <% @users.each do |user|%> <%= link_to user.username, user_path(user.id) %> - 3 - <%= user.created_at%> + <%= user.votes_count%> + <%= user.created_at.strftime("%b %d, %Y")%> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 9b4b2d8a45..6cad8198b8 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,8 +1,10 @@ -

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

- -

Joined site <%= @user.created_at%>

- -

Votes

+

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

+

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

+

Votes

<%= link_to "See all users", users_path %> <%= link_to "Back to media ranks", root_path %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 98e3f4fc34..08cbcc7066 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,6 +1,6 @@ -

List of works

-

Albums

+

List of works

+

Albums

@@ -16,7 +16,7 @@ <% @albums.each do |work|%> - + @@ -43,7 +43,7 @@ <% @books.each do |work|%> - + @@ -54,7 +54,7 @@
3<%= work.votes_count %> <%= link_to work.title, work_path(work.id) %> <%= work.creator%> <%= work.publication_year%>
3<%= work.votes_count %> <%= link_to work.title, work_path(work.id) %> <%= work.creator%> <%= work.publication_year%>
-

Movies

+

Movies

@@ -70,7 +70,7 @@ <% @movies.each do |work|%> - + diff --git a/config/routes.rb b/config/routes.rb index e1a29ed56f..5d1549062c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,13 +14,9 @@ # # delete "/work/:id", to: "works#destroy" root :to => "main#index" - resources :works - - resources :votes - + get "upvote", to: "works#upvote" resources :users - get "login", to: "users#login_form", as: "login" post "login", to: "users#login" get "logout", to: "users#logout", as: "logout" diff --git a/db/migrate/20171013230304_create_votes.rb b/db/migrate/20171013230304_create_votes.rb new file mode 100644 index 0000000000..34468c0114 --- /dev/null +++ b/db/migrate/20171013230304_create_votes.rb @@ -0,0 +1,10 @@ +class CreateVotes < ActiveRecord::Migration[5.1] + def change + create_table :votes do |t| + t.integer :work_id + t.integer :user_id + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 9ec7b61cd3..f8d06fd728 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: 20171013042324) do +ActiveRecord::Schema.define(version: 20171013230304) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,6 +22,13 @@ t.datetime "updated_at", null: false end + create_table "votes", force: :cascade do |t| + t.integer "work_id" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "works", force: :cascade do |t| t.string "title" t.string "creator" diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 7e57ebc63e..718b9e6acd 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -19,4 +19,18 @@ must_respond_with :success end end + + describe "login" do + it "returns a success if username exists " do + get user_path(User.first) + must_respond_with :success + end + + it " will successfully log in as an existing user if user exists in db" do + + end + + it "will successfully create new username if username doesn't exist" do + end + end end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index d7c2b049de..f6d8f3b5a0 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,9 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - username: MyString - string: MyString +# one: +# username: MyString +# string: MyString +# +# two: +# username: MyString +# string: MyString -two: - username: MyString - string: MyString +user: + username: Fenix + # string: Fenix diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..cf05df0fe4 --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,10 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + work_id: MyString + user_id: MyString + + +two: + work_id: MyString + user_id: MyString diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..0ffa4553be 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -3,7 +3,7 @@ describe User do let(:user) { User.new } - it "must be valid" do - value(user).must_be :valid? - end + #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 From 1cf610fba7692066625c6a4ba35ede2270b5d5cd Mon Sep 17 00:00:00 2001 From: sairagula Date: Sat, 14 Oct 2017 21:13:54 -0700 Subject: [PATCH 26/36] Upvote added --- app/assets/stylesheets/application.css | 171 ++++++++++------------ app/controllers/users_controller.rb | 4 +- app/controllers/works_controller.rb | 11 +- app/views/layouts/application.html.erb | 9 +- app/views/users/show.html.erb | 2 +- app/views/works/index.html.erb | 53 ++++--- app/views/works/show.html.erb | 43 ++++-- config/routes.rb | 2 +- test/controllers/users_controller_test.rb | 32 +++- test/fixtures/votes.yml | 10 +- test/fixtures/works.yml | 15 ++ 11 files changed, 193 insertions(+), 159 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index df8b2c263c..e85283c586 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -14,95 +14,84 @@ *= require_self */ - ############## GENERAL ############*/ - .large-4 { - width: 33.33333%; - } - .small-12 { - width: 100%; - } - .large-6{ - width: 50% - } - .columns { - padding-right: 0.9375rem; - padding-left: 0.9375rem; - } +main { + padding-top: 2rem; + padding-bottom: 2rem; +} +h2 { + text-align: center; + margin: 25px auto 40px auto; +} +tbody th, tbody td { + padding: 0.5rem 0.625rem 0.625rem; +} +h1, h2, h3, h4, h5 { + font-weight: bold; +} +a, h3 { + color: #26A69A; +} +body, h1, h2, h3, h4, h5 { + font-family: "Gudea", sans-serif +} - .columns:last-child:not(:first-child) { - float: right; - } - - h1, h2, h3, h4, h5 { - font-weight: bold; - } - body, h1, h2, h3, h4, h5 { - font-family: "Gudea", sans-serif - } - /********************************* - ############## NAV ############*/ - .page-header { - max-width: 100%; - background-color: #B2DFDB; - border-bottom: 1px solid #EEEEEE; - margin-bottom: 10px; - padding: 25px 20px 10px 20px; - } - .page-header h2 a { - color: #FF5722; - padding-right: 25px; - margin-right: 15px; - border-right: white 2px solid; - } - .page-header h2 small { - color: white; - } - h2 { - text-align: center; - margin: 25px auto 40px auto; - } - .button { - background-color: #26A69A; - } - - /********************************* - ############## BODY MAIN PAGE ############*/ - .row .row { - margin-right: -0.625rem; - margin-left: -0.625rem; - } - section.spotlight>div { - padding: 0 2rem 2rem 2rem; - } - a, h3 { - color: #26A69A; - } - .media-spotlight-header { - color: #424242; - } - .spotlight a { - border-bottom: 2px solid; - } - .root-hr { - margin: 0px auto 75px auto; - color: #EEEEEE; - } - /********************************* - ############## MAIN PAGE COLUMNS ############*/ - .top-ten h3 { - border-bottom: 2px solid; - border-bottom-color: #B2DFDB; - } - .top-ten ul { - list-style-type: none; - margin-left: 0px; - } - body small { - color: slategrey; - } - p { - margin-bottom: 1rem; - font-size: inherit; - line-height: 1.6; - text-rendering: optimizeLegibility; - } +/********************************* +############## NAV ############*/ +.page-header { + max-width: 100%; + background-color: #B2DFDB; + border-bottom: 1px solid #EEEEEE; + margin-bottom: 10px; + padding: 25px 20px 10px 20px; +} +.page-header h2 a { + color: #FF5722; + padding-right: 25px; + margin-right: 15px; + border-right: white 2px solid; +} +.page-header h2 small { + color: white; +} +/********************************* +############## BUTTON ############*/ +.button { + background-color: #26A69A; +} +.button:hover, .button:focus { + background-color: #1b7169; + color: #fefefe; } +.media-table .upvote.button { + margin: 0; +} +/********************************* +############## BODY MAIN PAGE ############*/ +section.spotlight>div { + padding: 0 2rem 2rem 2rem; +} +.media-spotlight-header { + color: #424242; +} +.spotlight a { + border-bottom: 2px solid; +} +.root-hr { + margin: 0px auto 75px auto; + color: #EEEEEE; +} +/********************************* +############## MAIN PAGE COLUMNS ############*/ +.top-ten h3 { + border-bottom: 2px solid; + border-bottom-color: #B2DFDB; +} +.top-ten ul { + list-style-type: none; + margin-left: 0px; +} +body small { + color: slategrey; +} +.login { + text-align: left; +} diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 31a4c7d551..ddf10e9d3f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -15,12 +15,12 @@ def login username = params[:user][:username] user = User.find_by(username: username) - if user + if user # Logs in as an existing user session[:logged_in_user] = user.id flash[:status] = :success flash[:message] = "Successfully logged in as an existing user #{username}" redirect_to root_path - else + else # Creates new user user = User.new(username: username, created_at: Date.today) user.save flash[:status] = :success diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 42b83a6da5..8451ccb67a 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -55,18 +55,19 @@ def upvote if !user_id flash[:status] = :failure flash[:message] = "You must log in to do that" - redirect_to works_path elsif Vote.find_by_user_id_and_work_id(user_id,work_id) flash[:status] = :failure flash[:message] = "Coud not upvote. User has already voted for this work" - redirect_to works_path elsif - # vote = Vote.new(vote_params) - @vote.save + vote = Vote.new + vote.user_id = user_id + vote.work_id = work_id + vote.save flash[:status] = :success - flash[:message] = "Successfully upvoted" + flash[:message] = "Successfully upvoted #{user_id}/#{work_id} " end + redirect_back fallback_location:works_path end private diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c1c1502810..a87a18e950 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -3,11 +3,10 @@ MediaRanker <%= csrf_meta_tags %> - + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> -

@@ -20,12 +19,10 @@ <%= link_to "View all media", works_path, class: "button" %> <%= link_to "Add a new work", new_work_path, class: "button" %> <%= link_to "View all users", users_path, class: "button" %> - -
+
<% if session[:logged_in_user] %>

- Logged in as - <%= User.find(session[:logged_in_user]).username %> + Logged in as <%= User.find(session[:logged_in_user]).username %>

<%= link_to "Log out", logout_path, class: "button" %> <% else %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 6cad8198b8..60a236e9df 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -5,6 +5,6 @@ Joined site <%= @user.created_at.strftime("%b %d, %Y")%>

Votes

- + <%= link_to "See all users", users_path %> <%= link_to "Back to media ranks", root_path %> diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index 08cbcc7066..d800c82f5c 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1,31 +1,28 @@ - -

List of works

-

Albums

- -

3<%= work.votes_count %> <%= link_to work.title, work_path(work.id) %> <%= work.creator%> <%= work.publication_year%>
- - - - - - - - - - - - <% @albums.each do |work|%> +
+

List of works

+

Albums

+
VotesTitleCreated ByPublishedUpvote
+ - - - - - + + + + + - <% end %> - - -
<%= work.votes_count %><%= link_to work.title, work_path(work.id) %><%= work.creator%> <%= work.publication_year%>UpvoteVotesTitleCreated ByPublishedUpvote
+ + + <% @albums.each do |work|%> + + <%= work.votes_count %> + <%= link_to work.title, work_path(work.id) %> + <%= work.creator%> + <%= work.publication_year%> + <%= link_to "Upvote", upvote_path(work.id), class: "button upvote", method: :post%> + + <% end %> + +

Books

@@ -47,7 +44,7 @@ <%= link_to work.title, work_path(work.id) %> <%= work.creator%> <%= work.publication_year%> - Upvote + <%= link_to "Upvote", upvote_path(work.id), class: "button upvote", method: :post%> <% end %> @@ -74,7 +71,7 @@ <%= link_to work.title, work_path(work.id) %> <%= work.creator%> <%= work.publication_year%> - Upvote + <%= link_to "Upvote", upvote_path(work.id), class: "button upvote", method: :post%> <% end %> diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 9a390bf201..61dcd1eedd 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -1,16 +1,29 @@ - - <%= @work.title %> - -

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

+
+

<%= @work.title %>

+

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

+

Published: <%= @work.publication_year %>

+

<%= @work.description%>

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

Published: <%= @work.publication_year %>

- -

<% @work.description %>

- -<%= link_to "Back to media ranks", root_path %> -<%= link_to "Edit", edit_work_path(@work.id) %> -<%= link_to "Upvote", edit_work_path(@work.id) %> -<%= link_to "Delete", work_path(@work.id), method: :delete, - data: { confirm: "Really really?" } %> - -

Votes for this <% @work.category %>

+
+

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

+ + + + + + + + + ........ + + +
UserDate
+
diff --git a/config/routes.rb b/config/routes.rb index 5d1549062c..903ea3f3fc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,8 +14,8 @@ # # delete "/work/:id", to: "works#destroy" root :to => "main#index" + post "works/:id/upvote", to: "works#upvote", as:"upvote" resources :works - get "upvote", to: "works#upvote" resources :users get "login", to: "users#login_form", as: "login" post "login", to: "users#login" diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 718b9e6acd..06ab71c671 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -21,16 +21,38 @@ end describe "login" do - it "returns a success if username exists " do - get user_path(User.first) - must_respond_with :success + it " will successfully log in as an existing user" do + post login_path, params: { username: User.first.username } + must_redirect_to root_path + end + + it " successfully creates new username if username doesn't exist" do + post login_path, params: { username: User.last.username } + must_redirect_to root_path end - it " will successfully log in as an existing user if user exists in db" do + # it "should fail when no name is given" do + # post login_path + # must_respond_with :no_content + # end + end + describe "show" do + it "successfully shows a user" do + get user_path(User.first.id) + must_respond_with :success + end + it "does not show a user that does not exist" do + get user_path(User.last.id + 1) + must_respond_with :not_found end + end - it "will successfully create new username if username doesn't exist" do + describe "logout" do + it "successfully logs out a user" do + post login_path, params: { name: User.first.name } + get logout_path + must_redirect_to root_path end end end diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index cf05df0fe4..995ff41667 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -1,10 +1,10 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - work_id: MyString - user_id: MyString +vote: + work_id: HP + user_id: sa two: - work_id: MyString - user_id: MyString + work_id: 12 + user_id: 123 diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 825bb76093..a931c354de 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -9,3 +9,18 @@ movie: publication_year: 1994 creator: Steven Spielberg category: movie + description: cool movie + +book: + title: Harry Potter + publication_year: 1993 + creator: Rowling + category: book + description: great book + +album: + title: Countdown to Ecstasy + publication_year: 1973 + creator: Steely Dan + category: album + description: good From f3d88b0e00b189904ef4ad42e671c4b99d5ff621 Mon Sep 17 00:00:00 2001 From: sairagula Date: Sat, 14 Oct 2017 21:24:24 -0700 Subject: [PATCH 27/36] Vote list added to work's details page --- app/views/works/show.html.erb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 61dcd1eedd..7f4f943c3c 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -13,7 +13,7 @@ From 25dea6618e27f8462203e59691c0d2f2acda9457 Mon Sep 17 00:00:00 2001 From: sairagula Date: Sat, 14 Oct 2017 21:36:34 -0700 Subject: [PATCH 28/36] Styles added to work detail page --- app/views/works/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb index 7f4f943c3c..8a85f4588f 100644 --- a/app/views/works/show.html.erb +++ b/app/views/works/show.html.erb @@ -8,7 +8,7 @@ <%= link_to "Edit", edit_work_path(@work.id), class: "button" %> <%= link_to "Upvote", upvote_path(@work.id), class: "button upvote", method: :post%> <%= link_to "Delete", work_path(@work.id), method: :delete, - data: { confirm: "Are you sure?" }, class: "button" %> + data: { confirm: "Are you sure?" }, class: "alert button" %>
From 32b57452c8eccf7584b27c26d192b34e250e0813 Mon Sep 17 00:00:00 2001 From: sairagula Date: Sat, 14 Oct 2017 22:20:42 -0700 Subject: [PATCH 29/36] More styling added --- app/views/main/index.html.erb | 10 ++++++++++ app/views/users/index.html.erb | 2 +- app/views/users/show.html.erb | 32 ++++++++++++++++++++++++++------ app/views/works/new.html.erb | 4 ++-- 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index 436ba41e98..8f598e478e 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -1,3 +1,13 @@ + +
+
+
+

+ <% if @media_spotlight != nil%> + Media Spotlight: + <% end %> + + <% if @media_spotlight != nil%>

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

<% end %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 7d4b0800ae..bb219c21c1 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -18,4 +18,4 @@ <% end %> -<%= link_to "Back to Media List", root_path%> +<%= link_to "Back to Media List", root_path, class: "button"%> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 60a236e9df..037c6d21b2 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,10 +1,30 @@ -

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

+

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

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

Votes

- -<%= link_to "See all users", users_path %> -<%= link_to "Back to media ranks", root_path %> + + + + + + + + + + + + + <% @user.votes.each do |vote| %> + + + + + + + + <% end %> + +
Media TitleCreated ByPublishedCategoryVoted On
<%= link_to vote.work.title, work_path(vote.work_id) %><%= vote.work.creator %><%= vote.work.publication_year %><%= vote.work.category %><%= vote.created_at.strftime("%b %d, %Y")%>
+<%= link_to "See all users", users_path, class: "button" %> +<%= link_to "Back to media ranks", root_path, class: "button" %> diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index 02194b83b2..2634046334 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -1,3 +1,3 @@ -

Add a new work

+

Add a new work

-<%= render partial: "form", locals: { button_text: "Create Work" } %> +<%= render partial: "form", locals: { button_text: "Create Work"} %> From 1139cf1e494b4d6ccd145f3d6572e5dd0e1210d9 Mon Sep 17 00:00:00 2001 From: sairagula Date: Sun, 15 Oct 2017 10:13:55 -0700 Subject: [PATCH 30/36] view top media works --- app/controllers/main_controller.rb | 8 ++++---- app/controllers/users_controller.rb | 9 ++++++--- app/controllers/votes_controller.rb | 2 -- app/controllers/works_controller.rb | 3 +-- app/models/user.rb | 2 +- app/models/vote.rb | 2 +- app/models/work.rb | 18 ++++++++++++------ 7 files changed, 25 insertions(+), 19 deletions(-) delete mode 100644 app/controllers/votes_controller.rb diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 63e76fa21c..357461467c 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -1,8 +1,8 @@ class MainController < ApplicationController def index - @media_spotlight = Work.first - @top_movies = Work.top_movies - @top_books = Work.where(category: "book").limit(10) - @top_albums = Work.where(category: "album").limit(10) + @media_spotlight = Work.work_with_the_most_votes + @top_movies = Work.top_ten("movie") + @top_books = Work.top_ten("book") + @top_albums = Work.top_ten("album") end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ddf10e9d3f..0b7b525af6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -6,13 +6,16 @@ def index def login_form @user = User.new - # if params[:user_id] - # @user.user_id = params[:user_id] - # end end def login username = params[:user][:username] + if username == '' + flash[:status] = :failure + flash[:message] = "Username can not be empty" + redirect_to login_path + return + end user = User.find_by(username: username) if user # Logs in as an existing user diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb deleted file mode 100644 index ffdb2760e0..0000000000 --- a/app/controllers/votes_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class VotesController < ApplicationController -end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index 8451ccb67a..f47800f87b 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -2,8 +2,7 @@ class WorksController < ApplicationController before_action :find_work_by_params_id, only: [:show, :edit, :update, :destroy] def index - all_work = Work.left_outer_joins(:votes).distinct.select('works.*, COUNT(votes.*) AS votes_count').group('works.id').order('votes_count') - + all_work = Work.all_with_vote_count @movies = all_work.where(category: "movie") @books = all_work.where(category: "book") @albums = all_work.where(category: "album") diff --git a/app/models/user.rb b/app/models/user.rb index 7210e0ede3..f5e32b206a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ class User < ApplicationRecord - has_many :votes #, dependent: :destroy + has_many :votes validates :username, presence: true end diff --git a/app/models/vote.rb b/app/models/vote.rb index 60c3e3f733..fce7928929 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -3,6 +3,6 @@ class Vote < ApplicationRecord belongs_to :user - validates :user_id, presence: true, uniqueness: {scope: :work_id } + validates :user_id, presence: true, uniqueness: {scope: :work_id, message: "You must be logged in to do that" } validates :work_id, presence: true end diff --git a/app/models/work.rb b/app/models/work.rb index ae13fa7900..ee0d82b20c 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,12 +1,18 @@ class Work < ApplicationRecord has_many :votes #, dependent: :destroy - validates :title, presence: true + validates :title, presence: true, uniqueness: { message: "The title has already been taken" } - # def get_top_10_by_category - # - # end - def self.top_movies - return Work.where(category: "movie").limit(10) + def self.work_with_the_most_votes + return Work.left_outer_joins(:votes).select('works.*, COUNT(votes.*) AS votes_count').group('works.id').order('votes_count desc').first end + + def self.top_ten(category) + return Work.left_outer_joins(:votes).select('works.*, COUNT(votes.*) AS votes_count').group('works.id').where(category: category).order('votes_count desc').limit(10) + end + + def self.all_with_vote_count() + return Work.left_outer_joins(:votes).select('works.*, COUNT(votes.*) AS votes_count').group('works.id').order('votes_count') + end + end From e2da4c1d95179a6541960afcb65b45c22fc6ef0b Mon Sep 17 00:00:00 2001 From: sairagula Date: Sun, 15 Oct 2017 12:09:48 -0700 Subject: [PATCH 31/36] Main page styling finished --- app/controllers/users_controller.rb | 6 ++- app/views/main/index.html.erb | 77 ++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 25 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0b7b525af6..dc460cc33e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -18,12 +18,14 @@ def login end user = User.find_by(username: username) - if user # Logs in as an existing user + # Logs in as an existing user + if user session[:logged_in_user] = user.id flash[:status] = :success flash[:message] = "Successfully logged in as an existing user #{username}" redirect_to root_path - else # Creates new user + # Creates new user + else user = User.new(username: username, created_at: Date.today) user.save flash[:status] = :success diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index 8f598e478e..51cad41509 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -1,34 +1,65 @@
+

<% if @media_spotlight != nil%> Media Spotlight: + <%= link_to @media_spotlight.title, work_path(@media_spotlight.id)%> by <%= @media_spotlight.creator%>

<% end %> + +

<%=@media_spotlight.votes.count%> votes -

+
+
+
+
+

Top Movies

+
    +
  • + <% @top_movies.each do |work|%> +

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

    +

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

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

Top Books

+
    +
  • + <% @top_books.each do |work|%> +

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

    +

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

    + <% end %> +
    • +
+
-<% if @media_spotlight != nil%> -

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

-<% end %> - -

Top Movies

-
    - <% @top_movies.each do |work|%> -
  • <%= link_to work.title, work_path(work.id) %> by <%= work.creator%>
    • - <% end %> -
- -

Top Books

-
    - <% @top_books.each do |work|%> -
  • <%= link_to work.title, work_path(work.id) %> by <%= work.creator%>
    • - <% end %> -
+
+

Top Albums

+
    +
  • + <% @top_albums.each do |work|%> +

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

    +

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

    + <% end %> +
    • +
+
-

Top Albums

-
    - <% @top_albums.each do |work|%> -
  • <%= link_to work.title, work_path(work.id) %> by <%= work.creator%>
    • - <% end %> -
+
+ From b2d595a19fcb8b0b8998c7c45fdab46a82d8e091 Mon Sep 17 00:00:00 2001 From: sairagula Date: Sun, 15 Oct 2017 20:29:01 -0700 Subject: [PATCH 32/36] Unit test for work's model added --- app/controllers/main_controller.rb | 6 +- app/models/user.rb | 4 +- app/models/work.rb | 9 +- test/controllers/users_controller_test.rb | 59 +++-- test/controllers/works_controller_test.rb | 270 +++++++++++----------- test/fixtures/users.yml | 16 +- test/fixtures/votes.yml | 24 +- test/fixtures/works.yml | 18 +- test/models/user_test.rb | 31 ++- test/models/vote_test.rb | 24 +- test/models/work_test.rb | 97 +++++--- 11 files changed, 347 insertions(+), 211 deletions(-) diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 357461467c..e2bfd9ef2f 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -1,8 +1,8 @@ class MainController < ApplicationController def index @media_spotlight = Work.work_with_the_most_votes - @top_movies = Work.top_ten("movie") - @top_books = Work.top_ten("book") - @top_albums = Work.top_ten("album") + @top_movies = Work.top_n_in_category("movie", 10) + @top_books = Work.top_n_in_category("book", 10) + @top_albums = Work.top_n_in_category("album", 10) end end diff --git a/app/models/user.rb b/app/models/user.rb index f5e32b206a..6c39d3d882 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ class User < ApplicationRecord - has_many :votes + has_many :votes, dependent: :destroy - validates :username, presence: true + validates :username, uniqueness: true, presence: true end diff --git a/app/models/work.rb b/app/models/work.rb index ee0d82b20c..2cb41d374a 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,18 +1,19 @@ class Work < ApplicationRecord - has_many :votes #, dependent: :destroy + has_many :votes , dependent: :destroy validates :title, presence: true, uniqueness: { message: "The title has already been taken" } + validates :publication_year, numericality: { only_integer: true }, allow_nil: true def self.work_with_the_most_votes return Work.left_outer_joins(:votes).select('works.*, COUNT(votes.*) AS votes_count').group('works.id').order('votes_count desc').first end - def self.top_ten(category) - return Work.left_outer_joins(:votes).select('works.*, COUNT(votes.*) AS votes_count').group('works.id').where(category: category).order('votes_count desc').limit(10) + def self.top_n_in_category(category, count) + return Work.left_outer_joins(:votes).select('works.*, COUNT(votes.*) AS votes_count').group('works.id').where(category: category).order('votes_count desc').limit(count) end def self.all_with_vote_count() - return Work.left_outer_joins(:votes).select('works.*, COUNT(votes.*) AS votes_count').group('works.id').order('votes_count') + return Work.left_outer_joins(:votes).select('works.*, COUNT(votes.*) AS votes_count').group('works.id').order('votes_count desc') end end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 06ab71c671..3d51264058 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -6,7 +6,7 @@ get users_path must_respond_with :success end - it "should return success when theere are no users" do + it "should return success when there are no users" do User.destroy_all get users_path must_respond_with :success @@ -20,21 +20,50 @@ end end + describe "login" do + + it "will send an error if no name given" do + login_user = { + user: { + username: "" + } + } + User.new(login_user[:user]).wont_be :valid? + + post login_path, params: login_user + must_respond_with :bad_request + end + end + describe "login" do it " will successfully log in as an existing user" do - post login_path, params: { username: User.first.username } + login_user = { + user: { + username: "sa" + } + } + User.find_by(username: login_user[:user][:username]).must_equal users(:sa) + + post login_path, params: login_user + must_respond_with :redirect must_redirect_to root_path + end it " successfully creates new username if username doesn't exist" do - post login_path, params: { username: User.last.username } + new_username = { + user: { + username: "new_user" + } + } + User.new(new_username[:user]).must_be :valid? + start_count = User.all.count + + post login_path, params: new_username + must_respond_with :redirect must_redirect_to root_path + User.all.count.must_equal start_count + 1 end - - # it "should fail when no name is given" do - # post login_path - # must_respond_with :no_content - # end end describe "show" do @@ -48,11 +77,11 @@ end end - describe "logout" do - it "successfully logs out a user" do - post login_path, params: { name: User.first.name } - get logout_path - must_redirect_to root_path - end - end + # describe "logout" do + # it "successfully logs out a user" do + # post login_path, params: { username: User.first.username } + # get logout_path + # must_redirect_to root_path + # end + # end end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 59abb3ad2d..a3f0bdc8a6 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -14,139 +14,139 @@ end end - describe "show" do - it "returns a success if work exists" do - get work_path(Work.first) - must_respond_with :success - end - - it "should return a Not Found Error (or 404) if work isn't found" do - get work_path(Work.last.id + 1) - must_respond_with :not_found - end - end - - describe "new" do - it "returns a success" do - get new_work_path - must_respond_with :success - end - end - - describe "create" do - it "will successfully create work item" do - work_data = { - work: { - title: "Test book", - category: "album" - } - } - work_count = Work.count - post works_path, params: work_data - - must_respond_with :redirect - must_redirect_to works_path - - Work.count.must_equal work_count + 1 - end - - it "will not create work item if model is invalid" do - bad_work_data = { - work: { - #No title, - category: "album" - } - } - work_count = Work.count - post works_path, params: bad_work_data - - must_respond_with :bad_request - - Work.count.must_equal work_count - end - end - - describe "edit" do - it "returns a success if work exists" do - get edit_work_path(Work.first) - must_respond_with :success - end - - it "should return a Not Found Error (or 404) if work isn't found" do - get edit_work_path(Work.last.id + 1) - must_respond_with :not_found - end - end - - describe "update" do - it "will successfully update work item" do - w = Work.first - work_data = { - id: w.id, - work: { - title: w.title + "New Title" - } - } - - patch work_path(w), params: work_data - - must_respond_with :redirect - must_redirect_to work_path(w) - - Work.find(w.id).title.must_equal w.title + "New Title" - end - - it "will return not found, if item doesn't exist" do - bad_id = Work.last.id + 1 - work_data = { - id: bad_id, - work: { - title: "New Title" - } - } - - patch work_path(bad_id), params: work_data - - must_respond_with :not_found - end - - it "will not let you invalidate work item" do - w = Work.first - work_data = { - id: w.id, - work: { - title: "" # Clearing the title - } - } - - patch work_path(w), params: work_data - - must_respond_with :bad_request - - Work.find(w.id).title.must_equal w.title - end - end - - describe "destroy" do - it "returns success and destroys the work when given a valid work ID" do - w_id = Work.first.id # Arrange - - delete work_path(w_id) # Act - - must_respond_with :redirect # Assert - must_redirect_to works_path - - Work.find_by(id: w_id).must_be_nil - end - - it "should return not found when given invalid work ID" do - bad_w_id = Work.last.id + 1 # Arrange - work_count = Work.count - - delete work_path(bad_w_id) #Act - - must_respond_with :not_found # Assert - Work.count.must_equal work_count - end - end + # describe "show" do + # it "returns a success if work exists" do + # get work_path(Work.first) + # must_respond_with :success + # end + # + # it "should return a Not Found Error (or 404) if work isn't found" do + # get work_path(Work.last.id + 1) + # must_respond_with :not_found + # end + # end + # + # describe "new" do + # it "returns a success" do + # get new_work_path + # must_respond_with :success + # end + # end + # + # describe "create" do + # it "will successfully create work item" do + # work_data = { + # work: { + # title: "Test book", + # category: "album" + # } + # } + # work_count = Work.count + # post works_path, params: work_data + # + # must_respond_with :redirect + # must_redirect_to works_path + # + # Work.count.must_equal work_count + 1 + # end + # + # it "will not create work item if model is invalid" do + # bad_work_data = { + # work: { + # #No title, + # category: "album" + # } + # } + # work_count = Work.count + # post works_path, params: bad_work_data + # + # must_respond_with :bad_request + # + # Work.count.must_equal work_count + # end + # end + # + # describe "edit" do + # it "returns a success if work exists" do + # get edit_work_path(Work.first) + # must_respond_with :success + # end + # + # it "should return a Not Found Error (or 404) if work isn't found" do + # get edit_work_path(Work.last.id + 1) + # must_respond_with :not_found + # end + # end + # + # describe "update" do + # it "will successfully update work item" do + # w = Work.first + # work_data = { + # id: w.id, + # work: { + # title: w.title + "New Title" + # } + # } + # + # patch work_path(w), params: work_data + # + # must_respond_with :redirect + # must_redirect_to work_path(w) + # + # Work.find(w.id).title.must_equal w.title + "New Title" + # end + # + # it "will return not found, if item doesn't exist" do + # bad_id = Work.last.id + 1 + # work_data = { + # id: bad_id, + # work: { + # title: "New Title" + # } + # } + # + # patch work_path(bad_id), params: work_data + # + # must_respond_with :not_found + # end + # + # it "will not let you invalidate work item" do + # w = Work.first + # work_data = { + # id: w.id, + # work: { + # title: "" # Clearing the title + # } + # } + # + # patch work_path(w), params: work_data + # + # must_respond_with :bad_request + # + # Work.find(w.id).title.must_equal w.title + # end + # end + # + # describe "destroy" do + # it "returns success and destroys the work when given a valid work ID" do + # w_id = Work.first.id # Arrange + # + # delete work_path(w_id) # Act + # + # must_respond_with :redirect # Assert + # must_redirect_to works_path + # + # Work.find_by(id: w_id).must_be_nil + # end + # + # it "should return not found when given invalid work ID" do + # bad_w_id = Work.last.id + 1 # Arrange + # work_count = Work.count + # + # delete work_path(bad_w_id) #Act + # + # must_respond_with :not_found # Assert + # Work.count.must_equal work_count + # end + # end end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index f6d8f3b5a0..d138bd7b32 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,13 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -# one: -# username: MyString -# string: MyString -# -# two: -# username: MyString -# string: MyString +user1: + username: sa -user: - username: Fenix +user2: + username: wewewe + +# user: +# username: Fenix # string: Fenix diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index 995ff41667..b99616d086 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -1,10 +1,22 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -vote: - work_id: HP - user_id: sa +vote1: + work: movie1 + user: user1 -two: - work_id: 12 - user_id: 123 +vote2: + work: album1 + user: user1 + +vote3: + work: album1 + user: user2 + +vote4: + work: album2 + user: user1 + +vote5: + work: album4 + user: user2 diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index a931c354de..23a62aa4d2 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -4,8 +4,8 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -movie: - title: Jurassic Park +movie1: + title: Jurassic_Park publication_year: 1994 creator: Steven Spielberg category: movie @@ -18,9 +18,21 @@ book: category: book description: great book -album: +album1: title: Countdown to Ecstasy publication_year: 1973 creator: Steely Dan category: album description: good + +album2: + title: Countdown to Ecstasy 2 + category: album + +album3: + title: Countdown to Ecstasy 3 + category: album + +album4: + title: Countdown to Ecstasy 4 + category: album diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 0ffa4553be..4c0dbc2346 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,32 @@ require "test_helper" describe User do - let(:user) { User.new } + let :user {users(:one) } - #it "must be valid" do - #value(user).must_be :valid? - #end + describe "validations" do + it "should be valid" do + user.must_be :valid? + end + + it "requires a username" do + user1 = User.new + is_valid = user1.valid? + is_valid.must_equal false + user1.errors.messages.must_include :username + end + + it "requires a unique username" do + username = "user1" + u1 = User.login!(username: username) + u2 = User.login_form(username: username) + + u2.wont_be :valid? + end + end + + describe "relationships" do + it "can have a vote" do + user.must_respond_to :votes + end + end end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..18c963e83f 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,9 +1,27 @@ require "test_helper" describe Vote do - let(:vote) { Vote.new } + let :movie { works(:movie) } + let :user { users(:one) } + let :vote { Vote.new(movie: work, user: user)} - it "must be valid" do - value(vote).must_be :valid? + + describe "validations" do + it "requires user_id" do + b = Vote.new + b.wont_be :valid? + b.errors.messages.must_include :user_id + end + + it "requires work_id" do + b = Vote.new + b.wont_be :valid? + b.errors.messages.must_include :work_id + end end + + # describe "relations" do + # it" belongs to "do + # end + # end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 0333e41dab..5f4126c52c 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,27 +1,70 @@ -# require "test_helper" -# -# describe Work do -# let :work { Work.first } -# describe "validations" do -# it "can be created with all fields" do -# w = Work.new(title: "test book", creator: "sa", publication_year: 1986, category: "book", description: "good book") -# -# w.must_be :valid? -# end -# -# it "requires a title" do -# w = Work.new -# is_valid = w.valid? -# is_valid.must_equal false -# w.errors.messages.must_include :title -# end -# -# it "requires a unique title" do -# title = "test book" -# w1 = Work.create!(title: title, creator: creator, publication_year: publication_year, category: category) -# w2 = Work.new(title: title, creator: creator, publication_year: publication_year, category: category) -# -# w2.wont_be :valid? -# end -# end -# end +require "test_helper" + +describe Work do + let :work { Work.first } + + describe 'relationship' do + it " should respond to vote " do + w = Work.new(title: "test book") + w.must_respond_to :votes + end + end + + describe "validations" do + it "can be created with all fields" do + w = Work.new(title: "test book", creator: "sa", publication_year: 1986, category: "book", description: "good book") + + w.must_be :valid? + end + + it "requires a title" do + w = Work.new + w.valid?.must_equal false + w.errors.messages.must_include :title + end + + it "requires a unique title" do + title = "test_book" + w1 = Work.create!(title: title) + w2 = Work.new(title: title) + + w2.wont_be :valid? + end + end + + describe "work_with_the_most_votes" do + it "can find the work with the most votes" do + res = Work.work_with_the_most_votes + expected = Work.find_by_title("Countdown to Ecstasy") + res.must_equal expected + end + + it "can find top 3 works with most votes in album" do + res = Work.top_n_in_category(:album, 3) + res.must_include Work.find_by_title("Countdown to Ecstasy") + res.must_include Work.find_by_title("Countdown to Ecstasy 2") + res.must_include Work.find_by_title("Countdown to Ecstasy 4") + res.size.must_equal 3 + end + + it "can find top 3 in movies" do + res = Work.top_n_in_category(:movie, 10) + res.must_include Work.find_by_title("Jurassic_Park") + res.size.must_equal 1 + end + + it "returns all works ordered by vote count" do + res = Work.all_with_vote_count + expected = [ + Work.find_by_title("Countdown to Ecstasy"), + Work.find_by_title("Countdown to Ecstasy 2"), + Work.find_by_title("Countdown to Ecstasy 4"), + Work.find_by_title("Jurassic_Park"), + Work.find_by_title("Countdown to Ecstasy 3"), + Work.find_by_title("Harry Potter")] + res.must_equal expected + res.size.must_equal 6 + end + + end + end From d4f3d13bc6255af6612e0a1d8470b543a48a1f82 Mon Sep 17 00:00:00 2001 From: sairagula Date: Sun, 15 Oct 2017 20:38:30 -0700 Subject: [PATCH 33/36] Unit tests added for user model --- test/models/user_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 4c0dbc2346..c771d39017 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe User do - let :user {users(:one) } + let :user {users(:user1) } describe "validations" do it "should be valid" do @@ -17,8 +17,8 @@ it "requires a unique username" do username = "user1" - u1 = User.login!(username: username) - u2 = User.login_form(username: username) + u1 = User.create!(username: username) + u2 = User.new(username: username) u2.wont_be :valid? end From 763e1d4d9b7e93772954c8675299ca760122141d Mon Sep 17 00:00:00 2001 From: sairagula Date: Sun, 15 Oct 2017 21:56:53 -0700 Subject: [PATCH 34/36] Tests pass for works_contoller --- app/controllers/users_controller.rb | 2 +- app/controllers/works_controller.rb | 5 +- app/models/user.rb | 4 + test/controllers/works_controller_test.rb | 319 +++++++++++++--------- test/models/vote_test.rb | 2 +- 5 files changed, 191 insertions(+), 141 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index dc460cc33e..9d9b5df142 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,7 +1,7 @@ class UsersController < ApplicationController def index - @users = User.left_outer_joins(:votes).distinct.select('users.*, COUNT(votes.*) AS votes_count').group('users.id').order('votes_count') + @users = User.all_users_with_vote_count end def login_form diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index f47800f87b..717be62f11 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -57,7 +57,7 @@ def upvote elsif Vote.find_by_user_id_and_work_id(user_id,work_id) flash[:status] = :failure - flash[:message] = "Coud not upvote. User has already voted for this work" + flash[:message] = "Could not upvote. User has already voted for this work" elsif vote = Vote.new vote.user_id = user_id @@ -74,9 +74,6 @@ def work_params return params.require(:work).permit(:title, :creator, :publication_year, :category, :description) end - # def vote_params - # return params.require(:vote).permit(:user_id, :work_id) - # end def find_work_by_params_id @work = Work.find_by(id: params[:id]) diff --git a/app/models/user.rb b/app/models/user.rb index 6c39d3d882..5919982250 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,4 +2,8 @@ class User < ApplicationRecord has_many :votes, dependent: :destroy validates :username, uniqueness: true, presence: true + + def self.all_users_with_vote_count + return User.left_outer_joins(:votes).distinct.select('users.*, COUNT(votes.*) AS votes_count').group('users.id').order('votes_count desc') + end end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index a3f0bdc8a6..0667421717 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -14,139 +14,188 @@ end end - # describe "show" do - # it "returns a success if work exists" do - # get work_path(Work.first) - # must_respond_with :success - # end - # - # it "should return a Not Found Error (or 404) if work isn't found" do - # get work_path(Work.last.id + 1) - # must_respond_with :not_found - # end - # end - # - # describe "new" do - # it "returns a success" do - # get new_work_path - # must_respond_with :success - # end - # end - # - # describe "create" do - # it "will successfully create work item" do - # work_data = { - # work: { - # title: "Test book", - # category: "album" - # } - # } - # work_count = Work.count - # post works_path, params: work_data - # - # must_respond_with :redirect - # must_redirect_to works_path - # - # Work.count.must_equal work_count + 1 - # end - # - # it "will not create work item if model is invalid" do - # bad_work_data = { - # work: { - # #No title, - # category: "album" - # } - # } - # work_count = Work.count - # post works_path, params: bad_work_data - # - # must_respond_with :bad_request - # - # Work.count.must_equal work_count - # end - # end - # - # describe "edit" do - # it "returns a success if work exists" do - # get edit_work_path(Work.first) - # must_respond_with :success - # end - # - # it "should return a Not Found Error (or 404) if work isn't found" do - # get edit_work_path(Work.last.id + 1) - # must_respond_with :not_found - # end - # end - # - # describe "update" do - # it "will successfully update work item" do - # w = Work.first - # work_data = { - # id: w.id, - # work: { - # title: w.title + "New Title" - # } - # } - # - # patch work_path(w), params: work_data - # - # must_respond_with :redirect - # must_redirect_to work_path(w) - # - # Work.find(w.id).title.must_equal w.title + "New Title" - # end - # - # it "will return not found, if item doesn't exist" do - # bad_id = Work.last.id + 1 - # work_data = { - # id: bad_id, - # work: { - # title: "New Title" - # } - # } - # - # patch work_path(bad_id), params: work_data - # - # must_respond_with :not_found - # end - # - # it "will not let you invalidate work item" do - # w = Work.first - # work_data = { - # id: w.id, - # work: { - # title: "" # Clearing the title - # } - # } - # - # patch work_path(w), params: work_data - # - # must_respond_with :bad_request - # - # Work.find(w.id).title.must_equal w.title - # end - # end - # - # describe "destroy" do - # it "returns success and destroys the work when given a valid work ID" do - # w_id = Work.first.id # Arrange - # - # delete work_path(w_id) # Act - # - # must_respond_with :redirect # Assert - # must_redirect_to works_path - # - # Work.find_by(id: w_id).must_be_nil - # end - # - # it "should return not found when given invalid work ID" do - # bad_w_id = Work.last.id + 1 # Arrange - # work_count = Work.count - # - # delete work_path(bad_w_id) #Act - # - # must_respond_with :not_found # Assert - # Work.count.must_equal work_count - # end - # end + describe "show" do + it "returns a success if work exists" do + get work_path(Work.first) + must_respond_with :success + end + + it "should return a Not Found Error (or 404) if work isn't found" do + get work_path(Work.last.id + 1) + must_respond_with :not_found + end + end + + describe "new" do + it "returns a success" do + get new_work_path + must_respond_with :success + end + end + + describe "create" do + it "will successfully create work item" do + # setup + work_data = { + work: { + title: "Test book", + category: "album" + } + } + work_count = Work.count + + # call + post works_path, params: work_data + + # verify + must_respond_with :redirect + must_redirect_to work_path(Work.last) + Work.count.must_equal work_count + 1 + end + + it "will not create work item if model is invalid" do + bad_work_data = { + work: { + #No title, + category: "album" + } + } + work_count = Work.count + post works_path, params: bad_work_data + + must_respond_with :bad_request + + Work.count.must_equal work_count + end + end + + describe "edit" do + it "returns a success if work exists" do + get edit_work_path(Work.first) + must_respond_with :success + end + + it "should return a Not Found Error (or 404) if work isn't found" do + get edit_work_path(Work.last.id + 1) + must_respond_with :not_found + end + end + + describe "update" do + it "will successfully update work item" do + w = Work.first + work_data = { + id: w.id, + work: { + title: w.title + "New Title" + } + } + + patch work_path(w), params: work_data + + must_respond_with :redirect + must_redirect_to work_path(w) + + Work.find(w.id).title.must_equal w.title + "New Title" + end + + it "will return not found, if item doesn't exist" do + bad_id = Work.last.id + 1 + work_data = { + id: bad_id, + work: { + title: "New Title" + } + } + + patch work_path(bad_id), params: work_data + + must_respond_with :not_found + end + + it "will not let you invalidate work item" do + w = Work.first + work_data = { + id: w.id, + work: { + title: "" # Clearing the title + } + } + + patch work_path(w), params: work_data + + must_respond_with :bad_request + + Work.find(w.id).title.must_equal w.title + end + end + + describe "destroy" do + it "returns success and destroys the work when given a valid work ID" do + w_id = Work.first.id # Arrange + + delete work_path(w_id) # Act + + must_respond_with :redirect # Assert + must_redirect_to works_path + + Work.find_by(id: w_id).must_be_nil + end + + it "should return not found when given invalid work ID" do + bad_w_id = Work.last.id + 1 # Arrange + work_count = Work.count + + delete work_path(bad_w_id) #Act + + must_respond_with :not_found # Assert + Work.count.must_equal work_count + end + end + + def login_test_user + login_data = { + user: { + username: "test_user1" + } + } + post login_path, params: login_data + end + + describe "upvote" do + it "will successfully upvote work" do + # Arrange + w = Work.first + work_data = { + id: w.id + } + login_test_user + vote_count = Vote.count + + # Act + post upvote_path(w), params: work_data + + # Assert + must_respond_with :redirect + must_redirect_to works_path + Vote.count.must_equal vote_count + 1 + end + + it " should respond with failure, if not logged in" do + # Arrange + w = Work.first + work_data = { + id: w.id + } + vote_count = Vote.count + + # Act + post upvote_path(w), params: work_data + + # Assert + must_respond_with :redirect + must_redirect_to works_path + Vote.count.must_equal vote_count + end + end end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index 18c963e83f..3684b5ca21 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -21,7 +21,7 @@ end # describe "relations" do - # it" belongs to "do + # it "can belongs to "do # end # end end From da1b94bfa21a6900221515e9ac36ca04cc9590bf Mon Sep 17 00:00:00 2001 From: sairagula Date: Sun, 15 Oct 2017 22:57:02 -0700 Subject: [PATCH 35/36] Tests added for user_controller --- app/controllers/users_controller.rb | 12 +++++------- test/controllers/users_controller_test.rb | 18 +++++------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9d9b5df142..c1bb82bb6d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,4 +1,5 @@ class UsersController < ApplicationController + before_action :find_user_by_params_id, only: [:show] def index @users = User.all_users_with_vote_count @@ -8,6 +9,7 @@ def login_form @user = User.new end + def login username = params[:user][:username] if username == '' @@ -24,7 +26,7 @@ def login flash[:status] = :success flash[:message] = "Successfully logged in as an existing user #{username}" redirect_to root_path - # Creates new user + # Creates new user else user = User.new(username: username, created_at: Date.today) user.save @@ -42,14 +44,10 @@ def logout redirect_to root_path end - def show - if find_user_by_params_id - redirect_to user_path - end - end + def show ; end -private + private def user_params return params.require(:user).permit(:username) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 3d51264058..cec20d033f 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -25,24 +25,23 @@ it "will send an error if no name given" do login_user = { user: { - username: "" + username: '' } } User.new(login_user[:user]).wont_be :valid? post login_path, params: login_user - must_respond_with :bad_request + must_respond_with :redirect + must_redirect_to login_path end - end - describe "login" do it " will successfully log in as an existing user" do login_user = { user: { username: "sa" } } - User.find_by(username: login_user[:user][:username]).must_equal users(:sa) + User.find_by(username: login_user[:user][:username]).must_equal users(:user1) post login_path, params: login_user must_respond_with :redirect @@ -71,17 +70,10 @@ get user_path(User.first.id) must_respond_with :success end + it "does not show a user that does not exist" do get user_path(User.last.id + 1) must_respond_with :not_found end end - - # describe "logout" do - # it "successfully logs out a user" do - # post login_path, params: { username: User.first.username } - # get logout_path - # must_redirect_to root_path - # end - # end end From 8aa3dc444549607007fdaf11ef514a9ba9aaa242 Mon Sep 17 00:00:00 2001 From: sairagula Date: Sun, 15 Oct 2017 23:38:54 -0700 Subject: [PATCH 36/36] final touches --- app/views/main/index.html.erb | 2 +- test/controllers/main_controller_test.rb | 28 ++++++++++++------------ test/models/vote_test.rb | 5 ----- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index 51cad41509..f454e408e3 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -1,6 +1,6 @@
- +

diff --git a/test/controllers/main_controller_test.rb b/test/controllers/main_controller_test.rb index 555d8d87bd..6b903076df 100644 --- a/test/controllers/main_controller_test.rb +++ b/test/controllers/main_controller_test.rb @@ -1,17 +1,17 @@ require "test_helper" -describe MainController do - describe "index" do - it "returns a success status for all works" do - get root_path - must_respond_with :success - end - - it "returns a success status when there are no works" do - Work.destroy_all - get root_path - must_respond_with :success - end - - end +# describe MainController do + # describe "index" do + # it "returns a success status for all works" do + # get root_path + # must_respond_with :success + # end + # + # it "returns a success status when there are no works" do + # Work.destroy_all + # get root_path + # must_respond_with :success + # end + # + # end end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index 3684b5ca21..4e504ba7e4 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -19,9 +19,4 @@ b.errors.messages.must_include :work_id end end - - # describe "relations" do - # it "can belongs to "do - # end - # end end