From 8c0bccdc3187a6d8c15afd3222cba3fd2690db55 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 10 Oct 2017 14:07:31 -0700 Subject: [PATCH 01/68] Initial Rails setup --- .gitignore | 19 ++ Gemfile | 66 ++++++ Gemfile.lock | 222 ++++++++++++++++++ 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 75 files changed, 1291 insertions(+) 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..8daa6f0f7d --- /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' + gem 'pry-rails' +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 '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/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..c51241471d --- /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: de89e1626760b761bb5c525cb5bca1a1d9059c444c828aacffe9a3b1b7af319eb066211073fe6400e695f32e948ed144aec10dbb644fa45f32ce065b73966651 + +test: + secret_key_base: 667715255cfd8d42780933fbac405a00ddd51eecb62fcfcd41ed001c5d6cf1cb7e8ee00d58568caff3348663e0c71d0d46d9a505a5aa23b4a4b004dde41ee1cf + +# 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 edb744345fbdda9b895f543cd621a79b13ede0a0 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 10 Oct 2017 14:55:52 -0700 Subject: [PATCH 02/68] Add model migrations and crate database --- app/models/user.rb | 2 ++ app/models/vote.rb | 2 ++ app/models/work.rb | 2 ++ db/migrate/20171010213853_create_users.rb | 9 +++++ db/migrate/20171010213903_create_votes.rb | 10 ++++++ db/migrate/20171010214153_create_works.rb | 13 +++++++ db/schema.rb | 41 +++++++++++++++++++++++ test/fixtures/users.yml | 11 ++++++ test/fixtures/votes.yml | 11 ++++++ test/fixtures/works.yml | 11 ++++++ test/models/user_test.rb | 9 +++++ test/models/vote_test.rb | 9 +++++ test/models/work_test.rb | 9 +++++ 13 files changed, 139 insertions(+) create mode 100644 app/models/user.rb create mode 100644 app/models/vote.rb create mode 100644 app/models/work.rb create mode 100644 db/migrate/20171010213853_create_users.rb create mode 100644 db/migrate/20171010213903_create_votes.rb create mode 100644 db/migrate/20171010214153_create_works.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/fixtures/votes.yml create mode 100644 test/fixtures/works.yml create mode 100644 test/models/user_test.rb create mode 100644 test/models/vote_test.rb create mode 100644 test/models/work_test.rb diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..379658a509 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,2 @@ +class User < ApplicationRecord +end diff --git a/app/models/vote.rb b/app/models/vote.rb new file mode 100644 index 0000000000..4c58e4f3d5 --- /dev/null +++ b/app/models/vote.rb @@ -0,0 +1,2 @@ +class Vote < ApplicationRecord +end diff --git a/app/models/work.rb b/app/models/work.rb new file mode 100644 index 0000000000..95322dd45e --- /dev/null +++ b/app/models/work.rb @@ -0,0 +1,2 @@ +class Work < ApplicationRecord +end diff --git a/db/migrate/20171010213853_create_users.rb b/db/migrate/20171010213853_create_users.rb new file mode 100644 index 0000000000..db7b81a70b --- /dev/null +++ b/db/migrate/20171010213853_create_users.rb @@ -0,0 +1,9 @@ +class CreateUsers < ActiveRecord::Migration[5.1] + def change + create_table :users do |t| + + t.string "username" + t.timestamps + end + end +end diff --git a/db/migrate/20171010213903_create_votes.rb b/db/migrate/20171010213903_create_votes.rb new file mode 100644 index 0000000000..2dca47a8e1 --- /dev/null +++ b/db/migrate/20171010213903_create_votes.rb @@ -0,0 +1,10 @@ +class CreateVotes < ActiveRecord::Migration[5.1] + def change + create_table :votes do |t| + + t.integer "user_id" + t.integer "work_id" + t.timestamps + end + end +end diff --git a/db/migrate/20171010214153_create_works.rb b/db/migrate/20171010214153_create_works.rb new file mode 100644 index 0000000000..6784aecc05 --- /dev/null +++ b/db/migrate/20171010214153_create_works.rb @@ -0,0 +1,13 @@ +class CreateWorks < ActiveRecord::Migration[5.1] + def change + create_table :works do |t| + + t.string "category" + t.string "title" + t.string "creator" + t.string "description" + t.integer "year" + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..579dd8fb55 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,41 @@ +# 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: 20171010214153) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "users", force: :cascade do |t| + t.string "username" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "votes", force: :cascade do |t| + t.integer "user_id" + t.integer "work_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "works", force: :cascade do |t| + t.string "category" + t.string "title" + t.string "creator" + t.string "description" + t.integer "year" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..dc3ee79b5d --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml new file mode 100644 index 0000000000..dc3ee79b5d --- /dev/null +++ b/test/fixtures/votes.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml new file mode 100644 index 0000000000..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/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..cc862ac2d9 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe User do + let(:user) { User.new } + + it "must be valid" do + value(user).must_be :valid? + end +end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb new file mode 100644 index 0000000000..fc15947bd3 --- /dev/null +++ b/test/models/vote_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Vote do + let(:vote) { Vote.new } + + it "must be valid" do + value(vote).must_be :valid? + end +end diff --git a/test/models/work_test.rb b/test/models/work_test.rb new file mode 100644 index 0000000000..f6fba7104d --- /dev/null +++ b/test/models/work_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Work do + let(:work) { Work.new } + + it "must be valid" do + value(work).must_be :valid? + end +end From ead5b32cbc683da47bd05ec845028588c48e2c44 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 10 Oct 2017 15:01:48 -0700 Subject: [PATCH 03/68] Add all controllers with methods --- app/assets/javascripts/users.js | 2 ++ app/assets/javascripts/votes.js | 2 ++ app/assets/javascripts/works.js | 2 ++ app/assets/stylesheets/users.scss | 3 +++ app/assets/stylesheets/votes.scss | 3 +++ app/assets/stylesheets/works.scss | 3 +++ app/controllers/users_controller.rb | 22 ++++++++++++++++++++++ app/controllers/votes_controller.rb | 23 +++++++++++++++++++++++ app/controllers/works_controller.rb | 22 ++++++++++++++++++++++ app/helpers/users_helper.rb | 2 ++ app/helpers/votes_helper.rb | 2 ++ app/helpers/works_helper.rb | 2 ++ test/controllers/users_controller_test.rb | 7 +++++++ test/controllers/votes_controller_test.rb | 7 +++++++ test/controllers/works_controller_test.rb | 7 +++++++ 15 files changed, 109 insertions(+) create mode 100644 app/assets/javascripts/users.js create mode 100644 app/assets/javascripts/votes.js create mode 100644 app/assets/javascripts/works.js create mode 100644 app/assets/stylesheets/users.scss create mode 100644 app/assets/stylesheets/votes.scss create mode 100644 app/assets/stylesheets/works.scss create mode 100644 app/controllers/users_controller.rb create mode 100644 app/controllers/votes_controller.rb create mode 100644 app/controllers/works_controller.rb create mode 100644 app/helpers/users_helper.rb create mode 100644 app/helpers/votes_helper.rb create mode 100644 app/helpers/works_helper.rb create mode 100644 test/controllers/users_controller_test.rb create mode 100644 test/controllers/votes_controller_test.rb create mode 100644 test/controllers/works_controller_test.rb diff --git a/app/assets/javascripts/users.js b/app/assets/javascripts/users.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/users.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/votes.js b/app/assets/javascripts/votes.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/votes.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/works.js b/app/assets/javascripts/works.js new file mode 100644 index 0000000000..dee720facd --- /dev/null +++ b/app/assets/javascripts/works.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss new file mode 100644 index 0000000000..31a2eacb84 --- /dev/null +++ b/app/assets/stylesheets/users.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Users controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/votes.scss b/app/assets/stylesheets/votes.scss new file mode 100644 index 0000000000..9a6720f80e --- /dev/null +++ b/app/assets/stylesheets/votes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Votes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/works.scss b/app/assets/stylesheets/works.scss new file mode 100644 index 0000000000..5618452f3e --- /dev/null +++ b/app/assets/stylesheets/works.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Works controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..4da2ddd9da --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,22 @@ +class UsersController < ApplicationController + def index + end + + def show + end + + def new + end + + def create + end + + def edit + end + + def update + end + + def destroy + end +end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb new file mode 100644 index 0000000000..d6f4c5dd81 --- /dev/null +++ b/app/controllers/votes_controller.rb @@ -0,0 +1,23 @@ +class VotesController < ApplicationController + def index + end + + def show + end + + def new + end + + def create + end + + def edit + end + + def update + end + + def destroy + end + +end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb new file mode 100644 index 0000000000..f89371fa28 --- /dev/null +++ b/app/controllers/works_controller.rb @@ -0,0 +1,22 @@ +class WorksController < ApplicationController + def index + end + + def show + end + + def new + end + + def create + end + + def edit + end + + def update + end + + def destroy + end +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000..2310a240d7 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/app/helpers/votes_helper.rb b/app/helpers/votes_helper.rb new file mode 100644 index 0000000000..5a82eed07d --- /dev/null +++ b/app/helpers/votes_helper.rb @@ -0,0 +1,2 @@ +module VotesHelper +end diff --git a/app/helpers/works_helper.rb b/app/helpers/works_helper.rb new file mode 100644 index 0000000000..ccb78c2b73 --- /dev/null +++ b/app/helpers/works_helper.rb @@ -0,0 +1,2 @@ +module WorksHelper +end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000..89decb54e0 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe UsersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/votes_controller_test.rb b/test/controllers/votes_controller_test.rb new file mode 100644 index 0000000000..cf4d03935f --- /dev/null +++ b/test/controllers/votes_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe VotesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb new file mode 100644 index 0000000000..d95073c22e --- /dev/null +++ b/test/controllers/works_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe WorksController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 27d9e16e2c53e085ba1cd7d6bab63710bffc2dba Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 10 Oct 2017 15:22:26 -0700 Subject: [PATCH 04/68] Add to methods of each controller --- app/controllers/users_controller.rb | 16 +++++++++++++++- app/controllers/votes_controller.rb | 17 +++++++++++++++-- app/controllers/works_controller.rb | 26 +++++++++++++++++++++++++- 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4da2ddd9da..662c289eb2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,22 +1,36 @@ class UsersController < ApplicationController def index + @users = User.all end def show + @user = User.find(params[:id]) end def new + @user = User.new end - def create + def create # Add Strong Params + user = User.new( + id: params[:user][:id], + username: params[:user][:username] + ) + user.save + # Add redirect_to end def edit + @user = User.find(params[:id]) end def update + @user = User.find(param[:id]) + # Do I need to update the user at this time? end def destroy + user = User.find(params[:id]) + user.destroy end end diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb index d6f4c5dd81..4b09305656 100644 --- a/app/controllers/votes_controller.rb +++ b/app/controllers/votes_controller.rb @@ -1,23 +1,36 @@ class VotesController < ApplicationController def index + @votes = Vote.all end def show + @vote = Vote.find(params[:id]) end def new + @vote = Vote.new end - def create + def create # Add strong params + vote = Vote.new( + user_id: params[:vote][:user_id], + work_id: params[:vote][:work_id] + ) + vote.save + # Add redirect_to end def edit + @vote = Vote.find(params[:id]) end def update + @vote = Vote.find(params[:id]) + # Do we use the update method for vote? end def destroy + @vote = Vote.find(params[:id]) + # We do not need the destroy method for vote end - end diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index f89371fa28..ce36ed3356 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -1,22 +1,46 @@ class WorksController < ApplicationController def index + @works = Work.all end def show + @work = Work.find(params[:id]) end def new + @work = Work.new end - def create + def create # Add strong params + work = Work.new( + id: params[:work][:id], + category: params[:work][:category], + title: params[:work][:title], + creator: params[:work][:creator], + description: params[:work][:description], + year: params[:work][:year] + ) + work.save # Add redirect_to end def edit + @work = Work.find(params[:id]) end def update + @work = Work.find(params[:id]) + work_updates = params[:work] + @work.category = work_updates[:category] + @work.title = work_updates[:title] + @work.creator = work_updates[:creator] + @work.descripton = work_updates[:descripton] + @work.save + # Add a redirect_to end def destroy + @work = Work.find(params[:id]) + @work.destroy + # Add a redirect_to end end From edf373baeb7de430b3f5058a38a6b931d14cd11a Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 10 Oct 2017 15:36:14 -0700 Subject: [PATCH 05/68] Add relations and validations --- app/models/user.rb | 3 +++ app/models/vote.rb | 5 +++++ app/models/work.rb | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 379658a509..d61488143b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,5 @@ class User < ApplicationRecord + has_many :votes + + validates :user_name, format: { with: /[a-zA-Z]/ } end diff --git a/app/models/vote.rb b/app/models/vote.rb index 4c58e4f3d5..a946b6365c 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -1,2 +1,7 @@ class Vote < ApplicationRecord + belongs_to :user + belongs_to :work + + validates :user_id, numericality: { only_integer: true } + validates :work_id, numericality: { only_integer: true } end diff --git a/app/models/work.rb b/app/models/work.rb index 95322dd45e..d8c2db6227 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -1,2 +1,9 @@ class Work < ApplicationRecord + has_many :votes + + validates :category, presence: true + validates :title, presnce: true + validates :creator, presence: true + validates :description, presence: true + validates :year, numericality: { only_integer: true} end From 1ab71ebc6d4449f7b8fb382a00f8d475fb244f17 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 10 Oct 2017 15:45:12 -0700 Subject: [PATCH 06/68] Attempt to add seed csv file --- db/seeds.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..5dffa99c63 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,7 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) + +require 'csv' + +CSV.open("media_seeds.csv") From 05669f6c9d54e145bcd15c7509dafedee68a525c Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 10 Oct 2017 16:14:36 -0700 Subject: [PATCH 07/68] Change schema of Works, add testing to models --- app/models/work.rb | 2 +- ...ch_description_and_year_for_work_schema.rb | 6 +++++ ...yps_of_description_and_publication_year.rb | 5 +++++ db/schema.rb | 4 ++-- test/fixtures/works.yml | 22 +++++++++++++++---- test/models/user_test.rb | 4 ---- test/models/vote_test.rb | 4 ---- test/models/work_test.rb | 10 ++++++--- 8 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 db/migrate/20171010230317_swtich_description_and_year_for_work_schema.rb create mode 100644 db/migrate/20171010230610_change_data_typs_of_description_and_publication_year.rb diff --git a/app/models/work.rb b/app/models/work.rb index d8c2db6227..61482bf31e 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -2,7 +2,7 @@ class Work < ApplicationRecord has_many :votes validates :category, presence: true - validates :title, presnce: true + validates :title, presence: true validates :creator, presence: true validates :description, presence: true validates :year, numericality: { only_integer: true} diff --git a/db/migrate/20171010230317_swtich_description_and_year_for_work_schema.rb b/db/migrate/20171010230317_swtich_description_and_year_for_work_schema.rb new file mode 100644 index 0000000000..f886bfbf6c --- /dev/null +++ b/db/migrate/20171010230317_swtich_description_and_year_for_work_schema.rb @@ -0,0 +1,6 @@ +class SwtichDescriptionAndYearForWorkSchema < ActiveRecord::Migration[5.1] + def change + rename_column :works, :description, :publicaton_year + rename_column :works, :year, :description + end +end diff --git a/db/migrate/20171010230610_change_data_typs_of_description_and_publication_year.rb b/db/migrate/20171010230610_change_data_typs_of_description_and_publication_year.rb new file mode 100644 index 0000000000..21eeb0dcaf --- /dev/null +++ b/db/migrate/20171010230610_change_data_typs_of_description_and_publication_year.rb @@ -0,0 +1,5 @@ +class ChangeDataTypsOfDescriptionAndPublicationYear < ActiveRecord::Migration[5.1] + def change + change_column :works, :description, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 579dd8fb55..5045354828 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: 20171010214153) do +ActiveRecord::Schema.define(version: 20171010230610) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -32,8 +32,8 @@ t.string "category" t.string "title" t.string "creator" + t.string "publicaton_year" t.string "description" - t.integer "year" t.datetime "created_at", null: false t.datetime "updated_at", null: false end diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index dc3ee79b5d..1f7c7d6286 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -4,8 +4,22 @@ # 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: {} +album: + category: album + title: Can't Buy a Thrill + creator: Steely Dan + publicaton: 1972 + descripton: An album description +book: + category: book + title: Hidden Figures + creator: Margot Lee Shetterly + publicaton: 2016 + descripton: Good book that came before the movie +movie: + category: album + title: Can't Buy a Thrill + creator: Steely Dan + publicaton: 1972 + descripton: An album description # column: value diff --git a/test/models/user_test.rb b/test/models/user_test.rb index cc862ac2d9..7e81e26c94 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,5 @@ require "test_helper" describe User do - let(:user) { User.new } - it "must be valid" do - value(user).must_be :valid? - end end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index fc15947bd3..7b47eb3de6 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,9 +1,5 @@ require "test_helper" describe Vote do - let(:vote) { Vote.new } - it "must be valid" do - value(vote).must_be :valid? - end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index f6fba7104d..ef70fa53a1 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,9 +1,13 @@ require "test_helper" -describe Work do + +describe "validations" do let(:work) { Work.new } - it "must be valid" do - value(work).must_be :valid? + it "requires a category" do + is_valid = work.valid? + is_valid.must_be false + work.error.messages.wont_include :category end + end From 04401ab0dfe4941f7b2876672bfc6e33024c6824 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 10 Oct 2017 19:05:37 -0700 Subject: [PATCH 08/68] Add test for work_test validations --- app/models/work.rb | 2 +- .../20171011000902_change_name_of_pub_year.rb | 5 +++ db/schema.rb | 4 +-- test/fixtures/works.yml | 31 +++++++----------- test/models/user_test.rb | 6 ++-- test/models/vote_test.rb | 6 ++-- test/models/work_test.rb | 32 +++++++++++++++---- test/test_helper.rb | 2 +- 8 files changed, 52 insertions(+), 36 deletions(-) create mode 100644 db/migrate/20171011000902_change_name_of_pub_year.rb diff --git a/app/models/work.rb b/app/models/work.rb index 61482bf31e..66e479c62c 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -5,5 +5,5 @@ class Work < ApplicationRecord validates :title, presence: true validates :creator, presence: true validates :description, presence: true - validates :year, numericality: { only_integer: true} + validates :publication_year, presence: true end diff --git a/db/migrate/20171011000902_change_name_of_pub_year.rb b/db/migrate/20171011000902_change_name_of_pub_year.rb new file mode 100644 index 0000000000..3b901d38a9 --- /dev/null +++ b/db/migrate/20171011000902_change_name_of_pub_year.rb @@ -0,0 +1,5 @@ +class ChangeNameOfPubYear < ActiveRecord::Migration[5.1] + def change + rename_column :works, :publicaton_year, :publication_year + end +end diff --git a/db/schema.rb b/db/schema.rb index 5045354828..2f6a6f9453 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: 20171010230610) do +ActiveRecord::Schema.define(version: 20171011000902) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -32,7 +32,7 @@ t.string "category" t.string "title" t.string "creator" - t.string "publicaton_year" + t.string "publication_year" t.string "description" t.datetime "created_at", null: false t.datetime "updated_at", null: false diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 1f7c7d6286..632d69ff6b 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,25 +1,18 @@ -# 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 -# -album: +one: category: album title: Can't Buy a Thrill creator: Steely Dan - publicaton: 1972 - descripton: An album description -book: + publication_year: 1972 + description: An album description +two: category: book title: Hidden Figures creator: Margot Lee Shetterly - publicaton: 2016 - descripton: Good book that came before the movie -movie: - category: album - title: Can't Buy a Thrill - creator: Steely Dan - publicaton: 1972 - descripton: An album description -# column: value + publication_year: 2016 + description: Good book that came before the movie +three: + category: movie + title: Toy Story 3 + creator: Lee Unkrich + publication_year: 2010 + description: An movie description diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 7e81e26c94..caa8a11451 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,5 +1,5 @@ require "test_helper" -describe User do - -end +# describe User do +# +# end diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index 7b47eb3de6..c2f1e820d3 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,5 +1,5 @@ require "test_helper" -describe Vote do - -end +# describe Vote do +# +# end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index ef70fa53a1..fd63a51839 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -1,13 +1,31 @@ require "test_helper" +describe Work do + let :work { Work.first } -describe "validations" do - let(:work) { Work.new } + describe "validations" do + it "can be created with all fields" do + work = Work.new( + category: "album", + title: "Can't Buy a Thrill", + creator: "Steely Dan", + publication_year: "1972", + description: "An album description" + ) + work.must_be :valid? + end - it "requires a category" do - is_valid = work.valid? - is_valid.must_be false - work.error.messages.wont_include :category - end + it "requires a category, title, creator, description, publication_year" do + work = Work.new + is_valid = work.valid? + is_valid.must_equal false + work.errors.messages.must_include :category + work.errors.messages.must_include :title + work.errors.messages.must_include :creator + work.errors.messages.must_include :description + work.errors.messages.must_include :publication_year + end + + end # Describe end diff --git a/test/test_helper.rb b/test/test_helper.rb index 10594a3248..c039f4a1eb 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -17,7 +17,7 @@ # require "minitest/rails/capybara" # Uncomment for awesome colorful output -# require "minitest/pride" +require "minitest/pride" class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. From 636b78a627f6abf9b794e98416c2274bc61ae197 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 10 Oct 2017 20:42:23 -0700 Subject: [PATCH 09/68] Add main indext html.erb apge --- .DS_Store | Bin 0 -> 6148 bytes app/.DS_Store | Bin 0 -> 6148 bytes app/assets/javascripts/main.js | 2 ++ app/assets/stylesheets/main.scss | 3 ++ app/controllers/main_controller.rb | 2 ++ app/helpers/main_helper.rb | 2 ++ app/views/layouts/application.html.erb | 15 +++++++++ app/views/main/index.html.erb | 38 +++++++++++++++++++++++ config/routes.rb | 17 +++++++++- test/controllers/main_controller_test.rb | 7 +++++ test/models/user_test.rb | 10 ++++-- 11 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 .DS_Store create mode 100644 app/.DS_Store create mode 100644 app/assets/javascripts/main.js create mode 100644 app/assets/stylesheets/main.scss create mode 100644 app/controllers/main_controller.rb create mode 100644 app/helpers/main_helper.rb create mode 100644 app/views/main/index.html.erb create mode 100644 test/controllers/main_controller_test.rb diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1855c69cc253e3514d97d149e85e168f66be4028 GIT binary patch literal 6148 zcmeH~I}XA?3`A{0fkcy%avKi74OR$FzyvIYIqf#4$mI7QhFYo8^+Vg;}!TM!kPMk^St>SKu2 zy&WuhT}`%Nw2S8Op?PPuDF&v|E?SVlv^p5502LT0&_&+c`M-sKoBszbOsN1B_%j7` zy4h{kc&R*FKVHx3`>fi!!9l+q;q4~?i57KL2^5fO+(oag`Nh@MH0A_5{X4g&stD0J7F+PcQ4gG00c)G53}{wEG>Cu*3 +
+

<%= link_to "Media Ranker", root_path %>

+ Rank the Best of Everything + +
+ <% link_to "Log In", root_path %> +
+
+ <%= yield %> + diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb new file mode 100644 index 0000000000..3437d1aeed --- /dev/null +++ b/app/views/main/index.html.erb @@ -0,0 +1,38 @@ +
+
+
+

Media Spotlight:

+

# of Votes

+
+
+ +
+

Top Movies

+
    +
  • +

    Name of the Movie

    +

    # of Votes

    +
    • +
+
+ +
+

Top Books

+
    +
  • +

    Name of the Book

    +

    # of Votes

    +
    • +
+
+ +
+

Top Albums

+
    +
  • +

    Name of the Album

    +

    # of Votes

    +
    • +
+
+
diff --git a/config/routes.rb b/config/routes.rb index 787824f888..a42c6a40ed 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,18 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + +# get "/users", to: "users#index", as: "users" +# get "/users/new", to: "users#new", as: "new_user" +# post "/users", to: "users#create" +# get "/users/:id", to: "users#show", as: "user" +# get "/users/:id/edit", to: "users#edit", as: "edit_user" +# patch "/users/:id", to: "users#update" +# delete "/users/:id", to: "users#destroy" + +get '/', to: 'main#index', as: 'root' + +resources :users +resources :votes +resources :works + end diff --git a/test/controllers/main_controller_test.rb b/test/controllers/main_controller_test.rb new file mode 100644 index 0000000000..33c8140433 --- /dev/null +++ b/test/controllers/main_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MainController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index caa8a11451..9925657001 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,5 +1,9 @@ require "test_helper" -# describe User do -# -# end +describe User do + let :user { User.first } + describe "validations" do + it "can be created with all fields" do + end + end +end From f8913c484c6481d21194d51d86d173d29c058080 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 10 Oct 2017 21:54:16 -0700 Subject: [PATCH 10/68] Add test validations to models --- test/fixtures/users.yml | 9 ++++----- test/fixtures/votes.yml | 8 +++----- test/fixtures/works.yml | 6 +++--- test/models/user_test.rb | 16 +++++++++++++--- test/models/vote_test.rb | 34 +++++++++++++++++++++++++++++++--- test/models/work_test.rb | 4 ++-- 6 files changed, 56 insertions(+), 21 deletions(-) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index dc3ee79b5d..9caed9024f 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -4,8 +4,7 @@ # 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 +one: + username: Owly +two: + username: TestUser diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index dc3ee79b5d..436ccbed9a 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -4,8 +4,6 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +vote: + user_id: one # Not sure how to test this relation + work_id: album diff --git a/test/fixtures/works.yml b/test/fixtures/works.yml index 632d69ff6b..c2193c484d 100644 --- a/test/fixtures/works.yml +++ b/test/fixtures/works.yml @@ -1,16 +1,16 @@ -one: +album: category: album title: Can't Buy a Thrill creator: Steely Dan publication_year: 1972 description: An album description -two: +book: category: book title: Hidden Figures creator: Margot Lee Shetterly publication_year: 2016 description: Good book that came before the movie -three: +movie: category: movie title: Toy Story 3 creator: Lee Unkrich diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 9925657001..dbf75a5335 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,9 +1,19 @@ require "test_helper" describe User do - let :user { User.first } + let(:user) { users(:one) } + describe "validations" do it "can be created with all fields" do + u = User.new + u.username = "FirstUserEver" + + u.must_be :valid? end - end -end + + it "as a username" do + user.username.must_equal "Owly" + end + end # Describe + +end # Describe diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index c2f1e820d3..eb09fc0793 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -1,5 +1,33 @@ require "test_helper" -# describe Vote do -# -# end +describe Vote do + let(:user) { User.first } + let(:vote) { Vote.first } + let(:work) { Work.first } + + describe "validations" do + it "can be created with all fields" do + v = Vote.new( + user_id: user.id, + work_id: work.id, + ) + v.must_be :valid? + end + end + + describe "relations" do + it "has a user_id" do + v = votes(:vote) + # u = users(:one) + v.must_respond_to :user + # v.user_id.must_equal u + end + + it "has a work_id" do + v = votes(:vote) + w = works(:album) + v.must_respond_to :work + # v.work_id.must_equal w.id + end + end +end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index fd63a51839..abaf2b5588 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -5,14 +5,14 @@ describe "validations" do it "can be created with all fields" do - work = Work.new( + w = Work.new( category: "album", title: "Can't Buy a Thrill", creator: "Steely Dan", publication_year: "1972", description: "An album description" ) - work.must_be :valid? + w.must_be :valid? end it "requires a category, title, creator, description, publication_year" do From 92eb8ff599514317075d9debeeda104a1eeca137 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Tue, 10 Oct 2017 23:28:47 -0700 Subject: [PATCH 11/68] Add testing to models and tyaml files --- app/models/user.rb | 2 +- ...ange_name_of_username_to_name_for_users.rb | 5 ++ db/schema.rb | 4 +- test/fixtures/users.yml | 4 +- test/fixtures/votes.yml | 11 ++- test/models/user_test.rb | 15 +++- test/models/vote_test.rb | 79 ++++++++++++++++--- test/models/work_test.rb | 24 ++++-- test/test_helper.rb | 1 - 9 files changed, 111 insertions(+), 34 deletions(-) create mode 100644 db/migrate/20171011045500_change_name_of_username_to_name_for_users.rb diff --git a/app/models/user.rb b/app/models/user.rb index d61488143b..e8ee2fad12 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ class User < ApplicationRecord has_many :votes - validates :user_name, format: { with: /[a-zA-Z]/ } + validates :name, presence: true end diff --git a/db/migrate/20171011045500_change_name_of_username_to_name_for_users.rb b/db/migrate/20171011045500_change_name_of_username_to_name_for_users.rb new file mode 100644 index 0000000000..016b907357 --- /dev/null +++ b/db/migrate/20171011045500_change_name_of_username_to_name_for_users.rb @@ -0,0 +1,5 @@ +class ChangeNameOfUsernameToNameForUsers < ActiveRecord::Migration[5.1] + def change + rename_column :users, :username, :name + end +end diff --git a/db/schema.rb b/db/schema.rb index 2f6a6f9453..50b3982789 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,13 +10,13 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171011000902) do +ActiveRecord::Schema.define(version: 20171011045500) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" create_table "users", force: :cascade do |t| - t.string "username" + t.string "name" t.datetime "created_at", null: false t.datetime "updated_at", null: false end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 9caed9024f..918e3f4351 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -5,6 +5,6 @@ # below each fixture, per the syntax in the comments below # one: - username: Owly + name: Owly two: - username: TestUser + name: TestUser diff --git a/test/fixtures/votes.yml b/test/fixtures/votes.yml index 436ccbed9a..5d2e9146b1 100644 --- a/test/fixtures/votes.yml +++ b/test/fixtures/votes.yml @@ -4,6 +4,11 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -vote: - user_id: one # Not sure how to test this relation - work_id: album +# vote: +# user_id: one # Not sure how to test this relation +# work_id: album + +# user - raised error +# work - +# I am trying to get the user_id from the users.yml and it does not work. Am I supposed to be testing this. +# How to test tables that need a foreign key diff --git a/test/models/user_test.rb b/test/models/user_test.rb index dbf75a5335..efe5da801b 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -5,15 +5,22 @@ describe "validations" do it "can be created with all fields" do - u = User.new - u.username = "FirstUserEver" + u = User.new(name: "FirstUserEver") u.must_be :valid? end - it "as a username" do - user.username.must_equal "Owly" + it "has a username" do + user.name.must_equal "Owly" + end + + it "should be invalid if username is blank" do + u = User.new + + u.valid?.must_equal false + u.errors.messages.must_include :name end + end # Describe end # Describe diff --git a/test/models/vote_test.rb b/test/models/vote_test.rb index eb09fc0793..7367299ca0 100644 --- a/test/models/vote_test.rb +++ b/test/models/vote_test.rb @@ -2,32 +2,85 @@ describe Vote do let(:user) { User.first } - let(:vote) { Vote.first } let(:work) { Work.first } + let(:vote) { Vote.new } describe "validations" do it "can be created with all fields" do - v = Vote.new( + vote = Vote.new( user_id: user.id, work_id: work.id, ) - v.must_be :valid? + vote.must_be :valid? + end + + it "has a user_id as an integer" do + vote = Vote.new(user_id: user.id) + + vote.must_respond_to :user + vote.user_id.must_be_kind_of Integer + end + + it "is invalid if user_id is not an integer" do + vote.valid?.must_equal false + vote.errors.messages.must_include :user_id + end + + it "has a work_id as an integer" do + vote = Vote.new(work_id: work.id) + + vote.must_respond_to :work + vote.work_id.must_be_kind_of Integer + end + + it "is invalid if work_id is not an integer"do + vote.valid?.must_equal false + vote.errors.messages.must_include :work_id end end describe "relations" do - it "has a user_id" do - v = votes(:vote) - # u = users(:one) - v.must_respond_to :user - # v.user_id.must_equal u + it "can set the user through 'user_id'" do + # Create two models + # Make the models relate to one another + vote.user_id = user.id + + # vote should have changed accordingly + vote.must_respond_to :user + vote.user.must_equal user + vote.user_id.must_equal user.id end - it "has a work_id" do - v = votes(:vote) - w = works(:album) - v.must_respond_to :work - # v.work_id.must_equal w.id + it "can set work through work_id" do + vote.work_id = work.id + + vote.must_respond_to :work + vote.work.must_equal work + vote.work_id.must_equal work.id end + + # it 'can set the author through "author"' do + # # Create two models + # author = Author.create!(name: "test author") + # book = Book.new(title: "test book") + # + # # Make the models relate to one another + # book.author = author + # + # # author_id should have changed accordingly + # book.author_id.must_equal author.id + # end + + # it 'can set the author through "author_id"' do + # # Create two models + # author = Author.create!(name: "test author") + # book = Book.new(title: "test book") + # + # # Make the models relate to one another + # book.author_id = author.id + # + # # author should have changed accordingly + # book.author.must_equal author + # end end end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index abaf2b5588..4a156aef7c 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -15,17 +15,25 @@ w.must_be :valid? end - it "requires a category, title, creator, description, publication_year" do - work = Work.new - is_valid = work.valid? + it "will raise an error if category, title, creator, description, publication_year is invalid" do + w = Work.new + is_valid = w.valid? is_valid.must_equal false - work.errors.messages.must_include :category - work.errors.messages.must_include :title - work.errors.messages.must_include :creator - work.errors.messages.must_include :description - work.errors.messages.must_include :publication_year + w.errors.messages.must_include :category + w.errors.messages.must_include :title + w.errors.messages.must_include :creator + w.errors.messages.must_include :description + w.errors.messages.must_include :publication_year end + it "requires category, title, creator, description, publication_year is invalid" do + work.must_be :valid? + work.errors.messages.wont_include :category + work.errors.messages.wont_include :title + work.errors.messages.wont_include :creator + work.errors.messages.wont_include :description + work.errors.messages.wont_include :publication_year + end end # Describe end diff --git a/test/test_helper.rb b/test/test_helper.rb index c039f4a1eb..5ca3c140a0 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -11,7 +11,6 @@ Minitest.backtrace_filter ) - # To add Capybara feature tests add `gem "minitest-rails-capybara"` # to the test group in the Gemfile and uncomment the following: # require "minitest/rails/capybara" From 1e5cd9648c3eb19ee0daa7bd1f4b55314c6b97d3 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Wed, 11 Oct 2017 21:32:58 -0700 Subject: [PATCH 12/68] Add view pages, methods to works_controller, and works_controller tests --- app/controllers/works_controller.rb | 37 +++- app/views/users/edit.html.erb | 0 app/views/users/index.html.erb | 1 + app/views/users/new.html.erb | 0 app/views/users/show.html.erb | 1 + app/views/votes/edit.html.erb | 0 app/views/votes/index.html.erb | 1 + app/views/votes/new.html.erb | 0 app/views/votes/show.html.erb | 1 + app/views/works/edit.html.erb | 0 app/views/works/index.html.erb | 1 + app/views/works/new.html.erb | 0 app/views/works/show.html.erb | 1 + test/controllers/works_controller_test.rb | 233 +++++++++++++++++++++- test/models/work_test.rb | 2 +- 15 files changed, 266 insertions(+), 12 deletions(-) create mode 100644 app/views/users/edit.html.erb create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/new.html.erb create mode 100644 app/views/users/show.html.erb create mode 100644 app/views/votes/edit.html.erb create mode 100644 app/views/votes/index.html.erb create mode 100644 app/views/votes/new.html.erb create mode 100644 app/views/votes/show.html.erb create mode 100644 app/views/works/edit.html.erb create mode 100644 app/views/works/index.html.erb create mode 100644 app/views/works/new.html.erb create mode 100644 app/views/works/show.html.erb diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index ce36ed3356..c5a0c12435 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -4,7 +4,10 @@ def index end def show - @work = Work.find(params[:id]) + @work = Work.find_by(id: params[:id]) + unless @work + head :not_found + end end def new @@ -17,10 +20,15 @@ def create # Add strong params category: params[:work][:category], title: params[:work][:title], creator: params[:work][:creator], - description: params[:work][:description], - year: params[:work][:year] + publication_year: params[:work][:publication_year], + description: params[:work][:description] ) - work.save # Add redirect_to + work.save + if work.save + redirect_to works_path + else + render :new, status: :bad_request + end end def edit @@ -28,19 +36,32 @@ def edit end def update - @work = Work.find(params[:id]) + @work = Work.find_by(id: params[:id]) + unless @work + head :not_found + return + end + work_updates = params[:work] + # This is the same as the create method params @work.category = work_updates[:category] @work.title = work_updates[:title] @work.creator = work_updates[:creator] - @work.descripton = work_updates[:descripton] + @work.publication_year = work_updates[:publication_year] + @work.description = work_updates[:description] + @work.save - # Add a redirect_to + + if @work.save + redirect_to work_path(@work) + else + render :edit, status: :bad_request + end end def destroy @work = Work.find(params[:id]) @work.destroy - # Add a redirect_to + redirect_to works_path end end diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb new file mode 100644 index 0000000000..ac2666732f --- /dev/null +++ b/app/views/users/index.html.erb @@ -0,0 +1 @@ +This is the user index page with all users diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..78ec58ff7a --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1 @@ +This is the user show page diff --git a/app/views/votes/edit.html.erb b/app/views/votes/edit.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/votes/index.html.erb b/app/views/votes/index.html.erb new file mode 100644 index 0000000000..ac2666732f --- /dev/null +++ b/app/views/votes/index.html.erb @@ -0,0 +1 @@ +This is the user index page with all users diff --git a/app/views/votes/new.html.erb b/app/views/votes/new.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/votes/show.html.erb b/app/views/votes/show.html.erb new file mode 100644 index 0000000000..78ec58ff7a --- /dev/null +++ b/app/views/votes/show.html.erb @@ -0,0 +1 @@ +This is the user show page diff --git a/app/views/works/edit.html.erb b/app/views/works/edit.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb new file mode 100644 index 0000000000..f0dd4b7043 --- /dev/null +++ b/app/views/works/index.html.erb @@ -0,0 +1 @@ +This is the work index page with all users diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb new file mode 100644 index 0000000000..4120e5d3db --- /dev/null +++ b/app/views/works/show.html.erb @@ -0,0 +1 @@ +This is the work show page diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index d95073c22e..0f45abc661 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -1,7 +1,234 @@ require "test_helper" describe WorksController do - # it "must be a real test" do - # flunk "Need real tests" + + describe "#index" do + it "returns success" do + start_work_count = Work.count + get works_path + + must_respond_with :success + start_work_count.must_equal Work.count + end + + it "returns a success status when there are no works" do + Work.destroy_all + get works_path + + must_respond_with :success + Work.count.must_equal 0 + end + end # Describe + + describe "#show" do + it "returns success when the work_id exists" do + work = Work.first.id + + get work_path(work) + + must_respond_with :success + end + + it "returns invalid when the work_id does not exist" do + bad_work_id = Work.last.id + 1 + + get work_path(bad_work_id) + + must_respond_with :not_found + end + end # Des + + # describe "#new" do + # it "Creates an instance work" do + # + # end + # + # it "works without an author_id" do + # end # end -end + + describe "#create" do + it "returns success when all parameters are created" do + # Arrange + # Create a new hash of all the data and add that to a new instance + work_data = { + work: { + id: 1, + category: "book", + title: "Harry Potter", + creator: "J.K. Rowling", + publication_year: 2001, + description: "A boy to has a scar", + } + } + # Variable[:hash] + Work.new(work_data[:work]).must_be :valid? + start_work_count = Work.count + + # Act # Why does this work? + post works_path, params: work_data + + # Assert + must_respond_with :redirect + must_redirect_to works_path + Work.count.must_equal start_work_count + 1 + end + + it "returns something if the parameters are invalid" do + # Arrange + invalid_data = { + work: { + id: 1, + category: "book", + title: "", + creator: "J.K. Rowling", + publication_year: 2001, + description: "A boy to has a scar", + } + } + + Work.new(invalid_data[:work]).wont_be :valid? + + start_work_count = Work.count + + # Act # Why does this params: here work when passing is as a hash? + post works_path, params: invalid_data + + # Assert + must_respond_with :bad_request + Work.count.must_equal start_work_count + end + end # Des + + describe "update" do + it "returns success if the work_id exists and the change is valid" do + work = Work.first + + work_data = { + work: { + category: "book", + title: "Changed Title", + creator: "J.K. Rowling", + publication_year: 2001, + description: "A boy to has a scar", + } + } + + work.must_be :valid? + + patch work_path(work), params: work_data + + must_respond_with :redirect + must_redirect_to work_path(work) + + work.reload + work.title.must_equal work_data[:work][:title] + end + + it "returns not_found if the work_id is invalid" do + invalid_work_id = Work.last.id + 1 + + work_data = { + work: { + category: "book", + title: "Changed Title", + creator: "J.K. Rowling", + publication_year: 2001, + description: "A boy to has a scar", + } + } + + patch work_path(invalid_work_id), params: work_data + + must_respond_with :not_found + end + + it "returns bad_request if the change is invalid" do + work = Work.first + + invalid_work_data = { + work: { + category: "book", + title: "", + creator: "J.K. Rowling", + publication_year: 2001, + description: "A boy to has a scar", + } + } + + work.must_be :valid? + + patch work_path(work), params: invalid_work_data + + must_respond_with :bad_request + + # Check if change went through + work.reload + work.title.wont_equal invalid_work_data[:work][:title] + end + end # Des +end # Des + + + +# The default status will be a success if you do not set the status +# Book.count will go to the database + +# This wll go in the index method +# nothing: true + +# head: :not_found + +# This goes in the create method +# if @book.save +# redirect_to _bok_ath +# else +# render :new, status: :bad_r + +# end + +# Arrange + # book_data = { + # book: { + # title: "Test book", + # author_id: Author.first.id + # } + # } + # # Test data should result in a valid book, otherwise + # # the test is broken + # Book.new(book_data[:book]).must_be :valid? + # + # start_book_count = Book.count + # + # # Act + # post books_path, params: book_data + # + # # Assert + # must_respond_with :redirect + # must_redirect_to books_path + # + # Book.count.must_equal start_book_count + 1 +# If your controller action reads a Model ID from the URL, you need at least 2 cases: +# The ID corresponds to a model in the DB +# The ID is not found in the DB + + +# describe "create" do +# it "does soething when the book data is valid" do +# book_data = { +# book: { +# title: "Test Book", +# author_id: Autho.first.id +# } +# } +# +# Book.new(book_data[:book]).must_be :valid? +# +# start_book_count = Book.count +# +# post books_path, params: book_data +# must_respond_with :redirect +# must_redirect_to books_path +# +# Book.count.must_equal start_book_count 1 +# end diff --git a/test/models/work_test.rb b/test/models/work_test.rb index 4a156aef7c..ee959a5ea4 100644 --- a/test/models/work_test.rb +++ b/test/models/work_test.rb @@ -14,7 +14,7 @@ ) w.must_be :valid? end - + it "will raise an error if category, title, creator, description, publication_year is invalid" do w = Work.new is_valid = w.valid? From 2c9a839c7a182966b56553aabeba6015181788f2 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Wed, 11 Oct 2017 22:00:30 -0700 Subject: [PATCH 13/68] Create seed file to read in csv for media --- app/controllers/works_controller.rb | 9 +++++++- db/seeds.rb | 21 +++++++++++++++++- test/controllers/works_controller_test.rb | 26 +++++++++++++++++++++-- 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/app/controllers/works_controller.rb b/app/controllers/works_controller.rb index c5a0c12435..92d9519ba5 100644 --- a/app/controllers/works_controller.rb +++ b/app/controllers/works_controller.rb @@ -60,8 +60,15 @@ def update end def destroy - @work = Work.find(params[:id]) + @work = Work.find_by(id: params[:id]) + + unless @work + head :not_found + return + end + @work.destroy + redirect_to works_path end end diff --git a/db/seeds.rb b/db/seeds.rb index 5dffa99c63..2de9fb7e17 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -8,4 +8,23 @@ require 'csv' -CSV.open("media_seeds.csv") +WORK_FILE = Rails.root.join('db', 'seed_data', 'media_seeds.csv') +puts "Loading raw work data from #{WORK_FILE}" + +work_failures = [] +CSV.foreach(MEDIA_FILE, :headers => true) do |row| + work = Work.new + work.category = row['category'] + work.title = row['title'] + work.creator = row['creator'] + work.publication_year = row['publication_year'] + work.description = row['description'] + puts "Work created: #{work.inspect}" + successful = work.save + if !successful + work_failures << work + end +end + +puts "Added #{Work.count} work records" +puts "#{work_failures.length} works failed to save" diff --git a/test/controllers/works_controller_test.rb b/test/controllers/works_controller_test.rb index 0f45abc661..0c31fd0825 100644 --- a/test/controllers/works_controller_test.rb +++ b/test/controllers/works_controller_test.rb @@ -134,7 +134,7 @@ title: "Changed Title", creator: "J.K. Rowling", publication_year: 2001, - description: "A boy to has a scar", + description: "A boy who has a scar", } } @@ -152,7 +152,7 @@ title: "", creator: "J.K. Rowling", publication_year: 2001, - description: "A boy to has a scar", + description: "A boy who has a scar", } } @@ -167,6 +167,28 @@ work.title.wont_equal invalid_work_data[:work][:title] end end # Des + + describe "#destroy" do + it "returns success when given a valid work ID" do + before_count = Work.count + work_id = Work.first.id + + delete work_path(work_id) + + must_respond_with :redirect + must_redirect_to works_path + Work.find_by(id: work_id).must_equal nil + Work.count.must_equal before_count - 1 + end + + it "returns not found when a given work ID is invalid" do + invalid_work_id = Work.last.id + 1 + + delete work_path(invalid_work_id) + + must_respond_with :not_found + end + end end # Des From fcb356ff99b0a664bf1e2e88a298b40c9f72fee1 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Wed, 11 Oct 2017 22:09:42 -0700 Subject: [PATCH 14/68] Create and read in CSV file --- app/models/work.rb | 2 +- db/seeds.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/work.rb b/app/models/work.rb index 66e479c62c..441f981428 100644 --- a/app/models/work.rb +++ b/app/models/work.rb @@ -4,6 +4,6 @@ class Work < ApplicationRecord validates :category, presence: true validates :title, presence: true validates :creator, presence: true - validates :description, presence: true validates :publication_year, presence: true + # validates :description, presence: true end diff --git a/db/seeds.rb b/db/seeds.rb index 2de9fb7e17..354759038c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -8,11 +8,11 @@ require 'csv' -WORK_FILE = Rails.root.join('db', 'seed_data', 'media_seeds.csv') +WORK_FILE = Rails.root.join('db', 'media_seeds.csv') puts "Loading raw work data from #{WORK_FILE}" work_failures = [] -CSV.foreach(MEDIA_FILE, :headers => true) do |row| +CSV.foreach(WORK_FILE, :headers => true) do |row| work = Work.new work.category = row['category'] work.title = row['title'] From e2d527f947bae0f5005d5af077ad7ced12b639bb Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Wed, 11 Oct 2017 23:03:56 -0700 Subject: [PATCH 15/68] Add styling to all view pages --- app/views/layouts/application.html.erb | 7 +-- app/views/users/index.html.erb | 20 +++++++- app/views/users/show.html.erb | 24 ++++++++- app/views/works/index.html.erb | 70 +++++++++++++++++++++++++- app/views/works/new.html.erb | 18 +++++++ 5 files changed, 133 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5358d3b429..27629a3c39 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,10 +17,11 @@ <%= link_to "View all media", works_path %> <%= link_to "Add a new work", new_work_path %> <%= link_to "View all users", users_path %> +
+ <%= link_to "Log In", root_path %> +
-
- <% link_to "Log In", root_path %> -
+ <%= yield %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index ac2666732f..e71cfbd691 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1 +1,19 @@ -This is the user index page with all users +
+

List of Users

+ + + + + + + + + + + + + +
UsernameVotesJoined
+
+ <%= link_to "Back to Media List", works_path %> +
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 78ec58ff7a..1ac7627771 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1 +1,23 @@ -This is the user show page +
+

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

+

Joined site: <%= @user.created_at %>

+

Votes

+ + + + + + + + + + + + <%# Loop over here to get all the media titles for user votes %> + + + +
Media TitleCreated ByPublishedCategoryVoted On
<%= link_to @user.vote.work.name, work_path(@user.vote.work) %>
+ <%= link_to "See all Users", users_path %> + <%= link_to "Back to Media List", works_path %> +
diff --git a/app/views/works/index.html.erb b/app/views/works/index.html.erb index f0dd4b7043..0869b6b287 100644 --- a/app/views/works/index.html.erb +++ b/app/views/works/index.html.erb @@ -1 +1,69 @@ -This is the work index page with all users +
+

List of Works

+ +
+

Albums

+ + + + + + + + + + + + + + + +
VotesTitleCreated ByPublishedUpvote
+ +
+
+ +
+

Books

+ + + + + + + + + + + + + + + +
VotesTitleCreated ByPublishedUpvote
+ +
+
+ +
+

Movies

+ + + + + + + + + + + + + + + +
VotesTitleCreated ByPublishedUpvote
+ +
+
+
diff --git a/app/views/works/new.html.erb b/app/views/works/new.html.erb index e69de29bb2..54dd4116fd 100644 --- a/app/views/works/new.html.erb +++ b/app/views/works/new.html.erb @@ -0,0 +1,18 @@ +
+

Add a New Work

+
+ <%= form_for @work do |f| %> + <%= f.label :category %> + <%= f.select :category, [['Album','album'],['Book','book'],['Movie', 'movie']] %> + <%= f.label :title %> + <%= f.text_field :title %> + <%= f.label :creator %> + <%= f.text_field :creator %> + <%= f.label :publication_year %> + <%= f.text_field :publication_year %> + <%= f.label :description %> + <%= f.text_field :description %> + <%= f.submit "Create Work" %> + <% end %> +
+
From 952e09d9a99d1148cc5e99d12245b88f326ccac1 Mon Sep 17 00:00:00 2001 From: Irene DeVera Date: Thu, 12 Oct 2017 13:44:05 -0700 Subject: [PATCH 16/68] Add foundation css to stylesheets --- .DS_Store | Bin 6148 -> 8196 bytes app/.DS_Store | Bin 6148 -> 8196 bytes app/assets/.DS_Store | Bin 0 -> 8196 bytes app/assets/stylesheets/foundation.css | 4001 ++++++++++++++++++++++++ app/views/layouts/application.html.erb | 15 +- 5 files changed, 4009 insertions(+), 7 deletions(-) create mode 100644 app/assets/.DS_Store create mode 100644 app/assets/stylesheets/foundation.css diff --git a/.DS_Store b/.DS_Store index 1855c69cc253e3514d97d149e85e168f66be4028..895815b6a0eb15d1961905abca06c5089c7696d6 100644 GIT binary patch literal 8196 zcmeHMTTC2P828g-B3SK#1fIZaQf>Nh&QQ)9b9mijaYj zfslcafslcaf&T*obZ7G*ZE)|4)-Vkj2pPC38Q|wblp@D?fO7)UG+dOBu{VB)FPTKB(XPotT%_-N(c&&crC}UaIc*r1o zGiS7smpfomcifDjEWK4&y0iMux`qRXV!SH%*xIDASX@?KQF*JXuC-q3Wgwe0&ty$+npI2EVsR1MQWaH| zVV&l3+|hY&I{QG9{gz!(RUP6jtr>$-J#eV0Rh1r>Pgx5L_tq;)&!e=t%$0@fzWs{Y zYiUWtV!ABGX>3x|{+ytaJrGnLX;##MlruR=OL2>_E~suvsOktGxl41s6KTVySuOD4 zX>}bmt3lq@qU(H4)$tl30G|N4Ivxx3AVCGx(;e0W!(fospMYoKIk*VV!)x#+ybbTe z$FKljz?bk9T!!!AC-?<^h2P;1_!9wTEX8uHz)GyfyD)|gcnFVT3ns7?yYNBm#vbg& z5!7)E$8iGB;55$Qd7Q;3@glx}FXBu1I?m%e_%6POAL1wYDSn1u<2Se{<`-Gg@9|*1 z0pJgmSrKdSbuBV-U9q-zDEI$IV*Rd=E3{0Y_Bhon zDfC+7uyi9ckS8Wz&fov-8-M@5k(U_GJ!Bwc;BOef{I>441Q~5~$n&>$l;UZMJaD@? yfxZhR{&Sqre~uF_|6xe^D4BAfcz|;PsfNP8{vklz+2Q>!=m!Yze_w|;Tk;ob9o>%r delta 146 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGpJ516gFW5GME_>844H*(o%|(lk)R(Ktf=^ z1f@X&KrFxjmETx6jeTN+&|-ED4nby!8Ubz~?Fz)I8w?6qi;Dydg#>6+D8sCgj|1)Qnl%>3Aq9mO|&iT%q z|NqbBKi{0Q{{R3O%V_NYbpRkxW~j(i+#oSI%j;6eZz&^0vIlU%N#>mSq-iJDX$K8~ z2LcZS9tb=Tcp&h=X7B*r*(?bg-1}S_lz|5V58RXtE72nD^-$u8`v z14cOpW#ECp1M5A&V)t@T!J$9BD1Ki_&YOngMj}@+R8m@2zC{oOS*Q>mj?db;xU0Gu zC#I$+yeC7`lYV{3w$0VLnjA6oTteC2V_U9jSbF+8^~q7g((GK!&RCk`^>a#fXUSF+ zML|p`wTp}Gk=F3RLrbk;s@;94HQW*DTv`%^+B@322F}baoL{`K^w_I>S?C`PP+7Fh z*NWF@I@uonjUx0)VU6Dv)+kEyEd$4;!GuzsrKz8scMaQeM)b5pm{2MmTKquDwoavW zCQm3;Db-A6Ox4x9O*3ws*PYRnZD!^yXUx^lxvb^1W2fC7uQ8!08ApFeCw(KU_mY(} zW>9xbO+it3yP{@S)19sD2aiPi@>?sFDruXvV>D|xM$*)WbB5;5j;l^ew=~0=IZbZ2 zTw~hM(_$4~6NfByPS01>*3~!MD$B*%grGQW6hu$5J1ol+OwyCqsnmRf<`!8Ra@dqrUvXcXBn>@E`>8l0H{E|gl7~$-shf%> z@^LykC3!T?vBaw6dQR^b=;Hlx<#{EVZ+nv`e|0< zOxCSwY)(zlX1?d11H`6i#HWA&_0UFF$Pi2tz31Txcn+S2i|_)x4sXFb@Bw@REAS7Q zYe|&#KdXhNZb;d_e(C=IiL&2UFrHR#+rFcwad%7GfzGbj>V6jO;Pq7U_`?a}5vM>5 zZx7e7G0zAs@04~G7+lQkVd9;BPGICwws7s+wz)Nr$ zK87!ddspBp`~<(iHTWGvC}6e6x}A6%Hexfj;9hLSHtfJo;@=VM!hXCD2kji17})uQb{`O3nX6KQ}DFeJy60YSjXc3zKy^CZ}w#b^9wu>c;H`n084x0y)o)w zql28q+F{CPD6_=$mN|MRRCwVyp%;!5uKvT2>S0o4Hc=m!IZ_Ly|NKJ$`z;aN|Es?| MgZtm3;Z0Zk4VxzE`2YX_ delta 126 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGpJ516rOA$CL_ZH;sF681Op|D(^86)lk)R( z7&jJ9W1rZ-x0s!SLy#G)ia~%INV@{D>c+zF%#-2At62x;tLQ#0zQhRf)GMT{P9)shY)aQXB{<8{euuh>W(yX zXXoBKd*{sAnOp||FrHJ}0O|oipvt5oQ*(pD^sKHc0dJ&|B$7XX1~yDntAVr5+8^){ z@DcD4@DcD4@DbPu2+*C)icsd>=UTt@5%3YXDG^}jLx?JqF;6aW=^h=_xG4ZhmIAni z`jiK_J|R!WJh{ZB>q>L->;XMj^imAu?xYVfbCNMnE^*1-0l7P%_h$4m6m;KCej(Q! zFvg|d`Uv<4tVe)-J~CzP4$OnGCV#inbM|c7u+n6)lAbkm+lfZ6VxXdO)8;LLAjm?M z@Ni<U$tSGBa)AG9oEwVz54>)KpW+1_oLPD(em>~-c7Bf6ZIVf) z+9nwKGnRQOt1*3231(78CTFA^t;;YH`UTA%$yi2i#2?Q`ijuRn zhcvR+^I8vi*`qp5$IKKIg}19}cZKhav>iMW>n&`pR)W$tX~#%jxAnB44bADQGd-5F zGn%RD=G1B00MpUW>RMI|;x%#5OwDM8U|oGfYF(UVG?&)T<#cCW2@66YSgmYr z3dz!hO0k@t8d-XX~&c@CxWfH!!wQ<6tB*31ko#SUV`8}5qB@+5onK+1Mb&T1w_ zwZdLctLvkv#+a^4Ras2oSTo;!7XUFFi+W@bpaELxS{Z~1BK#~o0nfqna0y<3*WoRA z2R?vLU7>{8W#<3d*@Ig%A zAP(Uqs(2Qsa2n6yJTBlxT*RmF626Ep;mi02F5|oS9=?ws;ivc+evaSZw^-ou1&ZW7 z;l=9-{E<3kK2;*G_o)UZZ%E$WKI#7diM-!eF~-(x+rFc=X?IKOfsW4j>duzz<@Ka; znZ&8$Qm9A~cQ@DYvcRY<@04~Gxm?QeA!49*USKp*ws7m)<*-1^Q3U?DM{X8~-b%oI zl=jN|L?W?L!L?Cozd&?VHgWAeQoBfmRw}vnuyj-)-YT05jr9$6_a2iZ1=x2da_c=Z zonZffiUAyK8?@dv#YFp6EBx=u)l