From c81b0b2880eb784976e6d40246216f498ae36d4b Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Tue, 9 May 2017 13:33:16 -0700 Subject: [PATCH 01/36] initial rails setup --- .gitignore | 17 ++ Gemfile | 55 ++++++ Gemfile.lock | 187 ++++++++++++++++++ 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 | 34 ++++ bin/spring | 17 ++ bin/update | 29 +++ config.ru | 5 + config/application.rb | 34 ++++ config/boot.rb | 3 + config/cable.yml | 9 + config/database.yml | 85 ++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 +++++ config/environments/production.rb | 78 ++++++++ config/environments/test.rb | 42 ++++ .../application_controller_renderer.rb | 6 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/new_framework_defaults.rb | 18 ++ config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/puma.rb | 47 +++++ config/routes.rb | 3 + config/secrets.yml | 22 +++ config/spring.rb | 6 + lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 5 + 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 53 files changed, 924 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/new_framework_defaults.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 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 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..48fb168f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore Byebug command history file. +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..23eb702b4 --- /dev/null +++ b/Gemfile @@ -0,0 +1,55 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.2' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platform: :mri +end + +group :development do + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'pry-rails' + gem 'rails-erd' +end + +gem 'awesome_print' +gem 'foundation-rails' +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..afab7a239 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,187 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.2) + activesupport (= 5.0.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (7.1.4) + awesome_print (1.7.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (9.0.6) + choice (0.2.0) + coderay (1.1.1) + concurrent-ruby (1.0.5) + debug_inspector (0.0.3) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + foundation-rails (6.3.1.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.5) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.14) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.0.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) + pg (0.20.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.8.2) + rack (2.0.2) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-erd (1.5.0) + activerecord (>= 3.2) + activesupport (>= 3.2) + choice (~> 0.2.0) + ruby-graphviz (~> 1.2) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + ruby-graphviz (1.2.3) + ruby-progressbar (1.8.1) + sass (3.4.23) + slop (3.6.0) + spring (2.0.1) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.19.4) + thread_safe (0.3.6) + tzinfo (1.2.3) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + awesome_print + better_errors + binding_of_caller + byebug + foundation-rails + listen (~> 3.0.5) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.0) + rails (~> 5.0.2) + rails-erd + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.14.6 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..e620b4dad --- /dev/null +++ b/bin/setup @@ -0,0 +1,34 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..54782d010 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,34 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + # Force new test files to be generated in the minitest-spec style + config.generators do |g| + g.test_framework :minitest, spec: true + end + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0bbde6f74 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..aead51124 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..082a013ab --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=172800' + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..49275a9d6 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,78 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..30587ef6d --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=3600' + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..51639b67a --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 000000000..d859e4bea --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,18 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..c7f311f81 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,47 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum, this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted this block will be run, if you are using `preload_app!` +# option you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..eae4787e1 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: cf8a0b9efde362e0394425452311bf8c0d293e69bc277f57e69db2ab03007121a803c2f13947c09d62ac9a5913668161ef7c3c8050eb846a04fc14aff04296bf + +test: + secret_key_base: 38ba3caf638a86ed89b00c5510ceddedc07d172d313c960b64d48920d863f75528e045ac102a83921e19a37ae257d1d93f0676a8445974e5681f1eac92971a0f + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/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 From 440373e17e7a8310d8773e4e47e450c56b5d03cc Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Tue, 9 May 2017 13:52:33 -0700 Subject: [PATCH 02/36] created movie and customer models --- app/models/customer.rb | 2 + app/models/movie.rb | 2 + db/migrate/20170509204023_create_customers.rb | 16 ++++++++ db/migrate/20170509204837_create_movies.rb | 13 ++++++ db/schema.rb | 41 +++++++++++++++++++ test/fixtures/customers.yml | 11 +++++ test/fixtures/movies.yml | 11 +++++ test/models/customer_test.rb | 9 ++++ test/models/movie_test.rb | 9 ++++ 9 files changed, 114 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20170509204023_create_customers.rb create mode 100644 db/migrate/20170509204837_create_movies.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/20170509204023_create_customers.rb b/db/migrate/20170509204023_create_customers.rb new file mode 100644 index 000000000..682b94e5c --- /dev/null +++ b/db/migrate/20170509204023_create_customers.rb @@ -0,0 +1,16 @@ +class CreateCustomers < ActiveRecord::Migration[5.0] + def change + create_table :customers do |t| + t.string :name + t.string :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + t.integer :movies_checked_out_count, default: 0 + + t.timestamps + end + end +end diff --git a/db/migrate/20170509204837_create_movies.rb b/db/migrate/20170509204837_create_movies.rb new file mode 100644 index 000000000..b99365794 --- /dev/null +++ b/db/migrate/20170509204837_create_movies.rb @@ -0,0 +1,13 @@ +class CreateMovies < ActiveRecord::Migration[5.0] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + t.integer :available_inventory, default: 0 + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..25e53d258 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,41 @@ +# 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: 20170509204837) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.integer "movies_checked_out_count", default: 0 + 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.string "release_date" + t.integer "inventory" + t.integer "available_inventory", default: 0 + 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..dc3ee79b5 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/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 a5ae7f93f1c768af91dbb5fbb49a94cfb2b35cc4 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Tue, 9 May 2017 14:00:31 -0700 Subject: [PATCH 03/36] created test structure for models --- test/models/customer_test.rb | 36 ++++++++++++++++++++++++++++++++++-- test/models/movie_test.rb | 22 +++++++++++++++++++++- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..b647a1313 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -3,7 +3,39 @@ describe Customer do let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? + it "you can create a customer" do + + end + + it "won't create customer without name" do + + end + + it "won't create customer without registered_at" do + + end + + it "won't create customer without postal_code" do + + end + + it "won't create customer without phone" do + + end + + it "won't create customer without movies_checked_out_count" do + + end + + it "creates customer without address" do + + end + + it "creates customer without city" do + + end + + it "creates customer without state" do + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..f301158a5 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,7 +3,27 @@ describe Movie do let(:movie) { Movie.new } - it "must be valid" do + it "creates a movie" do value(movie).must_be :valid? end + + it "won't create movie without title" do + + end + + it "won't create movie without release_date" do + + end + + it "won't create movie without overview" do + + end + + it "won't create movie without inventory" do + + end + + it "won't create movie without available_inventory" do + + end end From 4026896b6b32279134868970fbf28c974d8e5ea3 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Tue, 9 May 2017 14:28:14 -0700 Subject: [PATCH 04/36] pseudocoded routes --- config/routes.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..3af4936d4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,9 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + + # GET '/customers', to: 'customers#index', as 'customers' ## no further params needed + # GET '/movies', to: 'movies#index', as 'movies' ## no further params needed + # GET '/movies/:title', to: 'movies#show', as 'movie' ## must provide movie title + end From 9d4e42b1ad82d713688671731284501f54c337df Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Tue, 9 May 2017 14:30:47 -0700 Subject: [PATCH 05/36] added simplecov --- .gitignore | 1 + Gemfile | 1 + Gemfile.lock | 8 ++++++++ test/test_helper.rb | 5 +++++ 4 files changed, 15 insertions(+) diff --git a/.gitignore b/.gitignore index 48fb168f6..10740c11c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ # Ignore Byebug command history file. .byebug_history +coverage diff --git a/Gemfile b/Gemfile index 23eb702b4..9d619d2ba 100644 --- a/Gemfile +++ b/Gemfile @@ -52,4 +52,5 @@ gem 'foundation-rails' group :test do gem 'minitest-rails' gem 'minitest-reporters' + gem 'simplecov' end diff --git a/Gemfile.lock b/Gemfile.lock index afab7a239..85f3431f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,6 +57,7 @@ GEM coderay (1.1.1) concurrent-ruby (1.0.5) debug_inspector (0.0.3) + docile (1.1.5) erubis (2.7.0) execjs (2.7.0) ffi (1.9.18) @@ -67,6 +68,7 @@ GEM globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.1) + json (2.0.3) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -137,6 +139,11 @@ GEM ruby-graphviz (1.2.3) ruby-progressbar (1.8.1) sass (3.4.23) + simplecov (0.13.0) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) slop (3.6.0) spring (2.0.1) activesupport (>= 4.2) @@ -179,6 +186,7 @@ DEPENDENCIES puma (~> 3.0) rails (~> 5.0.2) rails-erd + simplecov spring spring-watcher-listen (~> 2.0.0) tzinfo-data diff --git a/test/test_helper.rb b/test/test_helper.rb index 10594a324..a18f02619 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,9 +1,14 @@ +require "simplecov" +SimpleCov.start + 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, From b6fe999829a92daf72dabad07b60420cffa830fe Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Tue, 9 May 2017 14:36:32 -0700 Subject: [PATCH 06/36] added column to customers --- .../20170509213301_add_account_credit_column_to_customer.rb | 6 ++++++ db/schema.rb | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20170509213301_add_account_credit_column_to_customer.rb diff --git a/db/migrate/20170509213301_add_account_credit_column_to_customer.rb b/db/migrate/20170509213301_add_account_credit_column_to_customer.rb new file mode 100644 index 000000000..df9e21869 --- /dev/null +++ b/db/migrate/20170509213301_add_account_credit_column_to_customer.rb @@ -0,0 +1,6 @@ +class AddAccountCreditColumnToCustomer < ActiveRecord::Migration[5.0] + def change + + add_column :customers, :account_credit, :float + end +end diff --git a/db/schema.rb b/db/schema.rb index 25e53d258..3b1bca124 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: 20170509204837) do +ActiveRecord::Schema.define(version: 20170509213301) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -26,6 +26,7 @@ t.integer "movies_checked_out_count", default: 0 t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.float "account_credit" end create_table "movies", force: :cascade do |t| From ade5867396c4b4a9eaf06c8019ef19188a7fdfe4 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Tue, 9 May 2017 14:45:35 -0700 Subject: [PATCH 07/36] added model fixtures --- test/fixtures/customers.yml | 23 ++++++++++++++++++----- test/fixtures/movies.yml | 20 +++++++++++++++----- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index dc3ee79b5..d4f317e9d 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -4,8 +4,21 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +bare_minimum: + name: "Jou-Jou" + registered_at: "June 10th, 2015" + postal_code: 98136 + phone: "555-555-5555" + movies_checked_out_count: 0 + +has_all: + name: "Jou-Jou" + registered_at: "June 10th, 2015" + address: "555 Some Street" + city: "Seattle" + state: "WA" + postal_code: 98136 + phone: "555-555-5555" + movies_checked_out_count: 0 + + diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index dc3ee79b5..3bf22050b 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,18 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +dumbo: + title: "Dumbo" + overview: "cute baby elephant" + release_date: "1980" + inventory: 0 + available_inventory: 0 + + +heat: + title: "Heat" + overview: "Al Pacino being hot" + release_date: "1995" + inventory: 0 + available_inventory: 0 + From 88947cbcd111fd5e1b4fd46f04c2d5ea9fe7a6de Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Tue, 9 May 2017 15:05:09 -0700 Subject: [PATCH 08/36] created movies controller, added route for zomg action and added zomg json response --- app/controllers/movies_controller.rb | 5 ++ app/models/customer.rb | 1 + config/routes.rb | 8 +-- test/controllers/movies_controller_test.rb | 7 +++ test/models/customer_test.rb | 69 ++++++++++++---------- 5 files changed, 54 insertions(+), 36 deletions(-) create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..f5fe0a9a2 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,5 @@ +class MoviesController < ApplicationController + def zomg + render json: {hungry: "It works"} + end +end diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..a62356cd9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + validates :name, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 3af4936d4..62b74ad1e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,9 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get "/zomg", to: "movies#zomg", as: "zomg" + # get '/customers', to: 'customers#index', as 'customers' ## no further params needed + # get '/movies', to: 'movies#index', as 'movies' ## no further params needed + # get '/movies/:title', to: 'movies#show', as 'movie' ## must provide movie title - # GET '/customers', to: 'customers#index', as 'customers' ## no further params needed - # GET '/movies', to: 'movies#index', as 'movies' ## no further params needed - # GET '/movies/:title', to: 'movies#show', as 'movie' ## must provide movie title - end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index b647a1313..6e3c91944 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,41 +1,46 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + # let(:customer) { Customer.new } it "you can create a customer" do - + customer = Customer.new + customer.valid?.must_equal true end it "won't create customer without name" do - - end - - it "won't create customer without registered_at" do - - end - - it "won't create customer without postal_code" do - - end - - it "won't create customer without phone" do - - end - - it "won't create customer without movies_checked_out_count" do - - end - - it "creates customer without address" do - - end - - it "creates customer without city" do - - end - - it "creates customer without state" do - - end + customer = customers(:bare_minimum) + customer.name = "" + + customer.valid?.must_equal false + customer.errors.messages.must_include :name + end + + # it "won't create customer without registered_at" do + # + # end + # + # it "won't create customer without postal_code" do + # + # end + # + # it "won't create customer without phone" do + # + # end + # + # it "won't create customer without movies_checked_out_count" do + # + # end + # + # it "creates customer without address" do + # + # end + # + # it "creates customer without city" do + # + # end + # + # it "creates customer without state" do + # + # end end From e7c6c3bb30751c759f18b5be047d71a1c824df23 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Tue, 9 May 2017 15:14:10 -0700 Subject: [PATCH 09/36] added tests for customer validations --- app/models/customer.rb | 4 ++ test/models/customer_test.rb | 98 ++++++++++++++++++++++-------------- 2 files changed, 65 insertions(+), 37 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index a62356cd9..5e3aa1363 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,7 @@ class Customer < ApplicationRecord validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + validates :movies_checked_out_count, presence: true end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 6e3c91944..fca3f5f42 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,46 +1,70 @@ require "test_helper" describe Customer do + describe "validations" do # let(:customer) { Customer.new } - it "you can create a customer" do - customer = Customer.new - customer.valid?.must_equal true - end + it "you can create a customer" do + customer = Customer.new + customer.valid?.must_equal true + end - it "won't create customer without name" do - customer = customers(:bare_minimum) - customer.name = "" + it "won't create customer without name" do + customer = customers(:bare_minimum) + customer.name = "" - customer.valid?.must_equal false - customer.errors.messages.must_include :name - end + customer.valid?.must_equal false + customer.errors.messages.must_include :name + end + + it "won't create customer without registered_at" do + customer = customers(:bare_minimum) + customer.registered_at = "" + + customer.valid?.must_equal false + customer.errors.messages.must_include :registered_at + end + + it "won't create customer without postal_code" do + customer = customers(:bare_minimum) + customer.postal_code = "" + + customer.valid?.must_equal false + customer.errors.messages.must_include :postal_code + end + + it "won't create customer without phone" do + customer = customers(:bare_minimum) + customer.phone = "" - # it "won't create customer without registered_at" do - # - # end - # - # it "won't create customer without postal_code" do - # - # end - # - # it "won't create customer without phone" do - # - # end - # - # it "won't create customer without movies_checked_out_count" do - # - # end - # - # it "creates customer without address" do - # - # end - # - # it "creates customer without city" do - # - # end - # - # it "creates customer without state" do - # - # end + customer.valid?.must_equal false + customer.errors.messages.must_include :phone + end + + it "won't create customer without movies_checked_out_count" do + customer = customers(:bare_minimum) + customer.movies_checked_out_count = nil + + customer.valid?.must_equal false + customer.errors.messages.must_include :movies_checked_out_count + end + + it "creates customer without address" do + customer = customers("has_all") + customer.address = "" + customer.valid?.must_equal true + end + + it "creates customer without city" do + customer = customers("has_all") + customer.city = "" + customer.valid?.must_equal true + end + + it "creates customer without state" do + customer = customers("has_all") + customer.state = "" + customer.valid?.must_equal true + end + end end From 72b597ee1fc88eb9bd6c905927ff1e26d0bf15bf Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Tue, 9 May 2017 15:16:50 -0700 Subject: [PATCH 10/36] fixed one failing test --- test/models/customer_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index fca3f5f42..00baceb4a 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -5,7 +5,7 @@ # let(:customer) { Customer.new } it "you can create a customer" do - customer = Customer.new + customer = customers(:bare_minimum) customer.valid?.must_equal true end From e5e4bf25204e35b1e770e7c09ecfd8d0d15ab166 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Tue, 9 May 2017 15:32:38 -0700 Subject: [PATCH 11/36] all model validations tests passing --- app/models/movie.rb | 6 +++ test/models/movie_test.rb | 104 +++++++++++++++++++++++++++++++++----- 2 files changed, 97 insertions(+), 13 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..781e00a52 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,8 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :release_date, presence: true + validates :overview, presence: true + validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f301158a5..784453493 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,29 +1,107 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + describe "validations" do - it "creates a movie" do - value(movie).must_be :valid? - end + it "creates a movie" do + movie = movies(:dumbo) + movie.valid?.must_equal true + end - it "won't create movie without title" do + it "won't create movie without title" do + movie = movies(:dumbo) + movie.title = "" - end + movie.valid?.must_equal false + movie.errors.messages.must_include :title + end - it "won't create movie without release_date" do + it "won't create movie without release_date" do + movie = movies(:dumbo) + movie.release_date = "" - end + movie.valid?.must_equal false + movie.errors.messages.must_include :release_date + end - it "won't create movie without overview" do + it "won't create movie without overview" do + movie = movies(:dumbo) + movie.overview = "" - end + movie.valid?.must_equal false + movie.errors.messages.must_include :overview + end - it "won't create movie without inventory" do + it "won't create movie without inventory" do + movie = movies(:dumbo) + movie.inventory = nil - end + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + + it "inventory must be an integer" do + movie = movies(:dumbo) + + movie.inventory = "five" + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + + it "inventory must not be lt 0" do + movie = movies(:dumbo) + + movie.inventory = -1 + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + + it "inventory can be 0" do + movie = movies(:dumbo) + + movie.inventory = 0 + movie.valid?.must_equal true + end + + it "inventory can be more than 0" do + movie = movies(:dumbo) + + movie.inventory = 1 + movie.valid?.must_equal true + end + + + it "won't create movie without available_inventory" do + movie = movies(:dumbo) + movie.available_inventory = nil + + movie.valid?.must_equal false + movie.errors.messages.must_include :available_inventory + end + + it "available_inventory must not be lt 0" do + movie = movies(:dumbo) + + movie.available_inventory = -1 + movie.valid?.must_equal false + movie.errors.messages.must_include :available_inventory + end + + it "available_inventory can be 0" do + movie = movies(:dumbo) + + movie.available_inventory = 0 + movie.valid?.must_equal true + end + + it "available_inventory can be more than 0" do + movie = movies(:dumbo) + + movie.available_inventory = 1 + movie.valid?.must_equal true + end - it "won't create movie without available_inventory" do end + end From e38285737ee831994c07ee50170bda86b8486344 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Tue, 9 May 2017 15:38:06 -0700 Subject: [PATCH 12/36] added some validations for customer model --- app/models/customer.rb | 2 +- test/models/customer_test.rb | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 5e3aa1363..0e480beb8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,5 +3,5 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :postal_code, presence: true validates :phone, presence: true - validates :movies_checked_out_count, presence: true + validates :movies_checked_out_count, presence: true, numericality: {only_integer: true, greater_than_or_equal_to: 0} end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 00baceb4a..b81029f7b 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -49,6 +49,36 @@ customer.errors.messages.must_include :movies_checked_out_count end + it "movies_checked_out_count must be integer" do + customer = customers(:bare_minimum) + customer.movies_checked_out_count = "three" + + customer.valid?.must_equal false + customer.errors.messages.must_include :movies_checked_out_count + end + + it "movies_checked_out_count can't be lt 0" do + customer = customers(:bare_minimum) + customer.movies_checked_out_count = -1 + + customer.valid?.must_equal false + customer.errors.messages.must_include :movies_checked_out_count + end + + it "movies_checked_out_count can be 0" do + customer = customers(:bare_minimum) + customer.movies_checked_out_count = 0 + + customer.valid?.must_equal true + end + + it "movies_checked_out_count can be >= 0" do + customer = customers(:bare_minimum) + customer.movies_checked_out_count = 1 + + customer.valid?.must_equal true + end + it "creates customer without address" do customer = customers("has_all") customer.address = "" From 775cc353a9b6242cc41e576d83d4cea240429da7 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Tue, 9 May 2017 16:14:27 -0700 Subject: [PATCH 13/36] created controller for customers, added tests for movies index --- app/controllers/customers_controller.rb | 6 ++ config/routes.rb | 6 +- test/controllers/customers_controller_test.rb | 24 ++++++++ test/controllers/movies_controller_test.rb | 61 ++++++++++++++++++- 4 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..df2a72ca1 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,6 @@ +class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customers.as_json(only: [:name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + end +end diff --git a/config/routes.rb b/config/routes.rb index 62b74ad1e..54677473d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,8 +2,8 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get "/zomg", to: "movies#zomg", as: "zomg" - # get '/customers', to: 'customers#index', as 'customers' ## no further params needed - # get '/movies', to: 'movies#index', as 'movies' ## no further params needed - # get '/movies/:title', to: 'movies#show', as 'movie' ## must provide movie title + get '/customers', to: 'customers#index', as: 'customers' ## no further params needed + get '/movies', to: 'movies#index', as: 'movies' ## no further params needed + # get '/movies/:title', to: 'movies#show', as: 'movie' ## must provide movie title end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..d1edb7401 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,24 @@ +require "test_helper" + +describe CustomersController do + KEYS = %w(movies_checked_out_count name phone postal_code registered_at) + + describe "index" do + it "gets list of customers" do + get customers_path + must_respond_with :success + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal KEYS + end + end + + it "returns an empty array if no customers" do + Customer.delete_all + get customers_path + must_respond_with :success + body = JSON.parse(response.body) + body.must_equal [] + end + end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..47f70a711 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,62 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + KEYS = %w(available_inventory inventory overview release_date title) + + describe "index" do + it "is a real working route" do + get movies_path + must_respond_with :success + end + + it "returns an array" do + get movies_path + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + get movies_path + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns a json" do + get movies_path + repsonse.header['Content-Type'].must_include 'json' + end + + it "returns movies with exactly the required fields" do + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal KEYS + end + end + + it "returns an empty array if no movies" do + Movie.delete_all + get movies_path + body = JSON.parse(response.body) + body.must_equal [] + end + end + + describe "show" do + it "gets a single movie" do + + end + + it "returns a json object specific to not found" do + + end + + it "gets the correct movie" do + + end + + it "retuning the right keys" do + + end + end end From f65fcfed4cf86277ff13e1405213161469bee360 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Tue, 9 May 2017 16:24:15 -0700 Subject: [PATCH 14/36] added test for customers index action --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 5 ++++ test/controllers/customers_controller_test.rb | 26 +++++++++++++++++-- test/controllers/movies_controller_test.rb | 2 +- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index df2a72ca1..6116c28ef 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f5fe0a9a2..e75391f70 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,4 +2,9 @@ class MoviesController < ApplicationController def zomg render json: {hungry: "It works"} end + + def index + movies = Movie.all + render json: movies.as_json(except: [:created_at, :updated_at, :id]), status: :ok + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index d1edb7401..688a6dc8e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,10 +1,32 @@ require "test_helper" describe CustomersController do - KEYS = %w(movies_checked_out_count name phone postal_code registered_at) + KEYS = %w(id movies_checked_out_count name phone postal_code registered_at) describe "index" do - it "gets list of customers" do + it "is a real working route" do + get customers_path + must_respond_with :success + end + + it "returns a json" do + get customers_path + response.header['Content-Type'].must_include 'json' + end + + it "returns an array" do + get customers_path + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all the customers" do + get customers_path + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do get customers_path must_respond_with :success body = JSON.parse(response.body) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 47f70a711..e2d6334c2 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -23,7 +23,7 @@ it "returns a json" do get movies_path - repsonse.header['Content-Type'].must_include 'json' + response.header['Content-Type'].must_include 'json' end it "returns movies with exactly the required fields" do From 48815da7163083d34f732ca97de888925a1b0242 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Tue, 9 May 2017 16:48:12 -0700 Subject: [PATCH 15/36] all movie controller show tests passing --- app/controllers/movies_controller.rb | 14 ++++++++--- config/routes.rb | 3 +-- test/controllers/customers_controller_test.rb | 4 ++-- test/controllers/movies_controller_test.rb | 23 +++++++++++++++---- 4 files changed, 33 insertions(+), 11 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e75391f70..6d40d6deb 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,10 +1,18 @@ class MoviesController < ApplicationController - def zomg - render json: {hungry: "It works"} - end def index movies = Movie.all render json: movies.as_json(except: [:created_at, :updated_at, :id]), status: :ok end + + def show + movie = Movie.find_by_title(params[:title]) + + if movie + render json: movie.as_json(except: [:created_at, :updated_at, :id]), status: :ok + else + render json: {nothing: true}, status: :not_found + end + + end end diff --git a/config/routes.rb b/config/routes.rb index 54677473d..4c54a3e08 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,8 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html - get "/zomg", to: "movies#zomg", as: "zomg" get '/customers', to: 'customers#index', as: 'customers' ## no further params needed get '/movies', to: 'movies#index', as: 'movies' ## no further params needed - # get '/movies/:title', to: 'movies#show', as: 'movie' ## must provide movie title + get '/movies/:title', to: 'movies#show', as: 'movie' ## must provide movie title end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 688a6dc8e..696055182 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - KEYS = %w(id movies_checked_out_count name phone postal_code registered_at) + CUSTOMER_KEYS = %w(id movies_checked_out_count name phone postal_code registered_at) describe "index" do it "is a real working route" do @@ -31,7 +31,7 @@ must_respond_with :success body = JSON.parse(response.body) body.each do |customer| - customer.keys.sort.must_equal KEYS + customer.keys.sort.must_equal CUSTOMER_KEYS end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index e2d6334c2..f5b2bc319 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe MoviesController do - KEYS = %w(available_inventory inventory overview release_date title) + MOVIE_KEYS = %w(available_inventory inventory overview release_date title) describe "index" do it "is a real working route" do @@ -30,7 +30,7 @@ get movies_path body = JSON.parse(response.body) body.each do |movie| - movie.keys.sort.must_equal KEYS + movie.keys.sort.must_equal MOVIE_KEYS end end @@ -44,19 +44,34 @@ describe "show" do it "gets a single movie" do - + get movie_path(movies(:dumbo).title) + must_respond_with :success end it "returns a json object specific to not found" do + get movie_path("2;i5h23;kj5h23;jk5h23;lk5hj") + must_respond_with :not_found + body = JSON.parse(response.body) + body.must_equal "nothing" => true end it "gets the correct movie" do + get movie_path(movies(:dumbo).title) + body = JSON.parse(response.body) + MOVIE_KEYS.each do |key| + body[key].must_equal movies(:dumbo)[key] + end end - it "retuning the right keys" do + it "returning the right keys" do + get movie_path(movies(:dumbo).title) + must_respond_with :success + body = JSON.parse(response.body) + body.keys.sort.must_equal MOVIE_KEYS end end + end From a151344a9c7b078b306fced39352cb8cb1db2de7 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Tue, 9 May 2017 17:00:55 -0700 Subject: [PATCH 16/36] added error message for json returned when no movie found with that title --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6d40d6deb..9ed387771 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -11,7 +11,7 @@ def show if movie render json: movie.as_json(except: [:created_at, :updated_at, :id]), status: :ok else - render json: {nothing: true}, status: :not_found + render json: {errors: {"title": ["Movie '#{params[:title]}' not found"]} }, status: :not_found end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f5b2bc319..0019716c7 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -53,7 +53,7 @@ must_respond_with :not_found body = JSON.parse(response.body) - body.must_equal "nothing" => true + body.must_equal "errors" => { 'title' => ["Movie '2;i5h23;kj5h23;jk5h23;lk5hj' not found"]} end it "gets the correct movie" do From 4a02069b0d6a9d0fa008651e72b5b747258c6645 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Tue, 9 May 2017 17:17:31 -0700 Subject: [PATCH 17/36] added the error for title not found and no movies found --- app/controllers/movies_controller.rb | 17 ++++++++++++++++- test/controllers/movies_controller_test.rb | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 9ed387771..10160505d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,8 +1,23 @@ class MoviesController < ApplicationController def index + # movies = Movie.all + # count = Movie.count + # response = {} + # response["movies"] = movies + # response["count"] = count + # if !movies.empty? + # render json: response.as_json(except: [:created_at, :updated_at, :id]), status: :ok + # else + # render json: {count: Movie.count} + # end + movies = Movie.all - render json: movies.as_json(except: [:created_at, :updated_at, :id]), status: :ok + if !movies.empty? + render json: movies.as_json(except: [:created_at, :updated_at, :id]), status: :ok + else + render json: {count: Movie.count} + end end def show diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 0019716c7..5213f71b7 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -38,7 +38,7 @@ Movie.delete_all get movies_path body = JSON.parse(response.body) - body.must_equal [] + body.must_equal "count" => 0 end end From c0756242ff0bd9bc2dea69680f5322918a9ca715 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Wed, 10 May 2017 13:34:40 -0700 Subject: [PATCH 18/36] added default for available inventory, added rentals model and counter cache for rentals checked out --- app/models/customer.rb | 4 ++- app/models/movie.rb | 9 +++++++ app/models/rental.rb | 6 +++++ db/migrate/20170510193914_create_rentals.rb | 8 ++++++ ...0510194306_add_relationships_to_rentals.rb | 8 ++++++ ...e_default_value_for_available_inventory.rb | 5 ++++ ..._default_for_available_inventory_a_gain.rb | 5 ++++ ...0170510201715_trying_again_with_default.rb | 5 ++++ db/schema.rb | 26 ++++++++++++++----- test/fixtures/rentals.yml | 11 ++++++++ test/models/rental_test.rb | 9 +++++++ 11 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20170510193914_create_rentals.rb create mode 100644 db/migrate/20170510194306_add_relationships_to_rentals.rb create mode 100644 db/migrate/20170510195116_change_default_value_for_available_inventory.rb create mode 100644 db/migrate/20170510200626_set_default_for_available_inventory_a_gain.rb create mode 100644 db/migrate/20170510201715_trying_again_with_default.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 0e480beb8..2bb89c606 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,5 +3,7 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :postal_code, presence: true validates :phone, presence: true - validates :movies_checked_out_count, presence: true, numericality: {only_integer: true, greater_than_or_equal_to: 0} + validates :rentals_count, presence: true, numericality: {only_integer: true, greater_than_or_equal_to: 0} + + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index 781e00a52..874b79488 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,8 +1,17 @@ class Movie < ApplicationRecord + after_initialize :set_available_inventory_default validates :title, presence: true validates :release_date, presence: true validates :overview, presence: true validates :inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } + has_many :rentals + + + private + + def set_available_inventory_default + self.available_inventory = self.inventory + end end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..452156294 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,6 @@ +class Rental < ApplicationRecord + + belongs_to :movie + belongs_to :customer, counter_cache: true + +end diff --git a/db/migrate/20170510193914_create_rentals.rb b/db/migrate/20170510193914_create_rentals.rb new file mode 100644 index 000000000..8b6a32dbb --- /dev/null +++ b/db/migrate/20170510193914_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[5.0] + def change + create_table :rentals do |t| + t.date :duedate + t.timestamps + end + end +end diff --git a/db/migrate/20170510194306_add_relationships_to_rentals.rb b/db/migrate/20170510194306_add_relationships_to_rentals.rb new file mode 100644 index 000000000..eca95f530 --- /dev/null +++ b/db/migrate/20170510194306_add_relationships_to_rentals.rb @@ -0,0 +1,8 @@ +class AddRelationshipsToRentals < ActiveRecord::Migration[5.0] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true + remove_column :customers, :movies_checked_out_count + add_column :customers, :rentals_count, :integer, default: 0 + end +end diff --git a/db/migrate/20170510195116_change_default_value_for_available_inventory.rb b/db/migrate/20170510195116_change_default_value_for_available_inventory.rb new file mode 100644 index 000000000..026435c30 --- /dev/null +++ b/db/migrate/20170510195116_change_default_value_for_available_inventory.rb @@ -0,0 +1,5 @@ +class ChangeDefaultValueForAvailableInventory < ActiveRecord::Migration[5.0] + def change + change_column :movies, :available_inventory, :integer, default: :inventory + end +end diff --git a/db/migrate/20170510200626_set_default_for_available_inventory_a_gain.rb b/db/migrate/20170510200626_set_default_for_available_inventory_a_gain.rb new file mode 100644 index 000000000..8d0b6d3d1 --- /dev/null +++ b/db/migrate/20170510200626_set_default_for_available_inventory_a_gain.rb @@ -0,0 +1,5 @@ +class SetDefaultForAvailableInventoryAGain < ActiveRecord::Migration[5.0] + def change + change_column :movies, :available_inventory, :integer, default: :inventory + end +end diff --git a/db/migrate/20170510201715_trying_again_with_default.rb b/db/migrate/20170510201715_trying_again_with_default.rb new file mode 100644 index 000000000..00ea182d2 --- /dev/null +++ b/db/migrate/20170510201715_trying_again_with_default.rb @@ -0,0 +1,5 @@ +class TryingAgainWithDefault < ActiveRecord::Migration[5.0] + def change + change_column_default :movies, :available_inventory, :inventory + end +end diff --git a/db/schema.rb b/db/schema.rb index 3b1bca124..56249814e 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: 20170509213301) do +ActiveRecord::Schema.define(version: 20170510201715) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -23,10 +23,10 @@ t.string "state" t.string "postal_code" t.string "phone" - t.integer "movies_checked_out_count", default: 0 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.float "account_credit" + t.integer "rentals_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -34,9 +34,21 @@ t.string "overview" t.string "release_date" t.integer "inventory" - t.integer "available_inventory", default: 0 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.integer "available_inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.date "duedate" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "customer_id" + t.integer "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id", using: :btree + t.index ["movie_id"], name: "index_rentals_on_movie_id", using: :btree + end + + 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..dc3ee79b5 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/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 cde70e1f7b421537bdaf873074f65ada9874d57b Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Wed, 10 May 2017 15:19:04 -0700 Subject: [PATCH 19/36] created tests for rentals model --- app/models/rental.rb | 2 +- test/fixtures/customers.yml | 6 ++---- test/fixtures/rentals.yml | 14 +++++++++----- test/models/rental_test.rb | 33 +++++++++++++++++++++++++++++++-- 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 452156294..f2a58516a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,6 +1,6 @@ class Rental < ApplicationRecord - belongs_to :movie belongs_to :customer, counter_cache: true + validates :duedate, presence: true end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index d4f317e9d..34c904d3f 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -9,7 +9,7 @@ bare_minimum: registered_at: "June 10th, 2015" postal_code: 98136 phone: "555-555-5555" - movies_checked_out_count: 0 + rentals_count: 0 has_all: name: "Jou-Jou" @@ -19,6 +19,4 @@ has_all: state: "WA" postal_code: 98136 phone: "555-555-5555" - movies_checked_out_count: 0 - - + rentals_count: 0 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index dc3ee79b5..5a9e172ff 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -4,8 +4,12 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +rental_one: + customer: has_all + movie: dumbo + duedate: 2017-07-12 + +rental_two: + customer: bare_minimum + movie: heat + duedate: 2017-08-13 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..5a64e1446 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -3,7 +3,36 @@ describe Rental do let(:rental) { Rental.new } - it "must be valid" do - value(rental).must_be :valid? + describe "validations" do + it "creates a rental" do + rental = rentals(:rental_one) + rental.valid?.must_equal true + end + + it "won't create rental without duedate" do + rental = rentals(:rental_two) + rental.duedate = nil + rental.valid?.must_equal false + rental.errors.messages.must_include :duedate + end + end + + describe "relationships" do + it "has a customer" do + rental = rentals(:rental_one) + rental.customer.must_equal customers(:has_all) + + rental.customer = customers(:bare_minimum) + rental.customer.must_equal customers(:bare_minimum) + end + + it "has a movie" do + rental = rentals(:rental_two) + rental.movie.must_equal movies(:heat) + + rental.movie = movies(:dumbo) + rental.movie.must_equal movies(:dumbo) + + end end end From 14b7024e6718bc608c5914a31931f7a9f1af6ceb Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Wed, 10 May 2017 15:25:59 -0700 Subject: [PATCH 20/36] created routes for rentals --- config/routes.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 4c54a3e08..6e61f7869 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,4 +5,8 @@ get '/movies', to: 'movies#index', as: 'movies' ## no further params needed get '/movies/:title', to: 'movies#show', as: 'movie' ## must provide movie title + post '/rentals/:title/check-out', to: 'rentals#create', as: 'check-out' + post '/rentals/:title/check-in', to: 'rentals#update', as: 'check-in' + get '/rentals/overdue', to: 'rentals#index', as: 'overdue' + end From 88109e49047b115d9c25b9149231233972f7973d Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Wed, 10 May 2017 15:36:45 -0700 Subject: [PATCH 21/36] created rentals controller, added index, create and update actions with pseudocode and created overdue custom method --- app/controllers/rentals_controller.rb | 20 ++++++++++++++++++++ app/models/rental.rb | 4 ++++ test/controllers/rentals_controller_test.rb | 7 +++++++ test/fixtures/rentals.yml | 5 +++++ 4 files changed, 36 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..e4c518a46 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,20 @@ +class RentalsController < ApplicationController + def index + # lists all customers with overdue movies + # returns title, customer_id, name, post_code, checkout date, duedate + end + + def create + # must be given title, customer_id, duedate + # returns confirmation + # set the duedate + # updates movies available inventory + end + + def update + # must be give customer_id, title + # returns confirmation + # rest duedate to nil + # updates movies available inventory + end +end diff --git a/app/models/rental.rb b/app/models/rental.rb index f2a58516a..ada861ff0 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,4 +3,8 @@ class Rental < ApplicationRecord belongs_to :customer, counter_cache: true validates :duedate, presence: true + + def overdue? + Date.parse(self.duedate) < Date.today + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 5a9e172ff..4e2ab3c43 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -13,3 +13,8 @@ rental_two: customer: bare_minimum movie: heat duedate: 2017-08-13 + +rental_overdue: + customer: has_all + movie: heat + duedate: 2017-03-26 From 08f5142510614f40b6bd2046064f8dc415f0f728 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Thu, 11 May 2017 09:58:48 -0700 Subject: [PATCH 22/36] fixed tests --- app/controllers/customers_controller.rb | 2 +- app/models/rental.rb | 2 +- test/controllers/customers_controller_test.rb | 13 +++++----- test/controllers/movies_controller_test.rb | 11 ++++---- test/models/customer_test.rb | 26 +++++++++---------- test/models/rental_test.rb | 7 +++++ 6 files changed, 35 insertions(+), 26 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6116c28ef..1d822228f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :rentals_count]), status: :ok end end diff --git a/app/models/rental.rb b/app/models/rental.rb index ada861ff0..8502d5652 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -5,6 +5,6 @@ class Rental < ApplicationRecord validates :duedate, presence: true def overdue? - Date.parse(self.duedate) < Date.today + Date.parse(self.duedate.to_s) < Date.today end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 696055182..e539dd702 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - CUSTOMER_KEYS = %w(id movies_checked_out_count name phone postal_code registered_at) + CUSTOMER_KEYS = %w(id name phone postal_code registered_at rentals_count) describe "index" do it "is a real working route" do @@ -36,11 +36,12 @@ end it "returns an empty array if no customers" do - Customer.delete_all - get customers_path - must_respond_with :success - body = JSON.parse(response.body) - body.must_equal [] + proc { + Customer.delete_all + get customers_path + must_respond_with :success + body = JSON.parse(response.body) + body.must_equal [] } end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 5213f71b7..b4fcc9df0 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -34,11 +34,12 @@ end end - it "returns an empty array if no movies" do - Movie.delete_all - get movies_path - body = JSON.parse(response.body) - body.must_equal "count" => 0 + it "returns a json with count 0 if no movies" do + proc { + Movie.delete_all + get movies_path + body = JSON.parse(response.body) + body.must_equal "count" => 0 } end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index b81029f7b..3492c5cd3 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -41,40 +41,40 @@ customer.errors.messages.must_include :phone end - it "won't create customer without movies_checked_out_count" do + it "won't create customer without rentals_count" do customer = customers(:bare_minimum) - customer.movies_checked_out_count = nil + customer.rentals_count = nil customer.valid?.must_equal false - customer.errors.messages.must_include :movies_checked_out_count + customer.errors.messages.must_include :rentals_count end - it "movies_checked_out_count must be integer" do + it "rentals_count must be integer" do customer = customers(:bare_minimum) - customer.movies_checked_out_count = "three" + customer.rentals_count = "three" customer.valid?.must_equal false - customer.errors.messages.must_include :movies_checked_out_count + customer.errors.messages.must_include :rentals_count end - it "movies_checked_out_count can't be lt 0" do + it "rentals_count can't be lt 0" do customer = customers(:bare_minimum) - customer.movies_checked_out_count = -1 + customer.rentals_count = -1 customer.valid?.must_equal false - customer.errors.messages.must_include :movies_checked_out_count + customer.errors.messages.must_include :rentals_count end - it "movies_checked_out_count can be 0" do + it "rentals_count can be 0" do customer = customers(:bare_minimum) - customer.movies_checked_out_count = 0 + customer.rentals_count = 0 customer.valid?.must_equal true end - it "movies_checked_out_count can be >= 0" do + it "rentals_count can be >= 0" do customer = customers(:bare_minimum) - customer.movies_checked_out_count = 1 + customer.rentals_count = 1 customer.valid?.must_equal true end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 5a64e1446..1a3746d4c 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -35,4 +35,11 @@ end end + + describe "overdue?" do + it "returns true if rental is overdue" do + rental = rentals(:rental_overdue) + rental.overdue?.must_equal true + end + end end From 3ea78a306b05df29b067a56c5f6c70a4caaaee41 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Thu, 11 May 2017 10:13:27 -0700 Subject: [PATCH 23/36] added column to rentals with boolean for returned or not --- app/controllers/rentals_controller.rb | 3 +- .../20170511171210_add_returned_to_rentals.rb | 5 ++ db/schema.rb | 7 +- test/controllers/rentals_controller_test.rb | 76 ++++++++++++++++++- test/fixtures/rentals.yml | 3 + 5 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20170511171210_add_returned_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index e4c518a46..68b3bf5a5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -7,6 +7,7 @@ def index def create # must be given title, customer_id, duedate # returns confirmation + # returned is false # set the duedate # updates movies available inventory end @@ -14,7 +15,7 @@ def create def update # must be give customer_id, title # returns confirmation - # rest duedate to nil + # returned updates to true # updates movies available inventory end end diff --git a/db/migrate/20170511171210_add_returned_to_rentals.rb b/db/migrate/20170511171210_add_returned_to_rentals.rb new file mode 100644 index 000000000..d2684c3be --- /dev/null +++ b/db/migrate/20170511171210_add_returned_to_rentals.rb @@ -0,0 +1,5 @@ +class AddReturnedToRentals < ActiveRecord::Migration[5.0] + def change + add_column :rentals, :returned, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 56249814e..6875471d5 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: 20170510201715) do +ActiveRecord::Schema.define(version: 20170511171210) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -41,10 +41,11 @@ create_table "rentals", force: :cascade do |t| t.date "duedate" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "customer_id" t.integer "movie_id" + t.boolean "returned", default: false t.index ["customer_id"], name: "index_rentals_on_customer_id", using: :btree t.index ["movie_id"], name: "index_rentals_on_movie_id", using: :btree end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..f07d8df74 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,77 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + + describe "index" do + # each customer in the response body should have the following keys + CUSTOMER_KEYS = %w( customer_id name postal_code rentals ) + # each rental in the rentals key/value pair (value is an array of rentals) has these three keys + RENTAL_KEYS = %w( created_at duedate title ) + + it "can get a list of customers" do + + end + + it "customers each have the CUSTOMER_KEYS" do + + end + + it "all customers have at least one rental in their rentals array" do + + end + + it "all rentals have the RENTAL_KEYS" do + + end + + it "all rentals in each customer's rentals array are overdue" do + + end + + it "returns a specific message if no overdue rentals" do + + end + + end + + describe "create" do + it "must have title" do + + end + + it "must have customer_id" do + + end + + it "must have duedate" do + + end + + it "updates the available inventory for the assoc. movie" do + + end + + it "returns a confirmation hash" do + # what should this look like? + end + + end + + describe "update" do + it "must have customer_id" do + + end + + it "must have title" do + + end + + it "returns a confirmation hash" do + # what should this look like? + end + + it "resets duedate to nil" + + end + end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 4e2ab3c43..ca8058be6 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -8,13 +8,16 @@ rental_one: customer: has_all movie: dumbo duedate: 2017-07-12 + returned: false rental_two: customer: bare_minimum movie: heat duedate: 2017-08-13 + returned: false rental_overdue: customer: has_all movie: heat duedate: 2017-03-26 + returned: false From b8e0defe4903156829b45f78bb1eabd660633194 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Thu, 11 May 2017 10:18:11 -0700 Subject: [PATCH 24/36] stubbed out tests for rentals controller --- app/controllers/rentals_controller.rb | 7 ++++--- test/controllers/rentals_controller_test.rb | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 68b3bf5a5..8dcedd0ef 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,12 +2,13 @@ class RentalsController < ApplicationController def index # lists all customers with overdue movies # returns title, customer_id, name, post_code, checkout date, duedate + # it will check the returned column to get the list end def create # must be given title, customer_id, duedate # returns confirmation - # returned is false + # returned is false (default) # set the duedate # updates movies available inventory end @@ -15,7 +16,7 @@ def create def update # must be give customer_id, title # returns confirmation - # returned updates to true - # updates movies available inventory + # changes returned to true + # updates movie's available inventory end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f07d8df74..faaa63f50 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -55,6 +55,10 @@ # what should this look like? end + it "failure to checkout movie returns an appropriate error" do + # what should this be? + end + end describe "update" do @@ -70,7 +74,17 @@ # what should this look like? end - it "resets duedate to nil" + it "returned is now true" do + + end + + it "updates the movie's available_inventory" do + # use a proc to check the change of the number? + end + + it "if checking fails returns an error message" do + # what should it be? + end end From 959ff6cb8facdd3b15b1abb4027cc1e0935f8358 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Fri, 12 May 2017 11:13:07 -0700 Subject: [PATCH 25/36] added method to rentals to get ovedue rentals and then in rentals controller action we return all customers with overdue items --- app/controllers/rentals_controller.rb | 2 ++ app/models/customer.rb | 4 ++++ app/models/rental.rb | 11 +++++++++++ test/controllers/rentals_controller_test.rb | 16 ++++++++++++++++ 4 files changed, 33 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8dcedd0ef..a85fd7f63 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,6 +3,8 @@ def index # lists all customers with overdue movies # returns title, customer_id, name, post_code, checkout date, duedate # it will check the returned column to get the list + overdue_rentals = Rental.list_of_overdue + overdue_customers = overdue_rentals.group_by { |overdue_rental| overdue_rental.customer } end def create diff --git a/app/models/customer.rb b/app/models/customer.rb index 2bb89c606..2388d924c 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,4 +6,8 @@ class Customer < ApplicationRecord validates :rentals_count, presence: true, numericality: {only_integer: true, greater_than_or_equal_to: 0} has_many :rentals + + def self.has_overdue + #joins(:rentals).where("self.overdue?") + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 8502d5652..bcc9bf3d7 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,4 +7,15 @@ class Rental < ApplicationRecord def overdue? Date.parse(self.duedate.to_s) < Date.today end + + def self.list_of_overdue + rentals = Rental.all + overdue_rentals = [] + rentals.each do |rental| + if rental.overdue? + overdue_rentals << rental + end + end + return overdue_rentals + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index faaa63f50..f8419571c 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -8,6 +8,22 @@ # each rental in the rentals key/value pair (value is an array of rentals) has these three keys RENTAL_KEYS = %w( created_at duedate title ) + it "is a real working route" do + get overdue_path + must_respond_with :success + end + + it "returns a json" do + get overdue_path + response.header['Content-Type'].must_include 'json' + end + + it "returns an array" do + get overdue_path + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + it "can get a list of customers" do end From 04e74e1f9fa1a999c3880e2f6fb6b3bebd6b8fe1 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Fri, 12 May 2017 11:16:48 -0700 Subject: [PATCH 26/36] added json to index action in rentals controller --- app/controllers/rentals_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a85fd7f63..a053b5ad9 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,6 +5,7 @@ def index # it will check the returned column to get the list overdue_rentals = Rental.list_of_overdue overdue_customers = overdue_rentals.group_by { |overdue_rental| overdue_rental.customer } + render json: overdue_customers.as_json, status: :ok end def create From 0bc4d2b1d291a0ec0f65455735dce59a68f659ac Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Fri, 12 May 2017 11:18:09 -0700 Subject: [PATCH 27/36] some spaces. oops. --- app/models/rental.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/rental.rb b/app/models/rental.rb index 8502d5652..d83bf7a88 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -7,4 +7,5 @@ class Rental < ApplicationRecord def overdue? Date.parse(self.duedate.to_s) < Date.today end + end From 70dc5ebe674cb1324cc3620e0b488fe93778c577 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Fri, 12 May 2017 11:32:38 -0700 Subject: [PATCH 28/36] wrote method to convert the customers into the hash format we wanted --- app/controllers/rentals_controller.rb | 30 ++++++++++++++++++++++++--- app/models/rental.rb | 2 ++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index a053b5ad9..fbc7781d9 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,9 +3,26 @@ def index # lists all customers with overdue movies # returns title, customer_id, name, post_code, checkout date, duedate # it will check the returned column to get the list - overdue_rentals = Rental.list_of_overdue - overdue_customers = overdue_rentals.group_by { |overdue_rental| overdue_rental.customer } - render json: overdue_customers.as_json, status: :ok + overdue_customers = getList + final_product = [] + overdue_customers.each do |customer,rentals| + cust = {} + cust["customer_id"] = customer.id + cust["name"] = customer.name + cust["postal_code"] = customer.postal_code + formatted_rentals = [] + rentals.each do |rental| + rent = {} + rent["checkout_date"] = rental.created_at + rent["due_date"] = rental.duedate + rent["title"] = rental.movie.title + formatted_rentals << rent + end + cust["rentals"] = formatted_rentals + final_product << cust + end + + render json: final_product.as_json, status: :ok end def create @@ -22,4 +39,11 @@ def update # changes returned to true # updates movie's available inventory end + + private + + def getList + overdue_rentals = Rental.list_of_overdue + return overdue_rentals.group_by { |overdue_rental| overdue_rental.customer } + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index bcc9bf3d7..f6cc99f03 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -18,4 +18,6 @@ def self.list_of_overdue end return overdue_rentals end + + end From d9547e4ed175d61962ac05d91a63360bc3ac60d6 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Fri, 12 May 2017 13:19:01 -0700 Subject: [PATCH 29/36] rentals controller index method tests written and passing --- app/controllers/rentals_controller.rb | 3 - test/controllers/rentals_controller_test.rb | 142 ++++++++++++-------- test/fixtures/customers.yml | 4 +- 3 files changed, 89 insertions(+), 60 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index fbc7781d9..4c4515b38 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,8 +1,5 @@ class RentalsController < ApplicationController def index - # lists all customers with overdue movies - # returns title, customer_id, name, post_code, checkout date, duedate - # it will check the returned column to get the list overdue_customers = getList final_product = [] overdue_customers.each do |customer,rentals| diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f8419571c..5d7ba9618 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,9 +4,9 @@ describe "index" do # each customer in the response body should have the following keys - CUSTOMER_KEYS = %w( customer_id name postal_code rentals ) + OVERDUE_CUSTOMER_KEYS = %w( customer_id name postal_code rentals ) # each rental in the rentals key/value pair (value is an array of rentals) has these three keys - RENTAL_KEYS = %w( created_at duedate title ) + RENTAL_KEYS = %w( checkout_date due_date title ) it "is a real working route" do get overdue_path @@ -24,84 +24,116 @@ body.must_be_kind_of Array end - it "can get a list of customers" do - + it "returns only customers who have overdue rental(s)" do + get overdue_path + body = JSON.parse(response.body) + body.length.must_equal 1 + customer = body.first + customer["name"].must_equal "Alena" + customer["rentals"].length.must_equal 1 + customer["rentals"].first["title"].must_equal "Heat" end it "customers each have the CUSTOMER_KEYS" do - + get overdue_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal OVERDUE_CUSTOMER_KEYS + end end it "all customers have at least one rental in their rentals array" do - + get overdue_path + body = JSON.parse(response.body) + body.each do |customer| + customer["rentals"].length.must_be :>, 0 + end end it "all rentals have the RENTAL_KEYS" do - + get overdue_path + body = JSON.parse(response.body) + body.each do |customer| + customer["rentals"].each do |rental| + rental.keys.sort.must_equal RENTAL_KEYS + end + end end it "all rentals in each customer's rentals array are overdue" do - + get overdue_path + body = JSON.parse(response.body) + body.each do |customer| + customer["rentals"].each do |rental| + (Date.parse(rental["due_date"]) < Date.today).must_equal true + end + end end - it "returns a specific message if no overdue rentals" do - + it "returns an empty array if no overdue rentals" do + Rental.destroy_all + get overdue_path + body = JSON.parse(response.body) + body.must_equal [] end end - describe "create" do - it "must have title" do - - end - it "must have customer_id" do - end - - it "must have duedate" do - end - - it "updates the available inventory for the assoc. movie" do - - end - - it "returns a confirmation hash" do - # what should this look like? - end - - it "failure to checkout movie returns an appropriate error" do - # what should this be? - end + describe "create" do + # it "must have title" do + # + # end + # + # it "must have customer_id" do + # + # end + # + # it "must have duedate" do + # + # end + # + # it "updates the available inventory for the assoc. movie" do + # + # end + # + # it "returns a confirmation hash" do + # # what should this look like? + # end + # + # it "failure to checkout movie returns an appropriate error" do + # # what should this be? + # end end describe "update" do - it "must have customer_id" do - - end - - it "must have title" do - - end - - it "returns a confirmation hash" do - # what should this look like? - end - - it "returned is now true" do - - end - - it "updates the movie's available_inventory" do - # use a proc to check the change of the number? - end - - it "if checking fails returns an error message" do - # what should it be? - end - + # it "must have customer_id" do + # + # end + # + # it "must have title" do + # + # end + # + # it "returns a confirmation hash" do + # # what should this look like? + # end + # + # it "returned is now true" do + # + # end + # + # it "updates the movie's available_inventory" do + # # use a proc to check the change of the number? + # end + # + # it "if checking fails returns an error message" do + # # what should it be? + # end + # end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 34c904d3f..cc9f8f453 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -5,14 +5,14 @@ # below each fixture, per the syntax in the comments below # bare_minimum: - name: "Jou-Jou" + name: "Aurora" registered_at: "June 10th, 2015" postal_code: 98136 phone: "555-555-5555" rentals_count: 0 has_all: - name: "Jou-Jou" + name: "Alena" registered_at: "June 10th, 2015" address: "555 Some Street" city: "Seattle" From 9c98f8b0e495c0e1ed8667cfff047139e6cf8dd1 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Fri, 12 May 2017 13:34:28 -0700 Subject: [PATCH 30/36] wrote tests for model method list_of_rentals --- app/controllers/rentals_controller.rb | 4 ++-- test/models/rental_test.rb | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4c4515b38..ed1be943a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,6 +1,6 @@ class RentalsController < ApplicationController def index - overdue_customers = getList + overdue_customers = overdueCustomersRentals final_product = [] overdue_customers.each do |customer,rentals| cust = {} @@ -39,7 +39,7 @@ def update private - def getList + def overdueCustomersRentals overdue_rentals = Rental.list_of_overdue return overdue_rentals.group_by { |overdue_rental| overdue_rental.customer } end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 1a3746d4c..ff9cdbac7 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -41,5 +41,31 @@ rental = rentals(:rental_overdue) rental.overdue?.must_equal true end + + it "returns false if rental is not overdue" do + rental = rentals(:rental_one) + rental.overdue?.must_equal false + end + end + + describe "self.list_of_overdue" do + it "returns an array" do + Rental.list_of_overdue.must_be_kind_of Array + end + + it "all objects in array are Rentals & overdue" do + list = Rental.list_of_overdue + list.each do |rental| + rental.must_be_kind_of Rental + rental.overdue?.must_equal true + end + end + + it "if no overdue rentals returns empty array" do + Rental.destroy_all + Rental.list_of_overdue.must_equal [] + end + + end end From 9fa101885484e9b6122cabdb909f1b75c7c136c9 Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Fri, 12 May 2017 14:40:47 -0700 Subject: [PATCH 31/36] added create action to rentals controller, and added duedate is not in the past validation on rentals model --- app/controllers/rentals_controller.rb | 19 +++++++++++++++++++ app/models/rental.rb | 11 ++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index ed1be943a..8a44f7de0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -28,6 +28,21 @@ def create # returned is false (default) # set the duedate # updates movies available inventory + rental = Rental.new + rental.duedate = params[:future_due_date] + rental.customer_id = params[:customer_id] + rental.movie = Movie.find_by(title: params[:title]) + rental.movie.available_inventory -= 1 + if !rental.movie.save + render json: { errors: rental.movie.errors.messages }, status: :bad_request + end + + if rental.save + render json: {id: rental.id}, status: :ok + else + render json: { errors: rental.errors.messages }, status: :bad_request + end + end def update @@ -43,4 +58,8 @@ def overdueCustomersRentals overdue_rentals = Rental.list_of_overdue return overdue_rentals.group_by { |overdue_rental| overdue_rental.customer } end + + def params_rental + params.require(:rental).permit(:future_due_date, :customer_id) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index f6cc99f03..a5da82bc9 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -3,6 +3,15 @@ class Rental < ApplicationRecord belongs_to :customer, counter_cache: true validates :duedate, presence: true + validate :duedate_not_in_the_past + + +def duedate_not_in_the_past + if duedate <= Date.today + errors.add(:duedate, "can't be in the past") + end +end + def overdue? Date.parse(self.duedate.to_s) < Date.today @@ -19,5 +28,5 @@ def self.list_of_overdue return overdue_rentals end - + end From 88a1f0c96907acce9b721bdc1f19b928da32ab1b Mon Sep 17 00:00:00 2001 From: Spatterjaaay Date: Fri, 12 May 2017 15:21:20 -0700 Subject: [PATCH 32/36] added check to create action that it send error if movie not found, modified seed file to include available inventory --- app/controllers/rentals_controller.rb | 22 +++++++++++++++------- app/models/movie.rb | 8 -------- db/seeds.rb | 1 + 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8a44f7de0..420da5cb9 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -31,18 +31,26 @@ def create rental = Rental.new rental.duedate = params[:future_due_date] rental.customer_id = params[:customer_id] - rental.movie = Movie.find_by(title: params[:title]) - rental.movie.available_inventory -= 1 - if !rental.movie.save - render json: { errors: rental.movie.errors.messages }, status: :bad_request + movie = Movie.find_by(title: params[:title]) + if movie + rental.movie = movie + else + return render json: { errors: "Movie not found" }, status: :bad_request end - if rental.save - render json: {id: rental.id}, status: :ok + rental.movie.available_inventory -= 1 + if rental.movie.save + if rental.save + render json: {id: rental.id}, status: :ok + else + render json: { errors: rental.errors.messages }, status: :bad_request + end else - render json: { errors: rental.errors.messages }, status: :bad_request + render json: { errors: rental.movie.errors.messages }, status: :bad_request end + + end def update diff --git a/app/models/movie.rb b/app/models/movie.rb index 874b79488..485781a55 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,5 +1,4 @@ class Movie < ApplicationRecord - after_initialize :set_available_inventory_default validates :title, presence: true validates :release_date, presence: true validates :overview, presence: true @@ -7,11 +6,4 @@ class Movie < ApplicationRecord validates :available_inventory, presence: true, numericality: { only_integer: true, greater_than_or_equal_to: 0 } has_many :rentals - - - private - - def set_available_inventory_default - self.available_inventory = self.inventory - end end diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..1a91f67b1 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -3,5 +3,6 @@ end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| + movie["available_inventory"] = movie["inventory"] Movie.create!(movie) end From 826ea513db35dc90c59911daee56a736224bc234 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Fri, 12 May 2017 16:54:27 -0700 Subject: [PATCH 33/36] create test passing --- app/controllers/rentals_controller.rb | 23 +++++++------- app/models/rental.rb | 6 ++-- config/routes.rb | 4 +-- test/controllers/rentals_controller_test.rb | 34 +++++++++++++++------ test/fixtures/movies.yml | 14 ++++++--- 5 files changed, 51 insertions(+), 30 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 420da5cb9..358f6d468 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,3 +1,6 @@ +require 'pry-rails' + + class RentalsController < ApplicationController def index overdue_customers = overdueCustomersRentals @@ -23,15 +26,10 @@ def index end def create - # must be given title, customer_id, duedate - # returns confirmation - # returned is false (default) - # set the duedate - # updates movies available inventory rental = Rental.new - rental.duedate = params[:future_due_date] - rental.customer_id = params[:customer_id] - movie = Movie.find_by(title: params[:title]) + rental.duedate = params[:rental][:future_due_date] + rental.customer_id = params[:rental][:customer_id] + movie = Movie.find_by_title(params[:title]) if movie rental.movie = movie else @@ -39,7 +37,9 @@ def create end rental.movie.available_inventory -= 1 + if rental.movie.save + # binding.pry if rental.save render json: {id: rental.id}, status: :ok else @@ -48,9 +48,6 @@ def create else render json: { errors: rental.movie.errors.messages }, status: :bad_request end - - - end def update @@ -67,7 +64,9 @@ def overdueCustomersRentals return overdue_rentals.group_by { |overdue_rental| overdue_rental.customer } end + + def params_rental - params.require(:rental).permit(:future_due_date, :customer_id) + params.require(:rental).permit(:future_due_date, :customer_id, :title) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index a5da82bc9..e27163e1d 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,3 +1,4 @@ + class Rental < ApplicationRecord belongs_to :movie belongs_to :customer, counter_cache: true @@ -6,8 +7,9 @@ class Rental < ApplicationRecord validate :duedate_not_in_the_past -def duedate_not_in_the_past - if duedate <= Date.today +def duedate_not_in_the_past + # binding.pry + if self.duedate <= Date.today errors.add(:duedate, "can't be in the past") end end diff --git a/config/routes.rb b/config/routes.rb index 6e61f7869..1675319b7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,8 +5,8 @@ get '/movies', to: 'movies#index', as: 'movies' ## no further params needed get '/movies/:title', to: 'movies#show', as: 'movie' ## must provide movie title - post '/rentals/:title/check-out', to: 'rentals#create', as: 'check-out' - post '/rentals/:title/check-in', to: 'rentals#update', as: 'check-in' + post '/rentals/:title/check-out', to: 'rentals#create', as: 'checkout' + post '/rentals/:title/check-in', to: 'rentals#update', as: 'checkin' get '/rentals/overdue', to: 'rentals#index', as: 'overdue' end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 5d7ba9618..501653071 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -83,17 +83,22 @@ describe "create" do - # it "must have title" do - # - # end - # - # it "must have customer_id" do - # - # end - # - # it "must have duedate" do + let(:rental_data) { + { + # title: movies(:heat).title, + future_due_date: "2018-01-01", + customer_id: customers(:has_all).id + } } + + + it "can create rental" do + proc { + post checkout_path(movies(:heat).title), params: { rental: rental_data } + }.must_change 'Rental.count', 1 + must_respond_with :success + end # - # end + # # it "updates the available inventory for the assoc. movie" do # @@ -107,6 +112,15 @@ # # what should this be? # end + it "increases db by 1 if successful" do + + end + + it "does not increase db if fails" do + end + + + end describe "update" do diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 3bf22050b..877b292ee 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -8,14 +8,20 @@ dumbo: title: "Dumbo" overview: "cute baby elephant" release_date: "1980" - inventory: 0 - available_inventory: 0 + inventory: 6 + available_inventory: 6 heat: title: "Heat" overview: "Al Pacino being hot" release_date: "1995" - inventory: 0 + inventory: 5 + available_inventory: 5 + +unavailable: + title: "unavailable" + overview: "it's not available!" + release_date: "1995" + inventory: 4 available_inventory: 0 - From 3beb01997fc034eb615ed9ec81e84703a1e8156d Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Fri, 12 May 2017 17:43:18 -0700 Subject: [PATCH 34/36] got the darn test to pass --- app/controllers/rentals_controller.rb | 8 ++++---- test/controllers/rentals_controller_test.rb | 13 ++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 358f6d468..fd29c4012 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -27,8 +27,8 @@ def index def create rental = Rental.new - rental.duedate = params[:rental][:future_due_date] - rental.customer_id = params[:rental][:customer_id] + rental.duedate = params["rental"]["future_due_date"] + rental.customer_id = params["rental"]["customer_id"] movie = Movie.find_by_title(params[:title]) if movie rental.movie = movie @@ -36,10 +36,10 @@ def create return render json: { errors: "Movie not found" }, status: :bad_request end + # binding.pry rental.movie.available_inventory -= 1 if rental.movie.save - # binding.pry if rental.save render json: {id: rental.id}, status: :ok else @@ -67,6 +67,6 @@ def overdueCustomersRentals def params_rental - params.require(:rental).permit(:future_due_date, :customer_id, :title) + params.require(:rental).permit(:future_due_date, :customer_id) end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 501653071..81393c2a7 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -91,18 +91,17 @@ } } - it "can create rental" do + it "can create rental & update inventory" do + movies(:heat).available_inventory.must_equal 5 proc { - post checkout_path(movies(:heat).title), params: { rental: rental_data } + post checkout_path(movies(:heat).title), params: {rental: rental_data} }.must_change 'Rental.count', 1 must_respond_with :success + Rental.last.movie.must_equal movies(:heat) + Rental.last.customer.must_equal customers(:has_all) + Rental.last.movie.available_inventory.must_equal 4 end - # - # - # it "updates the available inventory for the assoc. movie" do - # - # end # # it "returns a confirmation hash" do # # what should this look like? From aff51c8e129a9a550011d96b7077076efca747a7 Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Fri, 12 May 2017 18:05:31 -0700 Subject: [PATCH 35/36] all checkout tests written and passing --- app/controllers/rentals_controller.rb | 6 +-- test/controllers/rentals_controller_test.rb | 44 ++++++++++++++++----- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index fd29c4012..ba52c9d7a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -66,7 +66,7 @@ def overdueCustomersRentals - def params_rental - params.require(:rental).permit(:future_due_date, :customer_id) - end + # def rental_params + # params.require(:rental).permit(:future_due_date, :customer_id) + # end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 81393c2a7..165f0f19b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -102,20 +102,46 @@ Rental.last.movie.available_inventory.must_equal 4 end - # - # it "returns a confirmation hash" do - # # what should this look like? - # end - # - # it "failure to checkout movie returns an appropriate error" do - # # what should this be? - # end - it "increases db by 1 if successful" do + it "returns a confirmation hash" do + post checkout_path(movies(:heat).title), params: {rental: rental_data} + body = JSON.parse(response.body) + body["id"].must_equal Rental.last.id + end + it "if movie not found, returns error" do + post checkout_path("sdlfkjlk"), params: {rental: rental_data} + body = JSON.parse(response.body) + must_respond_with :bad_request + body["errors"].must_equal "Movie not found" + end + + it "if duedate is bad will return an error" do + post checkout_path(movies(:heat).title), params: {rental: {future_due_date: "2016-01-01", customer_id: 1}} + body = JSON.parse(response.body) + must_respond_with :bad_request + body["errors"].keys.must_include "duedate" + end + + it "if customer_id is bad will return an error" do + post checkout_path(movies(:heat).title), params: {rental: {future_due_date: "2018-01-01", customer_id: -1}} + body = JSON.parse(response.body) + must_respond_with :bad_request + body["errors"].keys.must_include "customer" + end + + it "won't let you check out if not enough inv" do + post checkout_path(movies(:unavailable).title), params: {rental: rental_data} + body = JSON.parse(response.body) + must_respond_with :bad_request + body["errors"].keys.must_include "available_inventory" end it "does not increase db if fails" do + proc { + post checkout_path("wlsdkjflskdj"), params: {rental: rental_data} + }.must_change 'Rental.count', 0 + must_respond_with :bad_request end From 05f3b04059fe86aa3e775da12d28b581053db8ba Mon Sep 17 00:00:00 2001 From: Aurora Lemieux Date: Fri, 12 May 2017 18:22:19 -0700 Subject: [PATCH 36/36] added erd --- erd.pdf | Bin 0 -> 8024 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 erd.pdf diff --git a/erd.pdf b/erd.pdf new file mode 100644 index 0000000000000000000000000000000000000000..5bfd0a2ea715085c7d1597bcf0c648a9be9e18af GIT binary patch literal 8024 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 eT)=;dOz)D_4UP(Nt#Qh)oRY%YO literal 0 HcmV?d00001