From 98e2f98294e04e37e9a5aae903f5c6533d18d58c Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 11:51:40 -0700 Subject: [PATCH 01/47] initial setup --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/customer.rb | 2 + app/models/movie.rb | 2 + 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 | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ db/migrate/20190514184828_create_movies.rb | 8 + .../20190514184859_add_columns_to_movie.rb | 8 + db/migrate/20190514185107_create_customers.rb | 15 ++ db/schema.rb | 39 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/customers.yml | 19 ++ test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 11 ++ test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 9 + test/models/movie_test.rb | 9 + test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 68 files changed, 1057 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/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/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/models/customer.rb create mode 100644 app/models/movie.rb 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 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/migrate/20190514184828_create_movies.rb create mode 100644 db/migrate/20190514184859_add_columns_to_movie.rb create mode 100644 db/migrate/20190514185107_create_customers.rb create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/movies.yml create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb 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 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + 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] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..87697ba34 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.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.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 2.0.1 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /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/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /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 000000000..0ff5442f4 --- /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 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /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 000000000..286b2239d --- /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 000000000..10a4cba84 --- /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 000000000..e69de29bb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /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 000000000..37f0bddbd --- /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 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /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 000000000..d87d5f578 --- /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 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # 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 000000000..fb2ec2ebb --- /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 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + 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/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /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 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..1c72acfea --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +lqYhDmU+8fMBsCdGHmUOn4pO/aggIukDatTcV6ciBU2X/MJ454rVny0XffD3YOyzDEZUfutfJB+zftROIdmwR/BzQfuo0mPNCn/70/aJrx7Ci/dGHRdPsVutTX98Sf700Rzx1Fkz2uABK3HXa9MJVcwg3V9Q8cHp/7OH40TMk+khfxDqly7oo1Vex/Q6udrrqstmW7Lfvbqrzd42iHCdt066RCBS8pYU80R+4Nyai7Lx42IxK62eZdim1r9Xl3LYkTeh89n+sCP7aLdZvr3e03CSiWgo+WB9CNOZfpvn2OOvbrQ6KSG5SixyEHmBamg/F2hTsKm28cKgxq7gS6v4mwhXBflhHHEncYLrADlD40qrKuA431E3VzRKS0HHHGwgT3ynJWhFdqPzfeuD0BGH2BRLmUwXcMpC6wed--yE8ReAHcE82T0e1F--iyaePHQnfv/+3MGMQmouuA== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /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: VideoStoreAPI_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: VideoStoreAPI + + # 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: VideoStoreAPI_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: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /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 000000000..d52ec9efb --- /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. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # 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 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{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 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /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/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /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/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /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 000000000..ac033bf9d --- /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 000000000..dc1899682 --- /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 000000000..bbfc3961b --- /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 000000000..decc5a857 --- /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 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/migrate/20190514184828_create_movies.rb b/db/migrate/20190514184828_create_movies.rb new file mode 100644 index 000000000..a82569703 --- /dev/null +++ b/db/migrate/20190514184828_create_movies.rb @@ -0,0 +1,8 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20190514184859_add_columns_to_movie.rb b/db/migrate/20190514184859_add_columns_to_movie.rb new file mode 100644 index 000000000..12a35a857 --- /dev/null +++ b/db/migrate/20190514184859_add_columns_to_movie.rb @@ -0,0 +1,8 @@ +class AddColumnsToMovie < ActiveRecord::Migration[5.2] + def change + add_column :movies, :title, :string + add_column :movies, :overview, :string + add_column :movies, :release_date, :date + add_column :movies, :inventory, :integer + end +end diff --git a/db/migrate/20190514185107_create_customers.rb b/db/migrate/20190514185107_create_customers.rb new file mode 100644 index 000000000..3d6c3a31e --- /dev/null +++ b/db/migrate/20190514185107_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.date :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..0e923c8ed --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_185107) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.date "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + end + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..47797a3d5 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2019-05-14 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/movies.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/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From d4992943ba41df12cb5764014a643a037b2a2c94 Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 11:52:09 -0700 Subject: [PATCH 02/47] initial setup --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/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/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ db/schema.rb | 18 ++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 25 +++ tmp/.keep | 0 vendor/.keep | 0 59 files changed, 954 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/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/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/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 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/schema.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.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 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + 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] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..87697ba34 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.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.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 2.0.1 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /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/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /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 000000000..0ff5442f4 --- /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 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /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 000000000..286b2239d --- /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 000000000..10a4cba84 --- /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 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /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 000000000..37f0bddbd --- /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 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /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 000000000..d87d5f578 --- /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 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # 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 000000000..fb2ec2ebb --- /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 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + 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/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /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 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..918bd8c53 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +txR/ELwab9uaHRhBAPZCwvtrYZDTcnlVrZVUy1QuYa4IjJNYcj7QlT4pxcEGOXIspwNOk9gDhAxAg/GoJcs/MrCAIjpIvnSjHwg/EivoATeKNR5NtQfEExEMcHfzqHyFOCugnCwHUHpRNvsVnrtTIlnNv/DOmjtdJ+amxzKRdROmnfTYT6GRiE3BAroJ9YvhMarbTttb8vZB+HA8YLyHFxrogKRh12mwuvBTL0S2K/FdbBjicixjM9+f/6d4WKe+teHwQiXJ700RorP6wLJk0i+kCqWZOuSLMUzQeoqjpXRlBsU4L15Axn9PCf1cLvxhs2htYDHDjC5aws8DfL5mWWoTCNVqi1k8ujKsB9m3W3yEfZ/2cG8iOYM5sbHB5CVDLEd+80D6YsZIKvWUkHZAQ2k1Px6maoG5qUzl--wQTP9YZCJy3YOAsC--dsMhHF3d+eBpUOLWupFZJw== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /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: VideoStoreAPI_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: VideoStoreAPI + + # 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: VideoStoreAPI_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: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /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 000000000..d52ec9efb --- /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. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # 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 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{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 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /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/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /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/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /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 000000000..ac033bf9d --- /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 000000000..dc1899682 --- /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 000000000..bbfc3961b --- /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 000000000..decc5a857 --- /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 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..fb7dd505e --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,25 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From b5e75a172c035921b5b7288e96ba75a03d19bcfd Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 12:05:59 -0700 Subject: [PATCH 03/47] added customers and movies controllers --- app/controllers/customers_controller.rb | 7 +++++++ app/controllers/movies_controller.rb | 10 ++++++++++ config/routes.rb | 9 +++++++++ test/controllers/customers_controller_test.rb | 14 ++++++++++++++ test/controllers/movies_controller_test.rb | 19 +++++++++++++++++++ 5 files changed, 59 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..558cf72e7 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,7 @@ +class CustomersController < ApplicationController + def index + end + + def show + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..b69241e5f --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,10 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..a3691dc73 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,12 @@ +# frozen_string_literal: true + Rails.application.routes.draw do + get 'customers/index' + get 'customers/show' + get 'movies/index' + get 'movies/show' + get 'movies/create' + get '/zomg', to: 'movies#zomg' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..ac95821cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + + it "should get show" do + get customers_show_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..53607f49d --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + + it "should get show" do + get movies_show_url + value(response).must_be :success? + end + + it "should get create" do + get movies_create_url + value(response).must_be :success? + end + +end From 50b604ba94f243f63e7ec45a90389942857bbe0a Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 12:07:51 -0700 Subject: [PATCH 04/47] zomg test route --- app/controllers/movies_controller.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b69241e5f..96ce898be 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,10 +1,13 @@ +# frozen_string_literal: true + class MoviesController < ApplicationController - def index + def zomg + render json: { message: 'it works!' } end - def show - end + def index; end - def create - end + def show; end + + def create; end end From 57b8f57bbc08c268aada34f98e4b127bc71bd980 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 12:15:44 -0700 Subject: [PATCH 05/47] updated routes --- config/routes.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index a3691dc73..0c33bec53 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,12 +1,9 @@ # frozen_string_literal: true Rails.application.routes.draw do - get 'customers/index' - get 'customers/show' - get 'movies/index' - get 'movies/show' - get 'movies/create' - get '/zomg', to: 'movies#zomg' + resources :movies, only: [:index, :show, :create] + resources :customers, only: [:index, :show] + get "/zomg", to: "movies#zomg" # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 624971c42660245a6a91b0a0b2359e6772da515e Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 12:37:27 -0700 Subject: [PATCH 06/47] added tests for movies#show and movies#create --- app/controllers/movies_controller.rb | 26 ++++++++++- test/controllers/movies_controller_test.rb | 51 +++++++++++++++++----- test/test_helper.rb | 3 +- 3 files changed, 67 insertions(+), 13 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 96ce898be..b0b575149 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,7 +7,29 @@ def zomg def index; end - def show; end + def show + movie = Movie.find_by(id: params[:id]) - def create; end + if movie + render json: movie.as_json(only: %i[title overview release_date inventory]), status: :ok + else + render json: { ok: false, message: 'Movie not found' }, status: :not_found + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: movie.as_json(only: %i[title overview release_date inventory id]), status: :ok + else + render json: { ok: false, message: movie.errors.messages }, status: :bad_request + end + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53607f49d..801faff17 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,19 +1,50 @@ -require "test_helper" +# frozen_string_literal: true + +require 'test_helper' describe MoviesController do - it "should get index" do - get movies_index_url + it 'should get index' do + get movies_path value(response).must_be :success? end - it "should get show" do - get movies_show_url - value(response).must_be :success? - end + describe 'show' do + it 'should get show' do + get movies_path(movies(:one)) + value(response).must_be :success? + end - it "should get create" do - get movies_create_url - value(response).must_be :success? + it 'will display error if movie not found' do + get movie_path(-1) + body = JSON.parse(response.body) + must_respond_with :not_found + expect(body['message']).must_equal 'Movie not found' + end end + describe 'create' do + let(:movie_data) do + { movie: + { + title: 'The Little Mermaid', + overview: 'A woman gives up her ability to talk for a man.', + release_date: 1989, + inventory: 15 + } } + end + + it 'creates a new movie given valid data' do + expect do + post movies_path, params: movie_data + end.must_change 'Movie.count', 1 + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include 'id' + value(response).must_be :success? + end + + it "returns an error for invalid movie data" do + + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From c7570242c9eb092b74904170a4b250303396fe5c Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 12:42:42 -0700 Subject: [PATCH 07/47] movies and customers index --- app/controllers/customers_controller.rb | 9 ++++++ app/controllers/movies_controller.rb | 7 ++-- test/controllers/customers_controller_test.rb | 9 +++--- test/controllers/movies_controller_test.rb | 32 +++++++++++++------ test/test_helper.rb | 4 +-- 5 files changed, 42 insertions(+), 19 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 558cf72e7..1927091d0 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,16 @@ class CustomersController < ApplicationController def index + customers = Customer.all + render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end def show + customer = Customer.find_by(id: params[:id]) + + if customer + render status: :ok, json: customer.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) + else + render status: :not_found, json: { errors: { "name": ["Customer #{params[:id]} not found"] } } + end end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 96ce898be..548370c74 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,10 +2,13 @@ class MoviesController < ApplicationController def zomg - render json: { message: 'it works!' } + render json: { message: "it works!" } end - def index; end + def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]) + end def show; end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ac95821cd..c65a731f6 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,13 +2,12 @@ describe CustomersController do it "should get index" do - get customers_index_url - value(response).must_be :success? + get customers_path + value(response).must_be :successful? end it "should get show" do - get customers_show_url - value(response).must_be :success? + get customer_path(Customer.first) + value(response).must_be :successful? end - end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53607f49d..e32c986f5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,19 +1,31 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? + describe "index" do + it "should get index" do + get movies_path + value(response).must_be :successful? + end end + describe "show" do + it "should get show" do + get movie_path(Movie.first) + value(response).must_be :successful? + end - it "should get show" do - get movies_show_url - value(response).must_be :success? - end + it "renders an error if ID is invalid" do + get movie_path(Movie.last.id + 1) + must_respond_with :not_found - it "should get create" do - get movies_create_url - value(response).must_be :success? + error = JSON.parse(response.body) + expect(error["errors"]).must_be_kind_of Array + end end + describe "create" do + it "should get create" do + post movies_path + value(response).must_be :successful? + end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..3f7dc7d3e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, @@ -9,7 +10,6 @@ Minitest.backtrace_filter ) - # To add Capybara feature tests add `gem "minitest-rails-capybara"` # to the test group in the Gemfile and uncomment the following: # require "minitest/rails/capybara" From a36c20a39d493eab0299cae1d095277715358c63 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 12:45:01 -0700 Subject: [PATCH 08/47] merging again?? --- test/controllers/customers_controller_test.rb | 16 ++++++++----- test/controllers/movies_controller_test.rb | 24 ------------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c65a731f6..a02f3b307 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,13 +1,17 @@ require "test_helper" describe CustomersController do - it "should get index" do - get customers_path - value(response).must_be :successful? + describe "index" do + it "should get index" do + get customers_path + value(response).must_be :successful? + end end - it "should get show" do - get customer_path(Customer.first) - value(response).must_be :successful? + describe "show" do + it "should get show" do + get customer_path(Customer.first) + value(response).must_be :successful? + end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 758ccdbec..84e48e020 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -3,17 +3,9 @@ require 'test_helper' describe MoviesController do -<<<<<<< HEAD - describe "index" do - it "should get index" do - get movies_path - value(response).must_be :successful? - end -======= it 'should get index' do get movies_path value(response).must_be :success? ->>>>>>> 4066d05521e6d052329a5565f470625aab8f4142 end describe "show" do it "should get show" do @@ -21,21 +13,6 @@ value(response).must_be :successful? end -<<<<<<< HEAD - it "renders an error if ID is invalid" do - get movie_path(Movie.last.id + 1) - must_respond_with :not_found - - error = JSON.parse(response.body) - expect(error["errors"]).must_be_kind_of Array - end - end - - describe "create" do - it "should get create" do - post movies_path - value(response).must_be :successful? -======= describe 'show' do it 'should get show' do get movies_path(movies(:one)) @@ -73,7 +50,6 @@ it "returns an error for invalid movie data" do ->>>>>>> 4066d05521e6d052329a5565f470625aab8f4142 end end end From 1cc81c11314b4226e787bdf6f6d5ad5186e8fc61 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 13:01:00 -0700 Subject: [PATCH 09/47] available_inventory for movies --- .../20190514195802_add_available_inventory_to_movies.rb | 5 +++++ db/schema.rb | 3 ++- db/seeds.rb | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20190514195802_add_available_inventory_to_movies.rb diff --git a/db/migrate/20190514195802_add_available_inventory_to_movies.rb b/db/migrate/20190514195802_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..9bcb714a6 --- /dev/null +++ b/db/migrate/20190514195802_add_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovies < ActiveRecord::Migration[5.2] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 0e923c8ed..cc0b66309 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_185107) do +ActiveRecord::Schema.define(version: 2019_05_14_195802) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,6 +34,7 @@ t.string "overview" t.date "release_date" t.integer "inventory" + t.integer "available_inventory" end end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..b1c2e00f1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,10 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| +JSON.parse(File.read("db/seeds/customers.json")).each do |customer| Customer.create!(customer) end -JSON.parse(File.read('db/seeds/movies.json')).each do |movie| +JSON.parse(File.read("db/seeds/movies.json")).each do |movie| Movie.create!(movie) + current_movie = Movie.last + current_movie.available_inventory = current_movie.inventory + current_movie.save end From 6daa837b4909999011918fd1fac429a38d3d84e8 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 13:03:11 -0700 Subject: [PATCH 10/47] available_inventory in movies#create --- app/controllers/movies_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 73193e2b0..8d0a5e24e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -16,12 +16,13 @@ def show if movie render json: movie.as_json(only: %i[title overview release_date inventory]), status: :ok else - render json: { ok: false, message: 'Movie not found' }, status: :not_found + render json: { ok: false, message: "Movie not found" }, status: :not_found end end def create movie = Movie.new(movie_params) + movie.available_inventory = movie.inventory if movie.save render json: movie.as_json(only: %i[title overview release_date inventory id]), status: :ok From 967cbec22c9ff0eeef0c16abe4f4118f501eb6a7 Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 13:19:20 -0700 Subject: [PATCH 11/47] passing all tests for movie create --- app/models/movie.rb | 5 +++++ test/controllers/movies_controller_test.rb | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..bd57638cb 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,7 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, numericality: true + validates :available_inventory, numericality: true end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 84e48e020..aa600579e 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -7,11 +7,6 @@ get movies_path value(response).must_be :success? end - describe "show" do - it "should get show" do - get movie_path(Movie.first) - value(response).must_be :successful? - end describe 'show' do it 'should get show' do @@ -33,8 +28,9 @@ { title: 'The Little Mermaid', overview: 'A woman gives up her ability to talk for a man.', - release_date: 1989, - inventory: 15 + release_date: "1989-08-15", + inventory: 15, + available_inventory: 15 } } end @@ -42,14 +38,19 @@ expect do post movies_path, params: movie_data end.must_change 'Movie.count', 1 + body = JSON.parse(response.body) expect(body).must_be_kind_of Hash expect(body).must_include 'id' value(response).must_be :success? end - it "returns an error for invalid movie data" do - + it 'returns an error for invalid movie data' do + movie_data[:movie][:title] = nil + + expect do + post movies_path, params: movie_data + end.wont_change 'Movie.count' end end end From 48ef11d4d5e12be0ddf0ac0d00927e64655564ef Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 13:58:49 -0700 Subject: [PATCH 12/47] added validations to movie model --- app/controllers/movies_controller.rb | 8 ++++---- app/models/movie.rb | 1 - test/controllers/movies_controller_test.rb | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 8d0a5e24e..fb987cf97 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,12 +2,12 @@ class MoviesController < ApplicationController def zomg - render json: { message: "it works!" } + render json: { message: 'it works!' } end def index movies = Movie.all - render json: movies.as_json(only: [:id, :title, :release_date]) + render json: movies.as_json(only: %i[id title release_date]) end def show @@ -16,7 +16,7 @@ def show if movie render json: movie.as_json(only: %i[title overview release_date inventory]), status: :ok else - render json: { ok: false, message: "Movie not found" }, status: :not_found + render json: { ok: false, message: 'Movie not found' }, status: :not_found end end @@ -34,6 +34,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index bd57638cb..105b9e891 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,5 +3,4 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, numericality: true - validates :available_inventory, numericality: true end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index aa600579e..77bfd6b18 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -30,7 +30,6 @@ overview: 'A woman gives up her ability to talk for a man.', release_date: "1989-08-15", inventory: 15, - available_inventory: 15 } } end From 57bf2a1435f0d4b8a3aa1c58a2bc9bc2a8ec24af Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 14:16:05 -0700 Subject: [PATCH 13/47] merging to get validations --- test/controllers/customers_controller_test.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index a02f3b307..ef8a11c01 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -13,5 +13,12 @@ get customer_path(Customer.first) value(response).must_be :successful? end + + it "returns an error when customer ID is invalid" do + get customer_path(Customer.last.id + 1) + must_respond_with :not_found + body = JSON.parse(response.body) + expect(body["errors"]).must_be_kind_of Array + end end end From 97fd061390c5d10e075f5246a6816182c346ad8a Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 14:29:57 -0700 Subject: [PATCH 14/47] added available_inventory to json --- app/controllers/movies_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index fb987cf97..42e13b545 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,7 +2,7 @@ class MoviesController < ApplicationController def zomg - render json: { message: 'it works!' } + render json: { message: "it works!" } end def index @@ -14,9 +14,9 @@ def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: %i[title overview release_date inventory]), status: :ok + render json: movie.as_json(only: %i[title overview release_date inventory available_inventory]), status: :ok else - render json: { ok: false, message: 'Movie not found' }, status: :not_found + render json: { ok: false, message: "Movie not found" }, status: :not_found end end @@ -25,7 +25,7 @@ def create movie.available_inventory = movie.inventory if movie.save - render json: movie.as_json(only: %i[title overview release_date inventory id]), status: :ok + render json: movie.as_json(only: %i[title overview release_date inventory id available_inventory]), status: :ok else render json: { ok: false, message: movie.errors.messages }, status: :bad_request end From 025ee88c4b865be7ebc7f62cf77a358ebab0a8af Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 14:30:01 -0700 Subject: [PATCH 15/47] added available inventory to moviescontrolloer --- app/controllers/movies_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index fb987cf97..bb1f38a1b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,7 +14,7 @@ def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: %i[title overview release_date inventory]), status: :ok + render json: movie.as_json(only: %i[title overview release_date inventory available_inventory]), status: :ok else render json: { ok: false, message: 'Movie not found' }, status: :not_found end @@ -25,7 +25,7 @@ def create movie.available_inventory = movie.inventory if movie.save - render json: movie.as_json(only: %i[title overview release_date inventory id]), status: :ok + render json: movie.as_json(only: %i[title overview release_date inventory id available_inventory]), status: :ok else render json: { ok: false, message: movie.errors.messages }, status: :bad_request end From 31d005f2ef718d6e9944e4256f74986c3b90d9bb Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 14:33:29 -0700 Subject: [PATCH 16/47] added column to customer --- .../20190514213204_add_checked_out_count_to_customer.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190514213204_add_checked_out_count_to_customer.rb diff --git a/db/migrate/20190514213204_add_checked_out_count_to_customer.rb b/db/migrate/20190514213204_add_checked_out_count_to_customer.rb new file mode 100644 index 000000000..65ab37284 --- /dev/null +++ b/db/migrate/20190514213204_add_checked_out_count_to_customer.rb @@ -0,0 +1,5 @@ +class AddCheckedOutCountToCustomer < ActiveRecord::Migration[5.2] + def change + add_column :customers, :movies_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index cc0b66309..63b50e875 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_195802) do +ActiveRecord::Schema.define(version: 2019_05_14_213204) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count" end create_table "movies", force: :cascade do |t| From 0a24793fa340b8d0ab062e0d425f0528feb5c94d Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 14:33:31 -0700 Subject: [PATCH 17/47] fixed failing tests in movie_test and customers_controller --- test/controllers/customers_controller_test.rb | 2 +- test/models/movie_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ef8a11c01..5adada800 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -18,7 +18,7 @@ get customer_path(Customer.last.id + 1) must_respond_with :not_found body = JSON.parse(response.body) - expect(body["errors"]).must_be_kind_of Array + expect(body["errors"]).must_be_kind_of Hash end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..f80f4de52 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { Movie.new(title: "Test Movie", overview: "This is a test movie", release_date: "2019-04-05", inventory: 5) } it "must be valid" do value(movie).must_be :valid? From c844a85cf194de44bece9252e4446e87e233043d Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 14:36:39 -0700 Subject: [PATCH 18/47] generated rentals --- app/controllers/rentals_controller.rb | 2 ++ app/models/rental.rb | 2 ++ db/migrate/20190514213510_create_rentals.rb | 12 ++++++++++++ db/schema.rb | 11 ++++++++++- test/controllers/rentals_controller_test.rb | 7 +++++++ test/fixtures/rentals.yml | 13 +++++++++++++ test/models/rental_test.rb | 9 +++++++++ 7 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514213510_create_rentals.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20190514213510_create_rentals.rb b/db/migrate/20190514213510_create_rentals.rb new file mode 100644 index 000000000..7a8a77515 --- /dev/null +++ b/db/migrate/20190514213510_create_rentals.rb @@ -0,0 +1,12 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.integer :customer_id + t.integer :movie_id + t.date :checkout_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 63b50e875..ac7f7456e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_213204) do +ActiveRecord::Schema.define(version: 2019_05_14_213510) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,4 +38,13 @@ t.integer "available_inventory" end + create_table "rentals", force: :cascade do |t| + t.integer "customer_id" + t.integer "movie_id" + t.date "checkout_date" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..272ecf53d --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + customer_id: 1 + movie_id: 1 + checkout_date: 2019-05-14 + due_date: 2019-05-14 + +two: + customer_id: 1 + movie_id: 1 + checkout_date: 2019-05-14 + due_date: 2019-05-14 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From 44953a690b8084e1dce36dc8b56d5b25bacdcc97 Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 14:41:23 -0700 Subject: [PATCH 19/47] added validation tests to movie model --- test/models/movie_test.rb | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f80f4de52..5f5ca79ef 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -6,4 +6,35 @@ it "must be valid" do value(movie).must_be :valid? end + + describe "validations" do + + it "must have a title" do + movie.title = nil + movie.save + expect(movie.valid?).must_equal false + expect(movie.errors).must_include "title" + end + + it "must have an overview" do + movie.overview = nil + movie.save + expect(movie.valid?).must_equal false + expect(movie.errors).must_include "overview" + end + + it "must have a release date" do + movie.release_date = nil + movie.save + expect(movie.valid?).must_equal false + expect(movie.errors).must_include "release_date" + end + + it "inventory must be a number" do + movie.inventory = "abcd" + movie.save + expect(movie.valid?).must_equal false + expect(movie.errors[:inventory].first).must_include "is not a number" + end + end end From af5ebc9945a5e5f6833100557f67fb80376c22b3 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 14:42:21 -0700 Subject: [PATCH 20/47] rentals routes --- app/controllers/rentals_controller.rb | 5 +++++ config/routes.rb | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..012699722 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,7 @@ class RentalsController < ApplicationController + def checkout + end + + def checkin + end end diff --git a/config/routes.rb b/config/routes.rb index 0c33bec53..75f2c5132 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,10 @@ Rails.application.routes.draw do resources :movies, only: [:index, :show, :create] resources :customers, only: [:index, :show] + + post "rentals/check-out", to: "rentals#checkout", as: "checkout" + post "rentals/check-in", to: "rentals#checkin", as: "checkin" + get "/zomg", to: "movies#zomg" # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html From 3cd4a2aeb0bd69aaf3df1b13fbf40f2e440d3276 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 14:53:30 -0700 Subject: [PATCH 21/47] validations for rentals --- app/controllers/rentals_controller.rb | 6 ++++++ app/models/rental.rb | 2 ++ 2 files changed, 8 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 012699722..021b45ad8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,4 +4,10 @@ def checkout def checkin end + + private + + def rental_params + params.require(:rental).permit(:movie_id, :customer_id) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..2799cf02b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + validates :movie_id, presence: true + validates :customer_id, presence: true end From 28e51bed7724dd2294da9e1550f18962f85a1269 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 15:10:36 -0700 Subject: [PATCH 22/47] checkout action --- app/controllers/rentals_controller.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 021b45ad8..b1f41ccdb 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,21 @@ class RentalsController < ApplicationController def checkout + rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id], checkout_date: Date.today, due_date: (Date.today + 7)) + movie = Movie.find_by(id: rental.movie_id) + if !movie.available_inventory > 0 + render json: { ok: false, message: "Not enough copies in inventory" }, status: :bad_request + else + movie.available_inventory -= 1 + end + + if rental.save + movie.save + customer = Customer.find_by(id: rental.customer_id) + customer.movies_checked_out_count += 1 + customer.save + else + render json: { ok: false, message: rental.errors.messages }, status: :bad_request + end end def checkin From 1464dbfce735d86f26bc7bec6e8770f5e86dc0c7 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 15:11:34 -0700 Subject: [PATCH 23/47] fixed checkout --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index b1f41ccdb..dc6b7b854 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,7 +2,7 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id], checkout_date: Date.today, due_date: (Date.today + 7)) movie = Movie.find_by(id: rental.movie_id) - if !movie.available_inventory > 0 + if movie.available_inventory <= 0 render json: { ok: false, message: "Not enough copies in inventory" }, status: :bad_request else movie.available_inventory -= 1 From a85cee67ba8c318c809fbded98472df44eca31b2 Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 15:14:53 -0700 Subject: [PATCH 24/47] added default value to movies_checked_out_by_customer field --- db/migrate/20190514221309_add_default_value_to_customers.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20190514221309_add_default_value_to_customers.rb diff --git a/db/migrate/20190514221309_add_default_value_to_customers.rb b/db/migrate/20190514221309_add_default_value_to_customers.rb new file mode 100644 index 000000000..5e945f2d4 --- /dev/null +++ b/db/migrate/20190514221309_add_default_value_to_customers.rb @@ -0,0 +1,5 @@ +class AddDefaultValueToCustomers < ActiveRecord::Migration[5.2] + def change + change_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index ac7f7456e..1f4cae206 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_213510) do +ActiveRecord::Schema.define(version: 2019_05_14_221309) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,7 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.integer "movies_checked_out_count" + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| From 108f25f4689bb7f7283dd5ae2cbe5939edd28100 Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 15:16:54 -0700 Subject: [PATCH 25/47] passing postman tests for checkout --- app/controllers/rentals_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index dc6b7b854..87df554ce 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,6 +13,7 @@ def checkout customer = Customer.find_by(id: rental.customer_id) customer.movies_checked_out_count += 1 customer.save + render status: :ok else render json: { ok: false, message: rental.errors.messages }, status: :bad_request end From 7c69fa36d44495ada7b1b0a9f7f1f2235165fc1f Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 15:22:44 -0700 Subject: [PATCH 26/47] added checkedin migration for rentals table --- .../20190514222105_add_checkedin_column_for_rentals.rb | 7 +++++++ db/schema.rb | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190514222105_add_checkedin_column_for_rentals.rb diff --git a/db/migrate/20190514222105_add_checkedin_column_for_rentals.rb b/db/migrate/20190514222105_add_checkedin_column_for_rentals.rb new file mode 100644 index 000000000..d4965ad2a --- /dev/null +++ b/db/migrate/20190514222105_add_checkedin_column_for_rentals.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddCheckedinColumnForRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :checked_in, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 1f4cae206..f284fd371 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_221309) do +ActiveRecord::Schema.define(version: 2019_05_14_222105) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,6 +45,7 @@ t.date "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.boolean "checked_in", default: false end end From 4ed5fa8a041a100b29109c8832ac62850b837bf6 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 15:32:53 -0700 Subject: [PATCH 27/47] added fixtures for rental and customer --- test/fixtures/customers.yml | 10 +++++----- test/fixtures/rentals.yml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 47797a3d5..014589bcb 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,16 +1,16 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString +joe: + name: "Joe" registered_at: 2019-05-14 - address: MyString + address: "5 Main St" city: MyString state: MyString postal_code: MyString phone: MyString -two: - name: MyString +carly: + name: "Carly" registered_at: 2019-05-14 address: MyString city: MyString diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 272ecf53d..2c1e8373b 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - customer_id: 1 - movie_id: 1 + customer_id: joe + movie_id: one checkout_date: 2019-05-14 due_date: 2019-05-14 two: - customer_id: 1 - movie_id: 1 + customer_id: carly + movie_id: two checkout_date: 2019-05-14 due_date: 2019-05-14 From 93e1dbff46c32a008d53655ceb53b6146534c0cc Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 15:33:22 -0700 Subject: [PATCH 28/47] added movies yml and began checkin function --- app/controllers/rentals_controller.rb | 7 ++++++- test/fixtures/movies.yml | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 87df554ce..cc3ace264 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,11 @@ +# frozen_string_literal: true + class RentalsController < ApplicationController def checkout rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id], checkout_date: Date.today, due_date: (Date.today + 7)) movie = Movie.find_by(id: rental.movie_id) if movie.available_inventory <= 0 - render json: { ok: false, message: "Not enough copies in inventory" }, status: :bad_request + render json: { ok: false, message: 'Not enough copies in inventory' }, status: :bad_request else movie.available_inventory -= 1 end @@ -20,6 +22,9 @@ def checkout end def checkin + rental = Rental.where(["movie_id = ? and customer_id = ? and checked_in = ?", params[:movie_id], params[:customer_id], false]).first + + end private diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index dc3ee79b5..2d5de5bbb 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,15 @@ # 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: + title: This is a Film + release_date: 2004-06-05 + overview: This is a film. You probably haven't seen it. + inventory: 12 + +two: + title: This Too is a Film + release_date: 2005-05-02 + overview: You probably haven't seen this one either. + inventory: 8 + From f871a4cfb398653935c73db71ac0882c680a5daf Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 15:42:39 -0700 Subject: [PATCH 29/47] rental tests --- test/controllers/movies_controller_test.rb | 42 +++++++++++---------- test/controllers/rentals_controller_test.rb | 17 +++++++-- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 77bfd6b18..f57822324 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,55 +1,59 @@ # frozen_string_literal: true -require 'test_helper' +require "test_helper" describe MoviesController do - it 'should get index' do + it "should get index" do get movies_path value(response).must_be :success? end - describe 'show' do - it 'should get show' do + describe "show" do + it "should get show" do get movies_path(movies(:one)) value(response).must_be :success? end - it 'will display error if movie not found' do + it "will display error if movie not found" do get movie_path(-1) body = JSON.parse(response.body) must_respond_with :not_found - expect(body['message']).must_equal 'Movie not found' + expect(body["message"]).must_equal "Movie not found" end end - describe 'create' do + describe "create" do let(:movie_data) do - { movie: - { - title: 'The Little Mermaid', - overview: 'A woman gives up her ability to talk for a man.', - release_date: "1989-08-15", - inventory: 15, - } } + { movie: { + title: "The Little Mermaid", + overview: "A woman gives up her ability to talk for a man.", + release_date: "1989-08-15", + inventory: 15, + } } end - it 'creates a new movie given valid data' do + it "creates a new movie given valid data" do expect do post movies_path, params: movie_data - end.must_change 'Movie.count', 1 + end.must_change "Movie.count", 1 body = JSON.parse(response.body) expect(body).must_be_kind_of Hash - expect(body).must_include 'id' + expect(body).must_include "id" value(response).must_be :success? end - it 'returns an error for invalid movie data' do + it "returns an error for invalid movie data" do movie_data[:movie][:title] = nil expect do post movies_path, params: movie_data - end.wont_change 'Movie.count' + end.wont_change "Movie.count" + end + end + + describe "checkin" do + it "decrements customer's checked_out_count" do end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..d1d64c578 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,18 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "checkin" do + before do + @rental = rentals(:one) + @rental_params = { movie_id: @rental.movie_id, customer_id: @rental.customer_id } + @customer = Customer.find_by(id: @rental.customer_id) + @movie = Movie.find_by(id: @rental.movie_id) + end + + it "decrements customer's checked_out_count" do + post checkin_path, params: @rental_params + + expect + end + end end From 8767202607ca08a13c5385a818bbd1c5abc569ab Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 15:42:43 -0700 Subject: [PATCH 30/47] adding tests for checkout rental method --- app/controllers/rentals_controller.rb | 5 +++-- test/controllers/rentals_controller_test.rb | 24 ++++++++++++++++++--- test/fixtures/movies.yml | 2 ++ 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cc3ace264..9003784b3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,8 +1,9 @@ # frozen_string_literal: true class RentalsController < ApplicationController + def checkout - rental = Rental.new(movie_id: params[:movie_id], customer_id: params[:customer_id], checkout_date: Date.today, due_date: (Date.today + 7)) + rental = Rental.new(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id], checkout_date: Date.today, due_date: (Date.today + 7)) movie = Movie.find_by(id: rental.movie_id) if movie.available_inventory <= 0 render json: { ok: false, message: 'Not enough copies in inventory' }, status: :bad_request @@ -24,7 +25,7 @@ def checkout def checkin rental = Rental.where(["movie_id = ? and customer_id = ? and checked_in = ?", params[:movie_id], params[:customer_id], false]).first - + end private diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..c42a87a06 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,25 @@ require "test_helper" +require 'pry' describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "checkout" do + let(:rental_data) do + { rental: + { + customer_id: customers(:joe).id, + movie_id: movies(:one).id + } } + end + it "must create a new rental" do + expect { + post checkout_path, params: rental_data + }.must_change "Rental.count" + end + + it "must change the available_inventory of the checkout out movie" do + + end + + + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 2d5de5bbb..ebee20399 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -9,10 +9,12 @@ one: release_date: 2004-06-05 overview: This is a film. You probably haven't seen it. inventory: 12 + available_inventory: 12 two: title: This Too is a Film release_date: 2005-05-02 overview: You probably haven't seen this one either. inventory: 8 + available_inventory: 7 From a6096ff41a2796bf5337cb5e2509d7ce17f79298 Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 15:45:50 -0700 Subject: [PATCH 31/47] updated customers yml to add movies_checked_out column --- test/controllers/rentals_controller_test.rb | 24 ++++++++++++++------- test/fixtures/customers.yml | 2 ++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c42a87a06..d7ec3da4a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,8 +1,10 @@ -require "test_helper" +# frozen_string_literal: true + +require 'test_helper' require 'pry' describe RentalsController do - describe "checkout" do + describe 'checkout' do let(:rental_data) do { rental: { @@ -10,16 +12,22 @@ movie_id: movies(:one).id } } end - it "must create a new rental" do - expect { + it 'must create a new rental' do + expect do post checkout_path, params: rental_data - }.must_change "Rental.count" + end.must_change 'Rental.count' end - it "must change the available_inventory of the checkout out movie" do - - end + it 'must change the available_inventory of the checked out movie' do + count = movies(:one).available_inventory + post checkout_path, params: rental_data + expect(movies(:one).reload.available_inventory).must_equal count - 1 + end + + it 'must change the movies_checked_out count of the customer' do + count = customers(:joe).movies_checked_out + end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 014589bcb..c682e2cbc 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -8,6 +8,7 @@ joe: state: MyString postal_code: MyString phone: MyString + movies_checked_out_count: 1 carly: name: "Carly" @@ -17,3 +18,4 @@ carly: state: MyString postal_code: MyString phone: MyString + movies_checked_out_count: 1 From 8b7bc9b7ea80e94e625164948fd987c08e0e88c5 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 15:49:53 -0700 Subject: [PATCH 32/47] more rentals testing --- test/controllers/rentals_controller_test.rb | 26 +++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4370085a9..0910ab9a9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,27 +1,32 @@ require "test_helper" -require 'pry' +require "pry" describe RentalsController do describe "checkin" do before do @rental = rentals(:one) - @rental_params = { movie_id: @rental.movie_id, customer_id: @rental.customer_id } + @rental_params = { rental: { movie_id: @rental.movie_id, customer_id: @rental.customer_id } } @customer = Customer.find_by(id: @rental.customer_id) @movie = Movie.find_by(id: @rental.movie_id) end it "decrements customer's checked_out_count" do + old_customer_value = @customer.movies_checked_out_count + old_movie_value = @movie.available_inventory post checkin_path, params: @rental_params - - expect + @customer.reload + @movie.reload + expect(@customer.movies_checked_out_count).must_equal old_customer_value - 1 + expect(@movie.available_inventory).must_equal old_movie_value + 1 end + end + describe "checkout" do let(:rental_data) do - { rental: - { - customer_id: customers(:joe).id, - movie_id: movies(:one).id - } } + { rental: { + customer_id: customers(:joe).id, + movie_id: movies(:one).id, + } } end it "must create a new rental" do expect { @@ -30,9 +35,6 @@ end it "must change the available_inventory of the checkout out movie" do - end - - end end From 9c1e9b31ef8e3dbff7f269c7b532400d61f29885 Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 16:07:35 -0700 Subject: [PATCH 33/47] passing controller tests for rentals#checkout --- app/controllers/rentals_controller.rb | 3 +- test/controllers/rentals_controller_test.rb | 31 +++++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9003784b3..6d7d80f7a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,8 +5,9 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id], checkout_date: Date.today, due_date: (Date.today + 7)) movie = Movie.find_by(id: rental.movie_id) - if movie.available_inventory <= 0 + if movie.available_inventory == 0 render json: { ok: false, message: 'Not enough copies in inventory' }, status: :bad_request + return else movie.available_inventory -= 1 end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 9828fe9e6..1b7e0167f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -18,7 +18,7 @@ expect end end - + describe "checkout" do let(:rental_data) do { rental: @@ -42,7 +42,34 @@ end it 'must change the movies_checked_out count of the customer' do - count = customers(:joe).movies_checked_out + count = customers(:joe).movies_checked_out_count + + post checkout_path, params: rental_data + + expect(customers(:joe).reload.movies_checked_out_count).must_equal count + 1 + end + + it "will render error messages if any data is invalid" do + rental_data[:rental][:customer_id] = nil + + expect { + post checkout_path params: rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + expect(body["message"]).must_include "customer_id" + end + + it "will render error message if there is not enough inventory to checkout" do + movies(:one).available_inventory = 0 + movies(:one).save + + expect { + post checkout_path, params: rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + expect(body["message"]).must_equal "Not enough copies in inventory" end end end From 2404ed052fb6c6b48f606a29b6f1fc24d2e54e4a Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 16:14:38 -0700 Subject: [PATCH 34/47] fixed references --- app/controllers/rentals_controller.rb | 7 ++---- app/models/customer.rb | 1 + app/models/movie.rb | 2 ++ app/models/rental.rb | 3 +++ ...6_remove_customer_movie_ids_from_rental.rb | 6 +++++ ...0190514230739_add_references_to_rentals.rb | 6 +++++ db/schema.rb | 8 ++++--- test/controllers/rentals_controller_test.rb | 23 +++++++------------ test/fixtures/rentals.yml | 8 +++---- 9 files changed, 37 insertions(+), 27 deletions(-) create mode 100644 db/migrate/20190514230546_remove_customer_movie_ids_from_rental.rb create mode 100644 db/migrate/20190514230739_add_references_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 9003784b3..ec4e6f08d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,12 +1,11 @@ # frozen_string_literal: true class RentalsController < ApplicationController - def checkout rental = Rental.new(movie_id: params[:rental][:movie_id], customer_id: params[:rental][:customer_id], checkout_date: Date.today, due_date: (Date.today + 7)) movie = Movie.find_by(id: rental.movie_id) if movie.available_inventory <= 0 - render json: { ok: false, message: 'Not enough copies in inventory' }, status: :bad_request + render json: { ok: false, message: "Not enough copies in inventory" }, status: :bad_request else movie.available_inventory -= 1 end @@ -23,9 +22,7 @@ def checkout end def checkin - rental = Rental.where(["movie_id = ? and customer_id = ? and checked_in = ?", params[:movie_id], params[:customer_id], false]).first - - + rental = Rental.where(["movie_id = ? and customer_id = ? and checked_in = ?", params[:rental][:movie_id], params[:rental][:customer_id], false]).first end private diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d2533dbf9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index 105b9e891..e05c79331 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,6 @@ class Movie < ApplicationRecord + has_many :rentals + validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true diff --git a/app/models/rental.rb b/app/models/rental.rb index 2799cf02b..501324b4b 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,7 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie + validates :movie_id, presence: true validates :customer_id, presence: true end diff --git a/db/migrate/20190514230546_remove_customer_movie_ids_from_rental.rb b/db/migrate/20190514230546_remove_customer_movie_ids_from_rental.rb new file mode 100644 index 000000000..23226d94d --- /dev/null +++ b/db/migrate/20190514230546_remove_customer_movie_ids_from_rental.rb @@ -0,0 +1,6 @@ +class RemoveCustomerMovieIdsFromRental < ActiveRecord::Migration[5.2] + def change + remove_column :rentals, :movie_id + remove_column :rentals, :customer_id + end +end diff --git a/db/migrate/20190514230739_add_references_to_rentals.rb b/db/migrate/20190514230739_add_references_to_rentals.rb new file mode 100644 index 000000000..0b68ce3a4 --- /dev/null +++ b/db/migrate/20190514230739_add_references_to_rentals.rb @@ -0,0 +1,6 @@ +class AddReferencesToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, index: true + add_reference :rentals, :customer, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index f284fd371..fef98765a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_222105) do +ActiveRecord::Schema.define(version: 2019_05_14_230739) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -39,13 +39,15 @@ end create_table "rentals", force: :cascade do |t| - t.integer "customer_id" - t.integer "movie_id" t.date "checkout_date" t.date "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.boolean "checked_in", default: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 396bf3d94..708be34e9 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require 'test_helper' -require 'pry' +require "test_helper" +require "pry" describe RentalsController do describe "checkin" do @@ -9,6 +9,7 @@ @rental = rentals(:one) @rental_params = { rental: { movie_id: @rental.movie_id, customer_id: @rental.customer_id } } @customer = Customer.find_by(id: @rental.customer_id) + p @rental @movie = Movie.find_by(id: @rental.movie_id) end @@ -22,11 +23,7 @@ expect(@movie.available_inventory).must_equal old_movie_value + 1 end end -<<<<<<< HEAD -======= - ->>>>>>> 367e28becd85b9cd82f52ed89302d8cec2aff85b describe "checkout" do let(:rental_data) do { rental: { @@ -34,16 +31,13 @@ movie_id: movies(:one).id, } } end - it 'must create a new rental' do + it "must create a new rental" do expect do post checkout_path, params: rental_data - end.must_change 'Rental.count' + end.must_change "Rental.count" end -<<<<<<< HEAD - it "must change the available_inventory of the checkout out movie" do -======= - it 'must change the available_inventory of the checked out movie' do + it "must change the available_inventory of the checked out movie" do count = movies(:one).available_inventory post checkout_path, params: rental_data @@ -51,9 +45,8 @@ expect(movies(:one).reload.available_inventory).must_equal count - 1 end - it 'must change the movies_checked_out count of the customer' do - count = customers(:joe).movies_checked_out ->>>>>>> 367e28becd85b9cd82f52ed89302d8cec2aff85b + it "must change the movies_checked_out count of the customer" do + count = customers(:joe).movies_checked_out_count end end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 2c1e8373b..95830aeb5 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - customer_id: joe - movie_id: one + customer: joe + movie: one checkout_date: 2019-05-14 due_date: 2019-05-14 two: - customer_id: carly - movie_id: two + customer: carly + movie: two checkout_date: 2019-05-14 due_date: 2019-05-14 From ddfcdab85545dcf469013a7aa551405bb689c39e Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 16:33:36 -0700 Subject: [PATCH 35/47] checkin tests --- app/controllers/rentals_controller.rb | 13 +++++++++++++ test/controllers/rentals_controller_test.rb | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 77b1879eb..06f4e0138 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -24,6 +24,19 @@ def checkout def checkin rental = Rental.where(["movie_id = ? and customer_id = ? and checked_in = ?", params[:rental][:movie_id], params[:rental][:customer_id], false]).first + + customer = Customer.find_by(id: params[:rental][:customer_id]) + movie = Movie.find_by(id: params[:rental][:movie_id]) + + rental.checked_in = true + if rental.save + customer.movies_checked_out_count -= 1 + customer.save + movie.available_inventory += 1 + movie.save + else + render json: { ok: false, message: rental.errors.messages }, status: :bad_request + end end private diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f6a80cd39..1e0ca34d8 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -19,9 +19,22 @@ post checkin_path, params: @rental_params @customer.reload @movie.reload + expect(@customer.movies_checked_out_count).must_equal old_customer_value - 1 expect(@movie.available_inventory).must_equal old_movie_value + 1 end + + it "won't change the count in the db" do + expect { + post checkin_path, params: @rental_params + }.wont_change "Rental.count" + end + + it "sets the checked_in value to true" do + post checkin_path, params: @rental_params + @rental.reload + expect(@rental.checked_in).must_equal true + end end describe "checkout" do From a5af787201da307b2355a1a283071b45a2f1bb03 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Tue, 14 May 2019 16:41:00 -0700 Subject: [PATCH 36/47] created rental seeds --- app/controllers/rentals_controller.rb | 2 ++ db/seeds.rb | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 06f4e0138..a0255c3c6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -34,6 +34,8 @@ def checkin customer.save movie.available_inventory += 1 movie.save + render status: :ok + return else render json: { ok: false, message: rental.errors.messages }, status: :bad_request end diff --git a/db/seeds.rb b/db/seeds.rb index b1c2e00f1..4e068e1e2 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -8,3 +8,7 @@ current_movie.available_inventory = current_movie.inventory current_movie.save end + +rental1 = Rental.create!(customer_id: 1, movie_id: 1) +rental2 = Rental.create!(customer_id: 2, movie_id: 2) +rental3 = Rental.create!(customer_id: 3, movie_id: 3) From 211be947e3d143f354a6c876f625bf3f55cf7c51 Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Tue, 14 May 2019 16:42:08 -0700 Subject: [PATCH 37/47] stashing changes to rentalscontroller --- app/controllers/rentals_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 06f4e0138..815f67f79 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -27,13 +27,13 @@ def checkin customer = Customer.find_by(id: params[:rental][:customer_id]) movie = Movie.find_by(id: params[:rental][:movie_id]) - rental.checked_in = true if rental.save customer.movies_checked_out_count -= 1 customer.save movie.available_inventory += 1 movie.save + render statuus: :ok else render json: { ok: false, message: rental.errors.messages }, status: :bad_request end From da0dfb7ce1c8079ef16d568fcce1d43e77f96095 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Wed, 15 May 2019 13:11:24 -0700 Subject: [PATCH 38/47] sort customers --- app/controllers/customers_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 1927091d0..ef89c008e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,11 @@ class CustomersController < ApplicationController def index - customers = Customer.all + if params[:sort] + customers = Customer.order(params[:sort]) + else + customers = Customer.all + end + render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end From 312ea4b5588a15d9e29e6184bf3b917d27c17b29 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Wed, 15 May 2019 13:16:08 -0700 Subject: [PATCH 39/47] update gemfile --- Gemfile | 2 ++ app/controllers/customers_controller.rb | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Gemfile b/Gemfile index 687a6f632..115f4e3ad 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,8 @@ gem 'rails', '~> 5.2.3' gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server gem 'puma', '~> 3.11' + +gem 'will_paginate', '~> 3.1.0' # 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 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ef89c008e..4d474a6a2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -6,6 +6,9 @@ def index customers = Customer.all end + if params[:n] + end + render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end From 3a333ccea94153e9abc2cd682bd160a981b47451 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Wed, 15 May 2019 13:40:47 -0700 Subject: [PATCH 40/47] sort, paginate customers --- Gemfile | 3 ++- Gemfile.lock | 2 ++ app/controllers/customers_controller.rb | 9 +-------- config/application.rb | 14 +++++++------- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 115f4e3ad..63e6702e2 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server gem 'puma', '~> 3.11' -gem 'will_paginate', '~> 3.1.0' + # 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 @@ -47,6 +47,7 @@ end gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] group :development, :test do + gem 'will_paginate', '~> 3.1.0' gem 'pry-rails' end diff --git a/Gemfile.lock b/Gemfile.lock index 87697ba34..c1c1adeab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -144,6 +144,7 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) + will_paginate (3.1.7) PLATFORMS ruby @@ -161,6 +162,7 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) tzinfo-data + will_paginate (~> 3.1.0) RUBY VERSION ruby 2.5.1p57 diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 4d474a6a2..43d007829 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,13 +1,6 @@ class CustomersController < ApplicationController def index - if params[:sort] - customers = Customer.order(params[:sort]) - else - customers = Customer.all - end - - if params[:n] - end + customers = Customer.paginate(page: params[:p], per_page: params[:n]).order(params[:sort]) render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) end diff --git a/config/application.rb b/config/application.rb index 641b5d08c..f9cf27123 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,4 +1,4 @@ -require_relative 'boot' +require_relative "boot" require "rails" # Pick the frameworks you want: @@ -19,12 +19,12 @@ module VideoStoreAPI 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 + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end # Initialize configuration defaults for originally generated Rails version. config.load_defaults 5.2 From 2cbdecdcd245a05f1fb6c1eff64e19566c6a04bf Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Wed, 15 May 2019 13:45:23 -0700 Subject: [PATCH 41/47] fixed rental validation test --- test/controllers/rentals_controller_test.rb | 42 ++++++++++----------- test/models/rental_test.rb | 9 +++-- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 1e0ca34d8..fefa5daee 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true -require "test_helper" -require "pry" +require 'test_helper' +require 'pry' describe RentalsController do - describe "checkin" do + describe 'checkin' do before do @rental = rentals(:one) @rental_params = { rental: { movie_id: @rental.movie_id, customer_id: @rental.customer_id } } @customer = Customer.find_by(id: @rental.customer_id) - p @rental + @rental @movie = Movie.find_by(id: @rental.movie_id) end @@ -25,33 +25,33 @@ end it "won't change the count in the db" do - expect { + expect do post checkin_path, params: @rental_params - }.wont_change "Rental.count" + end.wont_change 'Rental.count' end - it "sets the checked_in value to true" do + it 'sets the checked_in value to true' do post checkin_path, params: @rental_params @rental.reload expect(@rental.checked_in).must_equal true end end - describe "checkout" do + describe 'checkout' do let(:rental_data) do { rental: { customer_id: customers(:joe).id, - movie_id: movies(:one).id, + movie_id: movies(:one).id } } end - it "must create a new rental" do + it 'must create a new rental' do expect do post checkout_path, params: rental_data - end.must_change "Rental.count" + end.must_change 'Rental.count' end - it "must change the available_inventory of the checked out movie" do + it 'must change the available_inventory of the checked out movie' do count = movies(:one).available_inventory post checkout_path, params: rental_data @@ -59,7 +59,7 @@ expect(movies(:one).reload.available_inventory).must_equal count - 1 end - it "must change the movies_checked_out count of the customer" do + it 'must change the movies_checked_out count of the customer' do count = customers(:joe).movies_checked_out_count post checkout_path, params: rental_data @@ -67,27 +67,27 @@ expect(customers(:joe).reload.movies_checked_out_count).must_equal count + 1 end - it "will render error messages if any data is invalid" do + it 'will render error messages if any data is invalid' do rental_data[:rental][:customer_id] = nil - expect { + expect do post checkout_path params: rental_data - }.wont_change "Rental.count" + end.wont_change 'Rental.count' body = JSON.parse(response.body) - expect(body["message"]).must_include "customer_id" + expect(body['message']).must_include 'customer_id' end - it "will render error message if there is not enough inventory to checkout" do + it 'will render error message if there is not enough inventory to checkout' do movies(:one).available_inventory = 0 movies(:one).save - expect { + expect do post checkout_path, params: rental_data - }.wont_change "Rental.count" + end.wont_change 'Rental.count' body = JSON.parse(response.body) - expect(body["message"]).must_equal "Not enough copies in inventory" + expect(body['message']).must_equal 'Not enough copies in inventory' end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..fad3becaf 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,12 @@ -require "test_helper" +# frozen_string_literal: true + +require 'test_helper' +require 'pry' describe Rental do - let(:rental) { Rental.new } + let(:rental) { Rental.new(customer_id: customers(:joe).id, movie_id: movies(:one).id) } - it "must be valid" do + it 'must be valid' do value(rental).must_be :valid? end end From 5bbd789055685d9c1896b70f3f2588689d7eaf2c Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Wed, 15 May 2019 15:09:48 -0700 Subject: [PATCH 42/47] added error checking for invalid params and intitial tests for query param features --- app/controllers/movies_controller.rb | 33 ++++++++++++++--- test/controllers/movies_controller_test.rb | 42 ++++++++++++---------- 2 files changed, 53 insertions(+), 22 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 42e13b545..ed92175f2 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,12 +2,16 @@ class MoviesController < ApplicationController def zomg - render json: { message: "it works!" } + render json: { message: 'it works!' } end def index - movies = Movie.all - render json: movies.as_json(only: %i[id title release_date]) + if valid?(params) + movies = Movie.paginate(page: params[:p], per_page: params[:n]).order(params[:sort]) + render json: movies.as_json(only: %i[id title release_date]) + else + render json: { ok: false, message: 'Query params not valid' }, status: :not_found + end end def show @@ -16,7 +20,7 @@ def show if movie render json: movie.as_json(only: %i[title overview release_date inventory available_inventory]), status: :ok else - render json: { ok: false, message: "Movie not found" }, status: :not_found + render json: { ok: false, message: 'Movie not found' }, status: :not_found end end @@ -33,6 +37,27 @@ def create private + def valid?(params) + sorts = ['title', 'release_date', nil] + return false unless sorts.include?(params[:sort]) + + unless params[:p].nil? + begin Integer(params[:p]) + rescue ArgumentError + return false + end + end + + unless params[:n].nil? + begin Integer(params[:n]) + rescue ArgumentError + return false + end + end + + true + end + def movie_params params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b8c6c74a9..d7001bbd5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,54 +1,60 @@ # frozen_string_literal: true -require "test_helper" +require 'test_helper' describe MoviesController do - it "should get index" do - get movies_path - value(response).must_be :success? + describe 'index' do + it 'should get index' do + get movies_path + value(response).must_be :success? + end + + it 'should get the correct path with query parameters' do + assert_recognizes({ controller: 'movies', action: 'index', sort: 'title' }, '/movies', sort: 'title') + end end - describe "show" do - it "should get show" do + describe 'show' do + it 'should get show' do get movies_path(movies(:one)) value(response).must_be :success? end - it "will display error if movie not found" do + it 'will display error if movie not found' do get movie_path(-1) body = JSON.parse(response.body) must_respond_with :not_found - expect(body["message"]).must_equal "Movie not found" + expect(body['message']).must_equal 'Movie not found' end end - describe "create" do + describe 'create' do let(:movie_data) do { movie: { - title: "The Little Mermaid", - overview: "A woman gives up her ability to talk for a man.", - release_date: "1989-08-15", - inventory: 15, + title: 'The Little Mermaid', + overview: 'A woman gives up her ability to talk for a man.', + release_date: '1989-08-15', + inventory: 15 } } end - it "creates a new movie given valid data" do + it 'creates a new movie given valid data' do expect do post movies_path, params: movie_data - end.must_change "Movie.count", 1 + end.must_change 'Movie.count', 1 body = JSON.parse(response.body) expect(body).must_be_kind_of Hash - expect(body).must_include "id" + expect(body).must_include 'id' value(response).must_be :success? end - it "returns an error for invalid movie data" do + it 'returns an error for invalid movie data' do movie_data[:movie][:title] = nil expect do post movies_path, params: movie_data - end.wont_change "Movie.count" + end.wont_change 'Movie.count' end end end From 4cb1481e56cfa7be30031af79cd0f6a85448abd0 Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Wed, 15 May 2019 15:35:03 -0700 Subject: [PATCH 43/47] fleshed out controller tests for movie query parameters --- test/controllers/movies_controller_test.rb | 28 +++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d7001bbd5..192c4b0b8 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -9,8 +9,34 @@ value(response).must_be :success? end - it 'should get the correct path with query parameters' do + it 'should get the correct path with query title' do assert_recognizes({ controller: 'movies', action: 'index', sort: 'title' }, '/movies', sort: 'title') + + get movies_path, params: { sort: 'title' } + must_respond_with :ok + end + + it 'should get the correct path with query :p' do + assert_recognizes({ controller: 'movies', action: 'index', p: 2 }, '/movies', p: 2) + + get movies_path, params: { p: 2 } + must_respond_with :ok + end + + it 'should get the correct path with query :n' do + assert_recognizes({ controller: 'movies', action: 'index', n: 2 }, '/movies', n: 2) + + get movies_path, params: { n: 2 } + must_respond_with :ok + end + + it 'renders an error if any query params are invalid' do + get movies_path, params: { sort: 'cheese' } + + body = JSON.parse(response.body) + + must_respond_with :not_found + expect(body['message']).must_equal 'Query params not valid' end end From e289189c4a183878e2432a99911f00cfb882eb4a Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Wed, 15 May 2019 15:41:02 -0700 Subject: [PATCH 44/47] more testing in customer --- app/controllers/customers_controller.rb | 31 ++++++++++++++- test/controllers/customers_controller_test.rb | 38 +++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 43d007829..19bf4649b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,12 @@ class CustomersController < ApplicationController def index - customers = Customer.paginate(page: params[:p], per_page: params[:n]).order(params[:sort]) + if valid?(params) + customers = Customer.paginate(page: params[:p], per_page: params[:n]).order(params[:sort]) - render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) + render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]) + else + render status: :bad_request, json: { errors: { "query": ["#{params} not a valid query parameter"] } } + end end def show @@ -14,4 +18,27 @@ def show render status: :not_found, json: { errors: { "name": ["Customer #{params[:id]} not found"] } } end end + + private + + def valid?(params) + sorts = ["name", "registered_at", "postal_code", nil] + return false unless sorts.include?(params[:sort]) + + unless params[:p].nil? + begin Integer(params[:p]) + rescue ArgumentError + return false + end + end + + unless params[:n].nil? + begin Integer(params[:n]) + rescue ArgumentError + return false + end + end + + true + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5adada800..9d124c2b3 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -6,6 +6,39 @@ get customers_path value(response).must_be :successful? end + + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns all of the customers" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(id movies_checked_out_count name phone postal_code registered_at) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + + it "should get the correct path with query parameters" do + assert_recognizes({ controller: "customers", action: "index", sort: "name" }, "/customers", sort: "name") + end + + it "gets the correct path with n query" do + assert_recognizes({ controller: "customers", action: "index", n: "10" }, "/customers", n: "10") + end + + it "gets the correct path with p query" do + assert_recognizes({ controller: "customers", action: "index", p: "10" }, "/customers", p: "10") + end end describe "show" do @@ -20,5 +53,10 @@ body = JSON.parse(response.body) expect(body["errors"]).must_be_kind_of Hash end + + it "still returns JSON if ID is invalid" do + get customer_path(-1) + expect(response.header["Content-Type"]).must_include "json" + end end end From 1b8e72836c9cb9ccdcf7dfcd8e973bfebb5f26e1 Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Fri, 17 May 2019 13:06:54 -0700 Subject: [PATCH 45/47] added rental model validation and relationship tests --- test/models/rental_test.rb | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index fad3becaf..0526e7572 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -5,8 +5,37 @@ describe Rental do let(:rental) { Rental.new(customer_id: customers(:joe).id, movie_id: movies(:one).id) } + let(:customer) { customers(:joe) } - it 'must be valid' do - value(rental).must_be :valid? + describe 'validations' do + it 'must be valid' do + value(rental).must_be :valid? + end + + it 'must have a customer' do + rental.customer_id = nil + rental.save + expect(rental.valid?).must_equal false + expect(rental.errors).must_include 'customer' + end + + it "must have a movie" do + rental.movie_id = nil + rental.save + expect(rental.valid?).must_equal false + expect(rental.errors).must_include "movie" + end + end + + describe "relationships" do + it "belongs to a customer" do + rental.save + expect(rental).must_respond_to :customer + end + + it "belongs to a movie" do + rental.save + expect(rental).must_respond_to :movie + end end end From 85ccd8fe9017fa35d9332f4499af3bb6cf82515c Mon Sep 17 00:00:00 2001 From: Ariana Bray Date: Fri, 17 May 2019 13:09:52 -0700 Subject: [PATCH 46/47] added relationship test to movie model --- test/models/movie_test.rb | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 5f5ca79ef..f2b3684c0 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,40 +1,48 @@ -require "test_helper" +# frozen_string_literal: true + +require 'test_helper' describe Movie do - let(:movie) { Movie.new(title: "Test Movie", overview: "This is a test movie", release_date: "2019-04-05", inventory: 5) } + let(:movie) { Movie.new(title: 'Test Movie', overview: 'This is a test movie', release_date: '2019-04-05', inventory: 5) } - it "must be valid" do + it 'must be valid' do value(movie).must_be :valid? end - describe "validations" do - - it "must have a title" do + describe 'validations' do + it 'must have a title' do movie.title = nil movie.save expect(movie.valid?).must_equal false - expect(movie.errors).must_include "title" + expect(movie.errors).must_include 'title' end - it "must have an overview" do + it 'must have an overview' do movie.overview = nil movie.save expect(movie.valid?).must_equal false - expect(movie.errors).must_include "overview" + expect(movie.errors).must_include 'overview' end - it "must have a release date" do + it 'must have a release date' do movie.release_date = nil movie.save expect(movie.valid?).must_equal false - expect(movie.errors).must_include "release_date" + expect(movie.errors).must_include 'release_date' end - it "inventory must be a number" do - movie.inventory = "abcd" + it 'inventory must be a number' do + movie.inventory = 'abcd' movie.save expect(movie.valid?).must_equal false - expect(movie.errors[:inventory].first).must_include "is not a number" + expect(movie.errors[:inventory].first).must_include 'is not a number' + end + end + + describe 'relationships' do + it 'has many rentals' do + movie.save + expect(movie).must_respond_to :rentals end end end From 45eecf973303663fdc5787247f79eeadc885a343 Mon Sep 17 00:00:00 2001 From: Kirsten Anderson Date: Fri, 17 May 2019 13:12:53 -0700 Subject: [PATCH 47/47] customer model test --- app/models/customer.rb | 1 + test/models/customer_test.rb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..8ea44290b 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,4 @@ class Customer < ApplicationRecord has_many :rentals end + diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..4548b22eb 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -6,4 +6,8 @@ it "must be valid" do value(customer).must_be :valid? end + + it "has rentals" do + expect(Customer.first.rentals.count).must_equal 1 + end end