From ad9148ac257026748da5597711bf11eb5b101ec9 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Mon, 7 May 2018 12:44:39 -0700 Subject: [PATCH 01/37] new rails setup --- .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..c37592d85 --- /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: 55c61d11cf16c672e02f2b99755c4f5f2a2b21334ee085467bcce329a17d32cf07c81bde94d06baded2da69f0f4475e18a5363e249fe285d3d171c0b82db4b12 + +test: + secret_key_base: eb3647005b278190375d3c9b49f8a3880d29d39ff6c524f9b70fdddcb4a18c5a0d0f7bdb91af3de677039179dda9fb1a9c9c73849a8079115b5dd99a9af1b64f + +# 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 fea2e0a7ae47d2a53724af18f44cff0c03cd7aa1 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Mon, 7 May 2018 13:01:33 -0700 Subject: [PATCH 02/37] creates models for movie and customer, migrations, seeds db --- app/models/customer.rb | 2 + app/models/movie.rb | 2 + db/migrate/20180507195510_create_movies.rb | 12 ++++++ db/migrate/20180507195625_create_customers.rb | 15 +++++++ db/schema.rb | 39 +++++++++++++++++++ test/fixtures/customers.yml | 19 +++++++++ test/fixtures/movies.yml | 13 +++++++ test/models/customer_test.rb | 9 +++++ test/models/movie_test.rb | 9 +++++ 9 files changed, 120 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20180507195510_create_movies.rb create mode 100644 db/migrate/20180507195625_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/20180507195510_create_movies.rb b/db/migrate/20180507195510_create_movies.rb new file mode 100644 index 000000000..62885a98f --- /dev/null +++ b/db/migrate/20180507195510_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20180507195625_create_customers.rb b/db/migrate/20180507195625_create_customers.rb new file mode 100644 index 000000000..23316d24a --- /dev/null +++ b/db/migrate/20180507195625_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..58dadebf4 --- /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: 20180507195625) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..8df7137ea --- /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 12:56:25 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2018-05-07 12:56:25 + 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..090b19e62 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2018-05-07 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2018-05-07 + inventory: 1 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 af64e6ff2e74763e2074762ab04251e4d79f8bf2 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Mon, 7 May 2018 13:17:41 -0700 Subject: [PATCH 03/37] adds validations model test for customer --- app/models/customer.rb | 8 ++++++ app/models/movie.rb | 6 +++++ test/fixtures/customers.yml | 8 +++--- test/models/customer_test.rb | 48 +++++++++++++++++++++++++++++++++++- 4 files changed, 65 insertions(+), 5 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..47e759ba0 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,10 @@ class Customer < ApplicationRecord + + validates :name, :address, :city, :state, :postal_code, :phone, presence: true + + validates :postal_code, length: { is: 5 } + + validates :phone, length: { is: 10 } + + end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..a14befa30 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,8 @@ class Movie < ApplicationRecord + + validates :title, :overview, :release_date, :inventory, presence: true + + validates :inventory, numericality: { greater_than: 0 } + + end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 8df7137ea..65e4c2fd2 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -6,8 +6,8 @@ one: address: MyString city: MyString state: MyString - postal_code: MyString - phone: MyString + postal_code: '12345' + phone: '1234567891' two: name: MyString @@ -15,5 +15,5 @@ two: address: MyString city: MyString state: MyString - postal_code: MyString - phone: MyString + postal_code: '12345' + phone: '1234567891' diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..9c5101e71 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,55 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:one) } it "must be valid" do value(customer).must_be :valid? end + + it "must have name" do + customer.name = nil + customer.valid?.must_equal false + end + + it "must have address" do + customer.address = nil + customer.valid?.must_equal false + end + + it "must have city" do + customer.city = nil + customer.valid?.must_equal false + end + + it "must have state" do + customer.state = nil + customer.valid?.must_equal false + end + + it "must have postal_code" do + customer.postal_code = nil + customer.valid?.must_equal false + end + + it "must have phone" do + customer.phone = nil + customer.valid?.must_equal false + end + + it "must have postal code length of 5" do + customer.postal_code = '1234' + customer.valid?.must_equal false + + customer.postal_code = '1238498520348' + customer.valid?.must_equal false + end + + it "must have phone length = 10" do + customer.postal_code = '1234' + customer.valid?.must_equal false + + customer.postal_code = '12384985203829387948' + customer.valid?.must_equal false + end end From 3d130044ae5c89e70e4110ce1554a70fde07362e Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Mon, 7 May 2018 13:22:56 -0700 Subject: [PATCH 04/37] adds validation model testing for movie --- app/models/movie.rb | 2 +- test/models/movie_test.rb | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index a14befa30..a43435cd6 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,7 +2,7 @@ class Movie < ApplicationRecord validates :title, :overview, :release_date, :inventory, presence: true - validates :inventory, numericality: { greater_than: 0 } + validates :inventory, numericality: { greater_than: -1 } end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..156f07cdd 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,37 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { movies(:one) } it "must be valid" do value(movie).must_be :valid? end + + it "must have title" do + movie.title = nil + movie.valid?.must_equal false + end + + it "must have overview" do + movie.overview = nil + movie.valid?.must_equal false + end + + it "must have release_date" do + movie.release_date = nil + movie.valid?.must_equal false + end + + it "must have title" do + movie.title = nil + movie.valid?.must_equal false + end + + it "must have non-negative inventory" do + movie.inventory = -1 + movie.valid?.must_equal false + + movie.inventory = "jdfaaldsjb" + movie.valid?.must_equal false + end end From 748a5f35457057b1ce95c6ff854627076cd074a3 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Mon, 7 May 2018 13:29:52 -0700 Subject: [PATCH 05/37] adds movies and customers controllers and routes --- 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..22e8a32ba 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,8 @@ Rails.application.routes.draw do + +resources :movies, only: [:index, :show, :create] + +resources :customers, only: :index + # 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 c4a833ccf5664831917697a6a54dbe4c6e3f70a3 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Mon, 7 May 2018 13:38:59 -0700 Subject: [PATCH 06/37] adds customer index controller test DIDN'T DO MOVIES CHECKOUT COUNT --- app/controllers/customers_controller.rb | 3 ++ test/controllers/customers_controller_test.rb | 37 +++++++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 73302240c..a1b799a0c 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,7 @@ class CustomersController < ApplicationController def index + @customers = Customer.all + + render json: @customers.as_json(only: [:name, :phone, :postal_code, :registered_at]) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5ec6f20b..e8ce674a9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,9 +1,38 @@ require "test_helper" describe CustomersController do - it "should get index" do - get customers_index_url - value(response).must_be :success? - end + describe "index" do + it "is a real working route" do + get customers_url + must_respond_with :success + end + + it "returns json" do + get customers_url + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + get customers_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + it "returns all of the customers" do + get customers_url + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + keys = %w(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 09105d393151ebac306e52c3796b415950a07400 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Mon, 7 May 2018 13:42:38 -0700 Subject: [PATCH 07/37] modifies movies cont test --- test/controllers/movies_controller_test.rb | 46 ++++++++++++++++------ 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53607f49d..8c9d371c4 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,19 +1,43 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? - end + describe "index" do + # These tests are a little verbose - yours do not need to be + # this explicit. + it "is a real working route" do + get movies_url + must_respond_with :success + end - it "should get show" do - get movies_show_url - value(response).must_be :success? - end + it "returns json" do + get movies_url + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + get movies_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end - it "should get create" do - get movies_create_url - value(response).must_be :success? + it "returns all of the movies" do + get movies_url + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + keys = %w(release_date title) + + get movies_url + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end end + end From f0d80b656e73e8f513d0c8cb6c717929ee0c8e6b Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Mon, 7 May 2018 13:54:32 -0700 Subject: [PATCH 08/37] adds movie index controller test --- app/controllers/customers_controller.rb | 3 ++- app/controllers/movies_controller.rb | 3 +++ test/controllers/customers_controller_test.rb | 2 +- test/controllers/movies_controller_test.rb | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index a1b799a0c..c5767d811 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,7 @@ class CustomersController < ApplicationController def index @customers = Customer.all - render json: @customers.as_json(only: [:name, :phone, :postal_code, :registered_at]) + render json: @customers.as_json(only: [ :id, :name, :phone, :postal_code, :registered_at]) end end + diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b69241e5f..42172bed2 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 diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index e8ce674a9..5630a6ae1 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,7 +27,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(name phone postal_code registered_at) + keys = %w(id name phone postal_code registered_at) get customers_url body = JSON.parse(response.body) body.each do |customer| diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 8c9d371c4..365d1a365 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -29,8 +29,8 @@ end it "returns movies with exactly the required fields" do - keys = %w(release_date title) - + keys = %w( id release_date title) + get movies_url body = JSON.parse(response.body) body.each do |movie| From 12450df5eab1581be58ef997707c6dcc29ebc37b Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Mon, 7 May 2018 14:05:55 -0700 Subject: [PATCH 09/37] adds movie show cont tests --- app/controllers/movies_controller.rb | 6 ++++++ test/controllers/movies_controller_test.rb | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 42172bed2..b7f4255a0 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: [:title, :overview, :release_date, :inventory]) + 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 365d1a365..d6b5068e5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -39,5 +39,26 @@ end end + describe "show" do + + it "can get a movie" do + get movie_path(movies(:one).id) + must_respond_with :success + end + + it "returns 404 for movies that are not found" do + movie = movies(:two) + movie.destroy + get movie_path(movie.id) + must_respond_with :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" + + end + end + end From 3bf21745c7f9031700ac522a05d7cde7867accfc Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Mon, 7 May 2018 14:17:31 -0700 Subject: [PATCH 10/37] adds create controller tests for movie --- app/controllers/movies_controller.rb | 13 ++++++++ test/controllers/movies_controller_test.rb | 37 ++++++++++++++++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b7f4255a0..51cdc555e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -15,5 +15,18 @@ def show end def create + @movie = Movie.create(movie_params) + + if @movie.valid? + render json: {id: @movie.id}, status: :ok + else + render json: {ok: false, errors: @movie.errors}, status: :bad_request + end end + + private + +def movie_params + return params.require(:movie).permit(:title, :overview, :release_date, :inventory) +end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d6b5068e5..23b817295 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -53,12 +53,45 @@ must_respond_with :not_found body = JSON.parse(response.body) body.must_be_kind_of Hash - body.must_include "ok" + body.must_include "ok" body["ok"].must_equal false body.must_include "errors" - end end + describe "create" do + let(:movie_data) { + { + title: "Gremlins", + overview: "Don't get them wet", + release_date: DateTime.now, + inventory: 25 + } + } + + it "Creates a new movie" do + proc { + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count', 1 + + must_respond_with :success + + end + + it "returns with bad request with invalid data" do + movie_data[:title] = nil + + proc { + post movies_path, params: {movie: movie_data} + }.must_change 'Movie.count', 0 + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "title" + + end + + end end From fa3861815e5854d2e64e26bab7da1341a6240818 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Mon, 7 May 2018 14:30:47 -0700 Subject: [PATCH 11/37] changes create to .new plus save --- app/controllers/movies_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 51cdc555e..28b9252e6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -15,9 +15,9 @@ def show end def create - @movie = Movie.create(movie_params) + @movie = Movie.new(movie_params) - if @movie.valid? + if @movie.save render json: {id: @movie.id}, status: :ok else render json: {ok: false, errors: @movie.errors}, status: :bad_request From a23c7e90e117ff3350696bf965d2d2ac281881df Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Mon, 7 May 2018 15:10:51 -0700 Subject: [PATCH 12/37] Fix controller test for movie create --- app/controllers/movies_controller.rb | 2 +- app/models/customer.rb | 2 +- .../20180507215338_delete_release_date_from_movies.rb | 5 +++++ db/migrate/20180507215628_add_release_date_to_movies.rb | 5 +++++ db/schema.rb | 4 ++-- test/controllers/movies_controller_test.rb | 6 +++--- 6 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20180507215338_delete_release_date_from_movies.rb create mode 100644 db/migrate/20180507215628_add_release_date_to_movies.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 28b9252e6..466d4e3df 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -27,6 +27,6 @@ def create private def movie_params - return params.require(:movie).permit(:title, :overview, :release_date, :inventory) + return params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 47e759ba0..013f81506 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,5 +6,5 @@ class Customer < ApplicationRecord validates :phone, length: { is: 10 } - + end diff --git a/db/migrate/20180507215338_delete_release_date_from_movies.rb b/db/migrate/20180507215338_delete_release_date_from_movies.rb new file mode 100644 index 000000000..f9cb7aeed --- /dev/null +++ b/db/migrate/20180507215338_delete_release_date_from_movies.rb @@ -0,0 +1,5 @@ +class DeleteReleaseDateFromMovies < ActiveRecord::Migration[5.1] + def change + remove_column :movies, :release_date + end +end diff --git a/db/migrate/20180507215628_add_release_date_to_movies.rb b/db/migrate/20180507215628_add_release_date_to_movies.rb new file mode 100644 index 000000000..810854394 --- /dev/null +++ b/db/migrate/20180507215628_add_release_date_to_movies.rb @@ -0,0 +1,5 @@ +class AddReleaseDateToMovies < ActiveRecord::Migration[5.1] + def change + add_column :movies, :release_date, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 58dadebf4..d5bbf1a20 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: 20180507195625) do +ActiveRecord::Schema.define(version: 20180507215628) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -30,10 +30,10 @@ create_table "movies", force: :cascade do |t| t.string "title" t.string "overview" - t.date "release_date" t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "release_date" end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 23b817295..20f75fa48 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -64,14 +64,14 @@ { title: "Gremlins", overview: "Don't get them wet", - release_date: DateTime.now, + release_date: "2018-5-7", inventory: 25 } } it "Creates a new movie" do proc { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change 'Movie.count', 1 must_respond_with :success @@ -82,7 +82,7 @@ movie_data[:title] = nil proc { - post movies_path, params: {movie: movie_data} + post movies_path, params: movie_data }.must_change 'Movie.count', 0 must_respond_with :bad_request From 8a6b2ca0c9854669ba9944a0e0618a373134af93 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Tue, 8 May 2018 10:31:51 -0700 Subject: [PATCH 13/37] adds rental join table and model and relationships with customer and movie --- Gemfile | 4 ++++ Gemfile.lock | 5 +++++ app/controllers/movies_controller.rb | 2 +- app/models/customer.rb | 3 ++- app/models/movie.rb | 3 ++- app/models/rental.rb | 4 ++++ db/migrate/20180508172450_create_rentals.rb | 12 ++++++++++++ db/schema.rb | 15 ++++++++++++++- test/fixtures/rentals.yml | 13 +++++++++++++ test/models/rental_test.rb | 9 +++++++++ 10 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20180508172450_create_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/Gemfile b/Gemfile index 78bff8d26..78866f3ac 100644 --- a/Gemfile +++ b/Gemfile @@ -24,6 +24,10 @@ gem 'puma', '~> 3.7' # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible # gem 'rack-cors' +# Gemfile +gem 'rabl' +# Also add either `oj` or `yajl-ruby` as the JSON parser +gem 'oj' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index e547d2449..60193674c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,6 +75,7 @@ GEM nio4r (2.3.1) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) + oj (3.6.0) pg (1.0.0) pry (0.11.3) coderay (~> 1.1.0) @@ -82,6 +83,8 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) puma (3.11.4) + rabl (0.13.1) + activesupport (>= 2.3.14) rack (2.0.5) rack-test (1.0.0) rack (>= 1.0, < 3) @@ -142,9 +145,11 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) minitest-rails minitest-reporters + oj pg (>= 0.18, < 2.0) pry-rails puma (~> 3.7) + rabl rails (~> 5.1.6) spring spring-watcher-listen (~> 2.0.0) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 466d4e3df..0993959a7 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -27,6 +27,6 @@ def create private def movie_params - return params.permit(:title, :overview, :release_date, :inventory) + return params.permit(:title, :overview, :release_date , :inventory) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 013f81506..9f89224e1 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,6 @@ class Customer < ApplicationRecord - + has_many :rentals + validates :name, :address, :city, :state, :postal_code, :phone, presence: true validates :postal_code, length: { is: 5 } diff --git a/app/models/movie.rb b/app/models/movie.rb index a43435cd6..9cba297c3 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,6 @@ class Movie < ApplicationRecord - + has_many :rentals + validates :title, :overview, :release_date, :inventory, presence: true validates :inventory, numericality: { greater_than: -1 } diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..e001ff37c --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie +end diff --git a/db/migrate/20180508172450_create_rentals.rb b/db/migrate/20180508172450_create_rentals.rb new file mode 100644 index 000000000..45423106f --- /dev/null +++ b/db/migrate/20180508172450_create_rentals.rb @@ -0,0 +1,12 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.string :checkout_date + t.string :due_date + t.references :customer, foreign_key: true + t.references :movie, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index d5bbf1a20..4334da7cf 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: 20180507215628) do +ActiveRecord::Schema.define(version: 20180508172450) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -36,4 +36,17 @@ t.string "release_date" end + create_table "rentals", force: :cascade do |t| + t.string "checkout_date" + t.string "due_date" + 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 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..40fbc40da --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + checkout_date: MyString + due_date: MyString + customer: one + movie: one + +two: + checkout_date: MyString + due_date: MyString + customer: two + movie: two 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 9eec28eb928fba525c2316bcadd2453b603d1e3c Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Tue, 8 May 2018 10:39:31 -0700 Subject: [PATCH 14/37] adds relationship model tests for movie --- test/models/movie_test.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 156f07cdd..5c9ec1ef7 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -34,4 +34,20 @@ movie.inventory = "jdfaaldsjb" movie.valid?.must_equal false end + + describe 'relationships' do + it "has many rentals" do + movie.rentals.must_equal [rentals(:one)] + + movie.rentals.count.must_equal 1 + end + + it "can have 0 rentals" do + movie.rentals.each do |rental| + rental.destroy + end + + movie.rentals.count.must_equal 0 + end + end end From 1127257cbde1e75d3dc16d574a98eb79ef5dbc98 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Tue, 8 May 2018 10:40:51 -0700 Subject: [PATCH 15/37] adds relationship test for customer model --- test/models/customer_test.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 9c5101e71..01ba73d13 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -52,4 +52,20 @@ customer.postal_code = '12384985203829387948' customer.valid?.must_equal false end + + describe 'relationships' do + it "has many rentals" do + customer.rentals.must_equal [rentals(:one)] + + customer.rentals.count.must_equal 1 + end + + it "can have 0 rentals" do + customer.rentals.each do |rental| + rental.destroy + end + + customer.rentals.count.must_equal 0 + end + end end From da2e5b35e74be77e615c7376206ba0784493e21a Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Tue, 8 May 2018 10:56:12 -0700 Subject: [PATCH 16/37] adds model tests for rentals --- app/models/rental.rb | 2 ++ test/fixtures/rentals.yml | 8 ++++---- test/models/rental_test.rb | 41 +++++++++++++++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..aca472667 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,6 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + + validates :checkout_date, :due_date, presence: true end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 40fbc40da..dac36ad61 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - checkout_date: MyString - due_date: MyString + checkout_date: "2018-05-08" + due_date: "2018-05-15" customer: one movie: one two: - checkout_date: MyString - due_date: MyString + checkout_date: "2018-05-08" + due_date: "2018-05-15" customer: two movie: two diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..e0cd67249 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,44 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) {rentals(:one) } - it "must be valid" do - value(rental).must_be :valid? + describe "validations" do + + it "must be valid" do + value(rental).must_be :valid? + end + + it "must have checkout_date" do + rental.checkout_date = nil + rental.valid?.must_equal false + end + + it "must have due_date" do + rental.due_date = nil + rental.valid?.must_equal false + end + + it "must have 7 day difference between checkout and due dates" do + checkout= Date.parse(rental.checkout_date) + due = Date.parse(rental.due_date) + (checkout...due).count.must_equal 7 + end + end + + describe "relationships" do + it "must have a customer" do + rental.customer.must_equal customers(:one) + + rental.customer = nil + rental.valid?.must_equal false + end + + it "must have a movie" do + rental.movie.must_equal movies(:one) + + rental.movie = nil + rental.valid?.must_equal false + end end end From 881787ad490f5589277c9abc9d1fdfac03e2ebe2 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Tue, 8 May 2018 11:04:21 -0700 Subject: [PATCH 17/37] adds routes and controller for rentals --- app/controllers/rentals_controller.rb | 9 +++++++++ config/routes.rb | 5 +++++ test/controllers/rentals_controller_test.rb | 14 ++++++++++++++ 3 files changed, 28 insertions(+) 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..61d7d414e --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,9 @@ +class RentalsController < ApplicationController + def check_out + + end + + def check_in + + end +end diff --git a/config/routes.rb b/config/routes.rb index 22e8a32ba..91e8ba7b3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,13 @@ Rails.application.routes.draw do + resources :movies, only: [:index, :show, :create] resources :customers, only: :index +post '/rentals/check-out', to: 'rentals#check_out', as: 'check-out' + +post '/rentals/check-in', to: 'rentals#check_in', as: 'check-in' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..fabb63af6 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe RentalsController do + it "should get check-out" do + get rentals_check-out_url + value(response).must_be :success? + end + + it "should get check-in" do + get rentals_check-in_url + value(response).must_be :success? + end + +end From 6a3d02e281bb2ec1bbc1a3aecb86189712246ac2 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Tue, 8 May 2018 11:38:21 -0700 Subject: [PATCH 18/37] adds checkout controller tests/not actions for rentals --- test/controllers/movies_controller_test.rb | 1 + test/controllers/rentals_controller_test.rb | 50 ++++++++++++++++++--- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 20f75fa48..adff5a51c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -76,6 +76,7 @@ must_respond_with :success + end it "returns with bad request with invalid data" do diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index fabb63af6..f3076545d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,14 +1,52 @@ require "test_helper" describe RentalsController do - it "should get check-out" do - get rentals_check-out_url - value(response).must_be :success? + + describe "check_out" do + let(:rental_data) { + { + customer_id: 1, + movie_id: 1 + } + } + + it "creates a rental object" do + + proc { + post check_out_path(params: rental_data) + }.must_change 'Rental.count', 1 + + must_respond_with :success + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include 'customer_id' + body['customer_id'].must_equal 1 + body.must_include 'movie_id' + body['movie_id'].must_equal 1 + + end + + it "returns bad_request with bad params" do + rental_data['customer_id'] = nil + + proc { + post check_out_path(params: rental_data) + }.must_change 'Rental.count', 0 + + 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 + + end end - it "should get check-in" do - get rentals_check-in_url - value(response).must_be :success? + describe "check_in" do + end + + + end From d2432937d5b7fc80feee07dd88c3b09ac8282dfb Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Tue, 8 May 2018 13:29:28 -0700 Subject: [PATCH 19/37] Add RentalsController tests for check_out --- app/controllers/rentals_controller.rb | 22 ++++++++++++++++++++- test/controllers/rentals_controller_test.rb | 10 +++++----- test/fixtures/movies.yml | 4 ++-- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 61d7d414e..ce5442461 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,29 @@ class RentalsController < ApplicationController def check_out + checkout = Date.today.to_s + due = (Date.today + 7.days).to_s + @rental = Rental.create( + checkout_date: checkout, + due_date: due, + customer_id: params[:customer_id], + movie_id: params[:movie_id] + ) + + if @rental.save + render json: {customer_id: @rental.customer_id, movie_id: @rental.movie_id}, status: :ok + else + render json: {ok: false}, status: :bad_request + end end def check_in - + + end + + private + + def rental_params + return params.permit(:customer_id, :movie_id) end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f3076545d..8ce076540 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -5,8 +5,8 @@ describe "check_out" do let(:rental_data) { { - customer_id: 1, - movie_id: 1 + customer_id: customers(:one).id, + movie_id: movies(:two).id } } @@ -20,14 +20,14 @@ body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include 'customer_id' - body['customer_id'].must_equal 1 + body['customer_id'].must_equal customers(:one).id body.must_include 'movie_id' - body['movie_id'].must_equal 1 + body['movie_id'].must_equal movies(:two).id end it "returns bad_request with bad params" do - rental_data['customer_id'] = nil + rental_data[:customer_id] = nil proc { post check_out_path(params: rental_data) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 090b19e62..4ba2168a2 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,10 +4,10 @@ one: title: MyString overview: MyString release_date: 2018-05-07 - inventory: 1 + inventory: 10 two: title: MyString overview: MyString release_date: 2018-05-07 - inventory: 1 + inventory: 10 From 01297b62084d883ace04c966534fa62052741d85 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Tue, 8 May 2018 15:10:48 -0700 Subject: [PATCH 20/37] adds controller tests for rentals-pass tests --- app/controllers/rentals_controller.rb | 13 ++++++- .../20180508211329_adds_statusto_rentals.rb | 5 +++ db/schema.rb | 3 +- test/controllers/rentals_controller_test.rb | 34 ++++++++++++++++++- test/fixtures/customers.yml | 4 +-- test/fixtures/movies.yml | 4 +-- 6 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20180508211329_adds_statusto_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ce5442461..0542ba85e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,7 +7,8 @@ def check_out checkout_date: checkout, due_date: due, customer_id: params[:customer_id], - movie_id: params[:movie_id] + movie_id: params[:movie_id], + ) if @rental.save @@ -18,6 +19,16 @@ def check_out end def check_in + @rental = Rental.find_by(id: params[:id]) + + if @rental.nil? + render json: {ok: false}, status: :bad_request + else + @rental.update(status: 'returned') + + render json: {customer_id: @rental.customer_id, movie_id: @rental.movie_id, status: @rental.status}, status: :ok + + end end diff --git a/db/migrate/20180508211329_adds_statusto_rentals.rb b/db/migrate/20180508211329_adds_statusto_rentals.rb new file mode 100644 index 000000000..b9de6e840 --- /dev/null +++ b/db/migrate/20180508211329_adds_statusto_rentals.rb @@ -0,0 +1,5 @@ +class AddsStatustoRentals < ActiveRecord::Migration[5.1] + def change + add_column :rentals, :status, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 4334da7cf..bd3c15efb 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: 20180508172450) do +ActiveRecord::Schema.define(version: 20180508211329) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,7 @@ t.bigint "movie_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "status" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8ce076540..574217b21 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -43,10 +43,42 @@ end describe "check_in" do + let(:rental_data) { + { + id: rentals(:one).id, + } + } - end + it "changes the status of the rental to returned" do + post check_in_path(params: rental_data) + + must_respond_with :success + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include 'customer_id' + body['customer_id'].must_equal customers(:one).id + body.must_include 'movie_id' + body['movie_id'].must_equal movies(:one).id + body.must_include 'status' + body['status'].must_equal 'returned' + + end + + it "returns bad_request with bad params" do + + rental_data[:id] = nil + post check_in_path(params: rental_data) + 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 + + end + + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 65e4c2fd2..532d62a36 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,7 +1,7 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString + name: 'Bob Kelly' registered_at: 2018-05-07 12:56:25 address: MyString city: MyString @@ -10,7 +10,7 @@ one: phone: '1234567891' two: - name: MyString + name: 'Customer One' registered_at: 2018-05-07 12:56:25 address: MyString city: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 4ba2168a2..f18b5aacb 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString + title: Movie_One overview: MyString release_date: 2018-05-07 inventory: 10 two: - title: MyString + title: Movie_Two overview: MyString release_date: 2018-05-07 inventory: 10 From 72d6cb03572b1dc82dd82a1a4e27c91370496509 Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Tue, 8 May 2018 15:36:45 -0700 Subject: [PATCH 21/37] Fix Movies#controller show test for 404 --- test/controllers/movies_controller_test.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index adff5a51c..178c04501 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -47,9 +47,7 @@ end it "returns 404 for movies that are not found" do - movie = movies(:two) - movie.destroy - get movie_path(movie.id) + get movie_path("fake_id") must_respond_with :not_found body = JSON.parse(response.body) body.must_be_kind_of Hash From f1414ae6dd4411fab96eb3e79a677387ce67be94 Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Tue, 8 May 2018 16:02:59 -0700 Subject: [PATCH 22/37] Add missing nodes in request body --- app/controllers/customers_controller.rb | 3 +-- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 4 ++-- app/models/customer.rb | 6 ++++-- app/models/movie.rb | 6 ++++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index c5767d811..87073a6e2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,6 @@ class CustomersController < ApplicationController def index @customers = Customer.all - render json: @customers.as_json(only: [ :id, :name, :phone, :postal_code, :registered_at]) + render json: @customers.as_json(only: [ :id, :name, :phone, :postal_code, :registered_at, :movies_checked_out_count]) end end - diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 0993959a7..5cbcd1c6f 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: [:title, :overview, :release_date, :inventory]) + render json: @movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) else render json: {ok: false, :errors => "Movie not found"}, status: :not_found end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 0542ba85e..d8d3c7210 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,7 +8,6 @@ def check_out due_date: due, customer_id: params[:customer_id], movie_id: params[:movie_id], - ) if @rental.save @@ -21,11 +20,12 @@ def check_out def check_in @rental = Rental.find_by(id: params[:id]) - if @rental.nil? + if @rental.nil? render json: {ok: false}, status: :bad_request else @rental.update(status: 'returned') + render json: {customer_id: @rental.customer_id, movie_id: @rental.movie_id, status: @rental.status}, status: :ok end diff --git a/app/models/customer.rb b/app/models/customer.rb index 9f89224e1..de4f834ce 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,11 +1,13 @@ class Customer < ApplicationRecord has_many :rentals - + validates :name, :address, :city, :state, :postal_code, :phone, presence: true validates :postal_code, length: { is: 5 } validates :phone, length: { is: 10 } - + def movies_checked_out_count + return 0 + end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 9cba297c3..12b28041d 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,9 +1,11 @@ class Movie < ApplicationRecord has_many :rentals - + validates :title, :overview, :release_date, :inventory, presence: true validates :inventory, numericality: { greater_than: -1 } - + def available_inventory + return inventory + end end From 731e2f3c333618cfc4469e86dcb62d2aa426f49b Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Wed, 9 May 2018 09:02:21 -0700 Subject: [PATCH 23/37] Comment out validation for phone in Customer --- app/models/customer.rb | 2 +- test/models/customer_test.rb | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index de4f834ce..3c7effc9b 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,7 +5,7 @@ class Customer < ApplicationRecord validates :postal_code, length: { is: 5 } - validates :phone, length: { is: 10 } + # validates :phone, length: { is: 10 } def movies_checked_out_count return 0 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 01ba73d13..69f7b7386 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -45,13 +45,13 @@ customer.valid?.must_equal false end - it "must have phone length = 10" do - customer.postal_code = '1234' - customer.valid?.must_equal false - - customer.postal_code = '12384985203829387948' - customer.valid?.must_equal false - end + # it "must have phone length = 10" do + # customer.postal_code = '1234' + # customer.valid?.must_equal false + # + # customer.postal_code = '12384985203829387948' + # customer.valid?.must_equal false + # end describe 'relationships' do it "has many rentals" do From a5cbd85a8de4156c54b72de3cb6f879d94e5cf8c Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Wed, 9 May 2018 09:03:10 -0700 Subject: [PATCH 24/37] Add missing fields for customer index and movie show using rabl --- Gemfile | 1 + Gemfile.lock | 5 +++++ app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 6 +++--- app/views/customers/index.rabl | 3 +++ app/views/movies/show.rabl | 3 +++ config/initializers/rabl_init.rb | 28 +++++++++++++++++++++++++ 7 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 app/views/customers/index.rabl create mode 100644 app/views/movies/show.rabl create mode 100644 config/initializers/rabl_init.rb diff --git a/Gemfile b/Gemfile index 78866f3ac..37299ae9d 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,7 @@ gem 'puma', '~> 3.7' gem 'rabl' # Also add either `oj` or `yajl-ruby` as the JSON parser gem 'oj' +gem 'jbuilder', '~> 2.5' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index 60193674c..1583e0bb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,6 +51,9 @@ GEM activesupport (>= 4.2.0) i18n (1.0.1) concurrent-ruby (~> 1.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -72,6 +75,7 @@ GEM builder minitest (>= 5.0) ruby-progressbar + multi_json (1.13.1) nio4r (2.3.1) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) @@ -142,6 +146,7 @@ PLATFORMS DEPENDENCIES byebug + jbuilder (~> 2.5) listen (>= 3.0.5, < 3.2) minitest-rails minitest-reporters diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 87073a6e2..c4a55e5f4 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,6 @@ class CustomersController < ApplicationController def index @customers = Customer.all - render json: @customers.as_json(only: [ :id, :name, :phone, :postal_code, :registered_at, :movies_checked_out_count]) + # render json: @customers.as_json(only: [ :id, :name, :phone, :postal_code, :registered_at, :movies_checked_out_count]) end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 5cbcd1c6f..958cb3685 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,9 +7,9 @@ def index def show @movie = Movie.find_by(id: params[:id]) - if @movie - render json: @movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) - else + if @movie.nil? + # render json: @movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) + # else render json: {ok: false, :errors => "Movie not found"}, status: :not_found end end diff --git a/app/views/customers/index.rabl b/app/views/customers/index.rabl new file mode 100644 index 000000000..7db8fa996 --- /dev/null +++ b/app/views/customers/index.rabl @@ -0,0 +1,3 @@ +collection @customers +attributes :id, :name, :registered_at, :postal_code, :phone +node(:movies_checked_out_count) { |customer| customer.movies_checked_out_count } diff --git a/app/views/movies/show.rabl b/app/views/movies/show.rabl new file mode 100644 index 000000000..20c6f7121 --- /dev/null +++ b/app/views/movies/show.rabl @@ -0,0 +1,3 @@ +object @movie +attributes :title, :overview, :release_date, :inventory +node(:available_inventory) { |movie| movie.available_inventory } diff --git a/config/initializers/rabl_init.rb b/config/initializers/rabl_init.rb new file mode 100644 index 000000000..e288dfcb4 --- /dev/null +++ b/config/initializers/rabl_init.rb @@ -0,0 +1,28 @@ +require 'rabl' +Rabl.configure do |config| + # Commented as these are defaults + # config.cache_all_output = false + # config.cache_sources = Rails.env != 'development' # Defaults to false + # config.cache_engine = Rabl::CacheEngine.new # Defaults to Rails cache + # config.perform_caching = false + # config.escape_all_output = false + # config.json_engine = nil # Class with #dump class method (defaults JSON) + # config.msgpack_engine = nil # Defaults to ::MessagePack + # config.bson_engine = nil # Defaults to ::BSON + # config.plist_engine = nil # Defaults to ::Plist::Emit + config.include_json_root = false + # config.include_msgpack_root = true + # config.include_bson_root = true + # config.include_plist_root = true + # config.include_xml_root = false + # config.include_child_root = true + # config.enable_json_callbacks = false + # config.xml_options = { :dasherize => true, :skip_types => false } + # config.view_paths = [] + # config.raise_on_missing_attribute = true # Defaults to false + # config.replace_nil_values_with_empty_strings = true # Defaults to false + # config.replace_empty_string_values_with_nil_values = true # Defaults to false + # config.exclude_nil_values = true # Defaults to false + # config.exclude_empty_values_in_collections = true # Defaults to false + # config.camelize_keys = :upper # Defaults to false +end From e156ab66536bacf2fa447c1f269ea80ea5a20088 Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Wed, 9 May 2018 09:18:22 -0700 Subject: [PATCH 25/37] Fix customer controller index test by adding missing field --- test/controllers/customers_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5630a6ae1..e8702da6d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -27,7 +27,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(id name phone postal_code registered_at) + 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| From 218b506466dd38709f170ba77432281d568e243b Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Wed, 9 May 2018 11:18:54 -0700 Subject: [PATCH 26/37] decreases movie inventory method and test works --- app/controllers/rentals_controller.rb | 26 ++++++++++++++------- app/models/customer.rb | 4 +++- app/models/movie.rb | 9 ++++++- app/views/customers/index.rabl | 2 +- test/controllers/rentals_controller_test.rb | 17 ++++++++++++++ test/fixtures/rentals.yml | 2 ++ 6 files changed, 49 insertions(+), 11 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d8d3c7210..16638f3b7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,16 +1,26 @@ class RentalsController < ApplicationController def check_out - checkout = Date.today.to_s - due = (Date.today + 7.days).to_s - @rental = Rental.create( - checkout_date: checkout, - due_date: due, - customer_id: params[:customer_id], - movie_id: params[:movie_id], - ) + movie = Movie.find_by(id: params[:movie_id]) + + if movie.available_inventory > 0 + checkout = Date.today.to_s + due = (Date.today + 7.days).to_s + + @rental = Rental.create( + checkout_date: checkout, + due_date: due, + customer_id: params[:customer_id], + movie_id: params[:movie_id], + status: 'checked_out' + ) + + else + render json: {ok: false}, status: :bad_request + end if @rental.save + # binding.pry render json: {customer_id: @rental.customer_id, movie_id: @rental.movie_id}, status: :ok else render json: {ok: false}, status: :bad_request diff --git a/app/models/customer.rb b/app/models/customer.rb index 3c7effc9b..ed3d7c0ca 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,6 +8,8 @@ class Customer < ApplicationRecord # validates :phone, length: { is: 10 } def movies_checked_out_count - return 0 + movies = self.rentals.select{ |rental| rental.status == 'checked_out' } + + return movies.count end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 12b28041d..a7319b711 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,6 +6,13 @@ class Movie < ApplicationRecord validates :inventory, numericality: { greater_than: -1 } def available_inventory - return inventory + checkout_count = 0 + self.rentals.each do |rental| + if rental.status == 'checked_out' + checkout_count += 1 + end + end + + return self.inventory - checkout_count end end diff --git a/app/views/customers/index.rabl b/app/views/customers/index.rabl index 7db8fa996..83f47d9e7 100644 --- a/app/views/customers/index.rabl +++ b/app/views/customers/index.rabl @@ -1,3 +1,3 @@ collection @customers -attributes :id, :name, :registered_at, :postal_code, :phone +attributes :id, :name, :phone, :postal_code, :registered_at node(:movies_checked_out_count) { |customer| customer.movies_checked_out_count } diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 574217b21..8780a4bb1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -39,6 +39,23 @@ body.must_include 'ok' body['ok'].must_equal false + end + + it "decreases the movie's available inventory" do + movie_two = movies(:two) + inventory = movie_two.available_inventory + + post check_out_path(params: rental_data) + + movie_two = Movie.find_by(id: movie_two.id) + # binding.pry + movie_two.available_inventory.must_equal inventory - 1 + + end + + it "increases the customer's movies checked out count" do + + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dac36ad61..3327c6c1b 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -5,9 +5,11 @@ one: due_date: "2018-05-15" customer: one movie: one + status: "checked_out" two: checkout_date: "2018-05-08" due_date: "2018-05-15" customer: two movie: two + status: "checked_out" From a54d38d952e90a9944d1923608a26e63490e4f32 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Wed, 9 May 2018 11:27:47 -0700 Subject: [PATCH 27/37] negative test for availeble inventory in rental controller tests passes --- app/controllers/rentals_controller.rb | 15 ++++++++------- test/controllers/rentals_controller_test.rb | 17 ++++++++++++++++- test/fixtures/movies.yml | 2 +- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 16638f3b7..cb42d0c3d 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -14,17 +14,18 @@ def check_out movie_id: params[:movie_id], status: 'checked_out' ) + if @rental.save + # binding.pry + render json: {customer_id: @rental.customer_id, movie_id: @rental.movie_id}, status: :ok - else - render json: {ok: false}, status: :bad_request - end + else + render json: {ok: false}, status: :bad_request + end - if @rental.save - # binding.pry - render json: {customer_id: @rental.customer_id, movie_id: @rental.movie_id}, status: :ok else - render json: {ok: false}, status: :bad_request + render json: {ok: false}, status: :no_content end + end def check_in diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8780a4bb1..f95b6175e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -53,8 +53,23 @@ end + it "does not decrease available inventory if available inventory is 0" do + movie_one = movies(:one) + inventory = movie_one.available_inventory + + post check_out_path(params: + { + customer_id: customers(:one).id, + movie_id: movies(:one).id + }) + + movie_one = Movie.find_by(id: movie_one.id) + # binding.pry + movie_one.available_inventory.must_equal inventory + end + it "increases the customer's movies checked out count" do - + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f18b5aacb..d79de05ab 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,7 +4,7 @@ one: title: Movie_One overview: MyString release_date: 2018-05-07 - inventory: 10 + inventory: 1 two: title: Movie_Two From 26694b7e7affff7e8efb36eab2f69925f448617c Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Wed, 9 May 2018 11:31:43 -0700 Subject: [PATCH 28/37] customer checkout count test in rental model passes --- test/controllers/rentals_controller_test.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f95b6175e..48877d193 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -65,11 +65,18 @@ movie_one = Movie.find_by(id: movie_one.id) # binding.pry - movie_one.available_inventory.must_equal inventory + movie_one.available_inventory.must_equal inventory end it "increases the customer's movies checked out count" do + customer = customers(:one) + movies = customer.movies_checked_out_count + post check_out_path(params: rental_data) + + customer = Customer.find_by(id: customer.id) + + customer.movies_checked_out_count.must_equal movies + 1 end end From 10d6ecf36ea52f5769ad8752afac85650f8f8e37 Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Wed, 9 May 2018 14:15:03 -0700 Subject: [PATCH 29/37] Pass Wave 3 smoke tests --- app/controllers/rentals_controller.rb | 8 +++--- test/controllers/rentals_controller_test.rb | 28 +++++++++++++++++++-- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cb42d0c3d..75b80c6d8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -15,7 +15,6 @@ def check_out status: 'checked_out' ) if @rental.save - # binding.pry render json: {customer_id: @rental.customer_id, movie_id: @rental.movie_id}, status: :ok else @@ -29,14 +28,15 @@ def check_out end def check_in - @rental = Rental.find_by(id: params[:id]) + @rental = Rental.find_by( + customer_id: params[:customer_id], + movie_id: params[:movie_id], + status: 'checked_out') if @rental.nil? render json: {ok: false}, status: :bad_request else @rental.update(status: 'returned') - - render json: {customer_id: @rental.customer_id, movie_id: @rental.movie_id, status: @rental.status}, status: :ok end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 48877d193..c86499291 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -84,7 +84,8 @@ describe "check_in" do let(:rental_data) { { - id: rentals(:one).id, + customer_id: customers(:one).id, + movie_id: movies(:one).id } } @@ -106,7 +107,7 @@ it "returns bad_request with bad params" do - rental_data[:id] = nil + rental_data[:customer_id] = nil post check_in_path(params: rental_data) @@ -118,6 +119,29 @@ end + it "increases the movie's available inventory" do + movie_one = movies(:one) + inventory = movie_one.available_inventory + + post check_in_path(params: rental_data) + + movie_one = Movie.find_by(id: movie_one.id) + movie_one.available_inventory.must_equal inventory + 1 + + end + + it "decrease the customer's movies checked out count" do + customer = customers(:one) + movies = customer.movies_checked_out_count + + post check_in_path(params: rental_data) + + customer = Customer.find_by(id: customer.id) + + customer.movies_checked_out_count.must_equal movies - 1 + + end + end end From 1324d9e7c05e2d4b6f12b4380358c229fd0898ae Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Wed, 9 May 2018 14:25:41 -0700 Subject: [PATCH 30/37] Refactor model tests --- test/models/customer_test.rb | 9 --------- test/models/movie_test.rb | 1 - 2 files changed, 10 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 69f7b7386..0af45b12c 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -45,18 +45,9 @@ customer.valid?.must_equal false end - # it "must have phone length = 10" do - # customer.postal_code = '1234' - # customer.valid?.must_equal false - # - # customer.postal_code = '12384985203829387948' - # customer.valid?.must_equal false - # end - describe 'relationships' do it "has many rentals" do customer.rentals.must_equal [rentals(:one)] - customer.rentals.count.must_equal 1 end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 5c9ec1ef7..d806bbf29 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -38,7 +38,6 @@ describe 'relationships' do it "has many rentals" do movie.rentals.must_equal [rentals(:one)] - movie.rentals.count.must_equal 1 end From 2bc4e90170cab9d4666a522016fbd76f49dba574 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Wed, 9 May 2018 14:49:27 -0700 Subject: [PATCH 31/37] removes unneeded instance variables in controllers --- app/controllers/customers_controller.rb | 4 +-- app/controllers/movies_controller.rb | 22 +++++++------- app/controllers/rentals_controller.rb | 39 +++++++++++++------------ app/views/movies/index.rabl | 2 ++ 4 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 app/views/movies/index.rabl diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index c4a55e5f4..322159115 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index - @customers = Customer.all - # render json: @customers.as_json(only: [ :id, :name, :phone, :postal_code, :registered_at, :movies_checked_out_count]) + @customers = Customer.all + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 958cb3685..9768aefff 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,32 +1,34 @@ class MoviesController < ApplicationController def index + @movies = Movie.all - render json: @movies.as_json(only: [ :id, :title, :release_date]) end def show + @movie = Movie.find_by(id: params[:id]) + if @movie.nil? - # render json: @movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]) - # else render json: {ok: false, :errors => "Movie not found"}, status: :not_found end + end def create - @movie = Movie.new(movie_params) - if @movie.save - render json: {id: @movie.id}, status: :ok + movie = Movie.new(movie_params) + + if movie.save + render json: {id: movie.id}, status: :ok else - render json: {ok: false, errors: @movie.errors}, status: :bad_request + render json: {ok: false, errors: movie.errors}, status: :bad_request end end private -def movie_params - return params.permit(:title, :overview, :release_date , :inventory) -end + def movie_params + return params.permit(:title, :overview, :release_date , :inventory) + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 75b80c6d8..3607281a0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,51 +1,54 @@ class RentalsController < ApplicationController + def check_out movie = Movie.find_by(id: params[:movie_id]) if movie.available_inventory > 0 + checkout = Date.today.to_s due = (Date.today + 7.days).to_s - @rental = Rental.create( + rental = Rental.create( checkout_date: checkout, due_date: due, customer_id: params[:customer_id], movie_id: params[:movie_id], status: 'checked_out' ) - if @rental.save - render json: {customer_id: @rental.customer_id, movie_id: @rental.movie_id}, status: :ok + + if rental.save + render json: {customer_id: rental.customer_id, movie_id: rental.movie_id}, status: :ok else - render json: {ok: false}, status: :bad_request + render json: {ok: false, errors: rental.errors}, status: :bad_request end else - render json: {ok: false}, status: :no_content + render json: {ok: false, errors: "No copies available"}, status: :no_content end - end def check_in - @rental = Rental.find_by( + + rental = Rental.find_by( customer_id: params[:customer_id], movie_id: params[:movie_id], status: 'checked_out') - if @rental.nil? - render json: {ok: false}, status: :bad_request - else - @rental.update(status: 'returned') - render json: {customer_id: @rental.customer_id, movie_id: @rental.movie_id, status: @rental.status}, status: :ok + if rental.nil? + render json: {ok: false, errors: "Rental does not exist"}, status: :bad_request + else + rental.update(status: 'returned') + render json: { customer_id: rental.customer_id, movie_id: rental.movie_id, status: rental.status }, status: :ok - end + end - end + end - private + private - def rental_params - return params.permit(:customer_id, :movie_id) + def rental_params + return params.permit(:customer_id, :movie_id) + end end -end diff --git a/app/views/movies/index.rabl b/app/views/movies/index.rabl new file mode 100644 index 000000000..8f7affc74 --- /dev/null +++ b/app/views/movies/index.rabl @@ -0,0 +1,2 @@ +collection @movies +attributes :id, :title, :release_date From a38ad1e2592d81b1932fe9d09034debe7bb17fef Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Wed, 9 May 2018 14:49:39 -0700 Subject: [PATCH 32/37] Refactor controller tests and add more edge cases --- test/controllers/customers_controller_test.rb | 5 ++ test/controllers/movies_controller_test.rb | 14 ++- test/controllers/rentals_controller_test.rb | 85 ++++++++----------- 3 files changed, 47 insertions(+), 57 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index e8702da6d..0c61c7e7d 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -26,6 +26,11 @@ body.length.must_equal Customer.count end + # TODO + it "returns empty array if there is no customers" do + + 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 diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 178c04501..8914993d1 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -2,8 +2,6 @@ describe MoviesController do describe "index" do - # These tests are a little verbose - yours do not need to be - # this explicit. it "is a real working route" do get movies_url must_respond_with :success @@ -28,8 +26,13 @@ body.length.must_equal Movie.count end + # TODO + it "returns empty array if there is no movies" do + + end + it "returns movies with exactly the required fields" do - keys = %w( id release_date title) + keys = %w(id release_date title) get movies_url body = JSON.parse(response.body) @@ -40,7 +43,6 @@ end describe "show" do - it "can get a movie" do get movie_path(movies(:one).id) must_respond_with :success @@ -73,8 +75,6 @@ }.must_change 'Movie.count', 1 must_respond_with :success - - end it "returns with bad request with invalid data" do @@ -89,8 +89,6 @@ body.must_be_kind_of Hash body.must_include "errors" body["errors"].must_include "title" - end - end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index c86499291..011f6f539 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,6 @@ require "test_helper" describe RentalsController do - describe "check_out" do let(:rental_data) { { @@ -10,8 +9,7 @@ } } - it "creates a rental object" do - + it "creates a rental object if given valid params and available inventory is > 0" do proc { post check_out_path(params: rental_data) }.must_change 'Rental.count', 1 @@ -23,7 +21,26 @@ body['customer_id'].must_equal customers(:one).id body.must_include 'movie_id' body['movie_id'].must_equal movies(:two).id + end + it "decreases the movie's available inventory if given valid params and available inventory is > 0" do + movie_two = movies(:two) + inventory = movie_two.available_inventory + + post check_out_path(params: rental_data) + + movie_two = Movie.find_by(id: movie_two.id) + movie_two.available_inventory.must_equal inventory - 1 + end + + it "increases the customer's movies checked out count if given valid params and available inventory is > 0" do + customer = customers(:one) + movies = customer.movies_checked_out_count + + post check_out_path(params: rental_data) + + customer = Customer.find_by(id: customer.id) + customer.movies_checked_out_count.must_equal movies + 1 end it "returns bad_request with bad params" do @@ -38,19 +55,6 @@ body.must_be_kind_of Hash body.must_include 'ok' body['ok'].must_equal false - - end - - it "decreases the movie's available inventory" do - movie_two = movies(:two) - inventory = movie_two.available_inventory - - post check_out_path(params: rental_data) - - movie_two = Movie.find_by(id: movie_two.id) - # binding.pry - movie_two.available_inventory.must_equal inventory - 1 - end it "does not decrease available inventory if available inventory is 0" do @@ -64,19 +68,11 @@ }) movie_one = Movie.find_by(id: movie_one.id) - # binding.pry movie_one.available_inventory.must_equal inventory end - it "increases the customer's movies checked out count" do - customer = customers(:one) - movies = customer.movies_checked_out_count - - post check_out_path(params: rental_data) - - customer = Customer.find_by(id: customer.id) - - customer.movies_checked_out_count.must_equal movies + 1 + # TODO + it "does not increase customer's movies checked out count if available inventory is 0" do end end @@ -89,8 +85,7 @@ } } - - it "changes the status of the rental to returned" do + it "changes the status of the rental to returned if given valid params" do post check_in_path(params: rental_data) must_respond_with :success @@ -102,24 +97,9 @@ body['movie_id'].must_equal movies(:one).id body.must_include 'status' body['status'].must_equal 'returned' - - end - - it "returns bad_request with bad params" do - - rental_data[:customer_id] = nil - - post check_in_path(params: rental_data) - - 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 - end - it "increases the movie's available inventory" do + it "increases the movie's available inventory if given valid params" do movie_one = movies(:one) inventory = movie_one.available_inventory @@ -127,21 +107,28 @@ movie_one = Movie.find_by(id: movie_one.id) movie_one.available_inventory.must_equal inventory + 1 - end - it "decrease the customer's movies checked out count" do + it "decrease the customer's movies checked out count if given valid params" do customer = customers(:one) movies = customer.movies_checked_out_count post check_in_path(params: rental_data) customer = Customer.find_by(id: customer.id) + customer.movies_checked_out_count.must_equal movies - 1 + end - customer.movies_checked_out_count.must_equal movies - 1 + it "returns bad_request with bad params" do + rental_data[:customer_id] = nil - end + post check_in_path(params: rental_data) + 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 + end end - end From 766327fb6b6c75bc59e11d131bc1766d46e71958 Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Wed, 9 May 2018 15:07:20 -0700 Subject: [PATCH 33/37] Implement new tests --- test/controllers/customers_controller_test.rb | 12 ++++++- test/controllers/movies_controller_test.rb | 12 ++++++- test/controllers/rentals_controller_test.rb | 35 ++++++++++++------- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 0c61c7e7d..af0856dd8 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -26,9 +26,19 @@ body.length.must_equal Customer.count end - # TODO it "returns empty array if there is no customers" do + Customer.all.each do |customer| + customer.rentals.each do |rental| + rental.destroy + end + customer.destroy + end + + get customers_url + body = JSON.parse(response.body) + body.must_equal [] + body.length.must_equal 0 end it "returns customers with exactly the required fields" do diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 8914993d1..2bc8a148c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -26,9 +26,19 @@ body.length.must_equal Movie.count end - # TODO it "returns empty array if there is no movies" do + Movie.all.each do |movie| + movie.rentals.each do |rental| + rental.destroy + end + movie.destroy + end + + get movies_url + body = JSON.parse(response.body) + body.must_equal [] + body.length.must_equal 0 end it "returns movies with exactly the required fields" do diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 011f6f539..a822cc9d0 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -9,7 +9,7 @@ } } - it "creates a rental object if given valid params and available inventory is > 0" do + it "creates a rental object and returns customer_id and movie_id in request body if given valid params and available inventory is > 0" do proc { post check_out_path(params: rental_data) }.must_change 'Rental.count', 1 @@ -25,22 +25,22 @@ it "decreases the movie's available inventory if given valid params and available inventory is > 0" do movie_two = movies(:two) - inventory = movie_two.available_inventory + ai = movie_two.available_inventory post check_out_path(params: rental_data) movie_two = Movie.find_by(id: movie_two.id) - movie_two.available_inventory.must_equal inventory - 1 + movie_two.available_inventory.must_equal ai - 1 end it "increases the customer's movies checked out count if given valid params and available inventory is > 0" do customer = customers(:one) - movies = customer.movies_checked_out_count + mcoc = customer.movies_checked_out_count post check_out_path(params: rental_data) customer = Customer.find_by(id: customer.id) - customer.movies_checked_out_count.must_equal movies + 1 + customer.movies_checked_out_count.must_equal mcoc + 1 end it "returns bad_request with bad params" do @@ -59,7 +59,7 @@ it "does not decrease available inventory if available inventory is 0" do movie_one = movies(:one) - inventory = movie_one.available_inventory + ai = movie_one.available_inventory post check_out_path(params: { @@ -68,12 +68,21 @@ }) movie_one = Movie.find_by(id: movie_one.id) - movie_one.available_inventory.must_equal inventory + movie_one.available_inventory.must_equal ai end - # TODO it "does not increase customer's movies checked out count if available inventory is 0" do + customer_one = customers(:one) + mcoc = customer_one.movies_checked_out_count + post check_out_path(params: + { + customer_id: customers(:one).id, + movie_id: movies(:one).id + }) + + customer_one = Customer.find_by(id: customer_one.id) + customer_one.movies_checked_out_count.must_equal mcoc end end @@ -85,7 +94,7 @@ } } - it "changes the status of the rental to returned if given valid params" do + it "changes the status of the rental to returned and returns customer_id and movie_id in request body if given valid params" do post check_in_path(params: rental_data) must_respond_with :success @@ -101,22 +110,22 @@ it "increases the movie's available inventory if given valid params" do movie_one = movies(:one) - inventory = movie_one.available_inventory + ai = movie_one.available_inventory post check_in_path(params: rental_data) movie_one = Movie.find_by(id: movie_one.id) - movie_one.available_inventory.must_equal inventory + 1 + movie_one.available_inventory.must_equal ai + 1 end it "decrease the customer's movies checked out count if given valid params" do customer = customers(:one) - movies = customer.movies_checked_out_count + mcoc = customer.movies_checked_out_count post check_in_path(params: rental_data) customer = Customer.find_by(id: customer.id) - customer.movies_checked_out_count.must_equal movies - 1 + customer.movies_checked_out_count.must_equal mcoc - 1 end it "returns bad_request with bad params" do From 691d6b0869203e9d9a3e4719c213d552b47dd5d0 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Wed, 9 May 2018 15:07:22 -0700 Subject: [PATCH 34/37] specifies error messages --- app/controllers/movies_controller.rb | 7 +++---- app/controllers/rentals_controller.rb | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9768aefff..c458eb4bd 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,16 +1,13 @@ class MoviesController < ApplicationController def index - @movies = Movie.all - end def show - @movie = Movie.find_by(id: params[:id]) if @movie.nil? - render json: {ok: false, :errors => "Movie not found"}, status: :not_found + render json: { ok: false, :errors => "Movie not found" }, status: :not_found end end @@ -24,6 +21,7 @@ def create else render json: {ok: false, errors: movie.errors}, status: :bad_request end + end private @@ -31,4 +29,5 @@ def create def movie_params return params.permit(:title, :overview, :release_date , :inventory) end + end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 3607281a0..0430c5c11 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,5 @@ class RentalsController < ApplicationController - + def check_out movie = Movie.find_by(id: params[:movie_id]) @@ -41,9 +41,7 @@ def check_in else rental.update(status: 'returned') render json: { customer_id: rental.customer_id, movie_id: rental.movie_id, status: rental.status }, status: :ok - end - end private From 909c95960b0fad58848ddb105c6d1e4206a1f15a Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Wed, 9 May 2018 15:35:59 -0700 Subject: [PATCH 35/37] fixes some unknown problem and all tests pass --- app/controllers/rentals_controller.rb | 5 ++++- test/controllers/rentals_controller_test.rb | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 0430c5c11..d76565222 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -4,6 +4,7 @@ def check_out movie = Movie.find_by(id: params[:movie_id]) + if movie.available_inventory > 0 checkout = Date.today.to_s @@ -22,10 +23,12 @@ def check_out else render json: {ok: false, errors: rental.errors}, status: :bad_request + end else - render json: {ok: false, errors: "No copies available"}, status: :no_content + + render json: {ok: false, errors: "No copies available"}, status: :bad_request end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a822cc9d0..fde7428b7 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -55,6 +55,25 @@ body.must_be_kind_of Hash body.must_include 'ok' body['ok'].must_equal false + body.must_include 'errors' + body['errors'].must_include 'customer' + end + + it "returns no_content with no availble inventory" do + + post check_out_path(params: + { + customer_id: customers(:one).id, + movie_id: movies(:one).id + }) + + 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_equal "No copies available" end it "does not decrease available inventory if available inventory is 0" do @@ -84,6 +103,8 @@ customer_one = Customer.find_by(id: customer_one.id) customer_one.movies_checked_out_count.must_equal mcoc end + + end describe "check_in" do From 460148677fa486fc583507203391141b04585d94 Mon Sep 17 00:00:00 2001 From: Mary Lamkin Date: Fri, 11 May 2018 11:31:49 -0700 Subject: [PATCH 36/37] adds movie model tests for available inventory --- test/models/movie_test.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index d806bbf29..5690fdf8d 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -49,4 +49,16 @@ movie.rentals.count.must_equal 0 end end + + describe 'available_inventory' do + + it 'returns the correct number of available to rent items' do + movies(:two).available_inventory.must_equal 9 + end + + it 'returns 0 if there are no available movies' do + movies(:one).available_inventory.must_equal 0 + end + + end end From f8a10419cb0d977d60fc1c17ab1d723434396e64 Mon Sep 17 00:00:00 2001 From: Zheng Cao Date: Fri, 11 May 2018 11:33:03 -0700 Subject: [PATCH 37/37] Implement model method tests --- app/models/customer.rb | 2 - test/models/customer_test.rb | 85 ++++++++++++++++++++++-------------- 2 files changed, 53 insertions(+), 34 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index ed3d7c0ca..8486ceb12 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,8 +5,6 @@ class Customer < ApplicationRecord validates :postal_code, length: { is: 5 } - # validates :phone, length: { is: 10 } - def movies_checked_out_count movies = self.rentals.select{ |rental| rental.status == 'checked_out' } diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 0af45b12c..fb4f93ca4 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -3,46 +3,48 @@ describe Customer do let(:customer) { customers(:one) } - it "must be valid" do - value(customer).must_be :valid? - end + describe 'validations' do + it "must be valid" do + value(customer).must_be :valid? + end - it "must have name" do - customer.name = nil - customer.valid?.must_equal false - end + it "must have name" do + customer.name = nil + customer.valid?.must_equal false + end - it "must have address" do - customer.address = nil - customer.valid?.must_equal false - end + it "must have address" do + customer.address = nil + customer.valid?.must_equal false + end - it "must have city" do - customer.city = nil - customer.valid?.must_equal false - end + it "must have city" do + customer.city = nil + customer.valid?.must_equal false + end - it "must have state" do - customer.state = nil - customer.valid?.must_equal false - end + it "must have state" do + customer.state = nil + customer.valid?.must_equal false + end - it "must have postal_code" do - customer.postal_code = nil - customer.valid?.must_equal false - end + it "must have postal_code" do + customer.postal_code = nil + customer.valid?.must_equal false + end - it "must have phone" do - customer.phone = nil - customer.valid?.must_equal false - end + it "must have phone" do + customer.phone = nil + customer.valid?.must_equal false + end - it "must have postal code length of 5" do - customer.postal_code = '1234' - customer.valid?.must_equal false + it "must have postal code length of 5" do + customer.postal_code = '1234' + customer.valid?.must_equal false - customer.postal_code = '1238498520348' - customer.valid?.must_equal false + customer.postal_code = '1238498520348' + customer.valid?.must_equal false + end end describe 'relationships' do @@ -59,4 +61,23 @@ customer.rentals.count.must_equal 0 end end + + describe 'movies_checked_out_count' do + it "returns the right count if there are rentals from that customer" do + customer.movies_checked_out_count.must_equal 1 + end + + it "returns 0 if there is no rentals from that customer" do + new_customer = Customer.create( + name: "name", + address: "address", + city: "city", + state: "state", + postal_code: "postal_code", + phone: "phone" + ) + + new_customer.movies_checked_out_count.must_equal 0 + end + end end