From 9622481a9729132a57c9bd6b058f87c500896d38 Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Mon, 7 May 2018 12:44:48 -0700 Subject: [PATCH 01/37] new rails project for api setup complete --- .gitignore | 16 ++ Gemfile | 50 ++++++ Gemfile.lock | 154 ++++++++++++++++++ Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 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 + lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 26 +++ tmp/.keep | 0 vendor/.keep | 0 53 files changed, 907 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/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 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/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..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..78bff8d26 --- /dev/null +++ b/Gemfile @@ -0,0 +1,50 @@ +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.6' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# 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', '~> 4.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] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..e547d2449 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,154 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.6) + actionpack (= 5.1.6) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.6) + activesupport (= 5.1.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.6) + activesupport (= 5.1.6) + globalid (>= 0.3.6) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) + arel (~> 8.0) + activesupport (5.1.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.23) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (1.0.1) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.2.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.3.1) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + pg (1.0.0) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.11.4) + rack (2.0.5) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) + bundler (>= 1.3.0) + railties (= 5.1.6) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + 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) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.7) + rails (~> 5.1.6) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.16.1 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..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..2fe7718ea --- /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..a7dea1ddb --- /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: eefa3ccbfc8634398f8b36f8ce2b6f24982d61da6557a75f5774bb5589571dc124b1f6cb339a3f1c1eeaa07c3f7f578e1b677d657b3c09f6b45831937f807ab5 + +test: + secret_key_base: 272380715a73132b76f015bf3e348342ab9ba4d696fe8f0f6f2a578a878be8cf4b82f938ea3e666ba10f4ae9b505560d4ca4f5aca8b51b653c653e34a6104c42 + +# 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/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/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..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 9ea204a5ba05cb206be56eab190c81ec23faa348 Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Mon, 7 May 2018 13:55:13 -0700 Subject: [PATCH 02/37] generated customer and movie models to match seed data/ERD --- app/models/customer.rb | 2 + app/models/movie.rb | 2 + db/migrate/20180507204528_create_movies.rb | 12 ++++++ db/migrate/20180507205027_create_customers.rb | 15 +++++++ db/schema.rb | 39 +++++++++++++++++++ test/fixtures/customers.yml | 19 +++++++++ test/fixtures/movies.yml | 7 ++++ test/models/customer_test.rb | 9 +++++ test/models/movie_test.rb | 9 +++++ 9 files changed, 114 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20180507204528_create_movies.rb create mode 100644 db/migrate/20180507205027_create_customers.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb 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/db/migrate/20180507204528_create_movies.rb b/db/migrate/20180507204528_create_movies.rb new file mode 100644 index 000000000..2706fc7a5 --- /dev/null +++ b/db/migrate/20180507204528_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.date :release_date + t.string :overview + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20180507205027_create_customers.rb b/db/migrate/20180507205027_create_customers.rb new file mode 100644 index 000000000..23316d24a --- /dev/null +++ b/db/migrate/20180507205027_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..0cab9f6aa --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20180507205027) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.date "release_date" + t.string "overview" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..2e87049ea --- /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: 2018-05-07 13:50:27 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-05-07 13:50:27 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..fba267b51 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,7 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + +two: + title: MyString 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 From 01e65d5b37258e0657c736fc03658083db7e81a8 Mon Sep 17 00:00:00 2001 From: marikoja Date: Mon, 7 May 2018 14:22:56 -0700 Subject: [PATCH 03/37] adds tests for customer model and validations --- app/models/customer.rb | 1 + test/models/customer_test.rb | 44 +++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..1870a7613 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..375f3d386 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,51 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { Customer.new(name: "Shelley Rocha", + registered_at: DateTime.new(2015, 4, 29), + address: "Ap #292-5216 Ipsum Rd.", + city: "Hillsboro", + state: "OR", + postal_code: "24309", + phone: "(322) 510-8695") } it "must be valid" do value(customer).must_be :valid? end + + it "must be invalid with missing name" do + customer.name = nil + value(customer).wont_be :valid? + end + + it "must be invalid with missing registered_at" do + customer.registered_at = nil + value(customer).wont_be :valid? + end + + it "must be invalid with missing address" do + customer.address = nil + value(customer).wont_be :valid? + end + + it "must be invalid with missing city" do + customer.city = nil + value(customer).wont_be :valid? + end + + it "must be invalid with missing state" do + customer.state = nil + value(customer).wont_be :valid? + end + + it "must be invalid with missing postal_code" do + customer.postal_code = nil + value(customer).wont_be :valid? + end + + it "must be invalid with missing phone" do + customer.phone = nil + value(customer).wont_be :valid? + end + end From dce714d9a0c35d73183a66ca9b2bc47aea265e6a Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Mon, 7 May 2018 14:22:57 -0700 Subject: [PATCH 04/37] creates model validations and tests --- app/models/movie.rb | 1 + test/models/movie_test.rb | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..44802a23f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + validates :title, :release_date, :inventory, presence: true end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..ff387f5cc 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,29 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { Movie.new( + title: "Blacksmith Of The Banished", + overview: "The unexciting life of a boy will be permanently altered as a strange woman enters his life.", + release_date: Date.new(2090,05,01), + inventory: 10 + ) } it "must be valid" do value(movie).must_be :valid? end + + it "must be invalid if title does not exist" do + movie.title = nil + value(movie).wont_be :valid? + end + + it "must be invalid if release_date does not exist" do + movie.release_date = nil + value(movie).wont_be :valid? + end + + it "must be invalid if inventory does not exist" do + movie.inventory = nil + value(movie).wont_be :valid? + end end From 85421ec386a8d7d5fc97a6f4f64007e02da9300a Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Mon, 7 May 2018 14:41:44 -0700 Subject: [PATCH 05/37] added routes for movies and customers endpoints, and generated movies and customers controllers with appropriate actions --- app/controllers/customers_controller.rb | 4 ++++ app/controllers/movies_controller.rb | 10 ++++++++++ config/routes.rb | 5 +++++ test/controllers/customers_controller_test.rb | 9 +++++++++ test/controllers/movies_controller_test.rb | 19 +++++++++++++++++++ 5 files changed, 47 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..73302240c --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,4 @@ +class CustomersController < ApplicationController + def index + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..b69241e5f --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,10 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..f319a138a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,8 @@ Rails.application.routes.draw do + + resources :customers, only: [:index] + + resources :movies, only: [:index, :show, :create] + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..c5ec6f20b --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..53607f49d --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + + it "should get show" do + get movies_show_url + value(response).must_be :success? + end + + it "should get create" do + get movies_create_url + value(response).must_be :success? + end + +end From 0198d23a560f77cffde314d8c5d0eeb20dfc7efc Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Mon, 7 May 2018 14:54:48 -0700 Subject: [PATCH 06/37] added method to the index action in the Movies Controller...oops we'll do testing next --- app/controllers/movies_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b69241e5f..5df914310 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,5 +1,8 @@ class MoviesController < ApplicationController def index + movies = Movie.all + + render json: movies.as_json(only: [:id, :title, :release_date]) end def show From 242ddf4f6575600be7d1537d1b017da76c083cef Mon Sep 17 00:00:00 2001 From: marikoja Date: Mon, 7 May 2018 14:55:09 -0700 Subject: [PATCH 07/37] adds customer controller index action --- app/controllers/customers_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 73302240c..355ca3696 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,6 @@ class CustomersController < ApplicationController def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok end end From 013f21dfa75ea50c3794d7e535f26b326489ad11 Mon Sep 17 00:00:00 2001 From: marikoja Date: Mon, 7 May 2018 15:20:23 -0700 Subject: [PATCH 08/37] adds movies_checked_out_count to customers model --- db/migrate/20180507221240_add_column_to_customers.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20180507221240_add_column_to_customers.rb diff --git a/db/migrate/20180507221240_add_column_to_customers.rb b/db/migrate/20180507221240_add_column_to_customers.rb new file mode 100644 index 000000000..f21e28d08 --- /dev/null +++ b/db/migrate/20180507221240_add_column_to_customers.rb @@ -0,0 +1,5 @@ +class AddColumnToCustomers < ActiveRecord::Migration[5.1] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end From 4d32360c23417871a23a8a6a3921f1fe01afc1ab Mon Sep 17 00:00:00 2001 From: marikoja Date: Mon, 7 May 2018 15:21:40 -0700 Subject: [PATCH 09/37] adds movies_checked_out_count to customer controller --- app/controllers/customers_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 355ca3696..6116c28ef 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]), status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end end From 7b1b37cb86c4e444912107c981335a409c017c1d Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Mon, 7 May 2018 15:46:08 -0700 Subject: [PATCH 10/37] added nominal customer controller tests for the index action --- test/controllers/customers_controller_test.rb | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5ec6f20b..577573ab4 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,9 +1,36 @@ require "test_helper" describe CustomersController do - it "should get index" do - get customers_index_url - value(response).must_be :success? + describe "index" do + it "is a real working route" do + get customers_url + + must_respond_with :success + end + + it "return json" do + get customers_url + + response.header['Content-Type'].must_include "json" + end + + it "returns an Array of all Customers" do + get customers_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(id movies_checked_out_count name phone postal_code registered_at) + get customers_url + + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end end end From 29ad211b96e3fb517f9c5a6e65bf4146cb36aa1d Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Mon, 7 May 2018 16:05:42 -0700 Subject: [PATCH 11/37] updated customers controller test for index action to include test for empty array if there are no existing customers --- test/controllers/customers_controller_test.rb | 10 ++++ test/fixtures/customers.yml | 50 +++++++++++++------ 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 577573ab4..1603f399e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -31,6 +31,16 @@ customer.keys.sort.must_equal keys end end + + it "returns an empty Array if there are no customers" do + Customer.all.each {|customer| customer.destroy} + + get customers_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + body.length.must_equal 0 + end end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 2e87049ea..41c0b2b71 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,37 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString - registered_at: 2018-05-07 13:50:27 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString +shell: + name: Shelley Rocha + registered_at: <%= DateTime.new(2016,12,07,07,54,27) %> + address: Ap 292-5216 Ipsum Rd. + city: Hillsboro + state: OR + postal_code: 24309 + phone: (322) 510-8695 -two: - name: MyString - registered_at: 2018-05-07 13:50:27 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString +curr: + name: Curran Stout + registered_at: <%= DateTime.new(2017,02,07,21,50,13) %> + address: Ap 658-1540 Erat Rd. + city: San Francisco + state: CA + postal_code: 94267 + phone: (908) 949-6758 + +roa: + name: Roanna Robinson + registered_at: <%= DateTime.new(2014,011,28,13,14,07) %> + address: Ap 561-4214 Eget St. + city: Harrisburg + state: PA + postal_code: 15867 + phone: (323) 336-1841 + +lyn: + name: Carolyn Chandler + registered_at: <%= DateTime.new(2014,07,04,11,50,20) %> + address: 133-8707 Arcu. Avenue + city: Fort Wayne + state: IN + postal_code: 73684 + phone: (234) 837-2886 From 1532046d3db60075743766e3c534a2b79cd4cb57 Mon Sep 17 00:00:00 2001 From: marikoja Date: Mon, 7 May 2018 16:24:27 -0700 Subject: [PATCH 12/37] movies index controlller tests --- test/controllers/customers_controller_test.rb | 2 ++ test/controllers/movies_controller_test.rb | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5ec6f20b..4c08785ff 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -6,4 +6,6 @@ value(response).must_be :success? end + + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53607f49d..f2377fb12 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,11 +1,18 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? + describe "index" do + it "is a real working route to index" do + get movies_url + must_respond_with :success + end + it "returns json" do + get movies_url + response.header['Content-Type'].must_include 'json' + end end + it "should get show" do get movies_show_url value(response).must_be :success? From c1eaa881b8526cdc7627fffd14dfd6ec5d4e27b1 Mon Sep 17 00:00:00 2001 From: marikoja Date: Mon, 7 May 2018 16:40:07 -0700 Subject: [PATCH 13/37] adds all movies controller index tests, refactors customer controller index test --- test/controllers/customers_controller_test.rb | 5 +--- test/controllers/movies_controller_test.rb | 30 ++++++++++++++++++- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index fa134e346..34bd4570f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -38,11 +38,8 @@ get customers_url body = JSON.parse(response.body) - body.must_be_kind_of Array - body.length.must_equal 0 + body.must_be :empty? end end - - end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f2377fb12..ea75295e2 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -10,8 +10,36 @@ get movies_url response.header['Content-Type'].must_include 'json' end - end + it "returns an Array of all the movies" do + get movies_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + body.length.must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + # must be listed in alphabetical order + keys = %w(id release_date title) + get movies_url + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + + it "returns [] when there are no movies" do + Movie.delete_all + + get movies_url + + body = JSON.parse(response.body) + body.must_be :empty? + + end + + end it "should get show" do get movies_show_url From 657d931bdceeb273b44822d5aa900cb7266fd0c8 Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Mon, 7 May 2018 17:07:05 -0700 Subject: [PATCH 14/37] updates movies yml file to have valid data (4 total) --- test/fixtures/movies.yml | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index fba267b51..5a1cb829b 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,7 +1,25 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString +blacksmith: + title: Blacksmith Of The Banished + overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life. + release_date: <%= Date.new(1979,01,18)%> + inventory: 10 -two: - title: MyString +savior: + title: Savior Of The Curse + overview: + release_date: <%= Date.new(2010,11,05)%> + inventory: 1 + +women: + title: Women Of Destruction + overview: But what if this strange woman is a con artist. Or what if everything told is completely true. How could an ordinary boy be relied upon in something this big. Time will tell. + release_date: <%= Date.new(1992,03,18)%> + inventory: 4 + +robots: + title: Robots Of Eternity + overview: The laid-back life of a woman is going in a different direction as a childhood friend enters her life. + release_date: <%= Date.new(2007,10,15)%> + inventory: 20 From b805ebc79cf8667b3194774fc0cb64678cfe3a9c Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Mon, 7 May 2018 17:28:17 -0700 Subject: [PATCH 15/37] TDD for show action in movie controller --- app/controllers/movies_controller.rb | 6 ++++ test/controllers/movies_controller_test.rb | 36 ++++++++++++++++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5df914310..1c4873e1b 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -6,6 +6,12 @@ def index end def show + movie = Movie.find_by(id: params[:id]) + if movie + render json: movie.as_json(only: [:inventory, :overview, :release_date, :title]) + else + render json: {ok: false, errors: "Movie not found"}, status: :not_found + end end def create diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ea75295e2..be50e5e87 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -41,9 +41,39 @@ end - it "should get show" do - get movies_show_url - value(response).must_be :success? + describe "show" do + let(:movie) { movies(:savior) } + it "is a real working route to index" do + get movie_url(movie.id) + + value(response).must_be :success? + response.header['Content-Type'].must_include 'json' + body = JSON.parse(response.body) + body.must_be_kind_of Hash + end + + it "returns movie with exactly the required fields" do + # must be listed in alphabetical order + keys = %w(inventory overview release_date title) + get movie_url(movie.id) + movie = JSON.parse(response.body) + movie.keys.sort.must_equal keys + end + + it "returns not_found for invalid id and returns error in body" do + id = movie.id + movie.destroy + + get movie_url(id) + + value(response).must_be :not_found? + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_equal "Movie not found" + end end it "should get create" do From d6e6f5ce78b17945edd18923ac76ac11b351384b Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Mon, 7 May 2018 17:44:21 -0700 Subject: [PATCH 16/37] created two migration to add column to movies table for available_inventory, and altered seed.rb to set the value equal to json inventory values --- db/migrate/20180508003127_add_column_to_movie.rb | 5 +++++ ...80508003738_change_available_inventory_column_in_movie.rb | 5 +++++ db/seeds.rb | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180508003127_add_column_to_movie.rb create mode 100644 db/migrate/20180508003738_change_available_inventory_column_in_movie.rb diff --git a/db/migrate/20180508003127_add_column_to_movie.rb b/db/migrate/20180508003127_add_column_to_movie.rb new file mode 100644 index 000000000..a33ca07ba --- /dev/null +++ b/db/migrate/20180508003127_add_column_to_movie.rb @@ -0,0 +1,5 @@ +class AddColumnToMovie < ActiveRecord::Migration[5.1] + def change + add_column :movies, :available_inventory, :integer, default: :inventory + end +end diff --git a/db/migrate/20180508003738_change_available_inventory_column_in_movie.rb b/db/migrate/20180508003738_change_available_inventory_column_in_movie.rb new file mode 100644 index 000000000..34bc1b4d8 --- /dev/null +++ b/db/migrate/20180508003738_change_available_inventory_column_in_movie.rb @@ -0,0 +1,5 @@ +class ChangeAvailableInventoryColumnInMovie < ActiveRecord::Migration[5.1] + def change + change_column :movies, :available_inventory, :integer, default: 0 + end +end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..37c9d7e06 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,5 +3,7 @@ end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) + new_movie = Movie.create!(movie) + new_movie.available_inventory = movie["inventory"] + new_movie.save! end From 919906f9ed970a14458e866d4d5e8b6f5324040e Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Mon, 7 May 2018 17:48:48 -0700 Subject: [PATCH 17/37] added available_inventory to the json response for the movie show action and updated test for new field --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1c4873e1b..dab693895 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,7 +8,7 @@ def index def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [:inventory, :overview, :release_date, :title]) + render json: movie.as_json(only: [:inventory, :overview, :release_date, :title, :available_inventory]) else render json: {ok: false, errors: "Movie not found"}, status: :not_found end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index be50e5e87..285f7ee96 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -54,7 +54,7 @@ it "returns movie with exactly the required fields" do # must be listed in alphabetical order - keys = %w(inventory overview release_date title) + keys = %w(available_inventory inventory overview release_date title) get movie_url(movie.id) movie = JSON.parse(response.body) movie.keys.sort.must_equal keys From a558f661e311666a8b4d03c7096e1726b7d22670 Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Mon, 7 May 2018 23:36:08 -0700 Subject: [PATCH 18/37] creates tests for the create method in the movies controller --- test/controllers/movies_controller_test.rb | 55 ++++++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 285f7ee96..f11d0747c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -76,9 +76,56 @@ end end - it "should get create" do - get movies_create_url - value(response).must_be :success? - end + describe "create" do + let(:movie_data) { + { + title: "The Princess Bride", + release_date: Date.new(2010,11,05), + inventory: 5, + available_inventory: 3 + } + } + + it "should get create" do + get movies_path + value(response).must_be :success? + end + + it "Creates a new movie" do + + proc { + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count', 1 + + must_respond_with :success + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "id" + + # Check that the ID matches + Movie.find(body["id"]).title.must_equal movie_data[:title] + end + + it "returns a bad_request for bad params data" do + not_a_movie ={ + release_date: Date.new(2010,11,05), + inventory: 5, + available_inventory: 3 + } + proc { + post movies_path, params: {movie: not_a_movie} + }.wont_change 'Movie.count' + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_include "title" + + end + end end From b9aee6794e3465919a8a68dc41f07839cd28b3c5 Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Mon, 7 May 2018 23:38:16 -0700 Subject: [PATCH 19/37] adds protect_from_forgery --- app/models/application_record.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 10a4cba84..b1980dc46 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,3 +1,5 @@ class ApplicationRecord < ActiveRecord::Base self.abstract_class = true + + # protect_from_forgery with: :exception end From a85bafe51e61d34e1f59f1e9e8a0f7a996cf3c8d Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Mon, 7 May 2018 23:42:49 -0700 Subject: [PATCH 20/37] creates code for the create method for movies --- app/controllers/movies_controller.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index dab693895..9b9e88193 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,4 +1,6 @@ class MoviesController < ApplicationController + # protect_from_forgery with: :exception + def index movies = Movie.all @@ -15,5 +17,18 @@ def show end def create + movie = Movie.create(movies_params) + + if movie.valid? + render json: {id: movie.id}, status: :ok + else + render json: {ok: false, errors: movie.errors}, status: :bad_request + end end end + +private + +def movies_params + return params.require(:movie).permit(:title, :release_date, :inventory) +end From 54b59e456424033fa8f975dee45598fe0a29a7bc Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Tue, 8 May 2018 10:16:43 -0700 Subject: [PATCH 21/37] remove commented out code --- app/controllers/movies_controller.rb | 3 +-- app/models/application_record.rb | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9b9e88193..e36d3bd89 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,6 +1,5 @@ class MoviesController < ApplicationController - # protect_from_forgery with: :exception - + def index movies = Movie.all diff --git a/app/models/application_record.rb b/app/models/application_record.rb index b1980dc46..0e0f662d4 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,5 +1,4 @@ class ApplicationRecord < ActiveRecord::Base self.abstract_class = true - # protect_from_forgery with: :exception end From b57162eb551d64ad9aa0e5a650e284557992d666 Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Tue, 8 May 2018 11:20:58 -0700 Subject: [PATCH 22/37] changes code to get smoke tests working --- app/controllers/movies_controller.rb | 7 ++++--- db/schema.rb | 4 +++- test/controllers/movies_controller_test.rb | 17 +++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e36d3bd89..b54676816 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,5 +1,5 @@ class MoviesController < ApplicationController - + def index movies = Movie.all @@ -16,7 +16,7 @@ def show end def create - movie = Movie.create(movies_params) + movie = Movie.create(title: params["title"], release_date: params["release_date"], inventory: params["inventory"], overview: params["overview"] ) if movie.valid? render json: {id: movie.id}, status: :ok @@ -29,5 +29,6 @@ def create private def movies_params - return params.require(:movie).permit(:title, :release_date, :inventory) + # tests expect that params should not be nested inside movie + return params.require(:title, :release_date, :inventory, :overview) end diff --git a/db/schema.rb b/db/schema.rb index 0cab9f6aa..619dc1a05 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: 20180507205027) do +ActiveRecord::Schema.define(version: 20180508003738) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.string "phone" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -34,6 +35,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory", default: 0 end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f11d0747c..b1020e964 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -77,14 +77,6 @@ end describe "create" do - let(:movie_data) { - { - title: "The Princess Bride", - release_date: Date.new(2010,11,05), - inventory: 5, - available_inventory: 3 - } - } it "should get create" do get movies_path @@ -94,7 +86,12 @@ it "Creates a new movie" do proc { - post movies_path, params: {movie: movie_data} + post movies_path, params: { + title: "The Princess Bride", + release_date: Date.new(2010,11,05), + inventory: 5, + available_inventory: 3 + } }.must_change 'Movie.count', 1 must_respond_with :success @@ -104,7 +101,7 @@ body.must_include "id" # Check that the ID matches - Movie.find(body["id"]).title.must_equal movie_data[:title] + Movie.find(body["id"]).title.must_equal "The Princess Bride" end it "returns a bad_request for bad params data" do From 5ef36b2438aed89fcef1db71678eba33501398b7 Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Tue, 8 May 2018 12:03:39 -0700 Subject: [PATCH 23/37] generated Rental model with necessary attributes --- app/models/rental.rb | 2 ++ db/migrate/20180508185414_create_rentals.rb | 13 +++++++++++++ test/fixtures/rentals.yml | 11 +++++++++++ test/models/rental_test.rb | 9 +++++++++ 4 files changed, 35 insertions(+) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20180508185414_create_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20180508185414_create_rentals.rb b/db/migrate/20180508185414_create_rentals.rb new file mode 100644 index 000000000..4e0816157 --- /dev/null +++ b/db/migrate/20180508185414_create_rentals.rb @@ -0,0 +1,13 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.date :checkout_date + t.date :due_date + t.boolean :returned, default: false + t.references :customer, index: true, foreign_key: true + t.references :movie, index: true, foreign_key: true + + t.timestamps + end + end +end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..c46de488c --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: 2018-05-08 + due_date: 2018-05-08 + returned: false + +two: + checkout_date: 2018-05-08 + due_date: 2018-05-08 + returned: false 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 4544050615594314d0462d861da1fe41f7c05f9d Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Tue, 8 May 2018 12:06:38 -0700 Subject: [PATCH 24/37] updated schema with the rental model details --- db/schema.rb | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 619dc1a05..dacef9c97 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: 20180508003738) do +ActiveRecord::Schema.define(version: 20180508185414) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -38,4 +38,18 @@ t.integer "available_inventory", default: 0 end + create_table "rentals", force: :cascade do |t| + t.date "checkout_date" + t.date "due_date" + t.boolean "returned", default: false + t.bigint "customer_id" + t.bigint "movie_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + 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 From 7fa7579144c2beecb8efa6c0d2de33994052e420 Mon Sep 17 00:00:00 2001 From: marikoja Date: Tue, 8 May 2018 12:58:42 -0700 Subject: [PATCH 25/37] tets for RentalsController checkout and check_out action for RentalsController --- app/controllers/rentals_controller.rb | 15 ++++++++++ app/models/customer.rb | 2 ++ app/models/movie.rb | 4 ++- app/models/rental.rb | 2 ++ config/routes.rb | 4 +++ test/controllers/rentals_controller_test.rb | 33 +++++++++++++++++++++ 6 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..ad0409851 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,15 @@ +class RentalsController < ApplicationController + def check_out + customer = Customer.find_by(id: params[:customer_id]) + + movie = Movie.find_by(id: params[:movie_id]) + + Rental.create(customer: customer, movie: movie, checkout_date: Date.today, due_date: Date.today + 7.days) + + render json: { status: 200} + end + + def check_in + + end +end diff --git a/app/models/customer.rb b/app/models/customer.rb index 1870a7613..8e510ea24 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,5 @@ class Customer < ApplicationRecord validates :name, :registered_at, :address, :city, :state, :postal_code, :phone, presence: true + + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index 44802a23f..9edc261d4 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,5 @@ class Movie < ApplicationRecord - validates :title, :release_date, :inventory, presence: true + validates :title, :release_date, :inventory, presence: true + + has_many :rentals 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/config/routes.rb b/config/routes.rb index f319a138a..161ed6148 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,9 @@ Rails.application.routes.draw do + post 'rentals/check-out', to: 'rentals#check_out', as: 'check_out' + + post 'rentals/check-in', to: 'rentals#check_in', as: 'check_in' + resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..ea5cbec4b --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,33 @@ +require "test_helper" + +describe RentalsController do + let(:customer) {customers(:shell)} + let(:movie) {movies(:women)} + + describe 'check_out' do + it "should get check-out" do + post check_out_url, params: { customer_id: customer.id, movie_id: movie.id } + value(response).must_be :success? + end + + it "should render status not_found for invalid customer " do + id = customer.id + customer.destroy + post check_out_url, params: { customer_id: id, movie_id: movie.id } + value(response).must_be :not_found? + end + + it "should render status not_found for invalid movie " do + id = movie.id + movie.destroy + post check_out_url, params: { customer_id: customer.id, movie_id: id } + value(response).must_be :not_found? + end + end + it "should get check-in" do + skip + get rentals_check-in_url + value(response).must_be :success? + end + +end From 7445271acf1267f6c93d119fe93da4603e54dd05 Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Tue, 8 May 2018 13:59:00 -0700 Subject: [PATCH 26/37] refactored check out action in rental controller to pass negative case tests and added more details to the negative tests --- app/controllers/rentals_controller.rb | 9 ++++++--- test/controllers/rentals_controller_test.rb | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ad0409851..2502d6a87 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,9 +4,12 @@ def check_out movie = Movie.find_by(id: params[:movie_id]) - Rental.create(customer: customer, movie: movie, checkout_date: Date.today, due_date: Date.today + 7.days) - - render json: { status: 200} + if customer && movie + Rental.create(customer: customer, movie: movie, checkout_date: Date.today, due_date: Date.today + 7.days) + render json: { status: 200} + else + render json: { ok: false, errors: "Invalid movie or customer"}, status: 404 + end end def check_in diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index ea5cbec4b..ac6b9e7fb 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -21,7 +21,13 @@ id = movie.id movie.destroy post check_out_url, params: { customer_id: customer.id, movie_id: id } + value(response).must_be :not_found? + body = JSON.parse(response.body) + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_equal "Invalid movie or customer" end end it "should get check-in" do From e853e4cc7943039643df4087244911e88eba7749 Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Tue, 8 May 2018 15:05:25 -0700 Subject: [PATCH 27/37] rentals_controller check_in code and error handling and testing --- app/controllers/rentals_controller.rb | 23 +++++++- test/controllers/rentals_controller_test.rb | 64 +++++++++++++++++++-- test/fixtures/rentals.yml | 10 +++- 3 files changed, 87 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2502d6a87..052f67183 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,14 +5,31 @@ def check_out movie = Movie.find_by(id: params[:movie_id]) if customer && movie - Rental.create(customer: customer, movie: movie, checkout_date: Date.today, due_date: Date.today + 7.days) - render json: { status: 200} + rental = Rental.new(customer: customer, movie: movie, checkout_date: Date.today, due_date: Date.today + 7.days) + if rental.save + render json: { status: 200} + # else + # render json: { ok: false, errors: rental.errors}, status: :bad_request + end else render json: { ok: false, errors: "Invalid movie or customer"}, status: 404 end end def check_in - + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) + if customer && movie + rental = Rental.find_by(customer: customer, movie: movie, returned: false) + if rental + rental.returned = true + rental.save + render json: { status: 200} + else + render json: { ok: false, errors: "Invalid rental"}, status: 404 + end + else + render json: { ok: false, errors: "Invalid movie or customer"}, status: 404 + end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index ac6b9e7fb..e3762c2c3 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -2,7 +2,9 @@ describe RentalsController do let(:customer) {customers(:shell)} + let(:customer2) {customers(:curr)} let(:movie) {movies(:women)} + let(:movie2) {movies(:savior)} describe 'check_out' do it "should get check-out" do @@ -30,10 +32,64 @@ body["errors"].must_equal "Invalid movie or customer" end end - it "should get check-in" do - skip - get rentals_check-in_url - value(response).must_be :success? + + describe "check-in" do + it "should get check-in" do + post check_in_url, params: { customer_id: customer2.id, movie_id: movie2.id } + + value(response).must_be :success? + end + + it "check-in should change returned status to true" do + rental = rentals(:one) + + post check_in_url, params: { customer_id: customer2.id, movie_id: movie2.id } + + rental = Rental.find_by(id: rental.id) + rental.returned.must_equal true + end + + it "should render status not_found for invalid customer " do + id = customer.id + customer.destroy + post check_in_url, params: { customer_id: id, movie_id: movie2.id } + value(response).must_be :not_found? + end + + it "should render status not_found for invalid movie " do + id = movie.id + movie.destroy + post check_in_url, params: { customer_id: customer2.id, movie_id: id } + + value(response).must_be :not_found? + body = JSON.parse(response.body) + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_equal "Invalid movie or customer" + end + + it "should render status not_found for rental that DNE" do + post check_in_url, params: { customer_id: customer.id, movie_id: movie.id } + + value(response).must_be :not_found? + body = JSON.parse(response.body) + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_equal "Invalid rental" + end + + it "should render status not_found for rental with true returned status" do + post check_in_url, params: { customer_id: customer2.id, movie_id: movies(:blacksmith).id } + + value(response).must_be :not_found? + body = JSON.parse(response.body) + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_equal "Invalid rental" + end end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index c46de488c..c61591c7d 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -2,10 +2,14 @@ one: checkout_date: 2018-05-08 - due_date: 2018-05-08 + due_date: 2018-05-15 returned: false + customer: curr + movie: savior two: checkout_date: 2018-05-08 - due_date: 2018-05-08 - returned: false + due_date: 2018-05-15 + returned: true + customer: curr + movie: blacksmith From 9457dd4db6c629f3b26773f38f71bbb10140133e Mon Sep 17 00:00:00 2001 From: Kate Pond Date: Wed, 9 May 2018 10:57:56 -0700 Subject: [PATCH 28/37] creates test for movie relationships to rentals --- test/fixtures/rentals.yml | 7 +++++++ test/models/movie_test.rb | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index c61591c7d..53889bf32 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -13,3 +13,10 @@ two: returned: true customer: curr movie: blacksmith + +three: + checkout_date: 2018-05-08 + due_date: 2018-05-15 + returned: true + customer: shell + movie: blacksmith diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ff387f5cc..7bca3ea23 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -26,4 +26,32 @@ movie.inventory = nil value(movie).wont_be :valid? end + + describe 'relations' do + it "should have many rentals" do + movie = movies(:blacksmith) + + movie.must_respond_to :rentals + movie.rentals.count.must_equal 2 + movie.rentals.first.must_be_instance_of Rental + end + + it "responds to movies with no rentals" do + movie = movies(:women) + + movie.rentals.count.must_equal 0 + end + + it "can get assigned new rentals" do + movie = movies(:blacksmith) + customer = customers(:shell) + Rental.create({ + movie_id: movie.id, + customer_id: customer.id + }) + + movie.rentals.count.must_equal 3 + end + end + end From dbceedabc776663110815c095e098ac09975a6f6 Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Wed, 9 May 2018 11:11:47 -0700 Subject: [PATCH 29/37] adds tests for rental model validation tests and relationship tests --- app/models/rental.rb | 3 ++ test/models/rental_test.rb | 77 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..43258f6cd 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 :checkout_date, :due_date, presence: true + validates_inclusion_of :returned, in: [true, false] end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..1882e04a5 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,80 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:one) } + let(:invalid_rental) { Rental.new( + checkout_date: Date.new(2018,05,8), + due_date: Date.new(2018,05,15), + returned: false, + customer: customers(:lyn), + movie: movies(:robots) + ) + } - it "must be valid" do - value(rental).must_be :valid? + describe "validity" do + it "must be valid" do + value(rental).must_be :valid? + rental.must_respond_to :movie + rental.movie.must_be_kind_of Movie + rental.must_respond_to :customer + rental.customer.must_be_kind_of Customer + rental.must_respond_to :returned + rental.must_respond_to :checkout_date + rental.checkout_date.must_be_kind_of Date + rental.must_respond_to :due_date + rental.due_date.must_be_kind_of Date + end + + it "invalid without a movie" do + invalid_rental.movie = nil + + value(invalid_rental).wont_be :valid? + end + + it "invalid without a customer" do + invalid_rental.customer = nil + + value(invalid_rental).wont_be :valid? + end + + it "invalid without a returned status" do + invalid_rental.returned = nil + + value(invalid_rental).wont_be :valid? + end + + it "invalid without a checkout date" do + invalid_rental.checkout_date = nil + + value(invalid_rental).wont_be :valid? + end + + it "wont be valid for a non-date checkout date" do + invalid_rental.checkout_date = "string" + + value(invalid_rental).wont_be :valid? + end + + it "invalid without a due date" do + invalid_rental.due_date = nil + + value(invalid_rental).wont_be :valid? + end + + it "wont be valid for a non-boolean due date" do + invalid_rental.due_date = "string" + + value(invalid_rental).wont_be :valid? + end + end + + describe "relationships" do + it "has one movie" do + rental.customer.id.must_equal customers(:curr).id + end + + it "has one customer" do + rental.movie.id.must_equal movies(:savior).id + end end end From 84f65cb17a96976439fe043f8cd7a3e45daba9a2 Mon Sep 17 00:00:00 2001 From: marikoja Date: Wed, 9 May 2018 11:24:23 -0700 Subject: [PATCH 30/37] relationship testing customer has many rentals --- test/models/customer_test.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 375f3d386..7eb7647b7 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -48,4 +48,27 @@ value(customer).wont_be :valid? end + describe "relations" do + describe "rentals" do + it "can have rentals" do + customer = customers(:curr) + customer.rentals.length.must_equal 2 + end + + it "can have no rentals" do + customer = customers(:shell) + customer.rentals.length.must_equal 0 + end + + it "can get a new rental" do + customer = customers(:shell) + movie = movies(:savior) + + rental = Rental.create(customer_id: customer.id, movie_id: movie.id, checkout_date: Date.today, due_date: Date.today + 7.days, returned: false) + + customer.rentals.length.must_equal 1 + customer.rentals.must_include rental + end + end + end end From 1243782f565054b577dd0d8a269acbfeb5f1f5ab Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Thu, 10 May 2018 13:02:42 -0700 Subject: [PATCH 31/37] changed the movie create method to set the available inventory within the controller and use strong params, and fixed movie controller tests to respect foreign key violation --- app/controllers/movies_controller.rb | 8 ++++---- test/controllers/movies_controller_test.rb | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b54676816..e24cc362d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -16,9 +16,9 @@ def show end def create - movie = Movie.create(title: params["title"], release_date: params["release_date"], inventory: params["inventory"], overview: params["overview"] ) - - if movie.valid? + movie = Movie.new(movies_params) + movie.available_inventory = params["inventory"] + if movie.save render json: {id: movie.id}, status: :ok else render json: {ok: false, errors: movie.errors}, status: :bad_request @@ -30,5 +30,5 @@ def create def movies_params # tests expect that params should not be nested inside movie - return params.require(:title, :release_date, :inventory, :overview) + return params.permit(:title, :release_date, :inventory, :overview) end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b1020e964..5d9c0d1a6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -30,7 +30,10 @@ end it "returns [] when there are no movies" do - Movie.delete_all + Movie.all.each do |movie| + movie.rentals.each { |rental| rental.destroy } + movie.destroy + end get movies_url @@ -62,6 +65,7 @@ it "returns not_found for invalid id and returns error in body" do id = movie.id + movie.rentals.each {|rental| rental.destroy} movie.destroy get movie_url(id) From 52e87d0fef18d0183119f12234d3b456de4e213d Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Thu, 10 May 2018 13:12:24 -0700 Subject: [PATCH 32/37] added logic to rental controller checkout and checkin to allow for 'interesting' changes to occur on the available_inventory of movies and the movies_checkout_count for a customer --- app/controllers/rentals_controller.rb | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 052f67183..828a9e79a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -6,10 +6,12 @@ def check_out if customer && movie rental = Rental.new(customer: customer, movie: movie, checkout_date: Date.today, due_date: Date.today + 7.days) - if rental.save + customer.movies_checked_out_count += 1 + movie.available_inventory -= 1 + if rental.save && movie.save && customer.save render json: { status: 200} - # else - # render json: { ok: false, errors: rental.errors}, status: :bad_request + else + render json: { ok: false, errors: rental.errors}, status: :bad_request end else render json: { ok: false, errors: "Invalid movie or customer"}, status: 404 @@ -23,8 +25,13 @@ def check_in rental = Rental.find_by(customer: customer, movie: movie, returned: false) if rental rental.returned = true - rental.save - render json: { status: 200} + customer.movies_checked_out_count -= 1 + movie.available_inventory += 1 + if rental.save && movie.save && customer.save + render json: { status: 200} + else + render json: { ok: false, errors: "Something went wrong."}, status: :bad_request + end else render json: { ok: false, errors: "Invalid rental"}, status: 404 end From fdbce8cd0fe5aeb9cef78a842004956991526729 Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Fri, 11 May 2018 13:11:04 -0700 Subject: [PATCH 33/37] added conditional for rental check_out method so number of rentals cannot exceed the inventory for a movie --- app/controllers/rentals_controller.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 828a9e79a..188038c2e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,13 +5,17 @@ def check_out movie = Movie.find_by(id: params[:movie_id]) if customer && movie - rental = Rental.new(customer: customer, movie: movie, checkout_date: Date.today, due_date: Date.today + 7.days) - customer.movies_checked_out_count += 1 - movie.available_inventory -= 1 - if rental.save && movie.save && customer.save - render json: { status: 200} + if movie.available_inventory > 0 + rental = Rental.new(customer: customer, movie: movie, checkout_date: Date.today, due_date: Date.today + 7.days) + customer.movies_checked_out_count += 1 + movie.available_inventory -= 1 + if rental.save && movie.save && customer.save + render json: { status: 200} + else + render json: { ok: false, errors: rental.errors}, status: :bad_request + end else - render json: { ok: false, errors: rental.errors}, status: :bad_request + render json: { ok: false, errors: "Sorry, not enough inventory"}, status: 404 end else render json: { ok: false, errors: "Invalid movie or customer"}, status: 404 From 88cad2ecb11aba3b4cee899fc31e0b50c0c59348 Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Fri, 11 May 2018 13:30:34 -0700 Subject: [PATCH 34/37] updates yml files to account for available inventory and customers movie count --- test/fixtures/customers.yml | 4 ++++ test/fixtures/movies.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 41c0b2b71..811fba9eb 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -8,6 +8,7 @@ shell: state: OR postal_code: 24309 phone: (322) 510-8695 + movies_checked_out_count: 1 curr: name: Curran Stout @@ -17,6 +18,7 @@ curr: state: CA postal_code: 94267 phone: (908) 949-6758 + movies_checked_out_count: 2 roa: name: Roanna Robinson @@ -26,6 +28,7 @@ roa: state: PA postal_code: 15867 phone: (323) 336-1841 + movies_checked_out_count: 0 lyn: name: Carolyn Chandler @@ -35,3 +38,4 @@ lyn: state: IN postal_code: 73684 phone: (234) 837-2886 + movies_checked_out_count: 0 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 5a1cb829b..9d41d2e1c 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -5,21 +5,25 @@ blacksmith: overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life. release_date: <%= Date.new(1979,01,18)%> inventory: 10 + available_inventory: 8 savior: title: Savior Of The Curse overview: release_date: <%= Date.new(2010,11,05)%> inventory: 1 + available_inventory: 0 women: title: Women Of Destruction overview: But what if this strange woman is a con artist. Or what if everything told is completely true. How could an ordinary boy be relied upon in something this big. Time will tell. release_date: <%= Date.new(1992,03,18)%> inventory: 4 + available_inventory: 4 robots: title: Robots Of Eternity overview: The laid-back life of a woman is going in a different direction as a childhood friend enters her life. release_date: <%= Date.new(2007,10,15)%> inventory: 20 + available_inventory: 20 From 65286514542e1de42b453c4018306d705bd4d579 Mon Sep 17 00:00:00 2001 From: Kaitlin Forsman Date: Fri, 11 May 2018 13:44:19 -0700 Subject: [PATCH 35/37] updated tests to handle foreign key violations from adjusted code and edited yml files --- test/controllers/customers_controller_test.rb | 5 ++++- test/models/customer_test.rb | 4 ++-- test/models/movie_test.rb | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 34bd4570f..db14584f7 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -33,7 +33,10 @@ end it "returns an empty Array if there are no customers" do - Customer.all.each {|customer| customer.destroy} + Customer.all.each do |customer| + customer.rentals.each {|rental| rental.destroy} + customer.destroy + end get customers_url diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 7eb7647b7..a87ea12aa 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -57,7 +57,7 @@ it "can have no rentals" do customer = customers(:shell) - customer.rentals.length.must_equal 0 + customer.rentals.length.must_equal 1 end it "can get a new rental" do @@ -66,7 +66,7 @@ rental = Rental.create(customer_id: customer.id, movie_id: movie.id, checkout_date: Date.today, due_date: Date.today + 7.days, returned: false) - customer.rentals.length.must_equal 1 + customer.rentals.length.must_equal 2 customer.rentals.must_include rental end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 7bca3ea23..7614b8502 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -50,7 +50,7 @@ customer_id: customer.id }) - movie.rentals.count.must_equal 3 + movie.rentals.count.must_equal 2 end end From c931c6e1d71b756dd5078688331c21035525d172 Mon Sep 17 00:00:00 2001 From: marikoja Date: Fri, 11 May 2018 13:53:01 -0700 Subject: [PATCH 36/37] rentals controller tests checkout inventory management --- test/controllers/rentals_controller_test.rb | 42 +++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index e3762c2c3..c47d3941a 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -14,6 +14,7 @@ it "should render status not_found for invalid customer " do id = customer.id + customer.rentals.each {|rental| rental.destroy} customer.destroy post check_out_url, params: { customer_id: id, movie_id: movie.id } value(response).must_be :not_found? @@ -31,6 +32,26 @@ body.must_include "errors" body["errors"].must_equal "Invalid movie or customer" end + + it "should decrease decrease the available_inventory and increase the movies_checked_out_count by 1" do + post check_out_url, params: { customer_id: customer.id, movie_id: movie.id } + + updated_cust = Customer.find_by(id: customer.id) + updated_cust.movies_checked_out_count.must_equal 2 + + updated_movie = Movie.find_by(id: movie.id) + updated_movie.available_inventory.must_equal 3 + end + + it "should not change the rental count, available_inventory or movies_checked_out_count if movie does not have available inventory" do + proc { post check_out_url, params: { customer_id: customer.id, movie_id: movie2.id} }.wont_change 'Rental.count' + + updated_cust = Customer.find_by(id: customer.id) + updated_cust.movies_checked_out_count.must_equal 1 + + updated_movie = Movie.find_by(id: movie2.id) + updated_movie.available_inventory.must_equal 0 + end end describe "check-in" do @@ -51,6 +72,7 @@ it "should render status not_found for invalid customer " do id = customer.id + customer.rentals.each {|rental| rental.destroy} customer.destroy post check_in_url, params: { customer_id: id, movie_id: movie2.id } value(response).must_be :not_found? @@ -92,4 +114,24 @@ end end + describe "Overdue" do + it "can generate list of overdue rentals " do + get overdue_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + must_respond_with :success + body.length.must_equal 1 + end + + it "returns movies with exactly the required fields" do + # must be listed in alphabetical order + keys = %w(checkout_date customer_id due_date movie_id name postal_code title) + get overdue_url + body = JSON.parse(response.body) + body.each do |rental| + rental.keys.sort.must_equal keys + end + end + end end From 445f1dcd821d73856d0d14f59ad7728a246efd66 Mon Sep 17 00:00:00 2001 From: marikoja Date: Fri, 11 May 2018 14:12:22 -0700 Subject: [PATCH 37/37] rental controller tests for checkin inventory management and updates to yaml --- test/controllers/rentals_controller_test.rb | 12 +++++++++++- test/fixtures/customers.yml | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c47d3941a..5f575c820 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -33,7 +33,7 @@ body["errors"].must_equal "Invalid movie or customer" end - it "should decrease decrease the available_inventory and increase the movies_checked_out_count by 1" do + it "should decrease the available_inventory and increase the movies_checked_out_count by 1" do post check_out_url, params: { customer_id: customer.id, movie_id: movie.id } updated_cust = Customer.find_by(id: customer.id) @@ -70,6 +70,16 @@ rental.returned.must_equal true end + it "should increase the available_inventory and decrease the movies_checked_out_count by 1" do + post check_in_url, params: { customer_id: customer2.id, movie_id: movie2.id } + + updated_cust = Customer.find_by(id: customer2.id) + updated_cust.movies_checked_out_count.must_equal 0 + + updated_movie = Movie.find_by(id: movie2.id) + updated_movie.available_inventory.must_equal 1 + end + it "should render status not_found for invalid customer " do id = customer.id customer.rentals.each {|rental| rental.destroy} diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 811fba9eb..fada97685 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -18,7 +18,7 @@ curr: state: CA postal_code: 94267 phone: (908) 949-6758 - movies_checked_out_count: 2 + movies_checked_out_count: 1 roa: name: Roanna Robinson