From 8c0bf612ef431aee72b1644037558c3242a2e1d4 Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Tue, 9 May 2017 14:41:48 -0700 Subject: [PATCH 01/36] created movie, customer and rental databases --- .gitignore | 17 ++ Gemfile | 53 ++++++ Gemfile.lock | 175 ++++++++++++++++++ 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/models/rental.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 | 34 ++++ bin/spring | 17 ++ bin/update | 29 +++ config.ru | 5 + config/application.rb | 34 ++++ config/boot.rb | 3 + config/cable.yml | 9 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 +++++ config/environments/production.rb | 78 ++++++++ config/environments/test.rb | 42 +++++ .../application_controller_renderer.rb | 6 + 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/new_framework_defaults.rb | 18 ++ config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/puma.rb | 47 +++++ config/routes.rb | 3 + config/secrets.yml | 22 +++ config/spring.rb | 6 + db/migrate/20170509212549_create_movies.rb | 12 ++ db/migrate/20170509212933_create_customers.rb | 15 ++ db/migrate/20170509213029_create_rentals.rb | 10 + db/schema.rb | 49 +++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/customers.yml | 19 ++ test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 11 ++ test/fixtures/rentals.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/models/rental_test.rb | 9 + test/test_helper.rb | 26 +++ tmp/.keep | 0 66 files changed, 1070 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock 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/models/rental.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/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/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/new_framework_defaults.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 db/migrate/20170509212549_create_movies.rb create mode 100644 db/migrate/20170509212933_create_customers.rb create mode 100644 db/migrate/20170509213029_create_rentals.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 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/fixtures/rentals.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/models/rental_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..48fb168f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# 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 Byebug command history file. +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..0ed2648fb --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.2' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.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 +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# 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', platform: :mri +end + +group :development do + gem 'listen', '~> 3.0.5' + # 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 do + gem 'better_errors' + gem 'pry-rails' +end + +gem 'awesome_print' +gem 'foundation-rails' +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..dc0da7400 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,175 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.2) + activesupport (= 5.0.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (7.1.4) + awesome_print (1.7.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + builder (3.2.3) + byebug (9.0.6) + coderay (1.1.1) + concurrent-ruby (1.0.5) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + foundation-rails (6.3.1.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.5) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.14) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.0.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) + pg (0.20.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.8.2) + rack (2.0.2) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + ruby-progressbar (1.8.1) + sass (3.4.23) + slop (3.6.0) + spring (2.0.1) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.19.4) + thread_safe (0.3.6) + tzinfo (1.2.3) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + awesome_print + better_errors + byebug + foundation-rails + listen (~> 3.0.5) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.0) + rails (~> 5.0.2) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.14.6 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/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/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..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 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..e620b4dad --- /dev/null +++ b/bin/setup @@ -0,0 +1,34 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # 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..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/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..54782d010 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,34 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +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 + # Force new test files to be generated in the minitest-spec style + config.generators do |g| + g.test_framework :minitest, spec: true + end + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # 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..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0bbde6f74 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..aead51124 --- /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..082a013ab --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=172800' + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + + # 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..49275a9d6 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,78 @@ +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 + + # 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 + + # 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..30587ef6d --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=3600' + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..51639b67a --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) 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/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 000000000..d859e4bea --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,18 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } 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..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# 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. +# +# 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..c7f311f81 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,47 @@ +# 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 }.to_i +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted this block will be run, if you are using `preload_app!` +# option you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 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/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..5448b7b5e --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: 310d9da47c63d345a445e78ed3504a5d6873341bffd0815643f65a547829d4345c471b0ccda4b5aff13e7ca23c42626ad887515bae23f2d3923d511843ed3c67 + +test: + secret_key_base: 193f40d57679f8b1a35e6158c509ecba8388d3aa2b5c5ed24e6c21b3db37df1fd004c8f17542634194b9bcf4a656134de237ceb7e9a861eb964e904af197044c + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/migrate/20170509212549_create_movies.rb b/db/migrate/20170509212549_create_movies.rb new file mode 100644 index 000000000..c300d95a7 --- /dev/null +++ b/db/migrate/20170509212549_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.0] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20170509212933_create_customers.rb b/db/migrate/20170509212933_create_customers.rb new file mode 100644 index 000000000..ba079c631 --- /dev/null +++ b/db/migrate/20170509212933_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.0] + def change + create_table :customers do |t| + t.string :name + t.datetime :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/migrate/20170509213029_create_rentals.rb b/db/migrate/20170509213029_create_rentals.rb new file mode 100644 index 000000000..3e5ae9270 --- /dev/null +++ b/db/migrate/20170509213029_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.0] + def change + create_table :rentals do |t| + t.belongs_to :customer + t.belongs_to :movie + t.date :due_date + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..bb2fff2d4 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,49 @@ +# 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: 20170509213029) 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.datetime "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.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.integer "customer_id" + t.integer "movie_id" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["customer_id"], name: "index_rentals_on_customer_id", using: :btree + t.index ["movie_id"], name: "index_rentals_on_movie_id", using: :btree + 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..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / 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..676a64036 --- /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: + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: + 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..622062da8 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: + inventory: 1 + +two: + title: MyString + overview: + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/rentals.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/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 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb From c3647c921d91f7af5d6c7826bb4d5a3f9ef5fd72 Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Tue, 9 May 2017 14:52:29 -0700 Subject: [PATCH 02/36] added relationships in models --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ 3 files changed, 6 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..b62bcbf04 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,4 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..6237ce84b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,4 @@ class Movie < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..e001ff37c 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie end From 0198dfd905bf6fca341276436871298556d5bf74 Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Tue, 9 May 2017 14:55:31 -0700 Subject: [PATCH 03/36] modified rental tes --- test/models/rental_test.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..9d053ce3b 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,5 @@ require "test_helper" -describe Rental do - let(:rental) { Rental.new } - it "must be valid" do - value(rental).must_be :valid? - end + end From c6f5145c615e1a716f70a5623b971f74fbc35f1c Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Tue, 9 May 2017 15:04:03 -0700 Subject: [PATCH 04/36] Write validations for movie model --- app/models/movie.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index 6237ce84b..19a86e3be 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,7 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + + # validates :title, presence: true + # validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } end From ddf7dbfe18489dc1c333327a516b75ae96d8a360 Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Tue, 9 May 2017 15:04:03 -0700 Subject: [PATCH 05/36] Write validations for movie model --- app/models/movie.rb | 3 +++ ...20170509220431_add_account_credit_column_to_customer.rb | 5 +++++ db/schema.rb | 7 ++++--- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20170509220431_add_account_credit_column_to_customer.rb diff --git a/app/models/movie.rb b/app/models/movie.rb index 6237ce84b..0e9c08447 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,7 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals + + validates :title, presence: true + validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } end diff --git a/db/migrate/20170509220431_add_account_credit_column_to_customer.rb b/db/migrate/20170509220431_add_account_credit_column_to_customer.rb new file mode 100644 index 000000000..310db9fb0 --- /dev/null +++ b/db/migrate/20170509220431_add_account_credit_column_to_customer.rb @@ -0,0 +1,5 @@ +class AddAccountCreditColumnToCustomer < ActiveRecord::Migration[5.0] + def change + add_column :customers, :account_credit, :float + end +end diff --git a/db/schema.rb b/db/schema.rb index bb2fff2d4..4545db1c8 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: 20170509213029) do +ActiveRecord::Schema.define(version: 20170509220431) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -23,8 +23,9 @@ t.string "state" t.string "postal_code" t.string "phone" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.float "account_credit" end create_table "movies", force: :cascade do |t| From 283e5e6d23393c7daa5db5ca12a966974e0c4f63 Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Tue, 9 May 2017 15:40:07 -0700 Subject: [PATCH 06/36] added validation for customer model --- app/models/customer.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index b62bcbf04..55ee83491 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,9 @@ class Customer < ApplicationRecord has_many :rentals - has_many :movies, through: :rentals + has_many :movies, through: :rentals + + validates :name, presence: true + validates :phone, presence: true + validates :postal_code, length: { is: 5 } + end From 7759891d837f0ba72c3cc46cf694034e5145815b Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Tue, 9 May 2017 15:42:23 -0700 Subject: [PATCH 07/36] added rental validations --- app/models/rental.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..20e372ec4 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,6 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + #potentially need to comment the below out for a while... + validates :due_date, presence: true end From dd0af83c506b54b1958ab7cd314f19a73e9bb792 Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Tue, 9 May 2017 15:54:11 -0700 Subject: [PATCH 08/36] Add fixtures for movie and customer --- test/fixtures/movies.yml | 20 ++++++++++---------- test/fixtures/rentals.yml | 28 ++++++++++++++++++---------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 622062da8..2f91e3113 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,11 +1,11 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html +psycho: + title: Psycho + overview: When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower. + release_date: 1960-06-16 + inventory: 8 -one: - title: MyString - overview: - inventory: 1 - -two: - title: MyString - overview: - inventory: 1 +jaws: + title: Jaws + overview: An insatiable great white shark terrorizes the townspeople of Amity Island, The police chief, an oceanographer and a grizzled shark hunter seek to destroy the bloodthirsty beast. + release_date: 1975-06-19 + inventory: 6 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..b330193bc 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,11 +1,19 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html +rocha: + name: Shelley Rocha + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: Ap 292-5216 Ipsum Rd. + city: Hillsboro + state: OR + postal_code: '24309' + phone: (322) 510-8695 + account_credit: 13.15 -# 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 +stout: + name: Curran Stout + registered_at: Wed, 16 Apr 2014 21:40:20 -0700 + address: Ap 658-1540 Erat Rd. + city: San Francisco + state: California + postal_code: '94267' + phone: (908) 949-6758 + account_credit: 35.66 From 8a5c0a300d7d25c493c8218f81c4b0ef8dfb9066 Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Tue, 9 May 2017 15:58:58 -0700 Subject: [PATCH 09/36] added rental yml files --- test/fixtures/rentals.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..8bde84287 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -3,9 +3,13 @@ # 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 + +one: + customer: rocha + movie: jaws + due_date: 2017-08-09 + +two: + customer: stout + movie: psycho + due_date: 2017-09-12 From 20ec181943a1bb9e9c2d805cf88b11d782607d6e Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Tue, 9 May 2017 16:16:28 -0700 Subject: [PATCH 10/36] phone and number validations for customer passing --- test/fixtures/customers.yml | 18 +++++++++--------- test/models/customer_test.rb | 19 +++++++++++++++---- test/models/rental_test.rb | 4 ---- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index f732f07ef..31cdd6fa9 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -9,12 +9,12 @@ rocha: phone: (322) 510-8695 account_credit: 13.15 - stout: - name: Curran Stout - registered_at: Wed, 16 Apr 2014 21:40:20 -0700 - address: Ap 658-1540 Erat Rd. - city: San Francisco - state: California - postal_code: '94267' - phone: (908) 949-6758 - account_credit: 35.66 +stout: + name: Curran Stout + registered_at: Wed, 16 Apr 2014 21:40:20 -0700 + address: Ap 658-1540 Erat Rd. + city: San Francisco + state: California + postal_code: '94267' + phone: (908) 949-6758 + account_credit: 35.66 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..7d3354083 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,20 @@ require "test_helper" -describe Customer do - let(:customer) { Customer.new } +describe "Customer" do + describe "Validations" do + it "Requires a name" do + customer = Customer.create + result = customer.valid? + result.must_equal false + customer.errors.messages.must_include :name + end + + it "requires a phone number" do + customer = Customer.create + result = customer.valid? + result.must_equal false + customer.errors.messages.must_include :phone + end - it "must be valid" do - value(customer).must_be :valid? end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 9d053ce3b..0ad635fec 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,5 +1 @@ require "test_helper" - - - -end From f47852f8f556cde737e4d748906d0e9b0e4bbe04 Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Tue, 9 May 2017 16:26:38 -0700 Subject: [PATCH 11/36] Write test for movie relations --- test/fixtures/customers.yml | 18 +++++++++--------- test/models/movie_test.rb | 24 +++++++++++++++++++++--- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index f732f07ef..31cdd6fa9 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -9,12 +9,12 @@ rocha: phone: (322) 510-8695 account_credit: 13.15 - stout: - name: Curran Stout - registered_at: Wed, 16 Apr 2014 21:40:20 -0700 - address: Ap 658-1540 Erat Rd. - city: San Francisco - state: California - postal_code: '94267' - phone: (908) 949-6758 - account_credit: 35.66 +stout: + name: Curran Stout + registered_at: Wed, 16 Apr 2014 21:40:20 -0700 + address: Ap 658-1540 Erat Rd. + city: San Francisco + state: California + postal_code: '94267' + phone: (908) 949-6758 + account_credit: 35.66 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..cce085d8b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,27 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + # let(:movie) { Movie.new } + # + # it "must be valid" do + # value(movie).must_be :valid? + # end - it "must be valid" do - value(movie).must_be :valid? + describe "relations" do + it "has a list of customers" do + jaws = movies(:jaws) + jaws.must_respond_to :customers + jaws.customers.each do |customer| + customer.must_be_kind_of Customer + end + end + + it "has a list of rentals" do + jaws = movies(:jaws) + jaws.must_respond_to :rentals + jaws.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end end end From 22c53d17b51aa6177c59d2a383808a0a388a8b84 Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Tue, 9 May 2017 16:35:35 -0700 Subject: [PATCH 12/36] Write test for customer relations --- test/models/customer_test.rb | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..634c393cd 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,27 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + # let(:customer) { Customer.new } + # + # it "must be valid" do + # value(customer).must_be :valid? + # end - it "must be valid" do - value(customer).must_be :valid? + describe "relations" do + it "has a list of rentals" do + stout = customers(:stout) + stout.must_respond_to :rentals + stout.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + + it "has a list of movies" do + stout = customers(:stout) + stout.must_respond_to :movies + stout.movies.each do |movie| + movie.must_be_kind_of Movie + end + end end end From 95b64f19325ac6e449ae76a2585178783ad791de Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Tue, 9 May 2017 16:40:53 -0700 Subject: [PATCH 13/36] all customer validation tests passing --- test/models/customer_test.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 7d3354083..ef718de5c 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -16,5 +16,24 @@ customer.errors.messages.must_include :phone end + it "requires a postal code" do + customer = Customer.create + result = customer.valid? + result.must_equal false + customer.errors.messages.must_include :postal_code + end + + it "checks the length isn't greater than 5 for the postal code" do + customer = Customer.create(postal_code: "9832928938") + result = customer.valid? + result.must_equal false + end + + it "checks the length of the postal code is not less than 5" do + customer = Customer.create(postal_code: "9") + result = customer.valid? + result.must_equal false + end + end end From b20b5c919a08210bbd83434af20726f40086ff92 Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Tue, 9 May 2017 16:50:18 -0700 Subject: [PATCH 14/36] Write tests for movie validations --- app/models/movie.rb | 2 +- test/models/movie_test.rb | 43 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 0e9c08447..81c3a11c5 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,6 +2,6 @@ class Movie < ApplicationRecord has_many :rentals has_many :customers, through: :rentals - validates :title, presence: true + validates :title, presence: true, uniqueness: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index cce085d8b..62a5af39b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -24,4 +24,47 @@ end end end + + describe "validations" do + it "can be created with all required attributes" do + Movie.create!( + title: 'test title', + inventory: 8 + ) + end + + it "requires a title" do + movie = Movie.new + movie.valid?.must_equal false + movie.errors.messages.must_include :title + end + + it "requires a unique title" do + duplicate_movie = Movie.new(title: "Jaws", inventory: 8) + duplicate_movie.valid?.must_equal false + duplicate_movie.errors.messages.must_include :title + end + + it "requires an inventory" do + movie = Movie.new + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + + it "requires the inventory to be an integer" do + movie = Movie.new(inventory: "8") + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + + it "requires the inventory to be positive" do + movie = Movie.new(inventory: -4) + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + + it "allows an inventory of zero" do + Movie.create!(inventory: 0, title: "test title") + end + end end From b726aba7455940b24c3b8c74b4b70f23327e4b32 Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Tue, 9 May 2017 16:55:49 -0700 Subject: [PATCH 15/36] added rental tests --- test/models/customer_test.rb | 1 - test/models/rental_test.rb | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index ef718de5c..8523cea03 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -34,6 +34,5 @@ result = customer.valid? result.must_equal false end - end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 0ad635fec..14df41d49 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1 +1,26 @@ require "test_helper" + +describe "Rental" do + describe "relationships" do + it "belongs to a customer" do + # ar = Rental.reflect_on_association(:customers) + # ar.macro.must_equal :belongs_to + rental = rentals(:one) + rental.must_respond_to :customer + rental.customer.must_be_kind_of Customer + end + + it "belongs to a movie" do + end + end + + describe "Validations" do + it "checks the presence of due_date" do + rental = Rental.create + result = rental.valid? + result.must_equal false + rental.errors.messages.must_include :due_date + end + end + +end From ac3b20f06c67a2e39d501bc5d6c44c3d80a92e6f Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Wed, 10 May 2017 10:26:23 -0700 Subject: [PATCH 16/36] Fix test errors --- test/models/customer_test.rb | 2 +- test/models/movie_test.rb | 8 +------- test/models/rental_test.rb | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index ed7f3f41f..1cf77d9ca 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Customer" do +describe Customer do describe "Validations" do it "Requires a name" do customer = Customer.create diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 62a5af39b..deab1bb53 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,12 +1,6 @@ require "test_helper" describe Movie do - # let(:movie) { Movie.new } - # - # it "must be valid" do - # value(movie).must_be :valid? - # end - describe "relations" do it "has a list of customers" do jaws = movies(:jaws) @@ -52,7 +46,7 @@ end it "requires the inventory to be an integer" do - movie = Movie.new(inventory: "8") + movie = Movie.new(inventory: "e") movie.valid?.must_equal false movie.errors.messages.must_include :inventory end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 14df41d49..e6e713935 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Rental" do +describe Rental do describe "relationships" do it "belongs to a customer" do # ar = Rental.reflect_on_association(:customers) From 886477fbb8df571f6873fc0ee38e301cf3a80ded Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Wed, 10 May 2017 10:28:20 -0700 Subject: [PATCH 17/36] added rental test belongs to movie --- test/models/rental_test.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index e6e713935..dbac0d671 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -11,6 +11,9 @@ end it "belongs to a movie" do + rental = rentals(:one) + rental.must_respond_to :movie + rental.movie.must_be_kind_of Movie end end From e08c772086d27bde7626a0f55310a65f58dadd9e Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Wed, 10 May 2017 10:35:18 -0700 Subject: [PATCH 18/36] Define routes for movies index, customers index, and movies show --- config/routes.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..a27b2d72e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get 'movies', to: 'movies#index', as: 'movies' + get 'movies/:title', to: 'movies#show', as: 'movie' + get 'customers', to: 'customers#index', as: 'customers' + end From eee9fbfc58b7a72231b682418ba62d0ffc7c7ebc Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Wed, 10 May 2017 10:36:01 -0700 Subject: [PATCH 19/36] Generate controllers for movies and customers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ 4 files changed, 18 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..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 51f82315576d9329c5cd791fff0b38419f49f967 Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Wed, 10 May 2017 10:43:27 -0700 Subject: [PATCH 20/36] Write index method for movies controller, add movie serializer --- Gemfile | 1 + Gemfile.lock | 9 +++++++++ app/controllers/movies_controller.rb | 4 ++++ app/models/movie.rb | 4 ++++ app/serializers/movie_serializer.rb | 3 +++ 5 files changed, 21 insertions(+) create mode 100644 app/serializers/movie_serializer.rb diff --git a/Gemfile b/Gemfile index 0ed2648fb..c2f709690 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,7 @@ gem 'rails', '~> 5.0.2' gem 'pg', '~> 0.18' # Use Puma as the app server gem 'puma', '~> 3.0' +gem 'active_model_serializers' # 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/Gemfile.lock b/Gemfile.lock index dc0da7400..5ce130a2e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,6 +24,11 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) + active_model_serializers (0.10.6) + actionpack (>= 4.1, < 6) + activemodel (>= 4.1, < 6) + case_transform (>= 0.2) + jsonapi-renderer (>= 0.1.1.beta1, < 0.2) activejob (5.0.2) activesupport (= 5.0.2) globalid (>= 0.3.6) @@ -51,6 +56,8 @@ GEM rack (>= 0.9.0) builder (3.2.3) byebug (9.0.6) + case_transform (0.2) + activesupport coderay (1.1.1) concurrent-ruby (1.0.5) erubis (2.7.0) @@ -63,6 +70,7 @@ GEM globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.1) + jsonapi-renderer (0.1.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -156,6 +164,7 @@ PLATFORMS ruby DEPENDENCIES + active_model_serializers awesome_print better_errors byebug diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..a06c0817b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,6 @@ class MoviesController < ApplicationController + def index + movies = Movie.all + render :json => movies + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 81c3a11c5..aeff7f895 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,4 +4,8 @@ class Movie < ApplicationRecord validates :title, presence: true, uniqueness: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + + def available_inventory + inventory + end end diff --git a/app/serializers/movie_serializer.rb b/app/serializers/movie_serializer.rb new file mode 100644 index 000000000..1533ab208 --- /dev/null +++ b/app/serializers/movie_serializer.rb @@ -0,0 +1,3 @@ +class MovieSerializer < ActiveModel::Serializer + attributes :title, :release_date, :overview, :inventory, :available_inventory +end From 0780cb57ef8cef3f42e13037fdf9ce554baa3505 Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Wed, 10 May 2017 11:12:06 -0700 Subject: [PATCH 21/36] Add show method for movies controller and implement movie serializer to DRY up controller --- app/controllers/movies_controller.rb | 7 ++++++- app/serializers/movie_preview_serializer.rb | 3 +++ config/routes.rb | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 app/serializers/movie_preview_serializer.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a06c0817b..5113950ca 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,6 +1,11 @@ class MoviesController < ApplicationController def index movies = Movie.all - render :json => movies + render :json => movies, each_serializer: MoviePreviewSerializer + end + + def show + movie = Movie.find_by(id: params[:title]) + render :json => movie end end diff --git a/app/serializers/movie_preview_serializer.rb b/app/serializers/movie_preview_serializer.rb new file mode 100644 index 000000000..c5b1463fe --- /dev/null +++ b/app/serializers/movie_preview_serializer.rb @@ -0,0 +1,3 @@ +class MoviePreviewSerializer < ActiveModel::Serializer + attributes :title, :release_date +end diff --git a/config/routes.rb b/config/routes.rb index a27b2d72e..baceaba66 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do get 'movies', to: 'movies#index', as: 'movies' - get 'movies/:title', to: 'movies#show', as: 'movie' + get 'movies/:title', to: 'movies#show' get 'customers', to: 'customers#index', as: 'customers' end From 0418a8f92e03197b4a4ad86d6a7fb6e3cbb20f4b Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Wed, 10 May 2017 11:16:49 -0700 Subject: [PATCH 22/36] created serializer for customer --- app/controllers/customers_controller.rb | 4 ++++ app/serializers/customer_serializer.rb | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 app/serializers/customer_serializer.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..7b627dcb2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,6 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render :json => customers + end end diff --git a/app/serializers/customer_serializer.rb b/app/serializers/customer_serializer.rb new file mode 100644 index 000000000..e11aa2746 --- /dev/null +++ b/app/serializers/customer_serializer.rb @@ -0,0 +1,3 @@ +class CustomerSerializer < ActiveModel::Serializer + attributes :id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count +end From 8dac9c0005b5bb0b57a3de444be571cc55dcb02f Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Wed, 10 May 2017 11:21:57 -0700 Subject: [PATCH 23/36] added method in customer model for movie count --- app/models/customer.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 55ee83491..e926675dc 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,4 +6,10 @@ class Customer < ApplicationRecord validates :phone, presence: true validates :postal_code, length: { is: 5 } + # scope :movies_checked_out_count, -> { movies.count } + + def movies_checked_out_count + movies.count + end + end From db42bd4241c37bd7361e8ed2738932472d5e7485 Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Wed, 10 May 2017 11:29:14 -0700 Subject: [PATCH 24/36] Modify movie show method so based on movie title not id --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5113950ca..ff21b605a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,7 +5,7 @@ def index end def show - movie = Movie.find_by(id: params[:title]) + movie = Movie.find_by(title: params[:title].capitalize) render :json => movie end end From 388525560bee508d91ab9b8f2c0bb0f92a8ecc7c Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Wed, 10 May 2017 12:00:35 -0700 Subject: [PATCH 25/36] Add statuses and error messages for movie controller methods --- app/controllers/movies_controller.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ff21b605a..6c0878b32 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,11 +1,15 @@ class MoviesController < ApplicationController def index movies = Movie.all - render :json => movies, each_serializer: MoviePreviewSerializer + render json: movies, each_serializer: MoviePreviewSerializer, status: :ok end def show movie = Movie.find_by(title: params[:title].capitalize) - render :json => movie + if movie + render json: movie, status: :ok + else + render status: :not_found, json: { errors: { title: ["Movie '#{params[:title]}' not found"] } } + end end end From 60d26667cbed91a4e700e58db58aa19051502238 Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Wed, 10 May 2017 12:02:05 -0700 Subject: [PATCH 26/36] added status ok for customer index --- app/controllers/customers_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 7b627dcb2..99a8bc3c5 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - render :json => customers - end + render :json => customers, status: :ok + end end From 43b9b95ca5549cac7ee58db13dd5a825aed927b7 Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Wed, 10 May 2017 15:17:20 -0700 Subject: [PATCH 27/36] wrote an customer index test that passes --- test/controllers/customers_controller_test.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..b362b7a78 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,13 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + it "is a real working route" do + get customers_path + must_respond_with :success + end + + it "returns json" do + + end + end From 940d6232462857bc81740de24b4307ab08b02dcd Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Wed, 10 May 2017 15:32:10 -0700 Subject: [PATCH 28/36] all customer controller tests passing --- test/controllers/customers_controller_test.rb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index b362b7a78..04d9887b3 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,7 +7,30 @@ end it "returns json" do + get customers_path + response.header['Content-Type'].must_include 'json' + end + + it "returns an array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + 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 the required feilds" 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 end From 244bdabf1cb5b3615f4e3279c31df0737844e054 Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Wed, 10 May 2017 15:43:44 -0700 Subject: [PATCH 29/36] Write movie controller tests --- app/controllers/movies_controller.rb | 2 +- config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 61 ++++++++++++++++++++-- 3 files changed, 60 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c0878b32..54d283a3f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,7 +9,7 @@ def show if movie render json: movie, status: :ok else - render status: :not_found, json: { errors: { title: ["Movie '#{params[:title]}' not found"] } } + render status: :not_found, json: { errors: { title: "Movie '#{params[:title]}' not found" } } end end end diff --git a/config/routes.rb b/config/routes.rb index baceaba66..a27b2d72e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do get 'movies', to: 'movies#index', as: 'movies' - get 'movies/:title', to: 'movies#show' + get 'movies/:title', to: 'movies#show', as: 'movie' get 'customers', to: 'customers#index', as: 'customers' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..c42393a9a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,62 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "responds successfully" do + get movies_url + must_respond_with :success + end + + it "responds successfully when there are no movies" do + Movie.destroy_all + get movies_url + must_respond_with :success + end + + it "returns json" do + get movies_url + response.header['Content-Type'].must_include 'json' + end + + it "returns all of the movies" do + get movies_url + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with only the required fields" do + required_fields = %w(release_date title) + get movies_url + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal required_fields + end + end + end + + describe "show" do + it "responds successfully for an existing movie title" do + get movie_url(movies(:jaws).title) + must_respond_with :success + end + + it "responds with not_found for a non-existent movie title" do + get movie_url("fake movie title") + must_respond_with :not_found + end + + it "returns an informative error message if a movie does not exist" do + get movie_url("fake movie title") + body = JSON.parse(response.body) + body.keys.must_equal ["errors"] + body.values.first.keys.must_include "title" + end + + it "returns a movie with only the required fields" do + required_fields = %w(available_inventory inventory overview release_date title) + get movie_url(movies(:jaws).title) + body = JSON.parse(response.body) + body.keys.sort.must_equal required_fields + end + end end From f42d71e031a7e85b2fe2a985075e4992aae4ad8a Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Fri, 12 May 2017 11:11:55 -0700 Subject: [PATCH 30/36] Add returned boolean to rental model and set it to false by default --- app/models/rental.rb | 7 +++++++ .../20170512180314_add_returned_column_to_rentals.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20170512180314_add_returned_column_to_rentals.rb diff --git a/app/models/rental.rb b/app/models/rental.rb index 20e372ec4..336063aaa 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,4 +3,11 @@ class Rental < ApplicationRecord belongs_to :movie #potentially need to comment the below out for a while... validates :due_date, presence: true + + after_initialize :set_defaults, unless: :persisted? + + private + def set_defaults + self.returned = false if self.returned.nil? + end end diff --git a/db/migrate/20170512180314_add_returned_column_to_rentals.rb b/db/migrate/20170512180314_add_returned_column_to_rentals.rb new file mode 100644 index 000000000..9f8ad8524 --- /dev/null +++ b/db/migrate/20170512180314_add_returned_column_to_rentals.rb @@ -0,0 +1,5 @@ +class AddReturnedColumnToRentals < ActiveRecord::Migration[5.0] + def change + add_column :rentals, :returned, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index 4545db1c8..21e7a0db6 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: 20170509220431) do +ActiveRecord::Schema.define(version: 20170512180314) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,7 @@ t.date "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.boolean "returned" t.index ["customer_id"], name: "index_rentals_on_customer_id", using: :btree t.index ["movie_id"], name: "index_rentals_on_movie_id", using: :btree end From 4d29d66d73683daa65802367ce3b375a6a2e27bb Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Fri, 12 May 2017 11:33:29 -0700 Subject: [PATCH 31/36] Write checkout method to add functionality to checkout a movie --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 11 +++++++++++ app/models/rental.rb | 1 + config/routes.rb | 2 ++ test/controllers/rentals_controller_test.rb | 7 +++++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 54d283a3f..6c0878b32 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,7 +9,7 @@ def show if movie render json: movie, status: :ok else - render status: :not_found, json: { errors: { title: "Movie '#{params[:title]}' not found" } } + render status: :not_found, json: { errors: { title: ["Movie '#{params[:title]}' not found"] } } end end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..f437a14b2 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,11 @@ +class RentalsController < ApplicationController + def checkout + movie = Movie.find_by(title: params[:title].capitalize) + rental = Rental.new(customer_id: params["customer_id"], movie: movie, due_date: params["due_date"]) + if rental.save + render json: { id: rental.id}, status: :ok + else + render status: :bad_request, json: { errors: rental.errors.messages } + end + end +end diff --git a/app/models/rental.rb b/app/models/rental.rb index 336063aaa..ab3a3b9d4 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,6 +2,7 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie #potentially need to comment the below out for a while... + # due date has to be after today validates :due_date, presence: true after_initialize :set_defaults, unless: :persisted? diff --git a/config/routes.rb b/config/routes.rb index a27b2d72e..a1b81deac 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,4 +3,6 @@ get 'movies/:title', to: 'movies#show', as: 'movie' get 'customers', to: 'customers#index', as: 'customers' + post 'rentals/:title/check-out', to: 'rentals#checkout', as: 'checkout' + 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 From 5d20e33b7fcdeb43b3cbb2ce87e22940a07ccc10 Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Fri, 12 May 2017 12:00:31 -0700 Subject: [PATCH 32/36] added reduce_inventory method in movie model and added rental controller error handling --- app/controllers/rentals_controller.rb | 14 ++++++++++---- app/models/movie.rb | 5 +++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f437a14b2..fc12f25b5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,11 +1,17 @@ class RentalsController < ApplicationController def checkout movie = Movie.find_by(title: params[:title].capitalize) - rental = Rental.new(customer_id: params["customer_id"], movie: movie, due_date: params["due_date"]) - if rental.save - render json: { id: rental.id}, status: :ok + + if movie && movie.inventory <= 0 + render status: :bad_request, json: { errors: { inventory: ["#{movie.title} is not in stock"] } } else - render status: :bad_request, json: { errors: rental.errors.messages } + rental = Rental.new(customer_id: params["customer_id"], movie: movie, due_date: params["due_date"]) + if rental.save + movie.reduce_inventory + render json: { id: rental.id }, status: :ok + else + render status: :bad_request, json: { errors: rental.errors.messages } + end end end end diff --git a/app/models/movie.rb b/app/models/movie.rb index aeff7f895..dbe5b6f9a 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -8,4 +8,9 @@ class Movie < ApplicationRecord def available_inventory inventory end + + def reduce_inventory + self.inventory -= 1 + self.save + end end From 4e8cf07b6da3d9e1be7234c43a4c2e0081442a97 Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Fri, 12 May 2017 14:18:34 -0700 Subject: [PATCH 33/36] Implemented changing available inventory instead of inventory when check a move in and out --- app/controllers/rentals_controller.rb | 22 ++++++++++++++++++++-- app/models/movie.rb | 16 +++++++++++----- config/routes.rb | 1 + 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index fc12f25b5..a8212a4c7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,16 +2,34 @@ class RentalsController < ApplicationController def checkout movie = Movie.find_by(title: params[:title].capitalize) - if movie && movie.inventory <= 0 + if movie && movie.available_inventory <= 0 render status: :bad_request, json: { errors: { inventory: ["#{movie.title} is not in stock"] } } else rental = Rental.new(customer_id: params["customer_id"], movie: movie, due_date: params["due_date"]) if rental.save - movie.reduce_inventory + # movie.reduce_inventory render json: { id: rental.id }, status: :ok else render status: :bad_request, json: { errors: rental.errors.messages } end end end + + def checkin + # Assuming that no customer is going to have more than one copy of a movie checkout + # If so, we would redesign the params passed in so given rental id. + movie = Movie.find_by(title: params[:title].capitalize) + rental = Rental.find_by(movie: movie, customer_id: params["customer_id"]) + if movie && rental + if rental.returned + render status: :bad_request, json: { errors: { retnal: ["Already returned #{movie.title}."] } } + else + # movie.increase_inventory + rental.update_attributes(returned: true) + render json: { id: rental.id, returned: rental.returned }, status: :ok + end + else + render status: :not_found, json: { errors: { rental: ["Rental of '#{params[:title]}' not found"] } } + end + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index dbe5b6f9a..043f894d7 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,11 +6,17 @@ class Movie < ApplicationRecord validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } def available_inventory - inventory + rentals = Rental.where(returned: false, movie_id: id) + return inventory - rentals.count end - def reduce_inventory - self.inventory -= 1 - self.save - end + # def reduce_inventory + # self.inventory -= 1 + # self.save + # end + # + # def increase_inventory + # self.inventory += 1 + # self.save + # end end diff --git a/config/routes.rb b/config/routes.rb index a1b81deac..5c757895e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,5 +4,6 @@ get 'customers', to: 'customers#index', as: 'customers' post 'rentals/:title/check-out', to: 'rentals#checkout', as: 'checkout' + post 'rentals/:title/check-in', to: 'rentals#checkin', as: 'checkin' end From 3ce99982900ee213300b102998b9e46d8364bcee Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Fri, 12 May 2017 14:31:17 -0700 Subject: [PATCH 34/36] refactored checkin so that a person can check out and check in the same movies multiple times --- app/controllers/rentals_controller.rb | 16 ++++------------ app/models/movie.rb | 9 --------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a8212a4c7..176d2c1e3 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,7 +7,6 @@ def checkout else rental = Rental.new(customer_id: params["customer_id"], movie: movie, due_date: params["due_date"]) if rental.save - # movie.reduce_inventory render json: { id: rental.id }, status: :ok else render status: :bad_request, json: { errors: rental.errors.messages } @@ -16,20 +15,13 @@ def checkout end def checkin - # Assuming that no customer is going to have more than one copy of a movie checkout - # If so, we would redesign the params passed in so given rental id. movie = Movie.find_by(title: params[:title].capitalize) - rental = Rental.find_by(movie: movie, customer_id: params["customer_id"]) + rental = Rental.find_by(returned: false, movie: movie, customer_id: params["customer_id"]) if movie && rental - if rental.returned - render status: :bad_request, json: { errors: { retnal: ["Already returned #{movie.title}."] } } - else - # movie.increase_inventory - rental.update_attributes(returned: true) - render json: { id: rental.id, returned: rental.returned }, status: :ok - end + rental.update_attributes(returned: true) + render json: { id: rental.id, returned: rental.returned }, status: :ok else - render status: :not_found, json: { errors: { rental: ["Rental of '#{params[:title]}' not found"] } } + render status: :not_found, json: { errors: { rental: ["Current rental of '#{params[:title]}' not found"] } } end end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 043f894d7..725703efc 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,13 +10,4 @@ def available_inventory return inventory - rentals.count end - # def reduce_inventory - # self.inventory -= 1 - # self.save - # end - # - # def increase_inventory - # self.inventory += 1 - # self.save - # end end From a75477c4ed4eccf6257f0f2f133440e402bcd3a2 Mon Sep 17 00:00:00 2001 From: Cara Comfort Date: Fri, 12 May 2017 15:40:05 -0700 Subject: [PATCH 35/36] Work on tests for rentals controller checkin method --- app/controllers/rentals_controller.rb | 2 +- test/controllers/rentals_controller_test.rb | 84 ++++++++++++++++++++- test/fixtures/rentals.yml | 7 ++ 3 files changed, 89 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 176d2c1e3..8eb7e83e7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -21,7 +21,7 @@ def checkin rental.update_attributes(returned: true) render json: { id: rental.id, returned: rental.returned }, status: :ok else - render status: :not_found, json: { errors: { rental: ["Current rental of '#{params[:title]}' not found"] } } + render status: :bad_request, json: { errors: { rental: ["There is no current rental of '#{params[:title]}'"] } } end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..ea7a43266 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,85 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "checkin" do + # customer = customers(:stout) + # movie = movies(:jaws) + # due_date = "2018-08-03" + # post checkout_url(customer_id: customer, title: movie.title, due_date: due_date) + it "responds with success when params are valid and movie is checkouted" do + rental = rentals(:one) + rental.returned.must_equal false + + post checkin_url(customer_id: rental.customer, title: rental.movie.title) + must_respond_with :success + # rental.returned.must_equal true + end + + it "increases a movie's available inventory when it's checked back in" do + rental = rentals(:one) + rental.returned.must_equal false + initial_inventory = rental.movie.available_inventory + + post checkin_url(customer_id: rental.customer, title: rental.movie.title) + adjusted_inventory = rental.movie.available_inventory + + adjusted_inventory.must_equal initial_inventory + 1 + end + + it "responds with bad_request when params are valid but no movie is checkout" do + rental = rentals(:three) + rental.returned.must_equal true + + post checkin_url(customer_id: rental.customer, title: rental.movie.title) + must_respond_with :bad_request + rental.returned.must_equal false + end + + it "responds with bad_request when given an invalid movie title" do + rental = rentals(:one) + rental.returned.must_equal false + + post checkin_url(customer_id: rental.customer, title: "Test title") + must_respond_with :bad_request + rental.returned.must_equal false + end + + it "responds with bad_request when given an invalid customer_id" do + rental = rentals(:one) + rental.returned.must_equal false + + post checkin_url(customer_id: Customer.last.id + 1, title: rental.movie.title) + must_respond_with :bad_request + rental.returned.must_equal false + end + + it "does not modify the available_inventory of a movie if given a bad request" do + rental = rentals(:one) + rental.returned.must_equal false + initial_inventory = rental.movie.available_inventory + + post checkin_url(customer_id: Customer.last.id + 1, title: rental.movie.title) + adjusted_inventory = rental.movie.available_inventory + + adjusted_inventory.must_equal initial_inventory + end + + # it "allows a customer to return a movie that they have checkout for a 2nd time" do + # rental = rentals(:one) + # rental.returned.must_equal false + # post checkin_url(customer_id: rental.customer, title: rental.movie.title) + # rental.returned.must_equal true + # + # post checkout_url(customer_id: rental.customer, title: rental.movie.title, due_date: "2017-08-03") + # rental.returned.must_equal false + # + # post checkin_url(customer_id: rental.customer, title: rental.movie.title) + # must_respond_with :success + # rental.returned.must_equal true + # end + + # customer can return two copies of the same movie + # customer can return a movie that they have checked out for the second time + # if current rental not found, returns json erorr + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index a8eb3cd98..54e86c7df 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -2,8 +2,15 @@ one: customer: rocha movie: jaws due_date: 2017-08-09 + returned: false two: customer: stout movie: psycho due_date: 2017-09-12 + +three: + customer: rocha + movie: jaws + due_date: 2017-08-09 + returned: true From a89db4450be9d0fbf8d8e8f812ffc4fee2d788e6 Mon Sep 17 00:00:00 2001 From: Allison Northrop Date: Fri, 12 May 2017 15:40:42 -0700 Subject: [PATCH 36/36] wrote some tests for rentals controller --- test/controllers/rentals_controller_test.rb | 43 +++++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..f3b0765c4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,44 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "checkout" do + + it "a real working route" do + customer = customers(:stout) + movie = movies(:jaws) + post checkout_path(customer_id: customer.id, title: movie.title, due_date: "2017-09-12") + must_respond_with :success + end + + it "decreases the available inventory by one if the movie is found and the avialable inventory is more than 0" do + customer = customers(:stout) + movie = movies(:jaws) + post checkout_path(customer_id: customer.id, title: movie.title, due_date: "2017-09-12") + + movie.available_inventory.must_equal movie.inventory - 1 + must_respond_with :success + end + + it "renders a bad request status if the available inventory is less than 0" do skip + customer = customers(:stout) + movie = Movie.new(title: "jaws", overview: "here is an overview", release_date: "1960-06-16", inventory: 0) + + post checkout_path(customer_id: customer.id, title: movie.title, due_date: "2017-09-12") + # post checkout_path(customer_id: customer.id, title: movie.title, due_date: "2017-09-11") + + must_respond_with :bad_request + + end + + it "renders a status ok if the rental is succesffully created" do + end + + it "renders a bad request if the rental wasn't saved" do skip + # customer = customers(:stout) + # post checkout_path(customer_id: customer.id, title: "", due_date: "2017-09-12") + Rental.new(customer_id: 1) + must_respond_with :bad_request + end + + end end