From 5fe5fd37fd440879a63a5c80606f1cac5bdc880a Mon Sep 17 00:00:00 2001 From: sai samant Date: Tue, 9 May 2017 14:10:34 -0700 Subject: [PATCH 01/50] made new empty api app --- .gitignore | 17 ++ Gemfile | 54 ++++++ Gemfile.lock | 175 ++++++++++++++++++ Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/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, 911 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..fea716e19 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.2' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platform: :mri +end + +group :development do + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development do + gem 'better_errors' + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end + +gem 'awesome_print' +gem 'foundation-rails' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..dc0da7400 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,175 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.2) + activesupport (= 5.0.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (7.1.4) + awesome_print (1.7.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + builder (3.2.3) + byebug (9.0.6) + coderay (1.1.1) + concurrent-ruby (1.0.5) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + foundation-rails (6.3.1.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.5) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.14) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.0.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) + pg (0.20.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.8.2) + rack (2.0.2) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + ruby-progressbar (1.8.1) + sass (3.4.23) + slop (3.6.0) + spring (2.0.1) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.19.4) + thread_safe (0.3.6) + tzinfo (1.2.3) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + awesome_print + better_errors + byebug + foundation-rails + listen (~> 3.0.5) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.0) + rails (~> 5.0.2) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.14.6 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/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..94333008e --- /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: 964de4f11cc77a39072b60fde9618e294fc7bcff085e56ed7f9b2a18a0869c64320715ed6c5215ab63e61d49c043e572121c60dac93e73726c9b313783dd5898 + +test: + secret_key_base: 873d3f68aae924d8f1f0dd590f256b938f095db6574af7288fa9cd9ff9af13da32ce1170750c9640869a07b91df6eff3a61ca2d6f55da739725290651119af6d + +# 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 b5bdffa098025f112b3cb89301c02a2ba1bd0c25 Mon Sep 17 00:00:00 2001 From: sai samant Date: Tue, 9 May 2017 14:19:58 -0700 Subject: [PATCH 02/50] baseline with test route --- app/controllers/application_controller.rb | 3 +++ config/routes.rb | 1 + 2 files changed, 4 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac8823b0..f9064eab4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,5 @@ class ApplicationController < ActionController::API + def index + render :json => { testing: "it works!!"} + end end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..d4c90785e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get '/zomg', to: 'application#index' end From 056e9852935647f41dc58de1fa42ffd1f6ee67b9 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Tue, 9 May 2017 14:29:05 -0700 Subject: [PATCH 03/50] added gems needed for testing and error views --- .gitignore | 1 + Gemfile | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 48fb168f6..be9779036 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ # Ignore Byebug command history file. .byebug_history +/coverage/ diff --git a/Gemfile b/Gemfile index fea716e19..d87667951 100644 --- a/Gemfile +++ b/Gemfile @@ -42,13 +42,15 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] group :development do gem 'better_errors' + gem 'binding_of_caller' gem 'pry-rails' end group :test do gem 'minitest-rails' gem 'minitest-reporters' + gem 'simplecov' end gem 'awesome_print' -gem 'foundation-rails' \ No newline at end of file +gem 'foundation-rails' From 33b86fa172f09dfd908418309487eb492bd04c0e Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Tue, 9 May 2017 14:45:54 -0700 Subject: [PATCH 04/50] generated models for movies and customers --- Gemfile.lock | 12 ++++++++++++ app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ db/migrate/20170509213347_create_movies.rb | 12 ++++++++++++ db/migrate/20170509214328_create_customers.rb | 15 +++++++++++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/models/customer_test.rb | 9 +++++++++ test/models/movie_test.rb | 9 +++++++++ 9 files changed, 93 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20170509213347_create_movies.rb create mode 100644 db/migrate/20170509214328_create_customers.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/Gemfile.lock b/Gemfile.lock index dc0da7400..059e6c6d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,10 +49,14 @@ GEM 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) coderay (1.1.1) concurrent-ruby (1.0.5) + debug_inspector (0.0.2) + docile (1.1.5) erubis (2.7.0) execjs (2.7.0) ffi (1.9.18) @@ -63,6 +67,7 @@ GEM globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.1) + json (2.0.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -127,6 +132,11 @@ GEM ffi (>= 0.5.0) 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) @@ -158,6 +168,7 @@ PLATFORMS DEPENDENCIES awesome_print better_errors + binding_of_caller byebug foundation-rails listen (~> 3.0.5) @@ -167,6 +178,7 @@ DEPENDENCIES pry-rails puma (~> 3.0) rails (~> 5.0.2) + simplecov spring spring-watcher-listen (~> 2.0.0) tzinfo-data 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/20170509213347_create_movies.rb b/db/migrate/20170509213347_create_movies.rb new file mode 100644 index 000000000..909b24e50 --- /dev/null +++ b/db/migrate/20170509213347_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.0] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20170509214328_create_customers.rb b/db/migrate/20170509214328_create_customers.rb new file mode 100644 index 000000000..faca228d9 --- /dev/null +++ b/db/migrate/20170509214328_create_customers.rb @@ -0,0 +1,15 @@ +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 :postal_code + t.string :phone + t.float :account_credit + + t.timestamps + end + end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..c530393d4 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: MyString + address: MyString + city: MyString + postal_code: MyString + phone: MyString + account_credit: 1.5 + +two: + name: MyString + registered_at: MyString + address: MyString + city: MyString + postal_code: MyString + phone: MyString + account_credit: 1.5 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..d774de5f1 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 diff --git a/test/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 2cebec7a803d3456f9ece280f2af66392dd96d3b Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Tue, 9 May 2017 14:51:51 -0700 Subject: [PATCH 05/50] updated gemfile.lock --- Gemfile.lock | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index dc0da7400..059e6c6d1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,10 +49,14 @@ GEM 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) coderay (1.1.1) concurrent-ruby (1.0.5) + debug_inspector (0.0.2) + docile (1.1.5) erubis (2.7.0) execjs (2.7.0) ffi (1.9.18) @@ -63,6 +67,7 @@ GEM globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.1) + json (2.0.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -127,6 +132,11 @@ GEM ffi (>= 0.5.0) 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) @@ -158,6 +168,7 @@ PLATFORMS DEPENDENCIES awesome_print better_errors + binding_of_caller byebug foundation-rails listen (~> 3.0.5) @@ -167,6 +178,7 @@ DEPENDENCIES pry-rails puma (~> 3.0) rails (~> 5.0.2) + simplecov spring spring-watcher-listen (~> 2.0.0) tzinfo-data From 2117324619a0c07ed99cacd9032ab6a25680f546 Mon Sep 17 00:00:00 2001 From: sai samant Date: Tue, 9 May 2017 14:53:03 -0700 Subject: [PATCH 06/50] added coverage to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 48fb168f6..be9779036 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ # Ignore Byebug command history file. .byebug_history +/coverage/ From 5a031f2fecbd22bc1d6a80e669d4d2fef605328b Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Tue, 9 May 2017 14:59:50 -0700 Subject: [PATCH 07/50] schema created --- db/schema.rb | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..abc4d47c2 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20170509214328) 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 "postal_code" + t.string "phone" + t.float "account_credit" + 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 23a3adadcda7efb451d492033d6eef96095dd256 Mon Sep 17 00:00:00 2001 From: sai samant Date: Tue, 9 May 2017 15:02:19 -0700 Subject: [PATCH 08/50] schema file --- db/schema.rb | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..abc4d47c2 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,39 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20170509214328) 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 "postal_code" + t.string "phone" + t.float "account_credit" + 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 732afcac579544027895d82a696b12c9844337c2 Mon Sep 17 00:00:00 2001 From: sai samant Date: Tue, 9 May 2017 15:12:19 -0700 Subject: [PATCH 09/50] added default value for account credit in Customer model --- db/migrate/20170509220652_add_default_value_customer.rb | 5 +++++ db/schema.rb | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20170509220652_add_default_value_customer.rb diff --git a/db/migrate/20170509220652_add_default_value_customer.rb b/db/migrate/20170509220652_add_default_value_customer.rb new file mode 100644 index 000000000..a15308ac5 --- /dev/null +++ b/db/migrate/20170509220652_add_default_value_customer.rb @@ -0,0 +1,5 @@ +class AddDefaultValueCustomer < ActiveRecord::Migration[5.0] + def change + change_column :customers, :account_credit, :float, :default => 0.0 + end +end diff --git a/db/schema.rb b/db/schema.rb index abc4d47c2..c27725b87 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: 20170509214328) do +ActiveRecord::Schema.define(version: 20170509220652) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -22,9 +22,9 @@ t.string "city" t.string "postal_code" t.string "phone" - t.float "account_credit" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.float "account_credit", default: 0.0 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "movies", force: :cascade do |t| From cb2656300bcaa8740ca18dc9b2f639761f0ee440 Mon Sep 17 00:00:00 2001 From: sai samant Date: Tue, 9 May 2017 15:39:59 -0700 Subject: [PATCH 10/50] validations for customer and movie models --- app/models/customer.rb | 2 ++ app/models/movie.rb | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..952aecaaf 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,4 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :phone, presence: true, uniqueness: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..3a361bfdd 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,7 @@ class Movie < ApplicationRecord + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true, format: { with: /^\d{4}\-(0?[1-9]|1[012])\-(0?[1-9]|[12][0-9]|3[01])$/, message: "must be in YYYY-MM-DD format" } + validates :inventory, presence: true, numericality: { only_integer: true, greater_than: 0} + end From fb97a18ec1dbedfe2b1a0d41f70b17cb0b0c1471 Mon Sep 17 00:00:00 2001 From: sai samant Date: Tue, 9 May 2017 15:57:48 -0700 Subject: [PATCH 11/50] trying to fix regex in customer model --- app/models/movie.rb | 4 ++-- db/migrate/20170509224335_add_col_state_customer.rb | 5 +++++ db/schema.rb | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20170509224335_add_col_state_customer.rb diff --git a/app/models/movie.rb b/app/models/movie.rb index 3a361bfdd..e3260eee3 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,7 @@ class Movie < ApplicationRecord validates :title, presence: true validates :overview, presence: true - validates :release_date, presence: true, format: { with: /^\d{4}\-(0?[1-9]|1[012])\-(0?[1-9]|[12][0-9]|3[01])$/, message: "must be in YYYY-MM-DD format" } + validates :release_date, presence: true, format: { with: /\A\d{4}\-(0?[1-9]|1[012])\-(0?[1-9]|[12][0-9]|3[01])\z/, message: "must be in YYYY-MM-DD format" } validates :inventory, presence: true, numericality: { only_integer: true, greater_than: 0} - + end diff --git a/db/migrate/20170509224335_add_col_state_customer.rb b/db/migrate/20170509224335_add_col_state_customer.rb new file mode 100644 index 000000000..54c6240d8 --- /dev/null +++ b/db/migrate/20170509224335_add_col_state_customer.rb @@ -0,0 +1,5 @@ +class AddColStateCustomer < ActiveRecord::Migration[5.0] + def change + add_column :customers, :state, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index c27725b87..c27e9cb3b 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: 20170509220652) do +ActiveRecord::Schema.define(version: 20170509224335) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -25,6 +25,7 @@ t.float "account_credit", default: 0.0 t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "state" end create_table "movies", force: :cascade do |t| From 7ca8c0209f7a80cde70224ed7a5cb47f74d106ae Mon Sep 17 00:00:00 2001 From: sai samant Date: Tue, 9 May 2017 16:01:54 -0700 Subject: [PATCH 12/50] adjusting regex --- app/models/movie.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index e3260eee3..2bfbb3c01 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,7 +1,7 @@ class Movie < ApplicationRecord validates :title, presence: true validates :overview, presence: true - validates :release_date, presence: true, format: { with: /\A\d{4}\-(0?[1-9]|1[012])\-(0?[1-9]|[12][0-9]|3[01])\z/, message: "must be in YYYY-MM-DD format" } + validates :release_date, presence: true, format: { with: /\A\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\z/, message: "must be in YYYY-MM-DD format" } validates :inventory, presence: true, numericality: { only_integer: true, greater_than: 0} end From 91ccd40ddcb14246d450dbdcc27c448ab183ef53 Mon Sep 17 00:00:00 2001 From: sai samant Date: Tue, 9 May 2017 16:15:50 -0700 Subject: [PATCH 13/50] tests for customer model --- test/fixtures/customers.yml | 28 +++++++++++++++------------- test/models/customer_test.rb | 34 +++++++++++++++++++++++++++++++--- test/models/movie_test.rb | 5 ++--- 3 files changed, 48 insertions(+), 19 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index c530393d4..0c1ad5f97 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,21 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString - registered_at: MyString - address: MyString - city: MyString - postal_code: MyString - phone: MyString - account_credit: 1.5 + name: Ada Lovelace + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: 123 Main St + city: Seattle + state: WA + postal_code: 98105 + phone: (617)-404-2345 + account_credit: 0.0 two: - name: MyString - registered_at: MyString - address: MyString - city: MyString - postal_code: MyString - phone: MyString + name: Grace Hopper + registered_at: Thu, 30 Apr 2015 07:54:14 -0700 + address: 456 Main St + city: New York + state: NY + postal_code: 03450 + phone: (555)-555-5555 account_credit: 1.5 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..81861257a 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,37 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? + + describe 'validations for Customer' do + it 'requires a name' do + ada = customers(:one) + ada.valid?.must_equal true + ada.errors.messages.wont_include :name + + grace = Customer.new(phone: "(415)-567-8743") + grace.valid?.must_equal false + grace.errors.messages.must_include :name + end + + + it 'requires a phone number' do + ada = customers(:one) + ada.valid?.must_equal true + ada.errors.messages.wont_include :phone + + grace = Customer.new(name: "Grace Hopper") + grace.valid?.must_equal false + grace.errors.messages.must_include :phone + + end + + it 'requires a unique phone number' do + jane = Customer.new( name: "Jane Doe", phone: "(555)-555-5555" ) + jane.valid?.must_equal false + jane.errors.messages.must_include :phone + end + + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..a4e45d644 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,7 +3,6 @@ describe Movie do let(:movie) { Movie.new } - it "must be valid" do - value(movie).must_be :valid? - end + + end From a4a0e9555e2c7427ce6db5bafd055be1ec2939f2 Mon Sep 17 00:00:00 2001 From: sai samant Date: Tue, 9 May 2017 16:28:31 -0700 Subject: [PATCH 14/50] tests for Movie model --- test/fixtures/movies.yml | 16 ++++----- test/models/movie_test.rb | 73 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 79 insertions(+), 10 deletions(-) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d774de5f1..8a4d73265 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 + title: Titanic + overview: ship disaster + release_date: 1997-12-03 + inventory: 20 two: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 + title: Guardians of the Galaxy 2 + overview: space + release_date: 2017-05-04 + inventory: 4 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index a4e45d644..7a9f66a32 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,8 +1,77 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } - + it "requires a title" do + titanic = movies(:one) + titanic.valid?.must_equal true + titanic.errors.messages.wont_include :title + + movie2 = Movie.new( overview: "godd stuff", release_date: "2012-12-12", inventory: 2) + movie2.valid?.must_equal false + movie2.errors.messages.must_include :title + + end + + it "requires an overview" do + titanic = movies(:one) + titanic.valid?.must_equal true + titanic.errors.messages.wont_include :overview + + movie2 = Movie.new( title: "godd stuff", release_date: "2012-12-12", inventory: 2) + movie2.valid?.must_equal false + movie2.errors.messages.must_include :overview + + + end + + it "requires a release date" do + titanic = movies(:one) + titanic.valid?.must_equal true + titanic.errors.messages.wont_include :release_date + + movie2 = Movie.new( title: "godd stuff", overview: "funny", inventory: 2) + movie2.valid?.must_equal false + movie2.errors.messages.must_include :release_date + + end + + it "requires YYYY-MM-DD format for release_date" do + titanic = movies(:one) + titanic.valid?.must_equal true + titanic.errors.messages.wont_include :release_date + + movie2 = Movie.new( title: "good stuff", overview: "funny", release_date: "2017", inventory: 2) + movie2.valid?.must_equal false + movie2.errors.messages.must_include :release_date + end + + it "requires an inventory" do + guardians = movies(:two) + guardians.valid?.must_equal true + guardians.errors.messages.wont_include :inventory + + movie2 = Movie.new( title: "good stuff", overview: "funny", release_date: "2017") + movie2.valid?.must_equal false + movie2.errors.messages.must_include :inventory + end + + it "inventory must be an integer greater than 0" do + guardians = movies(:two) + guardians.valid?.must_equal true + guardians.errors.messages.wont_include :inventory + + movie2 = Movie.new( title: "good stuff", overview: "funny", release_date: "2017", inventory: 0) + movie2.valid?.must_equal false + movie2.errors.messages.must_include :inventory + + movie2 = Movie.new( title: "good stuff", overview: "funny", release_date: "2017", inventory: 1.5) + movie2.valid?.must_equal false + movie2.errors.messages.must_include :inventory + + movie2 = Movie.new( title: "good stuff", overview: "funny", release_date: "2017", inventory: -2) + movie2.valid?.must_equal false + movie2.errors.messages.must_include :inventory + end end From 563e704f00e5f1dabea1437ba338f1ff2f4d31d1 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Tue, 9 May 2017 16:34:12 -0700 Subject: [PATCH 15/50] initially generted controllers for customers and movies --- app/controllers/customers_controller.rb | 4 ++++ app/controllers/movies_controller.rb | 7 +++++++ config/routes.rb | 6 ++++++ test/controllers/customers_controller_test.rb | 9 +++++++++ test/controllers/movies_controller_test.rb | 14 ++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..73302240c --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,4 @@ +class CustomersController < ApplicationController + def index + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..c68ca82d9 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,7 @@ +class MoviesController < ApplicationController + def index + end + + def show + end +end diff --git a/config/routes.rb b/config/routes.rb index d4c90785e..f447f9b38 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,10 @@ Rails.application.routes.draw do + get 'movies/index' + + get 'movies/show' + + get 'customers/index' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get '/zomg', to: 'application#index' end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..c5ec6f20b --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..1a5c1a576 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,14 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + + it "should get show" do + get movies_show_url + value(response).must_be :success? + end + +end From 638714cf0e7bb9cdc88d807c258311a908487d7d Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Tue, 9 May 2017 16:55:19 -0700 Subject: [PATCH 16/50] update routes --- config/routes.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index f447f9b38..c02c30b19 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,9 @@ Rails.application.routes.draw do - get 'movies/index' + get '/movies', to: 'movies#index', as: 'movies' - get 'movies/show' + get '/movies/:title', to: 'movies#show', as: 'movie' - get 'customers/index' + get '/customers', to: 'customers#index', as: 'customers' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get '/zomg', to: 'application#index' From 7be22efadded43ba8d3dbf8fd08b17a129950709 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Tue, 9 May 2017 16:55:51 -0700 Subject: [PATCH 17/50] added controller tests for customers --- test/controllers/customers_controller_test.rb | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5ec6f20b..221cb5ce9 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,9 +1,38 @@ require "test_helper" describe CustomersController do - it "should get index" do - get customers_index_url - value(response).must_be :success? - end + KEYS = %w(id name phone postal_code registered_at) + + describe "index" do + it "is a real working route" do + get customers_path + must_respond_with :success + end + + it "returns json" do + get customers_path + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + get customers_path + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_path + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customer with exactly the required fields" do + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal KEYS + end + end + end end From de6fe7a32a15f78e362e96ec54562f8802a242b2 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Tue, 9 May 2017 16:56:15 -0700 Subject: [PATCH 18/50] update customers controller --- app/controllers/customers_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 73302240c..6116c28ef 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,6 @@ class CustomersController < ApplicationController def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end end From 121b2c1d095638eda1c817ee00354a38045ea1f2 Mon Sep 17 00:00:00 2001 From: sai samant Date: Wed, 10 May 2017 11:27:54 -0700 Subject: [PATCH 19/50] movie controller tests and controller index and show actions --- app/controllers/movies_controller.rb | 8 +++ test/controllers/movies_controller_test.rb | 75 ++++++++++++++++++++-- test/fixtures/movies.yml | 1 + 3 files changed, 77 insertions(+), 7 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index c68ca82d9..b374ea61f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,15 @@ class MoviesController < ApplicationController def index + movies = Movie.all + render json: movies.as_json(only: [:title, :release_date]), 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], methods: :available_inventory), status: :ok + else + render json: {title_match: false}, status: :not_found + end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 1a5c1a576..2ab530fb3 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,14 +1,75 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? - end - it "should get show" do - get movies_show_url - value(response).must_be :success? + + describe "index" do + INDEX_KEYS = %w(release_date title) + + it "is a real working route" do + get movies_path + must_respond_with :success + end + + it "returns json" do + get movies_path + response.header['Content-Type'].must_include 'json' + 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 Customer.count + end + + it "returns movie with exactly the required fields" do + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal INDEX_KEYS + end + end end + + describe "show" do + SHOW_KEYS = %w(available_inventory inventory overview release_date title) + + it "can get a movie" do + get movie_path(movies(:one).title) + must_respond_with :success + body = JSON.parse(response.body) + body.must_be_instance_of Hash + body.keys.sort.must_equal SHOW_KEYS + end + + it "responds correctly when movie is not found" do + get movie_path("Developers") + body = JSON.parse(response.body) + body.keys.must_include "title_match" + must_respond_with :not_found + end + + it "gives the right info for a movie" do + get movie_path(movies(:two).title) + body = JSON.parse(response.body) + + movie_model_keys = %w(inventory overview release_date title) + movie_model_keys.each do |key| + body[key].must_equal movies(:two)[key] + end + + movie = Movie.find_by(title: movies(:two).title) + body["available_inventory"].must_equal movie.available_inventory + + end + + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 8a4d73265..ffd19cd27 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -6,6 +6,7 @@ one: release_date: 1997-12-03 inventory: 20 + two: title: Guardians of the Galaxy 2 overview: space From df86273f8e73883507c8d1e2dae6871a38adf742 Mon Sep 17 00:00:00 2001 From: sai samant Date: Wed, 10 May 2017 11:28:31 -0700 Subject: [PATCH 20/50] test for custom method available_inventory and method --- app/models/movie.rb | 4 ++++ test/models/movie_test.rb | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index 2bfbb3c01..cd2464fe1 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -4,4 +4,8 @@ class Movie < ApplicationRecord validates :release_date, presence: true, format: { with: /\A\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\z/, message: "must be in YYYY-MM-DD format" } validates :inventory, presence: true, numericality: { only_integer: true, greater_than: 0} + def available_inventory + return inventory + end + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 7a9f66a32..63fcc4329 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,6 +2,9 @@ describe Movie do + describe "validations" do + + it "requires a title" do titanic = movies(:one) titanic.valid?.must_equal true @@ -73,5 +76,15 @@ movie2.valid?.must_equal false movie2.errors.messages.must_include :inventory end + end + + describe "custom methods" do + #need to update when we add rentals + it "available_inventory returns inventory" do + movie = movies(:one) + movie.available_inventory.must_equal movie.inventory + + end + end end From 7847e9600df37acdf61898abee8bff2adfac7a42 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Wed, 10 May 2017 12:42:11 -0700 Subject: [PATCH 21/50] update error handling for movie show action --- 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 b374ea61f..c60c20aa3 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,7 +9,7 @@ def show if movie render json: movie.as_json(except: [:created_at, :updated_at, :id], methods: :available_inventory), status: :ok else - render json: {title_match: false}, status: :not_found + render json: {"errors" => {"title" => "Movie '#{params[:title]}' not found"}}, status: :not_found end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 2ab530fb3..297e1cc02 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -53,7 +53,7 @@ it "responds correctly when movie is not found" do get movie_path("Developers") body = JSON.parse(response.body) - body.keys.must_include "title_match" + body.keys.must_include "errors" must_respond_with :not_found end From 2d37a9e4278e345cd9855078a3889b64b3ca13ce Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Wed, 10 May 2017 13:01:57 -0700 Subject: [PATCH 22/50] wip: added custom method to customer model --- app/models/customer.rb | 6 ++++++ test/models/customer_test.rb | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 952aecaaf..88637bdc8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,10 @@ class Customer < ApplicationRecord validates :name, presence: true validates :phone, presence: true, uniqueness: true + + # update later after adding rental + def movies_checked_out_count + return 0 + end + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 81861257a..f6aa9a11d 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,8 +1,6 @@ require "test_helper" describe Customer do - - describe 'validations for Customer' do it 'requires a name' do ada = customers(:one) @@ -31,7 +29,14 @@ jane.valid?.must_equal false jane.errors.messages.must_include :phone end + end + describe "custom methods" do + #need to update when we add rentals + it "movies_checked_out_count returns the number of rentals belonging to the customer" do + customer = customers(:one) + customer.movies_checked_out_count.must_equal 0 + end end end From 4cebdb26b663c3964724f823ec41373862c07850 Mon Sep 17 00:00:00 2001 From: sai samant Date: Wed, 10 May 2017 13:19:34 -0700 Subject: [PATCH 23/50] finishing test and controller action for movie count --- app/controllers/customers_controller.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 6116c28ef..85c8a6637 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], methods: :movies_checked_out_count), status: :ok end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 221cb5ce9..d49ea1a6b 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 name phone postal_code registered_at) + KEYS = %w(id movies_checked_out_count name phone postal_code registered_at) describe "index" do it "is a real working route" do From 7e4c786362e162f5c22a0b5a47a89e05a5c4d667 Mon Sep 17 00:00:00 2001 From: sai samant Date: Wed, 10 May 2017 13:43:36 -0700 Subject: [PATCH 24/50] added routes for rental optionals --- config/routes.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index c02c30b19..74d43da46 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,12 @@ get '/customers', to: 'customers#index', as: 'customers' + 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#overdue', as: 'overdue' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get '/zomg', to: 'application#index' end From 2f7cc152aedd40862b5d0665b17e6bf39795408f Mon Sep 17 00:00:00 2001 From: sai samant Date: Wed, 10 May 2017 13:58:39 -0700 Subject: [PATCH 25/50] created rental model --- app/models/rental.rb | 2 ++ db/migrate/20170510205007_create_rentals.rb | 10 ++++++++++ ..._refs_to_rental_change_default_for_returned.rb | 10 ++++++++++ db/schema.rb | 15 ++++++++++++++- test/fixtures/rentals.yml | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 6 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20170510205007_create_rentals.rb create mode 100644 db/migrate/20170510205116_add_refs_to_rental_change_default_for_returned.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20170510205007_create_rentals.rb b/db/migrate/20170510205007_create_rentals.rb new file mode 100644 index 000000000..1a24b0e04 --- /dev/null +++ b/db/migrate/20170510205007_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.0] + def change + create_table :rentals do |t| + t.date :due_date + t.boolean :returned + + t.timestamps + end + end +end diff --git a/db/migrate/20170510205116_add_refs_to_rental_change_default_for_returned.rb b/db/migrate/20170510205116_add_refs_to_rental_change_default_for_returned.rb new file mode 100644 index 000000000..200e494d1 --- /dev/null +++ b/db/migrate/20170510205116_add_refs_to_rental_change_default_for_returned.rb @@ -0,0 +1,10 @@ +class AddRefsToRentalChangeDefaultForReturned < ActiveRecord::Migration[5.0] + def change + change_column :rentals, :returned, :boolean, :default => false + + add_reference :rentals, :movie, index: true, foreign_key: true + + add_reference :rentals, :customer, index: true, foreign_key: true + + end +end diff --git a/db/schema.rb b/db/schema.rb index c27e9cb3b..6db4da106 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: 20170509224335) do +ActiveRecord::Schema.define(version: 20170510205116) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,4 +37,17 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.date "due_date" + t.boolean "returned", default: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "movie_id" + t.integer "customer_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..f40f06ce8 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + due_date: 2017-05-10 + returned: false + +two: + due_date: 2017-05-10 + returned: false diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From da6c2b1ededde1570bff062694a1cd8ea1e05cc9 Mon Sep 17 00:00:00 2001 From: sai samant Date: Wed, 10 May 2017 14:00:05 -0700 Subject: [PATCH 26/50] controller for Rentals --- app/controllers/rentals_controller.rb | 10 ++++++++++ config/routes.rb | 6 ++++++ test/controllers/rentals_controller_test.rb | 19 +++++++++++++++++++ 3 files changed, 35 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..8baf9abe9 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,10 @@ +class RentalsController < ApplicationController + def create + end + + def update + end + + def overdue + end +end diff --git a/config/routes.rb b/config/routes.rb index 74d43da46..165c4d817 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,10 @@ Rails.application.routes.draw do + get 'rentals/create' + + get 'rentals/update' + + get 'rentals/overdue' + get '/movies', to: 'movies#index', as: 'movies' get '/movies/:title', to: 'movies#show', as: 'movie' diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..b6adfbf0e --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe RentalsController do + it "should get create" do + get rentals_create_url + value(response).must_be :success? + end + + it "should get update" do + get rentals_update_url + value(response).must_be :success? + end + + it "should get overdue" do + get rentals_overdue_url + value(response).must_be :success? + end + +end From 4e4757f86f8efbe58c96a7970bd60cf00c5ae285 Mon Sep 17 00:00:00 2001 From: sai samant Date: Wed, 10 May 2017 14:25:29 -0700 Subject: [PATCH 27/50] started model tests for rental --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 17 ++++++++++++++ test/fixtures/rentals.yml | 8 +++++-- test/models/rental_test.rb | 48 +++++++++++++++++++++++++++++++++++--- 5 files changed, 72 insertions(+), 5 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 88637bdc8..52e9afc22 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,6 @@ class Customer < ApplicationRecord + has_many :rentals + validates :name, presence: true validates :phone, presence: true, uniqueness: true diff --git a/app/models/movie.rb b/app/models/movie.rb index cd2464fe1..d3355bf93 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,6 @@ class Movie < ApplicationRecord + has_many :rentals + validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true, format: { with: /\A\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\z/, message: "must be in YYYY-MM-DD format" } diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..020875bc2 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,19 @@ class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie + + validates :due_date, presence: true + validate :valid_due_date + + + + def valid_due_date + if due_date.class == Date && due_date > Date.current + return true + else + return false + end + end + + end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index f40f06ce8..b45e9c031 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,9 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - due_date: 2017-05-10 + due_date: Date.new(2017-05-14) returned: false + customer: one + movie: one two: - due_date: 2017-05-10 + due_date: Date.new(2017-05-17) returned: false + customer: two + movie: two diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..d0047a741 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,51 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } - it "must be valid" do - value(rental).must_be :valid? + describe "validations for rental" do + it "requires a due date" do + rental = rentals(:one) + puts rental.errors.messages + rental.valid?.must_equal true + + rental = Rental.new(customer: customers(:one), movie: movies(:one)) + rental.valid?.must_equal false + rental.errors.messages.must_include :due_date + + end + + it "requires a due date after today" do + + end + + it "due date must be a Date object" do + + end + + it "requires a returned field" do + + end + + it "returned is set to false" do + + end + + describe "relationships" do + it "requires a customer" do + + end + + it "requires a movie" do + + end + + it "can get the customer" do + end + + it "can get the movie" do + + end + + end end end From 3537ec2e215a13378a7d173eae32d4d3efa6bdce Mon Sep 17 00:00:00 2001 From: sai samant Date: Wed, 10 May 2017 15:57:28 -0700 Subject: [PATCH 28/50] testing rental model validations for due date --- app/controllers/rentals_controller.rb | 15 +++++++++++++++ app/models/rental.rb | 23 +++++++++++++++++++---- test/fixtures/rentals.yml | 4 ++-- test/models/rental_test.rb | 13 +++++++++---- 4 files changed, 45 insertions(+), 10 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8baf9abe9..4ccb7355e 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,13 @@ class RentalsController < ApplicationController def create + rental = Rental.new(rental_params) + + if rental.save + render status: :ok, json: {rental_success: true} + else + render status: :bad_request, json: { errors: rental.errors.messages } + end + end def update @@ -7,4 +15,11 @@ def update def overdue end + + private + + def rental_params + params.require(:rental).permit(:due_date, :customer_id, :title) + end + end diff --git a/app/models/rental.rb b/app/models/rental.rb index 020875bc2..eee5dde56 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -5,13 +5,28 @@ class Rental < ApplicationRecord validates :due_date, presence: true validate :valid_due_date + def initialize rental_params + converted_date = convert_date(rental_params[:due_date]) + rental_params[:due_date] = converted_date + super(rental_params) + end + def convert_date date + if date =~ /\A\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\z/ + return Date.parse(date) + else + date + #not raising an error; if the date can't be converted our validations will let the user know, then + # raise ArgumentError.new("date must be in format YYYY-MM-DD") + end + end def valid_due_date - if due_date.class == Date && due_date > Date.current - return true - else - return false + puts due_date + if due_date.class != Date + errors.add(:due_date, "date must be in YYYY-MM-DD format") + elsif due_date <= Date.current + errors.add(:due_date, "due date must be after today") end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index b45e9c031..a7bd38424 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - due_date: Date.new(2017-05-14) + due_date: 2017-05-14 returned: false customer: one movie: one two: - due_date: Date.new(2017-05-17) + due_date: 2017-05-17 returned: false customer: two movie: two diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index d0047a741..0115955ed 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -5,21 +5,25 @@ describe "validations for rental" do it "requires a due date" do rental = rentals(:one) - puts rental.errors.messages rental.valid?.must_equal true rental = Rental.new(customer: customers(:one), movie: movies(:one)) rental.valid?.must_equal false rental.errors.messages.must_include :due_date + rental = Rental.new(customer: customers(:one), movie: movies(:one), due_date: "2017") + rental.valid?.must_equal false + rental.errors.messages[:due_date].must_include "date must be in YYYY-MM-DD format" end it "requires a due date after today" do - + rental = Rental.new(customer: customers(:one), movie: movies(:one), due_date: "2016-04-13") + rental.valid?.must_equal false + rental.errors.messages[:due_date].must_equal ["due date must be after today"] end it "due date must be a Date object" do - + end it "requires a returned field" do @@ -29,6 +33,7 @@ it "returned is set to false" do end +end describe "relationships" do it "requires a customer" do @@ -47,5 +52,5 @@ end end - end + end From 4e447f9d4145cdc3b7a9c77444ee67aea859376c Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Wed, 10 May 2017 18:20:31 -0700 Subject: [PATCH 29/50] db:reset after pull --- .DS_Store | Bin 0 -> 8196 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ac3eaae51cda37ca1a87a5469478af5805f75264 GIT binary patch literal 8196 zcmeHMTWl0n827-PZ4PAx^$&fxwKGPuq^^^Z(_L!u?sD?ZfAE!I&nI)?9A@A zl$uJSQDZb-5);vAh;KFFiNyF~;yr4-#Kv3HnE2+C@y!@7|Cuw}6iOd_Q3G?5Io~<| z`Tsflf9IPyIkNzO-FbZ*KrH|;x&-p&R9&Npad9muk-$<$h!hX$qMJ=yPMZ23F7OTw zAp;=;Ap;=;Ap;=;{|5$W&lZI(vhT~$unrjr8Mq-C5buXLT>=vUPD}J(9aQ;8077vD z@C&uMXb{E&OawSBkw&PX3?-DI7#uNBhLb%W_$30ImMFskgTn^~Gh=WlnwNLG zwcH86XX-{eXeS-Vnrmz6qoz?z@l`#J?P;cMcJOeQW(4#pz5k5 zFU-%-atl533q|DlQifm8WvDKX_V3%TrufPN{qRFs&vb0}sF8CCQ@qNh)cZ4zeK==` z@xhE^<;QF{#j7)#mC0M0XLMQCfO*z%hdg846RqQ}lk<9f$03tqg)PN--ZkzsD8MWj zy%gqhRAwqx$JX7pxn;-ByLx9US5)!pm8yE2xV1g=e$&VuDVn-BdQ5XOhOL|S>A`~O znrX{O+S-^=jhdp&R<5b3t-CoIUCebTpEl3rO>crXFgD9qR8^|=(OVUMnVr<>R~&S7 zF_Z3(MC+rCjGYkno}59oG^-n;n-s3Gq)Um&TQsX%749m@2WUZMXsf!Naa}oLX=%ff zrgpWH@%_qRL9!{0yVO0b8k>}%j59VydAicv742dC12!z?KA^eYp{!xk^dh^y`e^i+ zuy^UYp) zPp!EJlH?kEP>T#-ORllLyZ8P_a{Z=4YV@X6tJgMcXl`xa)it+_SFPN95&622!te!C z5`@2eSE^8oS&bbbT^ZwxX__w+3SzUuyFMO^aUmVqUEfIE2&r3kH*SildHBOS}pj!qg~N{VH(bv3nX)IDlK5f2#$KUisusZ9Cj>bnRt@CLjG zACc<5gdgB1_yv9=#g$_f){x$A!5FT^+i@dq#wKjWJFtV4cPDAD5BFj}?j!vr@hA@A zF+7eLG)R4;Xkw1kSHL2U<3o7fSK*`hG(JN*e2#Q@5ofMaU4Kb$67jY9sw)iSY|F7v zldYuEE8WB1b-};Um4E$1K)C-C>*4 Date: Wed, 10 May 2017 18:21:47 -0700 Subject: [PATCH 30/50] removed extra unused defult routes --- config/routes.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 165c4d817..f808645f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,4 @@ Rails.application.routes.draw do - get 'rentals/create' - - get 'rentals/update' - - get 'rentals/overdue' get '/movies', to: 'movies#index', as: 'movies' From 4530b4d7b0942440151117216c2d8a79e7509825 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Wed, 10 May 2017 18:49:27 -0700 Subject: [PATCH 31/50] added entity relationship test --- test/models/rental_test.rb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 0115955ed..36dc29fa4 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -23,7 +23,7 @@ end it "due date must be a Date object" do - + end it "requires a returned field" do @@ -37,18 +37,25 @@ describe "relationships" do it "requires a customer" do - + rental = Rental.new(movie: movies(:one), due_date: "2017-8-13") + rental.valid?.must_equal false + rental.errors.messages.must_include :customer end it "requires a movie" do - + rental = Rental.new(customer: customers(:one), due_date: "2017-08-13") + rental.valid?.must_equal false + rental.errors.messages.must_include :movie end it "can get the customer" do + rental = rentals(:one) + rental.customer.must_be_kind_of Customer end it "can get the movie" do - + rental = rentals(:one) + rental.movie.must_be_kind_of Movie end end From 4dbe4e9663a171482eb80b32a516c5b01df1605f Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Wed, 10 May 2017 18:59:40 -0700 Subject: [PATCH 32/50] added simple cov --- test/test_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_helper.rb b/test/test_helper.rb index 10594a324..f6dc87f53 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -3,6 +3,8 @@ require "rails/test_help" require "minitest/rails" require "minitest/reporters" # for Colorized output +require "simplecov" +SimpleCov.start # For colorful output! Minitest::Reporters.use!( From f431b5173c9a58e34efb7286d5603ac0e8b15539 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Wed, 10 May 2017 19:00:43 -0700 Subject: [PATCH 33/50] clean up model file --- app/models/rental.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index eee5dde56..68964808f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -16,13 +16,10 @@ def convert_date date return Date.parse(date) else date - #not raising an error; if the date can't be converted our validations will let the user know, then - # raise ArgumentError.new("date must be in format YYYY-MM-DD") end end def valid_due_date - puts due_date if due_date.class != Date errors.add(:due_date, "date must be in YYYY-MM-DD format") elsif due_date <= Date.current From 48957ad29bd521ffab642be18959e5abbb055a8e Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Thu, 11 May 2017 09:40:31 -0700 Subject: [PATCH 34/50] update rental model test --- test/models/rental_test.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 36dc29fa4..dbcf9ac68 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -23,17 +23,18 @@ end it "due date must be a Date object" do - - end - - it "requires a returned field" do - + rental = Rental.new(customer: customers(:one), movie: movies(:one), due_date: "2017-04") + rental.valid?.must_equal false + rental.errors.messages[:due_date].must_include "can't be blank" + end + + it "returned is set as a default value to false" do + rental = rentals(:two) + rental.valid?.must_equal true + rental.returned.must_equal false + end end - it "returned is set to false" do - - end -end describe "relationships" do it "requires a customer" do From 44848e135a43b291c039bfd39fa1e5b4e8dc6f3c Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Thu, 11 May 2017 10:02:44 -0700 Subject: [PATCH 35/50] added some tests --- test/controllers/rentals_controller_test.rb | 43 +++++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b6adfbf0e..a623236e4 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,9 +1,46 @@ require "test_helper" describe RentalsController do - it "should get create" do - get rentals_create_url - value(response).must_be :success? + describe "create" do + let(:rental_data) { + { + title: movies(:one).title, + customer_id: customers(:one).id, + due_date: "2017-06-30" + } + } + + it "Creates a new rental" do + proc { + post check_out_path, params: { rental: rental_data } + }.must_change 'Rental.count', 1 + must_respond_with :success + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "id" + + # Check that the ID matches + Rental.find(body["id"]).movie.title.must_equal rental_data[:title] + Rental.find(body["id"]).customer_id.must_equal rental_data[:customer_id] + Rental.find(body["id"]).due_date.must_equal Date.parse(rental_data[:due_date]) + end + + # may need more tests for cases: missing customer, missing duedate + it "Returns an error for an invalid rental" do + bad_data = rental_data.clone() + bad_data.delete(:title) + + proc { + post check_out_path, params: { rental: bad_data } + }.wont_change 'Rental.count' + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "movie" + body.must_equal "errors" => {"movie" => ["can't be blank"]} + end end it "should get update" do From 0cf9d41d96ea18e3f14fad02a168a80136db9a2e Mon Sep 17 00:00:00 2001 From: sai samant Date: Thu, 11 May 2017 10:28:53 -0700 Subject: [PATCH 36/50] wrote controller action for rental create and updated tests --- app/controllers/rentals_controller.rb | 4 +++- app/models/rental.rb | 7 +++++++ test/controllers/rentals_controller_test.rb | 9 ++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 4ccb7355e..f2d9ed21b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,9 +1,10 @@ class RentalsController < ApplicationController def create + rental = Rental.new(rental_params) if rental.save - render status: :ok, json: {rental_success: true} + render status: :ok, json: {id: rental.id} else render status: :bad_request, json: { errors: rental.errors.messages } end @@ -20,6 +21,7 @@ def overdue def rental_params params.require(:rental).permit(:due_date, :customer_id, :title) + # params.require(:rental).permit(:due_date, :customer_id, :movie_id) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 68964808f..69e315a93 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -8,6 +8,13 @@ class Rental < ApplicationRecord def initialize rental_params converted_date = convert_date(rental_params[:due_date]) rental_params[:due_date] = converted_date + movie = Movie.find_by(title: rental_params[:title]) + if movie + rental_params[:movie_id] = movie.id + end + + rental_params.delete(:title) + puts rental_params.keys super(rental_params) end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a623236e4..16c3d15f1 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -12,7 +12,8 @@ it "Creates a new rental" do proc { - post check_out_path, params: { rental: rental_data } + post check_out_path(rental_data[:title]), params: { rental: rental_data } + }.must_change 'Rental.count', 1 must_respond_with :success body = JSON.parse(response.body) @@ -31,7 +32,7 @@ bad_data.delete(:title) proc { - post check_out_path, params: { rental: bad_data } + post check_out_path(rental_data[:title]), params: { rental: bad_data } }.wont_change 'Rental.count' must_respond_with :bad_request @@ -39,16 +40,18 @@ body.must_be_kind_of Hash body.must_include "errors" body["errors"].must_include "movie" - body.must_equal "errors" => {"movie" => ["can't be blank"]} + body.must_equal "errors" => {"movie" => ["must exist"]} end end it "should get update" do + skip get rentals_update_url value(response).must_be :success? end it "should get overdue" do + skip get rentals_overdue_url value(response).must_be :success? end From d7394fa6c07b4bdad2d874113466821df6bf4f79 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Fri, 12 May 2017 10:27:50 -0700 Subject: [PATCH 37/50] updated tests and controller logic --- app/controllers/rentals_controller.rb | 10 ++++------ app/models/rental.rb | 2 -- test/controllers/rentals_controller_test.rb | 11 +++-------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index f2d9ed21b..036b8cddb 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,14 +1,13 @@ class RentalsController < ApplicationController def create - - rental = Rental.new(rental_params) - + rental_info = rental_params + rental_info[:title] = params[:title] + rental = Rental.new(rental_info) if rental.save render status: :ok, json: {id: rental.id} else render status: :bad_request, json: { errors: rental.errors.messages } end - end def update @@ -20,8 +19,7 @@ def overdue private def rental_params - params.require(:rental).permit(:due_date, :customer_id, :title) - # params.require(:rental).permit(:due_date, :customer_id, :movie_id) + params.require(:rental).permit(:due_date, :customer_id) end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 69e315a93..d5909c2a7 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -12,9 +12,7 @@ def initialize rental_params if movie rental_params[:movie_id] = movie.id end - rental_params.delete(:title) - puts rental_params.keys super(rental_params) end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 16c3d15f1..f7f09656d 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -4,7 +4,6 @@ describe "create" do let(:rental_data) { { - title: movies(:one).title, customer_id: customers(:one).id, due_date: "2017-06-30" } @@ -12,8 +11,7 @@ it "Creates a new rental" do proc { - post check_out_path(rental_data[:title]), params: { rental: rental_data } - + post check_out_path(movies(:one).title), params: { rental: rental_data } }.must_change 'Rental.count', 1 must_respond_with :success body = JSON.parse(response.body) @@ -21,18 +19,15 @@ body.must_include "id" # Check that the ID matches - Rental.find(body["id"]).movie.title.must_equal rental_data[:title] + Rental.find(body["id"]).movie.title.must_equal movies(:one).title Rental.find(body["id"]).customer_id.must_equal rental_data[:customer_id] Rental.find(body["id"]).due_date.must_equal Date.parse(rental_data[:due_date]) end # may need more tests for cases: missing customer, missing duedate it "Returns an error for an invalid rental" do - bad_data = rental_data.clone() - bad_data.delete(:title) - proc { - post check_out_path(rental_data[:title]), params: { rental: bad_data } + post check_out_path("jaws"), params: { rental: rental_data } }.wont_change 'Rental.count' must_respond_with :bad_request From b2b9bd5ae2c350adbe293d21fb2da345c596130d Mon Sep 17 00:00:00 2001 From: sai samant Date: Fri, 12 May 2017 11:01:12 -0700 Subject: [PATCH 38/50] logic and tests for Movie model method available inventory --- app/models/movie.rb | 4 ++-- app/models/rental.rb | 7 +++++++ test/fixtures/movies.yml | 15 ++++++++++++++- test/fixtures/rentals.yml | 10 ++++++++-- test/models/movie_test.rb | 17 +++++++++++++++-- 5 files changed, 46 insertions(+), 7 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index d3355bf93..1f672932b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,13 +1,13 @@ class Movie < ApplicationRecord has_many :rentals - + validates :title, presence: true validates :overview, presence: true validates :release_date, presence: true, format: { with: /\A\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\z/, message: "must be in YYYY-MM-DD format" } validates :inventory, presence: true, numericality: { only_integer: true, greater_than: 0} def available_inventory - return inventory + return inventory - rentals.where(returned: false).length end end diff --git a/app/models/rental.rb b/app/models/rental.rb index d5909c2a7..72447674e 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,6 +4,7 @@ class Rental < ApplicationRecord validates :due_date, presence: true validate :valid_due_date + #validate :check_inventory def initialize rental_params converted_date = convert_date(rental_params[:due_date]) @@ -16,6 +17,12 @@ def initialize rental_params super(rental_params) end + # def check_inventory + # call movie.available_inventory and update numbers as appropriate + # add error message if there is not a movie available + #if number returned by available_inventory > 0 make the rental, if 0 or less, do not make the rental + # end + def convert_date date if date =~ /\A\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\z/ return Date.parse(date) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index ffd19cd27..e400cb6b4 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -11,4 +11,17 @@ two: title: Guardians of the Galaxy 2 overview: space release_date: 2017-05-04 - inventory: 4 + inventory: 1 + + +three: + title: Psycho + overview: weird mom-son issues + release_date: 1970-01-01 + inventory: 0 + +four: + title: Toy Story + overview: spaceman and cowboy become friends + release_date: 2000-05-05 + inventory: 6 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index a7bd38424..d5dc9b708 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,13 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - due_date: 2017-05-14 + due_date: 2018-05-14 returned: false customer: one movie: one two: - due_date: 2017-05-17 + due_date: 2018-05-17 returned: false customer: two movie: two + +three: + due_date: 2018-06-04 + returned: false + customer: two + movie: one diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 63fcc4329..22170fb2e 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -80,11 +80,24 @@ describe "custom methods" do #need to update when we add rentals - it "available_inventory returns inventory" do + it "available_inventory returns an Integer " do + # has two rentals movie = movies(:one) - movie.available_inventory.must_equal movie.inventory + movie.available_inventory.must_equal 18 + #has one rental + guardians = movies(:two) + guardians.available_inventory.must_equal 0 + + #has no inventory and no rentals + psycho = movies(:three) + psycho.available_inventory.must_equal 0 + + #has inventory and no rentals + toy_story = movies(:four) + toy_story.available_inventory.must_equal 6 end + end end From 82453419b1ceac9f177035c47fc6ee47f73e470d Mon Sep 17 00:00:00 2001 From: sai samant Date: Fri, 12 May 2017 11:23:53 -0700 Subject: [PATCH 39/50] tests for custom method check_availability in rental model --- app/models/rental.rb | 6 ++-- test/fixtures/customers.yml | 10 ++++++ test/models/rental_test.rb | 72 +++++++++++++++++++++++-------------- 3 files changed, 58 insertions(+), 30 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 72447674e..951cb6a70 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -18,9 +18,9 @@ def initialize rental_params end # def check_inventory - # call movie.available_inventory and update numbers as appropriate - # add error message if there is not a movie available - #if number returned by available_inventory > 0 make the rental, if 0 or less, do not make the rental + # call movie.available_inventory --> this will return a value + # if > 0 make the rental + # if 0 or less, do not make the rental, add error message # end def convert_date date diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 0c1ad5f97..87a72977b 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -19,3 +19,13 @@ two: postal_code: 03450 phone: (555)-555-5555 account_credit: 1.5 + +three: + name: Jim Henson + registered_at: Thu, 30 Apr 2015 07:54:14 -0700 + address: Sesame Street + city: New York + state: NY + postal_code: 03450 + phone: (666)-555-5555 + account_credit: 6 diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index dbcf9ac68..787587cfb 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -23,42 +23,60 @@ end it "due date must be a Date object" do - rental = Rental.new(customer: customers(:one), movie: movies(:one), due_date: "2017-04") - rental.valid?.must_equal false - rental.errors.messages[:due_date].must_include "can't be blank" - end - - it "returned is set as a default value to false" do - rental = rentals(:two) - rental.valid?.must_equal true - rental.returned.must_equal false - end + rental = Rental.new(customer: customers(:one), movie: movies(:one), due_date: "2017-04") + rental.valid?.must_equal false + rental.errors.messages[:due_date].must_include "can't be blank" end + it "returned is set as a default value to false" do + rental = rentals(:two) + rental.valid?.must_equal true + rental.returned.must_equal false + end - describe "relationships" do - it "requires a customer" do - rental = Rental.new(movie: movies(:one), due_date: "2017-8-13") - rental.valid?.must_equal false - rental.errors.messages.must_include :customer + describe "validate check_inventory" do + it "available inventory must be 1 or to be valid" do + rental = rentals(:one) + rental.valid?.must_equal true end - it "requires a movie" do - rental = Rental.new(customer: customers(:one), due_date: "2017-08-13") - rental.valid?.must_equal false - rental.errors.messages.must_include :movie - end + it "returns an error message if available inventory is less than 1" do + psycho = Rental.new(customer: customers(:three), movie: movies(:three), due_date: "2017-08-01") + psycho.valid?.must_equal false + psycho.errors.messages[:availability].must_include "Sorry, this movie is out of stock" - it "can get the customer" do - rental = rentals(:one) - rental.customer.must_be_kind_of Customer + guardians = Rental.new(customer: customers(:three), movie: movies(:two), due_date: "2018-10-10" ) + guardians.valid?.must_equal false + guardians.errors.messages[:availability].must_include "Sorry, this movie is out of stock" end + end - it "can get the movie" do - rental = rentals(:one) - rental.movie.must_be_kind_of Movie - end + end + + describe "relationships" do + it "requires a customer" do + rental = Rental.new(movie: movies(:one), due_date: "2017-8-13") + rental.valid?.must_equal false + rental.errors.messages.must_include :customer end + it "requires a movie" do + rental = Rental.new(customer: customers(:one), due_date: "2017-08-13") + rental.valid?.must_equal false + rental.errors.messages.must_include :movie + end + + it "can get the customer" do + rental = rentals(:one) + rental.customer.must_be_kind_of Customer + end + + it "can get the movie" do + rental = rentals(:one) + rental.movie.must_be_kind_of Movie + end + + end + end From ff405d5c2ca6207a2643cbf992628fd21138388f Mon Sep 17 00:00:00 2001 From: sai samant Date: Fri, 12 May 2017 12:52:10 -0700 Subject: [PATCH 40/50] finised testing for rental model custom method --- app/models/rental.rb | 14 ++++++++------ test/models/rental_test.rb | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 951cb6a70..328ced5f3 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -4,7 +4,7 @@ class Rental < ApplicationRecord validates :due_date, presence: true validate :valid_due_date - #validate :check_inventory + validate :check_inventory def initialize rental_params converted_date = convert_date(rental_params[:due_date]) @@ -17,11 +17,13 @@ def initialize rental_params super(rental_params) end - # def check_inventory - # call movie.available_inventory --> this will return a value - # if > 0 make the rental - # if 0 or less, do not make the rental, add error message - # end + def check_inventory + if movie + if movie.available_inventory <= 0 + errors.add(:availability, "Sorry, this movie is out of stock") + end + end + end def convert_date date if date =~ /\A\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])\z/ diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 787587cfb..4b86ef7f6 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -29,7 +29,7 @@ end it "returned is set as a default value to false" do - rental = rentals(:two) + rental = rentals(:one) rental.valid?.must_equal true rental.returned.must_equal false end From e442f2e629bf6eae22338a276a12eea3122aeb38 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Fri, 12 May 2017 12:57:44 -0700 Subject: [PATCH 41/50] fix typo in movie controllers test --- test/controllers/movies_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 297e1cc02..6f7389975 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -26,7 +26,7 @@ it "returns all of the movies" do get movies_path body = JSON.parse(response.body) - body.length.must_equal Customer.count + body.length.must_equal Movie.count end it "returns movie with exactly the required fields" do From 70ee7ef7d22d79cb22108eca7b35d07342788de4 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Fri, 12 May 2017 13:21:16 -0700 Subject: [PATCH 42/50] added tests for the rentals custom method in model --- app/models/rental.rb | 2 +- test/controllers/rentals_controller_test.rb | 29 ++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 328ced5f3..93a4a9ead 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -20,7 +20,7 @@ def initialize rental_params def check_inventory if movie if movie.available_inventory <= 0 - errors.add(:availability, "Sorry, this movie is out of stock") + errors.add(:availability, "Sorry, this movie is not in stock") end end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f7f09656d..bfb7d1b4b 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -25,7 +25,7 @@ end # may need more tests for cases: missing customer, missing duedate - it "Returns an error for an invalid rental" do + it "Returns an error for an incorrect title" do proc { post check_out_path("jaws"), params: { rental: rental_data } }.wont_change 'Rental.count' @@ -37,6 +37,33 @@ body["errors"].must_include "movie" body.must_equal "errors" => {"movie" => ["must exist"]} end + + it "Returns an error for a missing customer" do + bad_data = rental_data.clone() + bad_data.delete(:customer_id) + proc { + post check_out_path(movies(:one).title), params: { rental: bad_data } + }.wont_change 'Rental.count' + must_respond_with :bad_request + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "customer" + body.must_equal "errors" => {"customer" => ["must exist"]} + end + + it "returns an error if there is not enough inventory" do + proc { + post check_out_path(movies(:three).title), params: { rental: rental_data } + }.wont_change 'Rental.count' + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "availability" + body.must_equal "errors" => {"availability" => ["Sorry, this movie is not in stock"]} + end end it "should get update" do From 510a49d86ab29d63e1065319ed2cd1e3e5c93224 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Fri, 12 May 2017 13:27:10 -0700 Subject: [PATCH 43/50] fixed error message in rental model test --- test/models/rental_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 4b86ef7f6..1733f04af 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -43,11 +43,11 @@ it "returns an error message if available inventory is less than 1" do psycho = Rental.new(customer: customers(:three), movie: movies(:three), due_date: "2017-08-01") psycho.valid?.must_equal false - psycho.errors.messages[:availability].must_include "Sorry, this movie is out of stock" + psycho.errors.messages[:availability].must_include "Sorry, this movie is not in stock" guardians = Rental.new(customer: customers(:three), movie: movies(:two), due_date: "2018-10-10" ) guardians.valid?.must_equal false - guardians.errors.messages[:availability].must_include "Sorry, this movie is out of stock" + guardians.errors.messages[:availability].must_include "Sorry, this movie is not in stock" end end From 029a9149beedf93989bbc45866206309c87b9f7a Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Fri, 12 May 2017 13:29:10 -0700 Subject: [PATCH 44/50] updated logic on movies_checked_out_count method --- app/models/customer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 52e9afc22..a4156f826 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,12 +1,12 @@ class Customer < ApplicationRecord has_many :rentals - + validates :name, presence: true validates :phone, presence: true, uniqueness: true # update later after adding rental def movies_checked_out_count - return 0 + return rentals.where(returned: false).length end end From 0f368f008456cba5ec5bf6b0347f1e1fc30515b6 Mon Sep 17 00:00:00 2001 From: Bo Trethewey Date: Fri, 12 May 2017 13:32:55 -0700 Subject: [PATCH 45/50] updated tests for the custom method --- test/models/customer_test.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index f6aa9a11d..ab6cb6501 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -35,8 +35,7 @@ #need to update when we add rentals it "movies_checked_out_count returns the number of rentals belonging to the customer" do customer = customers(:one) - customer.movies_checked_out_count.must_equal 0 - + customer.movies_checked_out_count.must_equal Rental.where(customer: customers(:one), returned: false).length end end end From bf6306b43dbcb52c2c870cca1bc71a53547d2188 Mon Sep 17 00:00:00 2001 From: sai samant Date: Fri, 12 May 2017 13:57:00 -0700 Subject: [PATCH 46/50] TDD! wrote controller tests for Rental update action --- test/controllers/rentals_controller_test.rb | 57 +++++++++++++++++++-- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index bfb7d1b4b..d305744b2 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -66,12 +66,59 @@ end end - it "should get update" do - skip - get rentals_update_url - value(response).must_be :success? - end + describe "update (check in a movie)" do + it "should change returned field to true when a movie is checked in" do + + post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one)} } + must_respond_with :success + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "movie_returned" + end + + it "checking in a movie should increase its available inventory by one" do + available_inventory = movies(:one).available_inventory + post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one)} } + movies(:one).available_inventory.must_equal (available_inventory + 1) + end + + it "checking in a movie decreases the customer's movies_checked_out_count" do + movies_checked_out = customers(:one).movies_checked_out_count + post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one)} } + customers(:one).movies_checked_out_count.must_equal (movies_checked_out + 1) + end + + it "returns an error if the movie has already been checked in" do + + post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one)} } + must_respond_with :success + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "movie_returned" + + + available_inventory = movies(:one).available_inventory + post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one)} } + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_equal "errors" => {"check-in" => ["Customer has already checked in this movie"]} + available_inventory = movies(:one).available_inventory + + end + + it "returns an error if the customer has not checked out the movie" do + movie_count = customers(:one).movies_checked_out_count + post check_in_path(movies(:two).title), params: { rental: {customer_id: customers(:one)} } + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_equal "errors" => {"check-in" => ["Customer has not checked out this movie"]} + customers(:one).movies_checked_out_count.must_equal movie_count + end + + end it "should get overdue" do skip get rentals_overdue_url From d19069cf22c4b4854aa24d356279d8c757e36066 Mon Sep 17 00:00:00 2001 From: sai samant Date: Fri, 12 May 2017 15:21:49 -0700 Subject: [PATCH 47/50] tests for update action in Rental --- app/controllers/rentals_controller.rb | 14 ++++++++ test/controllers/rentals_controller_test.rb | 40 +++++++++++++++------ 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 036b8cddb..d6ca39339 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -11,9 +11,23 @@ def create end def update + movie = Movie.find_by(title: params[:title] ) + rental = Rental.find_by(movie_id: movie.id, customer_id: rental_params[:customer_id], returned: false) + if rental + rental.returned = true + if rental.save + render status: :ok, json: { movie_returned: true } + end + elsif Rental.find_by(movie_id: movie.id, customer_id: rental_params[:customer_id], returned: true) + render status: :bad_request, json: { errors: { check_in: "Customer has already checked in this movie"}} + else + render status: :bad_request, json: { errors: { check_in: "Cannot find this rental"} } + end end def overdue + rentals = Rental.all + render json: rentals.as_json end private diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index d305744b2..03d29d7ee 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -69,29 +69,44 @@ describe "update (check in a movie)" do it "should change returned field to true when a movie is checked in" do + rental = Rental.create(movie_id: movies(:one).id, customer_id: customers(:three).id, due_date: "2018-10-10") - post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one)} } + rental.returned.must_equal false + post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:three).id} } must_respond_with :success body = JSON.parse(response.body) body.must_be_kind_of Hash body.must_include "movie_returned" + rental.reload + rental.returned.must_equal true + end it "checking in a movie should increase its available inventory by one" do - available_inventory = movies(:one).available_inventory - post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one)} } - movies(:one).available_inventory.must_equal (available_inventory + 1) + #working + proc { post check_in_path(movies(:one).title), params: + { rental: {customer_id: customers(:one).id} } + }.must_change 'movies(:one).available_inventory', 1 + end it "checking in a movie decreases the customer's movies_checked_out_count" do - movies_checked_out = customers(:one).movies_checked_out_count - post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one)} } - customers(:one).movies_checked_out_count.must_equal (movies_checked_out + 1) + ada = Customer.create(name: "Ada Ada", phone: "617-6176-6170") + + Rental.create(movie_id: movies(:one).id, customer_id: ada.id, due_date: "2018-10-10") + + movies_checked_out = ada.movies_checked_out_count + + post check_in_path(movies(:one).title), params: { rental: {customer_id: ada.id}} + + ada.reload + ada.movies_checked_out_count.must_equal movies_checked_out - 1 + end it "returns an error if the movie has already been checked in" do - post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one)} } + post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one).id} } must_respond_with :success body = JSON.parse(response.body) body.must_be_kind_of Hash @@ -99,23 +114,26 @@ available_inventory = movies(:one).available_inventory - post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one)} } + post check_in_path(movies(:one).title), params: { rental: {customer_id: customers(:one).id} } must_respond_with :bad_request body = JSON.parse(response.body) body.must_be_kind_of Hash - body.must_equal "errors" => {"check-in" => ["Customer has already checked in this movie"]} + body.must_equal "errors" => {"check_in" => "Customer has already checked in this movie"} available_inventory = movies(:one).available_inventory + end it "returns an error if the customer has not checked out the movie" do + proc { movie_count = customers(:one).movies_checked_out_count post check_in_path(movies(:two).title), params: { rental: {customer_id: customers(:one)} } must_respond_with :bad_request body = JSON.parse(response.body) body.must_be_kind_of Hash - body.must_equal "errors" => {"check-in" => ["Customer has not checked out this movie"]} + body.must_equal "errors" => {"check_in" => "Cannot find this rental"} customers(:one).movies_checked_out_count.must_equal movie_count + } end end From 8ad3f291c7250d2df88004f2cdf8f2b366930405 Mon Sep 17 00:00:00 2001 From: sai samant Date: Fri, 12 May 2017 16:32:27 -0700 Subject: [PATCH 48/50] WIP overdue action in rental controller --- app/controllers/rentals_controller.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d6ca39339..5acd84234 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -26,7 +26,14 @@ def update end def overdue - rentals = Rental.all + + #what is the syntax for a conditional for due date? + rentals = Rental.where("returned = ? AND due_date <= ?", false, Date.current-1) + + + + rentals.group_by { |rental| rental.customer_id } + render json: rentals.as_json end From 79cd47690f8411b373886a1e12f789718199cab1 Mon Sep 17 00:00:00 2001 From: sai samant Date: Fri, 12 May 2017 21:18:25 -0700 Subject: [PATCH 49/50] hash to give to json in overdue action with all the required fields --- app/controllers/rentals_controller.rb | 31 ++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 5acd84234..d1b1d7823 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -26,15 +26,36 @@ def update end def overdue - #what is the syntax for a conditional for due date? - rentals = Rental.where("returned = ? AND due_date <= ?", false, Date.current-1) - + rentals = Rental.where("returned = ? AND due_date <= ?", false, Date.current) + if rentals + #array of customer ids for customers who have overdue rentals + customer_ids = rentals.map { |rental| rental.customer_id } + overdue_rentals = [] + customer_ids.each do |id| + customer = Customer.find_by_id(id) + hash = Hash.new + hash[:name] = customer.name + hash[:customer_id] = id + hash[:postal_code] = customer.postal_code - rentals.group_by { |rental| rental.customer_id } + rentals = [] + customer.rentals.each do |rental| + rental_hash = Hash.new + rental_hash[:title] = Movie.find_by_id(rental.movie_id).title + rental_hash[:checkout_date] = rental.created_at.to_date + rental_hash[:due_date] = rental.due_date + rentals << rental_hash + end + hash[:rentals] = rentals + overdue_rentals << hash + end + render status: :ok, json: overdue_rentals.as_json + else + render status: :bad_request, json: { overdue: "There are no overdue rentals" } + end - render json: rentals.as_json end private From 656104e06b59f596b3a3c2bf769de8b115194d8a Mon Sep 17 00:00:00 2001 From: sai samant Date: Fri, 12 May 2017 21:34:26 -0700 Subject: [PATCH 50/50] WIP changed error message in check_inventory method to give estimated due date of next available movie --- app/models/rental.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/rental.rb b/app/models/rental.rb index 93a4a9ead..99de60d08 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -20,7 +20,9 @@ def initialize rental_params def check_inventory if movie if movie.available_inventory <= 0 - errors.add(:availability, "Sorry, this movie is not in stock") + rentals = Rental.where(movie_id: movie.id) + earliest = rentals.min_by { |rental| rental.due_date} + errors.add(:availability, "Sorry, this movie is not in stock. One is due back on #{earliest.due_date}") end end end