From 467b79ca3b51a7a70647dab4455592d3cad5146e Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Mon, 6 Nov 2017 12:43:57 -0800 Subject: [PATCH 01/38] Generated customer and movie models --- .gitignore | 16 ++ Gemfile | 53 ++++++ Gemfile.lock | 170 ++++++++++++++++++ Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/models/customer.rb | 2 + app/models/movie.rb | 2 + app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 35 ++++ bin/spring | 17 ++ bin/update | 29 +++ config.ru | 5 + config/application.rb | 40 +++++ config/boot.rb | 3 + config/cable.yml | 10 ++ config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 +++++ config/environments/production.rb | 83 +++++++++ config/environments/test.rb | 42 +++++ .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 56 ++++++ config/routes.rb | 3 + config/secrets.yml | 32 ++++ config/spring.rb | 6 + db/migrate/20171106204213_create_movies.rb | 12 ++ db/migrate/20171106204317_create_customers.rb | 15 ++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/customers.yml | 19 ++ test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 13 ++ test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 9 + test/models/movie_test.rb | 9 + test/test_helper.rb | 26 +++ tmp/.keep | 0 vendor/.keep | 0 61 files changed, 1007 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/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/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/20171106204213_create_movies.rb create mode 100644 db/migrate/20171106204317_create_customers.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/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..68ac019ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# 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 + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..4ae55c93d --- /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.1.4' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# 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', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-turbolinks' +group :development do + gem 'better_errors' + gem 'pry-rails' + gem 'binding_of_caller' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..484707437 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,170 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.4) + actionpack (= 5.1.4) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.4) + activesupport (= 5.1.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.4) + activesupport (= 5.1.4) + globalid (>= 0.3.6) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) + arel (~> 8.0) + activesupport (5.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + better_errors (2.4.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + binding_of_caller (0.7.3) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (9.1.0) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.2) + debug_inspector (0.0.3) + erubi (1.7.0) + ffi (1.9.18) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.1.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (0.1.4) + mini_portile2 (2.3.0) + minitest (5.10.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.18) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + pg (0.21.0) + pry (0.11.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.10.0) + rack (2.0.3) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rails (5.1.4) + actioncable (= 5.1.4) + actionmailer (= 5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + activemodel (= 5.1.4) + activerecord (= 5.1.4) + activesupport (= 5.1.4) + bundler (>= 1.3.0) + railties (= 5.1.4) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.2.1) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.4) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.7) + rails (~> 5.1.4) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.15.4 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..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..104e40c1c --- /dev/null +++ b/bin/setup @@ -0,0 +1,35 @@ +#!/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..7d3c866ff --- /dev/null +++ b/config/application.rb @@ -0,0 +1,40 @@ +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 + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # 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..ad59bcd88 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: VideoStoreAPI_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..abc82221c --- /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=#{2.days.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + + # 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..3bd8115ea --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,83 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + + # 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..8e5cbde53 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 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..1720ddbb4 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: b1f276511dc9f0934d0f37ee6830acc848b399794d564ebb9b6fc6ab760d45bcf2b072130a902819727d2599d015404a22f68dabb8541311e870e414f913fa9a + +test: + secret_key_base: 1a4dfe6b6e5f68ff5a39f9ff0a21d2ee57e097517584f1b1c01a89dd4bbee00053518f0e947b3225951964343b5c04bf3972a3c4e340482e00928e86fcadb2b3 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 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/20171106204213_create_movies.rb b/db/migrate/20171106204213_create_movies.rb new file mode 100644 index 000000000..84782a1b7 --- /dev/null +++ b/db/migrate/20171106204213_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20171106204317_create_customers.rb b/db/migrate/20171106204317_create_customers.rb new file mode 100644 index 000000000..0a05c4bad --- /dev/null +++ b/db/migrate/20171106204317_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + t.string :name + t.string :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/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/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..bf442fa90 --- /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: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: MyString + 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..d774de5f1 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..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 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From c9e828ff78352b164e8e42edd682a7c54a9d50d0 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Mon, 6 Nov 2017 13:00:28 -0800 Subject: [PATCH 02/38] Added basic rote instantiation tests --- .../20171106204837_customer_add_account.rb | 5 +++ db/schema.rb | 40 +++++++++++++++++++ test/models/customer_test.rb | 5 ++- test/models/movie_test.rb | 5 ++- 4 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20171106204837_customer_add_account.rb create mode 100644 db/schema.rb diff --git a/db/migrate/20171106204837_customer_add_account.rb b/db/migrate/20171106204837_customer_add_account.rb new file mode 100644 index 000000000..a535bc56e --- /dev/null +++ b/db/migrate/20171106204837_customer_add_account.rb @@ -0,0 +1,5 @@ +class CustomerAddAccount < ActiveRecord::Migration[5.1] + def change + add_column :customers, :account_credit, :decimal + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..591575ad9 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,40 @@ +# 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: 20171106204837) 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.string "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 + t.decimal "account_credit" + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..1dfb7a855 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -3,7 +3,8 @@ describe Customer do let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? + it "Can be created" do + customer.save + customer.must_be_instance_of Customer end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..b6ff0c789 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,7 +3,8 @@ describe Movie do let(:movie) { Movie.new } - it "must be valid" do - value(movie).must_be :valid? + it "Can be created" do + movie.save + movie.must_be_instance_of Movie end end From 89f2bd0736d1d1fec33c7103b8044944e2f5f4e3 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Mon, 6 Nov 2017 13:07:31 -0800 Subject: [PATCH 03/38] customer index route and action --- app/controllers/customers_controller.rb | 5 +++++ config/routes.rb | 2 ++ test/controllers/customers_controller_test.rb | 11 +++++++++++ 3 files changed, 18 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..3521854ac --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,5 @@ +class CustomersController < ApplicationController + def index + + end +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..b1791f4da 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + get 'customers', to: "customers#index", as: 'customers' end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..367d0ebde --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +describe CustomersController do + describe "index" do + it "is a working route" do + get customers_path + must_respond_with :success + end + + end +end From 4bb42b7f80d3186c510330e3c6df3ac8458c78e3 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Mon, 6 Nov 2017 13:10:44 -0800 Subject: [PATCH 04/38] cust index returns json --- app/controllers/customers_controller.rb | 4 +++- test/controllers/customers_controller_test.rb | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3521854ac..42020838b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,5 +1,7 @@ class CustomersController < ApplicationController def index + customers = Customer.all - end + render json: { message: 'hey yall!'} + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 367d0ebde..c42b6f60f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,5 +7,13 @@ must_respond_with :success end + it "returns json" do + get customers_path + response.header['Content-Type'].must_include 'json' + end + + it 'returns an array' do + + end end end From 11ad4e503e12c7b0bedd4cfacc9572a085e13811 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Mon, 6 Nov 2017 13:13:01 -0800 Subject: [PATCH 05/38] json returns an array --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 42020838b..57515e1df 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: { message: 'hey yall!'} + render json: customers.as_json end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c42b6f60f..37158ffe4 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -13,7 +13,10 @@ end it 'returns an array' do - + get customers_path + body = JSON.parse(response.body) + body.must_be_instance_of Array + end end end From 82000b1b0e4195cda092624be4cbebafacf50ac7 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Mon, 6 Nov 2017 13:20:08 -0800 Subject: [PATCH 06/38] customer index returns all customers with reqd fields --- app/controllers/customers_controller.rb | 5 ++++- test/controllers/customers_controller_test.rb | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 57515e1df..f63e3a996 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,9 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json + render json: + customers.as_json( + only: [:id, :name, :registered_at, :postal_code, :phone] + ) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 37158ffe4..6c96ae9ae 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -15,8 +15,22 @@ it 'returns an array' do get customers_path body = JSON.parse(response.body) - body.must_be_instance_of Array + body.must_be_instance_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 exactly the fields required" do + keys = %w(id name registered_at postal_code phone) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys.sort + end end end end From ad0b16b78616d8b43bcef59336f083b8fb1dbf8e Mon Sep 17 00:00:00 2001 From: Shaunna Date: Mon, 6 Nov 2017 13:29:55 -0800 Subject: [PATCH 07/38] refactor cust index test --- test/controllers/customers_controller_test.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 6c96ae9ae..9e295ab42 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,18 +2,13 @@ describe CustomersController do describe "index" do - it "is a working route" do + + it "returns successfully returns json as an Array" do get customers_path must_respond_with :success - 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_instance_of Array end From 6fe93985b106b1c1929a1680a1e2333608a45e03 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Mon, 6 Nov 2017 14:04:21 -0800 Subject: [PATCH 08/38] Wrote Customers validation tests --- app/models/customer.rb | 10 ++++++++++ test/models/customer_test.rb | 38 ++++++++++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..e9c9318f5 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,12 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + + def registered_at # part of validation testing + return self.created_at + end + + #==========================# + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 1dfb7a855..2118cb6f9 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,9 +2,39 @@ describe Customer do let(:customer) { Customer.new } + let(:popo) {Customer.new( + name: "Popo", + postal_code: "V5C 6P2", + phone: "50650" + ) + } - it "Can be created" do - customer.save - customer.must_be_instance_of Customer - end + describe "VALIDATIONS" do + it "Can be created" do + customer.name = "Name" + customer.postal_code = "V5C 6P2" + customer.phone = "50560" + customer.must_be_instance_of Customer + end + + it "Cannot be created without a name, registered_at, postal_code, phone" do + customer.valid?.must_equal false + customer.errors.must_include :name + customer.errors.must_include :postal_code + customer.errors.must_include :phone + + customer.name = "Name" + customer.postal_code = "V5C 6P2" + customer.valid?.must_equal false + customer.phone = "50650" + customer.valid?.must_equal true + end + + it "Will be created with an id and a registered_at" do + popo.save + her_id = Customer.find_by(name: "Popo").id + popo.id.must_equal her_id + popo.registered_at.must_equal popo.created_at + end + end #VALIDATIONS end From f7e0fa0d479b3d47ae4782d3fc70e83cf73ca3e9 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Mon, 6 Nov 2017 14:35:50 -0800 Subject: [PATCH 09/38] Included registered at in the validation --- app/models/customer.rb | 7 +------ test/models/customer_test.rb | 8 +++++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index e9c9318f5..ccba9b03e 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,11 +2,6 @@ class Customer < ApplicationRecord validates :name, presence: true validates :postal_code, presence: true validates :phone, presence: true + validates :registered_at, presence: true - def registered_at # part of validation testing - return self.created_at - end - - #==========================# - end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 2118cb6f9..7f07d7389 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -5,7 +5,8 @@ let(:popo) {Customer.new( name: "Popo", postal_code: "V5C 6P2", - phone: "50650" + phone: "50650", + registered_at: "Mon, 06 Nov 2017 14:32:26 -0800" ) } @@ -14,6 +15,7 @@ customer.name = "Name" customer.postal_code = "V5C 6P2" customer.phone = "50560" + customer.registered_at = "Mon, 06 Nov 2017 14:32:26 -0800" customer.must_be_instance_of Customer end @@ -27,14 +29,14 @@ customer.postal_code = "V5C 6P2" customer.valid?.must_equal false customer.phone = "50650" + customer.registered_at = "Mon, 06 Nov 2017 14:32:26 -0800" customer.valid?.must_equal true end - it "Will be created with an id and a registered_at" do + it "Will be created with an id" do popo.save her_id = Customer.find_by(name: "Popo").id popo.id.must_equal her_id - popo.registered_at.must_equal popo.created_at end end #VALIDATIONS end From ba88916fe91379d7cb37cad28da323d73cb2a989 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Mon, 6 Nov 2017 14:44:59 -0800 Subject: [PATCH 10/38] Assessed our status responses for CustomersController#index --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index f63e3a996..8485daa92 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -4,7 +4,7 @@ def index render json: customers.as_json( - only: [:id, :name, :registered_at, :postal_code, :phone] + only: [:id, :name, :registered_at, :postal_code, :phone], status: :ok ) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 9e295ab42..d2c4898fb 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -5,7 +5,7 @@ it "returns successfully returns json as an Array" do get customers_path - must_respond_with :success + must_respond_with :ok response.header['Content-Type'].must_include 'json' @@ -27,5 +27,14 @@ customer.keys.sort.must_equal keys.sort end end + + it "returns an empty array if there are no Customers" do + Customer.destroy_all + get customers_path + must_respond_with :ok + body = JSON.parse(response.body) + body.must_be_kind_of Array + body.must_be :empty? + end end end From 369b589eeb8b9722bdddc446572bd5fde9d1a6af Mon Sep 17 00:00:00 2001 From: Shaunna Date: Mon, 6 Nov 2017 14:57:37 -0800 Subject: [PATCH 11/38] validations for movie model --- app/models/movie.rb | 2 ++ test/models/movie_test.rb | 23 +++++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..abdd35e2f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,4 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :release_date, presence: true end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index b6ff0c789..51fd402e8 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,8 +3,23 @@ describe Movie do let(:movie) { Movie.new } - it "Can be created" do - movie.save - movie.must_be_instance_of Movie - end + describe "VALIDATIONS" do + it "Can be created" do + movie.title = "I'll be stronger tomorrow" + movie.release_date= "Mon, 06 Nov 2017 14:32:26 -0800" + movie.valid?.must_equal true + proc {movie.save}.must_change("Movie.count", 1) + end + + it "cannot be created without title, release_date" do + movie.valid?.must_equal false + movie.errors.must_include :title + movie.errors.must_include :release_date + end + + it "has an id" do + + end + + end #VALIDATIONS end From c31c0d8694010f49d3384d039f16f6b6dc37ad74 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Mon, 6 Nov 2017 14:58:59 -0800 Subject: [PATCH 12/38] refactored customer model test --- test/models/customer_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 7f07d7389..60356ecc0 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -16,7 +16,7 @@ customer.postal_code = "V5C 6P2" customer.phone = "50560" customer.registered_at = "Mon, 06 Nov 2017 14:32:26 -0800" - customer.must_be_instance_of Customer + proc{customer.save}.must_change('Customer.count', 1) end it "Cannot be created without a name, registered_at, postal_code, phone" do From 4ae51bbd9fcd5d2ea0b9f8b7035f22ff6a9f5635 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Mon, 6 Nov 2017 15:02:44 -0800 Subject: [PATCH 13/38] validated id --- test/models/movie_test.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 51fd402e8..377f9d7b4 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,6 +2,7 @@ describe Movie do let(:movie) { Movie.new } + let(:movie2) {Movie.new(title: "The II", release_date: "Mon, 06 Nov 2017 14:32:26 -0800")} describe "VALIDATIONS" do it "Can be created" do @@ -18,7 +19,10 @@ end it "has an id" do + movie2.save + id = Movie.find_by(title: "The II").id + movie2.id.must_equal id end end #VALIDATIONS From 2ae7ebdb3b94910321e9bfb62a6abb4cc1b02526 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Mon, 6 Nov 2017 15:13:31 -0800 Subject: [PATCH 14/38] MoviesController#index test-returns successfully returns json as an Array --- app/controllers/movies_controller.rb | 8 ++++++++ config/routes.rb | 2 ++ test/controllers/movies_controller_test.rb | 16 ++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..a41ca08b2 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,8 @@ +class MoviesController < ApplicationController + + def index + movies = Movie.all + + render json: movies.as_json + end +end diff --git a/config/routes.rb b/config/routes.rb index b1791f4da..0fb081aee 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,4 +2,6 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get 'customers', to: "customers#index", as: 'customers' + + get 'movies', to: 'movies#index', as: 'movies' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..8a578ff79 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,16 @@ +require "test_helper" + +describe MoviesController do + describe "INDEX" do + it "successfully returns json as an Array" do + get movies_path + must_respond_with :success + + response.header['Content-Type'].must_include 'json' + + body = JSON.parse(response.body) + body.must_be_instance_of Array + end + end + +end From 85f39e675c51247dca63d614881985b2252ccf51 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Mon, 6 Nov 2017 15:25:49 -0800 Subject: [PATCH 15/38] MoviesController#index test-returns customers with exactly the fields required --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a41ca08b2..a1475c0cb 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,6 +3,6 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json + render json: movies.as_json(only: [:id, :title, :release_date]) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 8a578ff79..b36418b5d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -11,6 +11,21 @@ body = JSON.parse(response.body) body.must_be_instance_of Array end + + it 'returns ALL of the movies' do + get movies_path + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns customers with exactly the fields required" do + keys = %w(id title release_date) + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys.sort + end + end end end From 94b9732c485831e9913d4babeec0ad56486d48d8 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Mon, 6 Nov 2017 15:29:36 -0800 Subject: [PATCH 16/38] MoviesController#index test-returns an empty array if there are no Movies --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a1475c0cb..1e24f0da8 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,6 +3,6 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.as_json(only: [:id, :title, :release_date]) + render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b36418b5d..3e1b10cea 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -4,7 +4,7 @@ describe "INDEX" do it "successfully returns json as an Array" do get movies_path - must_respond_with :success + must_respond_with :ok response.header['Content-Type'].must_include 'json' @@ -26,6 +26,15 @@ movie.keys.sort.must_equal keys.sort end end + + it "returns an empty array if there are no Movies" do + Movie.destroy_all + get movies_path + must_respond_with :ok + body = JSON.parse(response.body) + body.must_be_kind_of Array + body.must_be :empty? + end end end From 1a68d14f433b8df2227eb39b48edbf1162398c32 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Mon, 6 Nov 2017 16:14:33 -0800 Subject: [PATCH 17/38] Wrote and tested MoviesController#Show tests and methods --- app/controllers/movies_controller.rb | 10 +++++++++ config/routes.rb | 1 + test/controllers/movies_controller_test.rb | 24 ++++++++++++++++++++++ test/fixtures/movies.yml | 20 +++++++++--------- 4 files changed, 45 insertions(+), 10 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1e24f0da8..88e1e58a7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,4 +5,14 @@ def index render json: movies.as_json(only: [:id, :title, :release_date]), status: :ok end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + else + render json: { ok: false }, status: :not_found + end + end end diff --git a/config/routes.rb b/config/routes.rb index 0fb081aee..6f284e2d1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,5 @@ get 'customers', to: "customers#index", as: 'customers' get 'movies', to: 'movies#index', as: 'movies' + get 'movies/:id', to: 'movies#show', as: 'movie' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 3e1b10cea..2c52d91f2 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,6 +1,7 @@ require "test_helper" describe MoviesController do + let(:psycho) {movies(:psycho)} describe "INDEX" do it "successfully returns json as an Array" do get movies_path @@ -37,4 +38,27 @@ end end + describe "SHOW" do + it "Can get a single Movie" do + get movie_path(psycho.id) + must_respond_with :success + end + + it "Returns json that includes title, overview, release_date and inventory(total)" do + keys = %w(title overview release_date inventory) + get movie_path(psycho.id) + + body = JSON.parse(response.body) + body.keys.sort.must_equal keys.sort + end + + it "Returns an error for an invalid id" do + psycho.destroy + get movie_path(psycho.id) + must_respond_with :not_found + body = JSON.parse(response.body) + body["ok"].must_equal false + end + end # SHOW + end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d774de5f1..8ffb76a34 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 +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 -two: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 +robin_hood: + title: The Adventures of Robin Hood + overview: Robin Hood (Errol Flynn) fights nobly for justice against the evil Sir Guy of Gisbourne (Basil Rathbone) while striving to win the hand of the beautiful Maid Marian (Olivia de Havilland). + release_date: 1938-05-14 + inventory: 3 From 59f9f6741f0e86e88ef39eaef352bca586ebc065 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Mon, 6 Nov 2017 18:18:18 -0800 Subject: [PATCH 18/38] Prepped empty MoviesController#create tests --- test/controllers/movies_controller_test.rb | 23 +++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2c52d91f2..9485daf89 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -51,7 +51,7 @@ body = JSON.parse(response.body) body.keys.sort.must_equal keys.sort end - + it "Returns an error for an invalid id" do psycho.destroy get movie_path(psycho.id) @@ -61,4 +61,25 @@ end end # SHOW + + describe "CREATE" do + let(:movie_data) { + {title: "Pajama Game", + overview: "A musical about a pajama factory and the hunt for a communist?", + release_date: "YYYY-MM-DD", + inventory: 5} + } + + it "Creates a new Movie" do + #proc must change + end + + it "Returns the id of the created Movie" do + + end + + it "Returns an error for an invalid Movie" do + + end + end # CREATE end From a48ffb9c3187de690cf12298ece5071e2edc98cb Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Tue, 7 Nov 2017 09:55:40 -0800 Subject: [PATCH 19/38] Wrote and tested MoviesController#create method --- app/controllers/movies_controller.rb | 14 ++++++++++++++ config/routes.rb | 1 + test/controllers/movies_controller_test.rb | 20 +++++++++++++++++--- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 88e1e58a7..515f38b33 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -15,4 +15,18 @@ def show render json: { ok: false }, status: :not_found end end + + def create + movie = Movie.new(movie_params) + + if movie.save + render json: movie.as_json(only: [:id]), status: :created + else + render json: { ok: false }, status: :bad_request + end end + + private + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end diff --git a/config/routes.rb b/config/routes.rb index 6f284e2d1..806af0050 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,4 +5,5 @@ get 'movies', to: 'movies#index', as: 'movies' get 'movies/:id', to: 'movies#show', as: 'movie' + post 'movies', to: 'movies#create' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 9485daf89..84654df4d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -69,16 +69,30 @@ release_date: "YYYY-MM-DD", inventory: 5} } - + it "Creates a new Movie" do - #proc must change + proc { + post movies_path(movie: movie_data) + }.must_change('Movie.count', 1) + must_respond_with :created + end - it "Returns the id of the created Movie" do + it "Returns json with just the id of the created Movie" do + post movies_path(movie: movie_data) + body = JSON.parse(response.body) + movie = Movie.find_by(title: "Pajama Game") + body["id"].must_equal movie.id end it "Returns an error for an invalid Movie" do + proc { + post movies_path(movie: {title: "BOGIES"}) + }.must_change('Movie.count', 0) + body = JSON.parse(response.body) + body["ok"].must_equal false + must_respond_with :bad_request end end # CREATE From 9cb1acaea902ae06044c2b6dde2fb1a0caecbef6 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Tue, 7 Nov 2017 10:51:53 -0800 Subject: [PATCH 20/38] rentals model and controller generated --- Gemfile | 2 +- Gemfile.lock | 9 +++++++++ app/controllers/rentals_controller.rb | 2 ++ app/models/rental.rb | 2 ++ app/serializers/movie_serializer.rb | 3 +++ db/migrate/20171107184238_create_rentals.rb | 10 ++++++++++ db/migrate/20171107184250_rental_relations.rb | 6 ++++++ db/schema.rb | 15 ++++++++++++++- test/controllers/rentals_controller_test.rb | 7 +++++++ test/fixtures/rentals.yml | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 11 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 app/models/rental.rb create mode 100644 app/serializers/movie_serializer.rb create mode 100644 db/migrate/20171107184238_create_rentals.rb create mode 100644 db/migrate/20171107184250_rental_relations.rb create mode 100644 test/controllers/rentals_controller_test.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/Gemfile b/Gemfile index 4ae55c93d..9e66183ff 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end - +gem 'active_model_serializers' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.1.4' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 484707437..b49a96958 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,6 +24,11 @@ GEM erubi (~> 1.4) 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.1.4) activesupport (= 5.1.4) globalid (>= 0.3.6) @@ -48,6 +53,8 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (9.1.0) + case_transform (0.2) + activesupport coderay (1.1.2) concurrent-ruby (1.0.5) crass (1.0.2) @@ -61,6 +68,7 @@ GEM jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks + jsonapi-renderer (0.1.3) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -151,6 +159,7 @@ PLATFORMS ruby DEPENDENCIES + active_model_serializers better_errors binding_of_caller byebug diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/app/serializers/movie_serializer.rb b/app/serializers/movie_serializer.rb new file mode 100644 index 000000000..08aa4b465 --- /dev/null +++ b/app/serializers/movie_serializer.rb @@ -0,0 +1,3 @@ +class MovieSerializer < ActiveModel::Serializer + attributes :id, :title, :release_date +end diff --git a/db/migrate/20171107184238_create_rentals.rb b/db/migrate/20171107184238_create_rentals.rb new file mode 100644 index 000000000..a757f9f65 --- /dev/null +++ b/db/migrate/20171107184238_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.string :checkout_date + t.string :due_date + + t.timestamps + end + end +end diff --git a/db/migrate/20171107184250_rental_relations.rb b/db/migrate/20171107184250_rental_relations.rb new file mode 100644 index 000000000..8e3cd2e67 --- /dev/null +++ b/db/migrate/20171107184250_rental_relations.rb @@ -0,0 +1,6 @@ +class RentalRelations < ActiveRecord::Migration[5.1] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 591575ad9..7e591be27 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: 20171106204837) do +ActiveRecord::Schema.define(version: 20171107184250) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,4 +37,17 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.string "checkout_date" + t.string "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..cf7fccba6 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: MyString + due_date: MyString + +two: + checkout_date: MyString + due_date: MyString diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From 4e04454b26ec62279ea59361befefe56dc8de319 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Tue, 7 Nov 2017 11:12:43 -0800 Subject: [PATCH 21/38] test fixtures added --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ test/fixtures/customers.yml | 34 ++++++++++++++++++---------------- test/fixtures/rentals.yml | 16 ++++++++++------ test/models/movie_test.rb | 12 ++++++++++++ 6 files changed, 46 insertions(+), 22 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index ccba9b03e..fe88a44f7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,6 @@ class Customer < ApplicationRecord + has_many :rentals, dependent: :nullify + validates :name, presence: true validates :postal_code, presence: true validates :phone, presence: true diff --git a/app/models/movie.rb b/app/models/movie.rb index abdd35e2f..44fd891d7 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,6 @@ class Movie < ApplicationRecord + has_many :rentals, dependent: :nullify + validates :title, presence: true validates :release_date, presence: true end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..34d3f4df8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index bf442fa90..e3fc31228 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,21 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString - registered_at: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString +shelley: + 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: 0.1315e2 -two: - name: MyString - registered_at: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString +kane: + name: "Kane Johnston" + registered_at: "Fri, 22 May 2015 09:56:42 -0700" + address: "P.O. Box 940, 1583 At, Street" + city: "Austin" + state: "Texas" + postal_code: "94282" + phone: "(270) 219-2853" + account_credit: 0.627e2 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index cf7fccba6..f4038ac5c 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,9 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - checkout_date: MyString - due_date: MyString +rental1: + checkout_date: 2017-10-12 + due_date: 2017-10-22 + customer: shelley + movie: psycho -two: - checkout_date: MyString - due_date: MyString +rental2: + checkout_date: 2017-11-1 + due_date: 2017-11-6 + customer: kane + movie: psycho diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 377f9d7b4..68b90e08d 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -26,4 +26,16 @@ end end #VALIDATIONS + describe "relationships" do + let(:psycho) {movies(:psycho)} + it "has many rentals" do + psycho.rentals.count.must_equal 2 + psycho.rentals.each do |r| + r.must_be_instance_of Rental + end + end + + + + end #relationships end From e17f92bd619a5af1f5b14b613970ddc882f670be Mon Sep 17 00:00:00 2001 From: Shaunna Date: Tue, 7 Nov 2017 11:28:56 -0800 Subject: [PATCH 22/38] movie relationships and tests --- test/models/movie_test.rb | 7 +++++++ test/models/rental_test.rb | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 68b90e08d..633cae242 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -35,6 +35,13 @@ end end + it "rental exists if the movie is deleted" do + proc {psycho.destroy}.must_change('Movie.count', -1) + + rentals(:rental1).must_be_instance_of Rental + rentals(:rental2).must_be_instance_of Rental + + end end #relationships diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..c9bd9298d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,9 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } - - it "must be valid" do - value(rental).must_be :valid? - end + # let(:rental) { Rental.new } + # + # it "must be valid" do + # value(rental).must_be :valid? + # end end From 2b167e926e713d4986283fa38dabd3b83b1a4ca8 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Tue, 7 Nov 2017 13:49:13 -0800 Subject: [PATCH 23/38] fixed format to pass smokeman tests --- app/controllers/movies_controller.rb | 13 ++++++++----- test/controllers/movies_controller_test.rb | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 515f38b33..ffa3a415c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -20,13 +20,16 @@ def create movie = Movie.new(movie_params) if movie.save - render json: movie.as_json(only: [:id]), status: :created + render json: movie.as_json(only: [:id]), status: :ok else render json: { ok: false }, status: :bad_request - end end + end + end + private - def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) - end + + def movie_params + params.permit([:title, :overview, :release_date, :inventory]) + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 84654df4d..ed34dbe9e 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -72,14 +72,14 @@ it "Creates a new Movie" do proc { - post movies_path(movie: movie_data) + post movies_path(movie_data) }.must_change('Movie.count', 1) - must_respond_with :created + must_respond_with :ok end it "Returns json with just the id of the created Movie" do - post movies_path(movie: movie_data) + post movies_path(movie_data) body = JSON.parse(response.body) movie = Movie.find_by(title: "Pajama Game") body["id"].must_equal movie.id @@ -88,7 +88,7 @@ it "Returns an error for an invalid Movie" do proc { - post movies_path(movie: {title: "BOGIES"}) + post movies_path(title: "BOGIES") }.must_change('Movie.count', 0) body = JSON.parse(response.body) body["ok"].must_equal false From 1f10dddd32100ef5f5b1e5f9a4f4469af5d168e9 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Tue, 7 Nov 2017 13:54:35 -0800 Subject: [PATCH 24/38] Added Customer Rental relation tests --- test/models/customer_test.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 60356ecc0..330fefecf 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -39,4 +39,21 @@ popo.id.must_equal her_id end end #VALIDATIONS + + describe "RELATIONS" do + let(:shelley) {customers(:shelley)} + + it "has many rentals" do + shelley.rentals.count.must_equal 1 + shelley.rentals.each do |r| + r.must_be_instance_of Rental + end + end + + it "Rentals still exist if Customer is deleted" do + proc {shelley.destroy}.must_change('Customer.count', -1) + + rentals(:rental1).must_be_instance_of Rental + end + end # RELATIONS end From 26d4aeee61835123b757d6ad48e97a015b4312bd Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Tue, 7 Nov 2017 14:06:08 -0800 Subject: [PATCH 25/38] Tested Rental model validations --- app/models/customer.rb | 5 +---- app/models/movie.rb | 4 ++-- app/models/rental.rb | 3 +++ test/models/rental_test.rb | 30 +++++++++++++++++++++++++----- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index fe88a44f7..1b430920d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,9 +1,6 @@ class Customer < ApplicationRecord has_many :rentals, dependent: :nullify - validates :name, presence: true - validates :postal_code, presence: true - validates :phone, presence: true - validates :registered_at, presence: true + validates_presence_of :name, :postal_code, :phone, :registered_at end diff --git a/app/models/movie.rb b/app/models/movie.rb index 44fd891d7..f8ba6a30e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord has_many :rentals, dependent: :nullify - validates :title, presence: true - validates :release_date, presence: true + validates_presence_of :title, :release_date + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..f5946f81d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,7 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + + validates_presence_of :customer, :movie, :checkout_date, :due_date + end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index c9bd9298d..e2b8a7015 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,29 @@ require "test_helper" describe Rental do - # let(:rental) { Rental.new } - # - # it "must be valid" do - # value(rental).must_be :valid? - # end + let(:rental) {Rental.new} + + describe "VALIDATIONS" do + it "can be created, and has an id" do + rental.customer = customers(:shelley) + rental.movie = movies(:robin_hood) + rental.checkout_date = "2020-12-20" + rental.due_date = "2020-12-31" + + proc { + rental.save + }.must_change('Rental.count', 1) + rental.must_respond_to :id + end + + it "cannot be created without customer, movie, checkout_date, due_date" do + rental.valid?.must_equal false + rental.errors.must_include :customer + rental.errors.must_include :movie + rental.errors.must_include :checkout_date + rental.errors.must_include :due_date + end + + end + end From ef1a5d6b7263618bea475516e0bc825717faec96 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Tue, 7 Nov 2017 14:25:18 -0800 Subject: [PATCH 26/38] Wrote tests for belongs to movie and customer --- test/models/rental_test.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index e2b8a7015..03f51d3fd 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -23,7 +23,18 @@ rental.errors.must_include :checkout_date rental.errors.must_include :due_date end + end #VALIDATIONS - end + describe "RELATIONS" do + let(:rental1) {rentals(:rental1)} + + it "belongs to a movie" do + rental1.movie.must_equal movies(:psycho) + end + + it "belongs to a customer" do + rental1.customer.must_equal customers(:shelley) + end + end #RELATIONS end From 9f1431fe86a71917702c536399e427a069536ce9 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Tue, 7 Nov 2017 14:28:23 -0800 Subject: [PATCH 27/38] Added Relation tests when custoer and movie are destroyed --- test/models/rental_test.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 03f51d3fd..c3cd82af4 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -35,6 +35,16 @@ it "belongs to a customer" do rental1.customer.must_equal customers(:shelley) end + + it "still exists if it's movie and/or customer is destroyed" do + customers(:shelley).destroy + rental1.customer.must_be_nil + + movies(:psycho).destroy + rental1.movie.must_be_nil + + rental1.must_be_instance_of Rental + end end #RELATIONS end From 08ae9f93130514c31b4ae3c1ecd6c37731c70c3c Mon Sep 17 00:00:00 2001 From: Shaunna Date: Tue, 7 Nov 2017 15:04:22 -0800 Subject: [PATCH 28/38] checkout movie action in rentails controller -- still doesn't change available count --- app/controllers/rentals_controller.rb | 16 +++++++ app/models/rental.rb | 8 +++- config/routes.rb | 2 + test/controllers/rentals_controller_test.rb | 17 +++++-- test/models/rental_test.rb | 51 ++------------------- 5 files changed, 44 insertions(+), 50 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..fb47c31a8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,18 @@ class RentalsController < ApplicationController + + def checkout + rental = Rental.new(rental_params) + rental.set_checkout + p rental.checkout_date + p rental.due_date + p rental.movie + p rental.customer + rental.save + end + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index f5946f81d..09b6d0626 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,7 +1,13 @@ +require 'date' + class Rental < ApplicationRecord belongs_to :movie belongs_to :customer - validates_presence_of :customer, :movie, :checkout_date, :due_date + RENTAL_PERIOD = 3 + def set_checkout + self.checkout_date = Date.today.strftime( "%Y-%m-%d ") + self.due_date = (Date.today + RENTAL_PERIOD).strftime( "%Y-%m-%d" ) + end end diff --git a/config/routes.rb b/config/routes.rb index 806af0050..0a9fae8c5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,4 +6,6 @@ get 'movies', to: 'movies#index', as: 'movies' get 'movies/:id', to: 'movies#show', as: 'movie' post 'movies', to: 'movies#create' + + post 'rentals/checkout', to: 'rentals#checkout', as: 'checkout' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..115b08f17 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,18 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "check-out" do + it "creates a new rental" do + proc{post checkout_path(customer_id: customers(:shelley).id, movie_id: movies(:robin_hood).id)}.must_change('Rental.count', 1) + end + + it "returns json with the id of the rental created" do + + end + + it "returns an error for an invalid rental" do + + end + + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index c3cd82af4..c9bd9298d 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,50 +1,9 @@ require "test_helper" describe Rental do - let(:rental) {Rental.new} - - describe "VALIDATIONS" do - it "can be created, and has an id" do - rental.customer = customers(:shelley) - rental.movie = movies(:robin_hood) - rental.checkout_date = "2020-12-20" - rental.due_date = "2020-12-31" - - proc { - rental.save - }.must_change('Rental.count', 1) - rental.must_respond_to :id - end - - it "cannot be created without customer, movie, checkout_date, due_date" do - rental.valid?.must_equal false - rental.errors.must_include :customer - rental.errors.must_include :movie - rental.errors.must_include :checkout_date - rental.errors.must_include :due_date - end - end #VALIDATIONS - - describe "RELATIONS" do - let(:rental1) {rentals(:rental1)} - - it "belongs to a movie" do - rental1.movie.must_equal movies(:psycho) - end - - it "belongs to a customer" do - rental1.customer.must_equal customers(:shelley) - end - - it "still exists if it's movie and/or customer is destroyed" do - customers(:shelley).destroy - rental1.customer.must_be_nil - - movies(:psycho).destroy - rental1.movie.must_be_nil - - rental1.must_be_instance_of Rental - end - end #RELATIONS - + # let(:rental) { Rental.new } + # + # it "must be valid" do + # value(rental).must_be :valid? + # end end From 23320d2528a6a8475f50f9246848212b6be8fbcb Mon Sep 17 00:00:00 2001 From: Shaunna Date: Tue, 7 Nov 2017 16:16:37 -0800 Subject: [PATCH 29/38] checkout action in rentals controller AND set_checkout method in rentals model --- app/controllers/rentals_controller.rb | 11 ++++++----- app/models/rental.rb | 2 +- test/controllers/rentals_controller_test.rb | 16 +++++++++++++++- test/models/rental_test.rb | 20 +++++++++++++++----- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index fb47c31a8..3b052ad90 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,11 +3,12 @@ class RentalsController < ApplicationController def checkout rental = Rental.new(rental_params) rental.set_checkout - p rental.checkout_date - p rental.due_date - p rental.movie - p rental.customer - rental.save + + if rental.save + render json: rental.as_json(only: [:id]), status: :ok + else + render json: {ok: false}, status: :bad_request + end end private diff --git a/app/models/rental.rb b/app/models/rental.rb index 09b6d0626..9e80cc1e1 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,7 +7,7 @@ class Rental < ApplicationRecord RENTAL_PERIOD = 3 def set_checkout - self.checkout_date = Date.today.strftime( "%Y-%m-%d ") + self.checkout_date = Date.today.strftime( "%Y-%m-%d") self.due_date = (Date.today + RENTAL_PERIOD).strftime( "%Y-%m-%d" ) end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 115b08f17..40410d186 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,16 +2,30 @@ describe RentalsController do describe "check-out" do + let(:rental_data) { + {customer_id: customers(:shelley).id, movie_id: movies(:robin_hood).id} + } + it "creates a new rental" do - proc{post checkout_path(customer_id: customers(:shelley).id, movie_id: movies(:robin_hood).id)}.must_change('Rental.count', 1) + proc{post checkout_path(rental_data)}.must_change('Rental.count', 1) + must_respond_with :ok end it "returns json with the id of the rental created" do + post checkout_path(rental_data) + + body = JSON.parse(response.body) + rental_id = Rental.last.id + body["id"].must_equal rental_id end it "returns an error for an invalid rental" do + proc{post checkout_path({})}.must_change('Rental.count', 0) + body = JSON.parse(response.body) + body["ok"].must_equal false + must_respond_with :bad_request end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index c9bd9298d..c5e1c7389 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,19 @@ require "test_helper" describe Rental do - # let(:rental) { Rental.new } - # - # it "must be valid" do - # value(rental).must_be :valid? - # end + describe "set_checkout" do + # HOW DO WE TEST THE NEGATIVE OF THIS? + it "sets the checkout date for the rental to today" do + rental = Rental.new + rental.set_checkout + rental.checkout_date.must_equal Date.today.strftime( "%Y-%m-%d") + end + + it "sets due_date for the rental" do + rental = Rental.new + rental.set_checkout + rental.due_date.must_equal (Date.today + 3).strftime( "%Y-%m-%d") + end + + end end From 645e47dda1af201377bebf02df6b856f5392f375 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Tue, 7 Nov 2017 16:49:15 -0800 Subject: [PATCH 30/38] Wrote tests for Movie#rent --- app/models/movie.rb | 19 ++++++++++++++++ .../20171108002922_add_column_movies_out.rb | 5 +++++ ...003129_change_column_movies_out_default.rb | 5 +++++ db/schema.rb | 3 ++- test/models/movie_test.rb | 22 +++++++++++++++++-- 5 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20171108002922_add_column_movies_out.rb create mode 100644 db/migrate/20171108003129_change_column_movies_out_default.rb diff --git a/app/models/movie.rb b/app/models/movie.rb index f8ba6a30e..0314d3877 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,23 @@ class Movie < ApplicationRecord validates_presence_of :title, :release_date + def available_inventory + self.inventory - self.out + end + + def rent + if available_inventory > 0 + self.out += 1 + else + return false + end + end + + def return + if self.available_inventory < self.inventory + self.out -= 1 + else + false + end + end end diff --git a/db/migrate/20171108002922_add_column_movies_out.rb b/db/migrate/20171108002922_add_column_movies_out.rb new file mode 100644 index 000000000..2f61b6d81 --- /dev/null +++ b/db/migrate/20171108002922_add_column_movies_out.rb @@ -0,0 +1,5 @@ +class AddColumnMoviesOut < ActiveRecord::Migration[5.1] + def change + add_column :movies, :out, :integer + end +end diff --git a/db/migrate/20171108003129_change_column_movies_out_default.rb b/db/migrate/20171108003129_change_column_movies_out_default.rb new file mode 100644 index 000000000..e5c0ee070 --- /dev/null +++ b/db/migrate/20171108003129_change_column_movies_out_default.rb @@ -0,0 +1,5 @@ +class ChangeColumnMoviesOutDefault < ActiveRecord::Migration[5.1] + def change + change_column_default :movies, :out, 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 7e591be27..30d112c13 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: 20171107184250) do +ActiveRecord::Schema.define(version: 20171108003129) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "out", default: 0 end create_table "rentals", force: :cascade do |t| diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 633cae242..da160ae3b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,6 +3,7 @@ describe Movie do let(:movie) { Movie.new } let(:movie2) {Movie.new(title: "The II", release_date: "Mon, 06 Nov 2017 14:32:26 -0800")} + let(:psycho) {movies(:psycho)} describe "VALIDATIONS" do it "Can be created" do @@ -27,7 +28,6 @@ end #VALIDATIONS describe "relationships" do - let(:psycho) {movies(:psycho)} it "has many rentals" do psycho.rentals.count.must_equal 2 psycho.rentals.each do |r| @@ -40,9 +40,27 @@ rentals(:rental1).must_be_instance_of Rental rentals(:rental2).must_be_instance_of Rental + end + end #relationships + + describe "available_inventory" do + it "returns the number available to rent" do + + end + end + describe "rent" do + it "increases movies out if available" do + proc { + psycho.rent + }.must_change('psycho.out', +1) end + it "returns false if movie is unavailable" do + psycho.inventory = 0 + psycho.rent.must_equal false - end #relationships + end + + end end From c068f8e23f3a2e045783d2f2d433ab5b9aeaa824 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Tue, 7 Nov 2017 16:51:15 -0800 Subject: [PATCH 31/38] Wrote tests for Movie#return --- test/models/movie_test.rb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index da160ae3b..1bb57e659 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -47,7 +47,7 @@ it "returns the number available to rent" do end - end + end #available_inventory describe "rent" do it "increases movies out if available" do @@ -59,8 +59,19 @@ it "returns false if movie is unavailable" do psycho.inventory = 0 psycho.rent.must_equal false + end + end # rent + describe "return" do + it "decreases movies out if inventory isn't surpassed" do + psycho.rent + proc { + psycho.return + }.must_change('psycho.out', -1) end - end + it "returns false if inventory is full" do + psycho.return.must_equal false + end + end # rent end From fd595023d94a6fb5ed9b5da60abad6300ce36ddd Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Tue, 7 Nov 2017 16:53:34 -0800 Subject: [PATCH 32/38] Wrote available_inventory test --- test/models/movie_test.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 1bb57e659..9f1322427 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -45,7 +45,11 @@ describe "available_inventory" do it "returns the number available to rent" do + psycho.available_inventory.must_equal psycho.inventory + psycho.out = psycho.inventory - 1 + + psycho.available_inventory.must_equal 1 end end #available_inventory @@ -73,5 +77,5 @@ it "returns false if inventory is full" do psycho.return.must_equal false end - end # rent + end # return end From 8197e59bd735e3958f9a98ccbca2a924a15243b1 Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 8 Nov 2017 10:10:57 -0800 Subject: [PATCH 33/38] finished tests and checkout action in rental controller now changes movie.out values --- app/controllers/rentals_controller.rb | 4 +++- test/controllers/rentals_controller_test.rb | 25 +++++++++++++++++++++ test/fixtures/movies.yml | 2 ++ test/fixtures/rentals.yml | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3b052ad90..251276d08 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,7 +4,9 @@ def checkout rental = Rental.new(rental_params) rental.set_checkout - if rental.save + if rental.valid? && rental.movie.rent + rental.save + rental.movie.save render json: rental.as_json(only: [:id]), status: :ok else render json: {ok: false}, status: :bad_request diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 40410d186..b0987cd80 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -11,6 +11,14 @@ must_respond_with :ok end + it "rents the movie" do + movie = movies(:robin_hood) + before = movie.out + post checkout_path(rental_data) + movie.reload + movie.out.must_equal (before + 1) + end + it "returns json with the id of the rental created" do post checkout_path(rental_data) @@ -28,5 +36,22 @@ must_respond_with :bad_request end + it "doesn't rent the movie if given invalid rental data" do + movie = movies(:psycho) + before = movie.out + + post checkout_path({movie: movie}) + + movie.out.must_equal before + end + + it "won't create a Rental object if movie is unavailable" do + movie = movies(:robin_hood) + movie.out = movie.inventory + movie.save + + proc{post checkout_path(rental_data)}.must_change('Rental.count', 0) + end + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 8ffb76a34..3b2b6b48d 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,9 +5,11 @@ 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 + out: 0 robin_hood: title: The Adventures of Robin Hood overview: Robin Hood (Errol Flynn) fights nobly for justice against the evil Sir Guy of Gisbourne (Basil Rathbone) while striving to win the hand of the beautiful Maid Marian (Olivia de Havilland). release_date: 1938-05-14 inventory: 3 + out: 0 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index f4038ac5c..1fdf3ef57 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -6,6 +6,7 @@ rental1: customer: shelley movie: psycho + rental2: checkout_date: 2017-11-1 due_date: 2017-11-6 From fadd223084bc42e1907602a3775002cf40cf74de Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Wed, 8 Nov 2017 10:22:21 -0800 Subject: [PATCH 34/38] added available_inventory to MoviesController#show --- app/controllers/movies_controller.rb | 23 +++++++++++++--------- test/controllers/movies_controller_test.rb | 10 +++++----- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ffa3a415c..43577f176 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -10,7 +10,15 @@ def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [:title, :overview, :release_date, :inventory]), status: :ok + show_movie_hash = { + title: movie.title, + overview: movie.overview, + release_date: movie.release_date, + inventory: movie.inventory, + available_inventory: movie.available_inventory, + } + + render json: show_movie_hash.as_json, status: :ok else render json: { ok: false }, status: :not_found end @@ -20,16 +28,13 @@ def create movie = Movie.new(movie_params) if movie.save - render json: movie.as_json(only: [:id]), status: :ok + render json: movie.as_json(only: [:id]), status: :created else render json: { ok: false }, status: :bad_request - end - end - + end end private - - def movie_params - params.permit([:title, :overview, :release_date, :inventory]) - end + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ed34dbe9e..08f2a9d60 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -45,7 +45,7 @@ end it "Returns json that includes title, overview, release_date and inventory(total)" do - keys = %w(title overview release_date inventory) + keys = %w(title overview release_date inventory available_inventory) get movie_path(psycho.id) body = JSON.parse(response.body) @@ -72,14 +72,14 @@ it "Creates a new Movie" do proc { - post movies_path(movie_data) + post movies_path(movie: movie_data) }.must_change('Movie.count', 1) - must_respond_with :ok + must_respond_with :created end it "Returns json with just the id of the created Movie" do - post movies_path(movie_data) + post movies_path(movie: movie_data) body = JSON.parse(response.body) movie = Movie.find_by(title: "Pajama Game") body["id"].must_equal movie.id @@ -88,7 +88,7 @@ it "Returns an error for an invalid Movie" do proc { - post movies_path(title: "BOGIES") + post movies_path(movie: {title: "BOGIES"}) }.must_change('Movie.count', 0) body = JSON.parse(response.body) body["ok"].must_equal false From 6fca43e7f570416e851b77fe6252e4cebd87d11b Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 8 Nov 2017 10:32:43 -0800 Subject: [PATCH 35/38] fix strong params and recovery if out is nil for smoke test --- app/controllers/movies_controller.rb | 4 ++-- app/models/movie.rb | 6 +++++- test/models/movie_test.rb | 6 ++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 43577f176..1b6a58374 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -28,13 +28,13 @@ def create movie = Movie.new(movie_params) if movie.save - render json: movie.as_json(only: [:id]), status: :created + render json: movie.as_json(only: [:id]), status: :ok else render json: { ok: false }, status: :bad_request end end private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory, :out) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 0314d3877..188ac5c04 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,7 +4,11 @@ class Movie < ApplicationRecord validates_presence_of :title, :release_date def available_inventory - self.inventory - self.out + if self.out + self.inventory - self.out + else + self.inventory + end end def rent diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 9f1322427..63a743c85 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -51,6 +51,12 @@ psycho.available_inventory.must_equal 1 end + + it "returns inventory if out is nil" do + psycho.out = nil + + psycho.available_inventory.must_equal psycho.inventory + end end #available_inventory describe "rent" do From 3cc33b40735d6570943fdc82152b9c95ca089e71 Mon Sep 17 00:00:00 2001 From: Jessica Owens Date: Wed, 8 Nov 2017 11:31:52 -0800 Subject: [PATCH 36/38] Wrote first checkin controller test. breaking for lunch --- app/controllers/rentals_controller.rb | 9 ++++++- app/models/rental.rb | 4 ++++ config/routes.rb | 2 ++ ...0171108190148_add_checkin_col_to_rental.rb | 5 ++++ db/schema.rb | 3 ++- test/controllers/movies_controller_test.rb | 11 +++++---- test/controllers/rentals_controller_test.rb | 24 +++++++++++++++++-- test/fixtures/movies.yml | 2 +- test/fixtures/rentals.yml | 2 ++ test/models/movie_test.rb | 2 -- test/models/rental_test.rb | 9 ++++++- 11 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 db/migrate/20171108190148_add_checkin_col_to_rental.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 251276d08..46f4e9336 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,8 +13,15 @@ def checkout end end - private + def check_in + rental = Rental.where(rental_params, check_in: nil).first + rental.set_check_in + rental.movie.return + rental.save + rental.movie.save + end + private def rental_params params.permit(:customer_id, :movie_id) end diff --git a/app/models/rental.rb b/app/models/rental.rb index 9e80cc1e1..53b71418f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -10,4 +10,8 @@ def set_checkout self.checkout_date = Date.today.strftime( "%Y-%m-%d") self.due_date = (Date.today + RENTAL_PERIOD).strftime( "%Y-%m-%d" ) end + + def set_check_in + self.check_in = Date.today.strftime( "%Y-%m-%d") + end end diff --git a/config/routes.rb b/config/routes.rb index 0a9fae8c5..e3317b51f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,4 +8,6 @@ post 'movies', to: 'movies#create' post 'rentals/checkout', to: 'rentals#checkout', as: 'checkout' + post 'rentals/check_in', to: 'rentals#check_in', as: 'check_in' + end diff --git a/db/migrate/20171108190148_add_checkin_col_to_rental.rb b/db/migrate/20171108190148_add_checkin_col_to_rental.rb new file mode 100644 index 000000000..9ab57fa8b --- /dev/null +++ b/db/migrate/20171108190148_add_checkin_col_to_rental.rb @@ -0,0 +1,5 @@ +class AddCheckinColToRental < ActiveRecord::Migration[5.1] + def change + add_column :rentals, :check_in, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 30d112c13..665ef5462 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: 20171108003129) do +ActiveRecord::Schema.define(version: 20171108190148) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -45,6 +45,7 @@ t.datetime "updated_at", null: false t.bigint "customer_id" t.bigint "movie_id" + t.string "check_in" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 08f2a9d60..f63119396 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -67,19 +67,20 @@ {title: "Pajama Game", overview: "A musical about a pajama factory and the hunt for a communist?", release_date: "YYYY-MM-DD", - inventory: 5} + inventory: 5, + out: 0} } it "Creates a new Movie" do proc { - post movies_path(movie: movie_data) + post movies_path(movie_data) }.must_change('Movie.count', 1) - must_respond_with :created + must_respond_with :ok end it "Returns json with just the id of the created Movie" do - post movies_path(movie: movie_data) + post movies_path(movie_data) body = JSON.parse(response.body) movie = Movie.find_by(title: "Pajama Game") body["id"].must_equal movie.id @@ -88,7 +89,7 @@ it "Returns an error for an invalid Movie" do proc { - post movies_path(movie: {title: "BOGIES"}) + post movies_path({title: "BOGIES"}) }.must_change('Movie.count', 0) body = JSON.parse(response.body) body["ok"].must_equal false diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b0987cd80..b01506ca6 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,8 +3,8 @@ describe RentalsController do describe "check-out" do let(:rental_data) { - {customer_id: customers(:shelley).id, movie_id: movies(:robin_hood).id} - } + {customer_id: customers(:shelley).id, movie_id: movies(:robin_hood).id} + } it "creates a new rental" do proc{post checkout_path(rental_data)}.must_change('Rental.count', 1) @@ -52,6 +52,26 @@ proc{post checkout_path(rental_data)}.must_change('Rental.count', 0) end + end # checkout + describe "check_in" do + # let(:rental_data) { + # {customer_id: customers(:shelley).id, movie_id: movies(:psycho).id} + # } + let(:rental) {rentals(:rental1)} + + it "checks in a rental" do + post check_in_path(customer_id: rental.customer.id, movie_id: rental.movie.id) + rental.reload + rental.check_in.must_equal Date.today.strftime("%Y-%m-%d") + end + + # it "returns the movie" do + # movie = movies(:psycho) + # before = movie.out + # post check_in_path(rental_data) + # movie.reload + # movie.out.must_equal (before - 1) + # end end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 3b2b6b48d..8f4df6a55 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,7 +5,7 @@ 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 - out: 0 + out: 2 robin_hood: title: The Adventures of Robin Hood diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 1fdf3ef57..2306c7b79 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -5,6 +5,7 @@ rental1: due_date: 2017-10-22 customer: shelley movie: psycho + check_in: rental2: @@ -12,3 +13,4 @@ rental2: due_date: 2017-11-6 customer: kane movie: psycho + check_in: diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 63a743c85..9de496427 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -45,8 +45,6 @@ describe "available_inventory" do it "returns the number available to rent" do - psycho.available_inventory.must_equal psycho.inventory - psycho.out = psycho.inventory - 1 psycho.available_inventory.must_equal 1 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index c5e1c7389..6a5bb3d90 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -14,6 +14,13 @@ rental.set_checkout rental.due_date.must_equal (Date.today + 3).strftime( "%Y-%m-%d") end + end #set_checkout - end + describe "set_check_in" do + it "sets the check in date for the rental to today" do + rental = Rental.new + rental.set_check_in + rental.check_in.must_equal Date.today.strftime( "%Y-%m-%d") + end + end #set_checkout end From 7adee0128a37ed2b20cace2363707d7e396a327d Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 8 Nov 2017 15:12:45 -0800 Subject: [PATCH 37/38] returns the movie test for movie for rental controller --- test/controllers/rentals_controller_test.rb | 14 +++++++------- test/models/movie_test.rb | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b01506ca6..d8573ff3d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -66,12 +66,12 @@ rental.check_in.must_equal Date.today.strftime("%Y-%m-%d") end - # it "returns the movie" do - # movie = movies(:psycho) - # before = movie.out - # post check_in_path(rental_data) - # movie.reload - # movie.out.must_equal (before - 1) - # end + it "returns the movie" do + movie = movies(:psycho) + before = movie.out + post check_in_path(customer_id: rental.customer.id, movie_id: rental.movie.id) + movie.reload + movie.out.must_equal (before - 1) + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 9de496427..7c1310854 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -79,6 +79,7 @@ end it "returns false if inventory is full" do + psycho.out = 0 psycho.return.must_equal false end end # return From 08fbe9a12f2e85818c042ee25eea805fea9e93ad Mon Sep 17 00:00:00 2001 From: Shaunna Date: Wed, 8 Nov 2017 16:42:28 -0800 Subject: [PATCH 38/38] finished tests for checkin in the controller --- app/controllers/rentals_controller.rb | 18 ++++++++++---- app/models/rental.rb | 14 +++++++++++ test/controllers/rentals_controller_test.rb | 26 ++++++++++++++++++--- test/models/rental_test.rb | 16 +++++++++++++ 4 files changed, 66 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 46f4e9336..f549e7756 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,15 +14,23 @@ def checkout end def check_in - rental = Rental.where(rental_params, check_in: nil).first - rental.set_check_in - rental.movie.return - rental.save - rental.movie.save + rental = Rental.find_rental(rental_params) + + if rental && rental.movie.return + rental.set_check_in + rental.save + rental.movie.save + render json: rental.as_json(only: [:id]), status: :ok + else + render json: {ok: false}, status: :bad_request + end + end private def rental_params params.permit(:customer_id, :movie_id) end + + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 53b71418f..48379588d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -14,4 +14,18 @@ def set_checkout def set_check_in self.check_in = Date.today.strftime( "%Y-%m-%d") end + + def self.find_rental(rental_data = {}) + + customer = Customer.find_by(id: rental_data[:customer_id]) + movie = Movie.find_by(id: rental_data[:movie_id]) + + if customer && movie + Rental.where(customer_id: customer.id, movie_id: movie.id, check_in: nil).first + else + return nil + end + + end + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d8573ff3d..32030fc2f 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -61,17 +61,37 @@ let(:rental) {rentals(:rental1)} it "checks in a rental" do - post check_in_path(customer_id: rental.customer.id, movie_id: rental.movie.id) + post check_in_path({customer_id: rental.customer.id, movie_id: rental.movie.id}) rental.reload rental.check_in.must_equal Date.today.strftime("%Y-%m-%d") end - it "returns the movie" do + it "increases the movies available inventory" do movie = movies(:psycho) before = movie.out - post check_in_path(customer_id: rental.customer.id, movie_id: rental.movie.id) + post check_in_path({customer_id: rental.customer.id, movie_id: rental.movie.id}) movie.reload movie.out.must_equal (before - 1) end + + it "returns json with the id of the returned rental" do + post check_in_path({customer_id: rental.customer.id, movie_id: rental.movie.id}) + + new_rental = Rental.find_rental(customer_id: rental.customer.id, movie_id: rental.movie.id) + + body = JSON.parse(response.body) + rental_id = rental.id + + body["id"].must_equal rental_id + end + + it "returns an error for an invalid check_in" do + post check_in_path({}) + + body = JSON.parse(response.body) + body["ok"].must_equal false + must_respond_with :bad_request + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6a5bb3d90..006dd4d2b 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -23,4 +23,20 @@ rental.check_in.must_equal Date.today.strftime( "%Y-%m-%d") end end #set_checkout + + describe "find_rental" do + it "returns the oldest rental match provided customer and movie" do + rental1 = rentals(:rental1) + rental2 = Rental.new(customer: customers(:shelley), movie: movies(:psycho)) + + Rental.find_rental({customer_id: customers(:shelley).id, movie_id: movies(:psycho).id}).must_equal rental1 + end + + it "returns nil if no rental is found or bad data" do + Rental.find_rental({customer_id: customers(:shelley).id, movie_id: movies(:robin_hood).id}).must_be_nil + + Rental.find_rental().must_be_nil + end + + end end