From 67389f751a9fe2b11951ead3308212c2c2b5c776 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Tue, 14 May 2019 12:50:30 -0700 Subject: [PATCH 01/49] created new rails api --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + 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 | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 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 | 24 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 935 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile 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/credentials.yml.enc 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/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# 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 uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..10ff272b5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.6.0 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..d39a5f189 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.0' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..480b9ac8f --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.0p0 + +BUNDLED WITH + 1.17.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end 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..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +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..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # 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..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..0798dd0b6 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +7EYtEaszv8ZF8Ene2rmH8xtS1Q7gBEDobRf+88Y1UpVvKJAHj4ZplWy20fzn7qIR8qu6nphl16EwBzEMb4RdSnyXrlWxrjcXQtfGg0rzVgcDEy0KoRVG7u5bnM/jJSe/Rb2NPBxvWEs0iq1fGmyJYZANIUtInqkDyA3g8+4iRpDDYCBK1tH7mbg6WAlnRSLqyRKosNDAG+n+r9tGQxR9lPlHGhnB5116tMUJp8lcPbAOqlLv20TYwHQR5if2jvXIy1pRgHfQ2SYIurYudFxNPtWBD1itpcprEbQmjkDK8skke7UVv0RvXslBTOTdUv1dY19WIchX8FHheum6qhOtfJa+C/4mFJMRm/+I7abZ8chSjafzLAHhXxucvZgQoARG4v1QhpBvu28oexTNTxeIyj+mEtq+CxZJoqya--rLeQpMjAsqrDdlg7--lUwVUe4Imw+/am+DUaO3BA== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +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. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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 + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # 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..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +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 + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = 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 + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + 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/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# 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/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /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/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb 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..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 397dc42028afe3acc2ddbd39bf2358f5ca18f18b Mon Sep 17 00:00:00 2001 From: Nidhi Date: Tue, 14 May 2019 12:54:17 -0700 Subject: [PATCH 02/49] added customer and movie model --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ db/migrate/20190514195258_create_movies.rb | 12 ++++++++++++ db/migrate/20190514195358_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 +++++++++ 8 files changed, 81 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20190514195258_create_movies.rb create mode 100644 db/migrate/20190514195358_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/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/20190514195258_create_movies.rb b/db/migrate/20190514195258_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514195258_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20190514195358_create_customers.rb b/db/migrate/20190514195358_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514195358_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..28081e26b --- /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: 2019-05-14 12:53:58 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 12:53:58 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..e8afe187d --- /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: 2019-05-14 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 + 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 8841352efda6e5e4c25e61567ddca78707d13be0 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 12:55:14 -0700 Subject: [PATCH 03/49] rails setup --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + 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 | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 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 | 25 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 936 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile 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/credentials.yml.enc 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/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# 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 uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..79838de54 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.3 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..f9a03d7fc --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.3' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..8a95703c4 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.3p105 + +BUNDLED WITH + 2.0.1 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end 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..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +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..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # 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..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..aa50da86a --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +GhDMyrn+T1ZhTKjY4ZKDUWV0dcBMAM0xPEeThONPLVSENfFiJVXL4tBUsMvj/wTjoY8lD98bK5jDKiSpTSix1i/MDD+324h3eBzzEKmRHFzrmHQWCNb8VPXgarXfZT0SWS2gJ1yt2N2nJt+hted96J1D7IKB0wn73al9R58ETSGVRVy+w9Y9y9Lue4WoX+olf5+FRc1aSgvIcperGGLdDkHWsk+qLMirIVu5rLdLzNShnBBW5KzUtddrcQFDxXEx4PPumU7ZZoDIS81K+T+bKXhGxfMlChSpGhqTtuQ+nQoRi6VtzfPtYn5gh1KPstiVydVw2vc7d9/qo3ZgpJUS1mtpBuenvbe5QOAw9uNmhbda2Woh08qiksVPZ3xoModR273jAPZJODkg5erfpJJ/Z2UX7G7FkM62hDCs--AjcshO1SNw4O1HJI--IdgjAQGg5PdJfnVSkoOctA== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +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. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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 + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # 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..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +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 + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = 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 + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + 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/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# 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/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /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/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb 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..fb7dd505e --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,25 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 9d677dc3884445664268ed859dd0bddcbc6dbce8 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 13:01:20 -0700 Subject: [PATCH 04/49] gemfile update ruby version --- Gemfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Gemfile b/Gemfile index 0f223ec8b..f9a03d7fc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -<<<<<<< HEAD ruby '2.5.3' -======= -ruby '2.6.0' ->>>>>>> 397dc42028afe3acc2ddbd39bf2358f5ca18f18b # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.3' From d54c71d538cfc7b817f3adee51d389713d93ffcd Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 13:02:10 -0700 Subject: [PATCH 05/49] gemfile.lock ruby version merge conflict --- Gemfile.lock | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e239224d7..8a95703c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,14 +163,7 @@ DEPENDENCIES tzinfo-data RUBY VERSION -<<<<<<< HEAD ruby 2.5.3p105 BUNDLED WITH 2.0.1 -======= - ruby 2.6.0p0 - -BUNDLED WITH - 1.17.2 ->>>>>>> 397dc42028afe3acc2ddbd39bf2358f5ca18f18b From 68f4f65bf348ce8ec91b2f51881cf9854b55d413 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 13:20:31 -0700 Subject: [PATCH 06/49] added rental model --- app/models/rental.rb | 2 + db/migrate/20190514201956_create_rentals.rb | 10 +++++ db/schema.rb | 46 +++++++++++++++++++++ test/fixtures/rentals.yml | 9 ++++ test/models/rental_test.rb | 9 ++++ 5 files changed, 76 insertions(+) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514201956_create_rentals.rb create mode 100644 db/schema.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/20190514201956_create_rentals.rb b/db/migrate/20190514201956_create_rentals.rb new file mode 100644 index 000000000..dc57bda5f --- /dev/null +++ b/db/migrate/20190514201956_create_rentals.rb @@ -0,0 +1,10 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :check_out_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..5e5376158 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,46 @@ +# 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: 2019_05_14_201956) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "check_out_date" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..935d3a243 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + check_out_date: 2019-05-14 + due_date: 2019-05-14 + +two: + check_out_date: 2019-05-14 + due_date: 2019-05-14 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 80d853310547d9afe10eddf75a9f43a96fb3df95 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 13:29:45 -0700 Subject: [PATCH 07/49] added foreign keys to rental model --- .../20190514202704_add_customer_and_movie_to_rental.rb | 6 ++++++ db/schema.rb | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190514202704_add_customer_and_movie_to_rental.rb diff --git a/db/migrate/20190514202704_add_customer_and_movie_to_rental.rb b/db/migrate/20190514202704_add_customer_and_movie_to_rental.rb new file mode 100644 index 000000000..628f5bb62 --- /dev/null +++ b/db/migrate/20190514202704_add_customer_and_movie_to_rental.rb @@ -0,0 +1,6 @@ +class AddCustomerAndMovieToRental < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 5e5376158..102193843 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: 2019_05_14_201956) do +ActiveRecord::Schema.define(version: 2019_05_14_202704) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -41,6 +41,12 @@ t.date "due_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" end + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From 01b7dd0c737981b62da6916e59058bdd4e88b471 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Tue, 14 May 2019 13:36:40 -0700 Subject: [PATCH 08/49] ruby version taken out --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index f9a03d7fc..e842491e6 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,6 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.3' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.3' From 3e913a87e47f5933c20306fbe79d426f03232c5e Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 14:11:19 -0700 Subject: [PATCH 09/49] created movies rentals and customers controllers and cleaned up routes --- app/controllers/customers_controller.rb | 4 ++++ app/controllers/movies_controller.rb | 10 ++++++++++ app/controllers/rentals_controller.rb | 2 ++ config/routes.rb | 2 ++ test/controllers/customers_controller_test.rb | 9 +++++++++ test/controllers/movies_controller_test.rb | 19 +++++++++++++++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ 7 files changed, 53 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..73302240c --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,4 @@ +class CustomersController < ApplicationController + def index + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..b69241e5f --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,10 @@ +class MoviesController < ApplicationController + def index + end + + def show + end + + def create + end +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..dacb6da61 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do + resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..c5ec6f20b --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + get customers_index_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..53607f49d --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,19 @@ +require "test_helper" + +describe MoviesController do + it "should get index" do + get movies_index_url + value(response).must_be :success? + end + + it "should get show" do + get movies_show_url + value(response).must_be :success? + end + + it "should get create" do + get movies_create_url + value(response).must_be :success? + end + +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From c70b708725e1e8b0f55aecb679332269ee311fdb Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 14:14:11 -0700 Subject: [PATCH 10/49] merge conflict - test helper --- test/test_helper.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index f785d6a11..3f7dc7d3e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,12 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -<<<<<<< HEAD require "minitest/rails" require "minitest/reporters" # for Colorized output -======= -require "minitest/rails"require "minitest/reporters" # for Colorized output ->>>>>>> 397dc42028afe3acc2ddbd39bf2358f5ca18f18b # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, @@ -14,7 +10,6 @@ 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" From 94fa52d145624398964a1e8bd7de08b4551a668c Mon Sep 17 00:00:00 2001 From: Nidhi Date: Tue, 14 May 2019 14:15:46 -0700 Subject: [PATCH 11/49] fixed ruby version --- Gemfile.lock | 3 --- test/test_helper.rb | 4 ---- 2 files changed, 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8a95703c4..707c96070 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,8 +162,5 @@ DEPENDENCIES spring-watcher-listen (~> 2.0.0) tzinfo-data -RUBY VERSION - ruby 2.5.3p105 - BUNDLED WITH 2.0.1 diff --git a/test/test_helper.rb b/test/test_helper.rb index f785d6a11..fb7dd505e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,12 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -<<<<<<< HEAD require "minitest/rails" require "minitest/reporters" # for Colorized output -======= -require "minitest/rails"require "minitest/reporters" # for Colorized output ->>>>>>> 397dc42028afe3acc2ddbd39bf2358f5ca18f18b # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 1ac6c971cfd603b87be4accdaed51ef7bf34f284 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Tue, 14 May 2019 14:25:18 -0700 Subject: [PATCH 12/49] added has many belongs to models --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + app/models/rental.rb | 3 +++ 3 files changed, 5 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d2533dbf9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..b8b339cbc 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..3a51cee13 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,5 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer + end From 96453aa352d62991f659f3182c3285f20ec5add6 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Tue, 14 May 2019 14:37:18 -0700 Subject: [PATCH 13/49] added get customers --- app/controllers/customers_controller.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 73302240c..d0bd83dcc 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,4 +1,10 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok end + + + end From 938465cb5ae8fd9ed9d36fb0d8ad67d8c2af8685 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 14:38:51 -0700 Subject: [PATCH 14/49] created index action and tests for movies controller --- app/controllers/movies_controller.rb | 2 + test/controllers/movies_controller_test.rb | 51 +++++++++++++++++----- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index b69241e5f..892da6f35 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,5 +1,7 @@ class MoviesController < ApplicationController def index + movies = Movie.all + render json: movies.as_json(only: [:id, :title, :release_date]) end def show diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 53607f49d..efd329623 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,19 +1,48 @@ require "test_helper" describe MoviesController do - it "should get index" do - get movies_index_url - value(response).must_be :success? - end + describe "index" do + it "should get index route" do + get movies_path + must_respond_with :success + end - it "should get show" do - get movies_show_url - value(response).must_be :success? - end + it "returns json" do + get movies_path + expect(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 "should get create" do - get movies_create_url - value(response).must_be :success? + it "returns all of the movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + keys = %w(id release_date title) + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end end + # it "should get show" do + # get movies_show_url + # value(response).must_be :success? + # end + + # it "should get create" do + # get movies_create_url + # value(response).must_be :success? + # end end From 0b06d152552fd4d64e30f31ebed1efdd514d47ee Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 15:02:28 -0700 Subject: [PATCH 15/49] updated fixutres for movies customers and rentals and updated movie relations tests accordingly --- test/fixtures/customers.yml | 28 ++++++++++++++-------------- test/fixtures/movies.yml | 18 +++++++++--------- test/fixtures/rentals.yml | 8 ++++++-- test/models/movie_test.rb | 22 ++++++++++++++++++++-- 4 files changed, 49 insertions(+), 27 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 28081e26b..956518267 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString +customer1: + name: Ada Lovelace registered_at: 2019-05-14 12:53:58 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 123 Computer Way + city: Seattle + state: WA + postal_code: '98199' + phone: 512-555-555 -two: - name: MyString +customer2: + name: Grace Hopper registered_at: 2019-05-14 12:53:58 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 345 Bytes Boulevard + city: Seattle + state: WA + postal_code: '98199' + phone: 512-333-3333 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e8afe187d..26b4cb39f 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: 2019-05-14 +movie1: + title: Amelie + overview: Feel good hipster movie about love and being kind to others + release_date: 2002-05-14 inventory: 1 -two: - title: MyString - overview: MyString - release_date: 2019-05-14 - inventory: 1 +movie2: + title: Finding Nemo + overview: A baby fish loses his mother in a horrible attack and goes on a big adventure + release_date: 2005-05-14 + inventory: 2 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 935d3a243..fbb79e9c8 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: +rental1: + customer: customer1 + movie: movie1 check_out_date: 2019-05-14 due_date: 2019-05-14 -two: +rental2: + customer: customer 2 + movie: movie1 check_out_date: 2019-05-14 due_date: 2019-05-14 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..ccfcab238 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,27 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let(:movie) { movies(:movie2) } + let(:rental1) { rentals(:rental1) } + let(:rental2) { rentals(:rental2) } it "must be valid" do - value(movie).must_be :valid? + expect(movie.valid?).must_equal true + end + + describe "relations" do + it "can have zero rentals" do + rentals = movie.rentals + expect(rentals.length).must_equal 0 + end + + it "can have many rentals" do + rentals = movie.rentals + rentals.push(rental1, rental2) + + expect(rentals.length).must_equal 2 + expect(rentals).must_include rental1 + expect(rentals).must_include rental2 + end end end From 217cedea980f82e92ce1e1caa8d29301722d27f7 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 15:14:04 -0700 Subject: [PATCH 16/49] testing for customer and rental models relationships --- test/fixtures/rentals.yml | 2 +- test/models/customer_test.rb | 22 ++++++++++++++++++++-- test/models/rental_test.rb | 19 +++++++++++++++++-- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index fbb79e9c8..9231eb21c 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -7,7 +7,7 @@ rental1: due_date: 2019-05-14 rental2: - customer: customer 2 + customer: customer 1 movie: movie1 check_out_date: 2019-05-14 due_date: 2019-05-14 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..c82c80624 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,27 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + let(:customer) { customers(:customer2) } + let(:rental1) { rentals(:rental1) } + let(:rental2) { rentals(:rental2) } it "must be valid" do - value(customer).must_be :valid? + expect(customer.valid?).must_equal true + end + + describe "relations" do + it "can have zero rentals" do + rentals = customer.rentals + expect(rentals.length).must_equal 0 + end + + it "can have many rentals" do + rentals = customer.rentals + rentals.push(rental1, rental2) + + expect(rentals.length).must_equal 2 + expect(rentals).must_include rental1 + expect(rentals).must_include rental2 + end end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..8e8c1fb85 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,24 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:rental1) } + let(:movie) { movies(:movie1) } it "must be valid" do - value(rental).must_be :valid? + expect(rental.valid?).must_equal true + end + + describe "relations" do + it "belongs to a movie" do + rental.movie = movie + + expect(rental.movie_id).must_equal movie.id + end + + it "can set the movie through the movie_id" do + rental.movie_id = movie.id + + expect(rental.movie).must_equal movie + end end end From 0864e23b9dbee2669b6d023e8500c43a5552ef8f Mon Sep 17 00:00:00 2001 From: Nidhi Date: Tue, 14 May 2019 15:27:58 -0700 Subject: [PATCH 17/49] added movies checked out --- app/controllers/customers_controller.rb | 4 ++-- app/models/customer.rb | 4 ++++ test/controllers/customers_controller_test.rb | 11 ++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index d0bd83dcc..e1d240d59 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,8 +1,8 @@ class CustomersController < ApplicationController - + def index customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone], methods: :movies_checked_out), status: :ok end diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..332838481 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,7 @@ class Customer < ApplicationRecord has_many :rentals + + def movies_checked_out + return rentals.count + end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5ec6f20b..116f5fb42 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,8 +2,17 @@ describe CustomersController do it "should get index" do - get customers_index_url + get customers_path value(response).must_be :success? end + it "returns customers with exactly the required fields" do + keys = %w(address city id name phone postal_code registered_at state) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + end From 3578a143aff2626119e274a25661982f5b83a7b9 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Tue, 14 May 2019 15:32:05 -0700 Subject: [PATCH 18/49] working on customer relation --- test/controllers/customers_controller_test.rb | 2 +- test/models/customer_test.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 116f5fb42..928cf676e 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,7 +7,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(address city id name phone postal_code registered_at state) + keys = %w(address city id name movies_checked_out phone postal_code registered_at state) get customers_path body = JSON.parse(response.body) body.each do |customer| diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..3d837a053 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -6,4 +6,6 @@ it "must be valid" do value(customer).must_be :valid? end + + end From c5f723c0408b36a6fcb52239ff315eee54b9e2c6 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 15:44:53 -0700 Subject: [PATCH 19/49] added create action to movies controller --- app/controllers/movies_controller.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 892da6f35..9909db64a 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,5 +8,18 @@ def show end def create + movie = Movie.new(movie_params) + + if movie.save + render json: { id: movie.id }, status: :ok + else + render json: { errors: movie.errors.messages }, status: :bad_request + end + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory) end end From 3f69f9b004acef6708a6db07fbe5b749f457975e Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 16:13:17 -0700 Subject: [PATCH 20/49] added testing for create action in movies controller --- app/models/movie.rb | 5 +++ test/controllers/movies_controller_test.rb | 47 ++++++++++++++++++++-- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index b8b339cbc..2735e27b8 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,8 @@ class Movie < ApplicationRecord has_many :rentals + + validates :title, presence: true + # validates :overview, presence: true + # validates :release_date, presence: true + validates :inventory, presence: true, numericality: true end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index efd329623..e5a4dc5b3 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -41,8 +41,47 @@ # value(response).must_be :success? # end - # it "should get create" do - # get movies_create_url - # value(response).must_be :success? - # end + describe "create" do + let(:movie_params) { + { + movie: { + title: "Thing", + overview: "Test", + release_date: "2019-01-01", + inventory: 0, + }, + } + } + + it "should create a new movie given valid data" do + expect { + post movies_path(movie_params) + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + expect(movie.title).must_equal movie_params[:movie][:title] + must_respond_with :success + end + + it "returns an error for invalid movie data" do + movie_params[:movie][:title] = nil + + expect { + post movies_path(movie_params) + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + expect(body["errors"]["title"]).must_equal ["can't be blank"] + must_respond_with :bad_request + end + end end From 32ab7d57e923d2973f8f35d00b68298d86763473 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Tue, 14 May 2019 16:23:11 -0700 Subject: [PATCH 21/49] add tests for get movies path --- app/controllers/movies_controller.rb | 6 +++++ app/models/movie.rb | 6 +++++ test/controllers/customers_controller_test.rb | 10 ++++++- test/controllers/movies_controller_test.rb | 27 +++++++++++++++++++ 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 892da6f35..8109e10d1 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,6 +5,12 @@ def index end def show + movie = Movie.find_by(id: params[:id]) + if movie + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory], methods: :available_inventory) + else + render json: { ok: "false", messages: { movie: ["Movie not found"] } }, status: :bad_request + end end def create diff --git a/app/models/movie.rb b/app/models/movie.rb index b8b339cbc..364f86273 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,9 @@ class Movie < ApplicationRecord has_many :rentals + + def available_inventory + available = inventory - rentals.count + return available + end + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 928cf676e..1e795b7fb 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,7 +7,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(address city id name movies_checked_out phone postal_code registered_at state) + keys = %w(address city id movies_checked_out name phone postal_code registered_at state) get customers_path body = JSON.parse(response.body) body.each do |customer| @@ -15,4 +15,12 @@ end end + it "gets index even without any customers" do + Rental.destroy_all + Customer.destroy_all + expect(Customer.count).must_equal 0 + get customers_path + value(response).must_be :success? + end + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index efd329623..b12efe3c9 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -45,4 +45,31 @@ # get movies_create_url # value(response).must_be :success? # end + + + describe "show" do + it "returns a movie with exactly require fields" do + keys = %w(available_inventory inventory overview release_date title) + get movie_path(movies(:movie1)) + body = JSON.parse(response.body) + body.keys.sort.must_equal keys + end + + it "should get movie details route with correct information" do + get movie_path(movies(:movie1)) + body = JSON.parse(response.body) + body["title"].must_equal movies(:movie1).title + body["overview"].must_equal movies(:movie1).overview + body["inventory"].must_equal movies(:movie1).inventory + must_respond_with :success + + end + + it "should not show details for a movie that does not exist" do + get movie_path(-1) + must_respond_with :bad_request + end + + + end end From 45b70091d1725fb5cf1f11bfa8ec0d69faa87c33 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Tue, 14 May 2019 16:41:25 -0700 Subject: [PATCH 22/49] fixed count --- app/controllers/customers_controller.rb | 2 +- app/models/customer.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index e1d240d59..1d17a2b1a 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone], methods: :movies_checked_out), status: :ok + render json: customers.as_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone], methods: :movies_checked_out_count), status: :ok end diff --git a/app/models/customer.rb b/app/models/customer.rb index 332838481..5e646aa1b 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,7 +1,7 @@ class Customer < ApplicationRecord has_many :rentals - def movies_checked_out + def movies_checked_out_count return rentals.count end end From 1535df7c12e54147eff420d1b3b55e9fbfc04b89 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Tue, 14 May 2019 16:43:46 -0700 Subject: [PATCH 23/49] fixed count in test --- test/controllers/customers_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 1e795b7fb..2e59a7b21 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -7,7 +7,7 @@ end it "returns customers with exactly the required fields" do - keys = %w(address city id movies_checked_out name phone postal_code registered_at state) + keys = %w(address city id movies_checked_out_count name phone postal_code registered_at state) get customers_path body = JSON.parse(response.body) body.each do |customer| From 2550c17ea889333526d34a1c727561068b9fb08e Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Tue, 14 May 2019 18:01:58 -0700 Subject: [PATCH 24/49] fixed movie params - weren't matching postman template --- app/controllers/movies_controller.rb | 4 ++-- test/controllers/movies_controller_test.rb | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 1a33fdaf0..1dce5e69f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -7,7 +7,7 @@ def index def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [:title, :overview, :release_date, :inventory], methods: :available_inventory) + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory], methods: :available_inventory) else render json: { ok: "false", messages: { movie: ["Movie not found"] } }, status: :bad_request end @@ -26,6 +26,6 @@ def create private def movie_params - params.require(:movie).permit(:title, :overview, :release_date, :inventory) + params.permit(:title, :overview, :release_date, :inventory) end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index f74691b2d..ab9cfd65d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -39,12 +39,10 @@ describe "create" do let(:movie_params) { { - movie: { - title: "Thing", - overview: "Test", - release_date: "2019-01-01", - inventory: 0, - }, + title: "Thing", + overview: "Test", + release_date: "2019-01-01", + inventory: 0, } } @@ -59,12 +57,12 @@ expect(body).must_include "id" movie = Movie.find(body["id"].to_i) - expect(movie.title).must_equal movie_params[:movie][:title] + expect(movie.title).must_equal movie_params[:title] must_respond_with :success end it "returns an error for invalid movie data" do - movie_params[:movie][:title] = nil + movie_params[:title] = nil expect { post movies_path(movie_params) From 8a6e2996ca0b8badbf9564353860df1805ff3940 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Wed, 15 May 2019 11:49:11 -0700 Subject: [PATCH 25/49] added checkout to rental --- app/controllers/rentals_controller.rb | 17 +++++++++++++++++ config/routes.rb | 2 ++ 2 files changed, 19 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..74fbe1a1b 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,19 @@ class RentalsController < ApplicationController + + def check_out + customer = Customer.find_by(id: rental_params[:customer_id]) + movie = Movie.find_by(id: rental_params[:movie_id]) + rental = Rental.new(check_out_date: Date.today, due_date: Date.today + 7.days, movie_id: movie.id, customer_id: customer.id ) + if rental.save + render json: { id: rental.id }, status: :ok + else + render json: { errors: rental.errors.messages }, status: :bad_request + end + end + + private + + def rental_params + params.permit(:movie_id, :customer_id) + end end diff --git a/config/routes.rb b/config/routes.rb index dacb6da61..a07090fa0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Rails.application.routes.draw do resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] + + post "/rentals/check-out", to: "rentals#check_out", as: "check_out" # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 32966710a53e46e3b620f25169b8e89ad1482000 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 12:57:50 -0700 Subject: [PATCH 26/49] added check_in action to rental controller --- app/controllers/rentals_controller.rb | 15 +++++++++++++++ config/routes.rb | 2 ++ 2 files changed, 17 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..963bc4bdd 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,17 @@ class RentalsController < ApplicationController + def check_in + rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) + # check_in: nil + + if rental + else + render json: { errors: ["Rental not found"] } + end + end + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end end diff --git a/config/routes.rb b/config/routes.rb index dacb6da61..3fb915e0e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Rails.application.routes.draw do resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] + + post "/rentals/check_in", to: "rentals#check_in", as: "check_in" # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 3d66436b4315527037ed17661dddfb3bd296d7ba Mon Sep 17 00:00:00 2001 From: Nidhi Date: Wed, 15 May 2019 13:10:12 -0700 Subject: [PATCH 27/49] change inventory --- app/controllers/rentals_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 74fbe1a1b..333657645 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,14 +1,17 @@ class RentalsController < ApplicationController def check_out - customer = Customer.find_by(id: rental_params[:customer_id]) - movie = Movie.find_by(id: rental_params[:movie_id]) + customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) rental = Rental.new(check_out_date: Date.today, due_date: Date.today + 7.days, movie_id: movie.id, customer_id: customer.id ) if rental.save render json: { id: rental.id }, status: :ok + movie.update(inventory: movie.inventory - 1) else render json: { errors: rental.errors.messages }, status: :bad_request end + + end private From f78e1f728387cbbb6e71fa96e3832dbe1e06f04b Mon Sep 17 00:00:00 2001 From: Nidhi Date: Wed, 15 May 2019 13:14:09 -0700 Subject: [PATCH 28/49] added no available copies for checkout --- app/controllers/rentals_controller.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 333657645..6e289ea3a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,15 +3,17 @@ class RentalsController < ApplicationController def check_out customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) - rental = Rental.new(check_out_date: Date.today, due_date: Date.today + 7.days, movie_id: movie.id, customer_id: customer.id ) - if rental.save - render json: { id: rental.id }, status: :ok - movie.update(inventory: movie.inventory - 1) + if movie.inventory > 0 + rental = Rental.new(check_out_date: Date.today, due_date: Date.today + 7.days, movie_id: movie.id, customer_id: customer.id ) + if rental.save + render json: { id: rental.id, inventory: movie.inventory }, status: :ok + movie.update(inventory: movie.inventory - 1) + else + render json: { errors: rental.errors.messages }, status: :bad_request + end else - render json: { errors: rental.errors.messages }, status: :bad_request + render json: { errors: "No available copies for checkout" }, status: :bad_request end - - end private From 95b428a7a0bee8e6510ed1df41377f828ca18166 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 13:16:45 -0700 Subject: [PATCH 29/49] migration to add check_in_date column to rental model --- app/controllers/rentals_controller.rb | 9 ++++++--- config/routes.rb | 2 +- .../20190515195843_add_check_in_date_to_rentals.rb | 5 +++++ db/schema.rb | 3 ++- 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20190515195843_add_check_in_date_to_rentals.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 963bc4bdd..d0cae8826 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,11 +1,14 @@ class RentalsController < ApplicationController def check_in - rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id]) - # check_in: nil + rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id], check_in_date: nil) + customer = Customer.find_by(id: params[:customer_id]) if rental + rental.check_in_date = Date.current + # adjust customer check out count? + render json: rental.as_json(only: [:id, :check_in_date]), status: :ok else - render json: { errors: ["Rental not found"] } + render json: { errors: ["Rental not found"] }, status: :bad_request end end diff --git a/config/routes.rb b/config/routes.rb index 3fb915e0e..c2f9a1777 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,6 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - post "/rentals/check_in", to: "rentals#check_in", as: "check_in" + post "/rentals/check-in", to: "rentals#check_in", as: "check-in" # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20190515195843_add_check_in_date_to_rentals.rb b/db/migrate/20190515195843_add_check_in_date_to_rentals.rb new file mode 100644 index 000000000..6c9383476 --- /dev/null +++ b/db/migrate/20190515195843_add_check_in_date_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCheckInDateToRentals < ActiveRecord::Migration[5.2] + def change + add_column :rentals, :check_in_date, :date + end +end diff --git a/db/schema.rb b/db/schema.rb index 102193843..c04a234f7 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: 2019_05_14_202704) do +ActiveRecord::Schema.define(version: 2019_05_15_195843) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -43,6 +43,7 @@ t.datetime "updated_at", null: false t.bigint "movie_id" t.bigint "customer_id" + t.date "check_in_date" t.index ["customer_id"], name: "index_rentals_on_customer_id" t.index ["movie_id"], name: "index_rentals_on_movie_id" end From 62ecbb2ed6e3df610dd1bcc892d2b3fc39e3037f Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 13:19:20 -0700 Subject: [PATCH 30/49] added some logic for inventory count which will need to be pulled out into the model --- app/controllers/rentals_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index d0cae8826..8e18ebe6c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,9 +2,12 @@ class RentalsController < ApplicationController def check_in rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id], check_in_date: nil) customer = Customer.find_by(id: params[:customer_id]) + movie = Movie.find_by(id: params[:movie_id]) if rental rental.check_in_date = Date.current + movie.inventory += 1 + movie.save # adjust customer check out count? render json: rental.as_json(only: [:id, :check_in_date]), status: :ok else From e459fc0557b997227ed473a2908961767eabe2d9 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 13:29:59 -0700 Subject: [PATCH 31/49] moved logic out of rental controller and into model custom methods - increase_inventory and set_check_in --- app/controllers/rentals_controller.rb | 7 +++---- app/models/movie.rb | 4 ++++ app/models/rental.rb | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 8e18ebe6c..93d5b43c0 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,10 +5,9 @@ def check_in movie = Movie.find_by(id: params[:movie_id]) if rental - rental.check_in_date = Date.current - movie.inventory += 1 - movie.save - # adjust customer check out count? + rental.set_check_in + movie.increase_inventory + render json: rental.as_json(only: [:id, :check_in_date]), status: :ok else render json: { errors: ["Rental not found"] }, status: :bad_request diff --git a/app/models/movie.rb b/app/models/movie.rb index 497142455..6c571f44f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,4 +10,8 @@ def available_inventory available = inventory - rentals.count return available end + + def increase_inventory + self.update(inventory: self.inventory += 1) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 3a51cee13..6ebbc8ee5 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,5 +1,8 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer - + + def set_check_in + self.update(check_in_date: Date.current) + end end From 40c3fd9c5503250e23c78bba9b4dc94b6f82f98f Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 13:48:40 -0700 Subject: [PATCH 32/49] added testing for rentals controller check_in action --- test/controllers/rentals_controller_test.rb | 48 +++++++++++++++++++-- test/fixtures/rentals.yml | 2 + 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..318a10155 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,49 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "check_in" do + let(:customer) { customers(:customer1) } + let(:movie) { movies(:movie1) } + let(:rental_params) { + { + movie_id: movie.id, + customer_id: customer.id, + } + } + + it "should check-in a movie given valid data" do + inventory = movie.inventory + + expect { + post check_in_path(rental_params) + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + movie.reload + + must_respond_with :success + expect(body).must_be_kind_of Hash + expect(body.keys).must_include "check_in_date" + expect(body["check_in_date"]).must_equal Date.current.to_s + expect(movie.inventory).must_equal inventory + 1 + end + + it "responds with bad request given invalid data" do + inventory = movie.inventory + rental_params[:customer_id] = nil + + expect { + post check_in_path(rental_params) + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + movie.reload + + must_respond_with :bad_request + expect(body).must_be_kind_of Hash + expect(body.keys).must_include "errors" + expect(body["errors"]).must_equal ["Rental not found"] + expect(movie.inventory).must_equal inventory + end + end end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 9231eb21c..dfcc1c7e7 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -5,9 +5,11 @@ rental1: movie: movie1 check_out_date: 2019-05-14 due_date: 2019-05-14 + check_in_date: nil rental2: customer: customer 1 movie: movie1 check_out_date: 2019-05-14 due_date: 2019-05-14 + check_in_date: 2019-05-14 From f512e8c86406131abb5c3f496c69e93f0028c003 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Wed, 15 May 2019 13:58:03 -0700 Subject: [PATCH 33/49] added tests for checkout method in rental controller --- app/controllers/rentals_controller.rb | 18 ++++- app/models/rental.rb | 2 +- test/controllers/rentals_controller_test.rb | 82 ++++++++++++++++++++- test/fixtures/movies.yml | 2 +- 4 files changed, 95 insertions(+), 9 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 6e289ea3a..10861b504 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,18 +1,28 @@ class RentalsController < ApplicationController def check_out + error = "No errors found" + customer = Customer.find_by(id: params[:customer_id]) + error = "Customer not found" if customer == nil + movie = Movie.find_by(id: params[:movie_id]) - if movie.inventory > 0 - rental = Rental.new(check_out_date: Date.today, due_date: Date.today + 7.days, movie_id: movie.id, customer_id: customer.id ) + error = "Movie not found" if movie == nil + error = "No available copies for checkout" if movie && movie.inventory < 1 + + if movie && movie.inventory > 0 && customer + rental = Rental.new(check_out_date: Date.today, + due_date: Date.today + 7.days, + movie_id: movie.id, + customer_id: customer.id ) if rental.save render json: { id: rental.id, inventory: movie.inventory }, status: :ok movie.update(inventory: movie.inventory - 1) else - render json: { errors: rental.errors.messages }, status: :bad_request + error = rental.errors.messages end else - render json: { errors: "No available copies for checkout" }, status: :bad_request + render json: { errors: error }, status: :bad_request end end diff --git a/app/models/rental.rb b/app/models/rental.rb index 3a51cee13..09e05ad13 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,5 +1,5 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer - + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..d5262c990 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,83 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "check_out" do + it "checks out a movie" do + rental_params = { + customer_id: customers(:customer1).id, + movie_id: movies(:movie1).id + } + + expect { + post check_out_path(rental_params) + }.must_change "Rental.count", +1 + end + + it "changes the inventory of checked out movie" do + start_inventory = movies(:movie1).inventory + rental_params = { + customer_id: customers(:customer1).id, + movie_id: movies(:movie1).id + } + + post check_out_path(rental_params) + + end_inventory = Movie.find_by(id: movies(:movie1).id).inventory + expect(end_inventory).must_equal start_inventory - 1 + + end + + it "changes the inventory of checked out movie when it checked out more than once" do + start_inventory = movies(:movie1).inventory + rental_params = { + customer_id: customers(:customer1).id, + movie_id: movies(:movie1).id + } + + post check_out_path(rental_params) + post check_out_path(rental_params) + post check_out_path(rental_params) + + end_inventory = Movie.find_by(id: movies(:movie1).id).inventory + expect(end_inventory).must_equal start_inventory - 3 + + end + + + it "does not check out for a customer that does not exist" do + rental_params = { + customer_id: -1, + movie_id: movies(:movie1).id + } + + expect { + post check_out_path(rental_params) + }.wont_change "Rental.count" + end + + it "does not check out for a movie that does not exist" do + rental_params = { + customer_id: customers(:customer1).id, + movie_id: -1 + } + + expect { + post check_out_path(rental_params) + }.wont_change "Rental.count" + end + + it "does not check out for movie with inventory of 0" do + no_movies = Movie.create(title: "titanic", overview: "movie", release_date: Date.today, inventory:0) + + rental_params = { + customer_id: customers(:customer1).id, + movie_id: no_movies.id + } + + expect { + post check_out_path(rental_params) + }.wont_change "Rental.count" + end + + end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 26b4cb39f..c7e7a7f11 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,7 +4,7 @@ movie1: title: Amelie overview: Feel good hipster movie about love and being kind to others release_date: 2002-05-14 - inventory: 1 + inventory: 5 movie2: title: Finding Nemo From 826897e8665ce9a78f5553ef2ce1713b674420ae Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 14:14:41 -0700 Subject: [PATCH 34/49] updated custome methods set_check_in and increase_inventory and created tests --- app/controllers/rentals_controller.rb | 1 + app/models/movie.rb | 6 +++++- test/models/movie_test.rb | 21 +++++++++++++++++++++ test/models/rental_test.rb | 24 ++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 93d5b43c0..2d1d023ef 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -8,6 +8,7 @@ def check_in rental.set_check_in movie.increase_inventory + # include what to do if set_check_in, or increase_inventory fail? render json: rental.as_json(only: [:id, :check_in_date]), status: :ok else render json: { errors: ["Rental not found"] }, status: :bad_request diff --git a/app/models/movie.rb b/app/models/movie.rb index 6c571f44f..372bf306c 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -12,6 +12,10 @@ def available_inventory end def increase_inventory - self.update(inventory: self.inventory += 1) + if self.inventory + self.update(inventory: self.inventory += 1) + else + return false + end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ccfcab238..cf7afbeee 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -24,4 +24,25 @@ expect(rentals).must_include rental2 end end + + describe "custom methods" do + describe "increase_inventory" do + it "increases a movies inventory count by one given a valid movie" do + inventory = movie.inventory + + movie.increase_inventory + movie.reload + + expect(movie.inventory).must_equal inventory + 1 + end + + it "will return false and error messages given an invalid movie" do + movie = Movie.create + + expect(movie.increase_inventory).must_equal false + expect(movie.errors.messages).must_include :inventory + expect(movie.errors.messages[:inventory]).must_equal ["can't be blank", "is not a number"] + end + end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 8e8c1fb85..8efc98462 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -21,4 +21,28 @@ expect(rental.movie).must_equal movie end end + + describe "custom methods" do + describe "set_check_in" do + it "must set the check_in_date" do + orig_check_in = rental.check_in_date + + rental.set_check_in + rental.reload + + assert_nil(orig_check_in) + expect(rental.check_in_date).must_equal Date.current + end + + it "will return false and error messages given an invalid rental" do + rental = Rental.create + + expect(rental.set_check_in).must_equal false + expect(rental.errors.messages).must_include :movie + expect(rental.errors.messages).must_include :customer + expect(rental.errors.messages[:movie]).must_equal ["must exist"] + expect(rental.errors.messages[:customer]).must_equal ["must exist"] + end + end + end end From a58fafa22834fbcac66faecbed1f8a090daac7cd Mon Sep 17 00:00:00 2001 From: Nidhi Date: Wed, 15 May 2019 14:22:03 -0700 Subject: [PATCH 35/49] add decrease inventory method in movie model --- app/controllers/rentals_controller.rb | 2 +- app/models/movie.rb | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 10861b504..6add765be 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -17,7 +17,7 @@ def check_out customer_id: customer.id ) if rental.save render json: { id: rental.id, inventory: movie.inventory }, status: :ok - movie.update(inventory: movie.inventory - 1) + movie.decrease_inventory else error = rental.errors.messages end diff --git a/app/models/movie.rb b/app/models/movie.rb index 497142455..92c40a0f2 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,4 +10,11 @@ def available_inventory available = inventory - rentals.count return available end + + def decrease_inventory + if inventory > 0 + self.update(inventory: inventory - 1) + end + return inventory + end end From e9a9f333d4be01fba187e33f8c8f86690d7170a7 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 14:23:58 -0700 Subject: [PATCH 36/49] deleted unneccessary line from check_in action --- app/controllers/rentals_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2d1d023ef..ef5389de8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,7 +1,6 @@ class RentalsController < ApplicationController def check_in rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id], check_in_date: nil) - customer = Customer.find_by(id: params[:customer_id]) movie = Movie.find_by(id: params[:movie_id]) if rental From f14ed600e5855e1f37c7bee4a21074db8703f2ad Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 14:28:59 -0700 Subject: [PATCH 37/49] merge conflict in routes --- config/routes.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 7db2ac230..309d94081 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,12 +1,8 @@ Rails.application.routes.draw do resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] -<<<<<<< HEAD post "/rentals/check-in", to: "rentals#check_in", as: "check-in" -======= - post "/rentals/check-out", to: "rentals#check_out", as: "check_out" ->>>>>>> master # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 07a051d817485f78e4a2114dbcbea6589fe535b9 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 14:37:56 -0700 Subject: [PATCH 38/49] removing inventory adjustments from check-in action --- app/controllers/rentals_controller.rb | 4 +--- test/controllers/rentals_controller_test.rb | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 774050322..80f193689 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,13 +1,11 @@ class RentalsController < ApplicationController def check_in rental = Rental.find_by(customer_id: params[:customer_id], movie_id: params[:movie_id], check_in_date: nil) - movie = Movie.find_by(id: params[:movie_id]) if rental rental.set_check_in - movie.increase_inventory - # include what to do if set_check_in, or increase_inventory fail? + # include what to do if set_check_in fails? render json: rental.as_json(only: [:id, :check_in_date]), status: :ok else render json: { errors: ["Rental not found"] }, status: :bad_request diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index a989a8904..4ae56e949 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -12,8 +12,6 @@ } it "should check-in a movie given valid data" do - inventory = movie.inventory - expect { post check_in_path(rental_params) }.wont_change "Rental.count" @@ -25,11 +23,9 @@ expect(body).must_be_kind_of Hash expect(body.keys).must_include "check_in_date" expect(body["check_in_date"]).must_equal Date.current.to_s - expect(movie.inventory).must_equal inventory + 1 end it "responds with bad request given invalid data" do - inventory = movie.inventory rental_params[:customer_id] = nil expect { @@ -43,7 +39,6 @@ expect(body).must_be_kind_of Hash expect(body.keys).must_include "errors" expect(body["errors"]).must_equal ["Rental not found"] - expect(movie.inventory).must_equal inventory end end From 05868ff74f25226861761692b45a3d77ca7860ce Mon Sep 17 00:00:00 2001 From: Nidhi Date: Wed, 15 May 2019 14:40:30 -0700 Subject: [PATCH 39/49] changed available inventory --- app/controllers/rentals_controller.rb | 1 - app/models/movie.rb | 16 +--------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 774050322..3c7c54b2a 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -31,7 +31,6 @@ def check_out customer_id: customer.id) if rental.save render json: { id: rental.id, inventory: movie.inventory }, status: :ok - movie.decrease_inventory else error = rental.errors.messages end diff --git a/app/models/movie.rb b/app/models/movie.rb index 3588d0b09..64f47c99b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -7,22 +7,8 @@ class Movie < ApplicationRecord validates :inventory, presence: true, numericality: true def available_inventory - available = inventory - rentals.count + available = inventory - Rental.where(check_in_date: nil).count return available end - def increase_inventory - if self.inventory - self.update(inventory: self.inventory += 1) - else - return false - end - end - - def decrease_inventory - if inventory > 0 - self.update(inventory: inventory - 1) - end - return inventory - end end From ec246d48487d88a4caaa815957dea7cf3cb4acbb Mon Sep 17 00:00:00 2001 From: Nidhi Date: Wed, 15 May 2019 14:45:24 -0700 Subject: [PATCH 40/49] fix movies checked out count --- app/models/customer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 5e646aa1b..d1ec545d7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,6 +2,6 @@ class Customer < ApplicationRecord has_many :rentals def movies_checked_out_count - return rentals.count + return Rental.where(check_in_date: nil).count end end From ea7acb2e28c5d7d9bc35adbbfdee3ada44cf212c Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 14:48:18 -0700 Subject: [PATCH 41/49] deleted tests that were expecting inventory count to change --- test/controllers/rentals_controller_test.rb | 28 --------------------- test/models/movie_test.rb | 18 ------------- 2 files changed, 46 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4ae56e949..2aadac9b5 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -54,34 +54,6 @@ }.must_change "Rental.count", +1 end - it "changes the inventory of checked out movie" do - start_inventory = movies(:movie1).inventory - rental_params = { - customer_id: customers(:customer1).id, - movie_id: movies(:movie1).id, - } - - post check_out_path(rental_params) - - end_inventory = Movie.find_by(id: movies(:movie1).id).inventory - expect(end_inventory).must_equal start_inventory - 1 - end - - it "changes the inventory of checked out movie when it checked out more than once" do - start_inventory = movies(:movie1).inventory - rental_params = { - customer_id: customers(:customer1).id, - movie_id: movies(:movie1).id, - } - - post check_out_path(rental_params) - post check_out_path(rental_params) - post check_out_path(rental_params) - - end_inventory = Movie.find_by(id: movies(:movie1).id).inventory - expect(end_inventory).must_equal start_inventory - 3 - end - it "does not check out for a customer that does not exist" do rental_params = { customer_id: -1, diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index cf7afbeee..ae225069d 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -26,23 +26,5 @@ end describe "custom methods" do - describe "increase_inventory" do - it "increases a movies inventory count by one given a valid movie" do - inventory = movie.inventory - - movie.increase_inventory - movie.reload - - expect(movie.inventory).must_equal inventory + 1 - end - - it "will return false and error messages given an invalid movie" do - movie = Movie.create - - expect(movie.increase_inventory).must_equal false - expect(movie.errors.messages).must_include :inventory - expect(movie.errors.messages[:inventory]).must_equal ["can't be blank", "is not a number"] - end - end end end From 975cb9985a7209998cf369702d28f1352f30fc56 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 15:08:25 -0700 Subject: [PATCH 42/49] added simplecov to gemfile and coverage folder to gitignore --- .gitignore | 2 ++ Gemfile | 1 + Gemfile.lock | 8 ++++++++ 3 files changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index 20319a28b..a138b3622 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ /config/master.key .ruby-version + +coverage/* diff --git a/Gemfile b/Gemfile index e842491e6..1dfb5e657 100644 --- a/Gemfile +++ b/Gemfile @@ -50,4 +50,5 @@ end group :test do gem 'minitest-rails' gem 'minitest-reporters' + gem 'simplecov' end diff --git a/Gemfile.lock b/Gemfile.lock index 707c96070..6b704390a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,12 +51,14 @@ GEM coderay (1.1.2) concurrent-ruby (1.1.5) crass (1.0.4) + docile (1.3.1) erubi (1.8.0) ffi (1.10.0) globalid (0.4.2) activesupport (>= 4.2.0) i18n (1.6.0) concurrent-ruby (~> 1.0) + json (2.2.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -125,6 +127,11 @@ GEM ffi (~> 1.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) @@ -158,6 +165,7 @@ DEPENDENCIES pry-rails puma (~> 3.11) rails (~> 5.2.3) + simplecov spring spring-watcher-listen (~> 2.0.0) tzinfo-data From bf6075354a0565ec142a8363b2c2ef83d9d2125c Mon Sep 17 00:00:00 2001 From: Nidhi Date: Wed, 15 May 2019 15:12:51 -0700 Subject: [PATCH 43/49] added validation to customer --- app/models/customer.rb | 1 + app/models/movie.rb | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index d1ec545d7..7fcd465ee 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,6 @@ class Customer < ApplicationRecord has_many :rentals + validates :name, presence: true def movies_checked_out_count return Rental.where(check_in_date: nil).count diff --git a/app/models/movie.rb b/app/models/movie.rb index 64f47c99b..97edf8fd7 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,8 +2,6 @@ class Movie < ApplicationRecord has_many :rentals validates :title, presence: true - # validates :overview, presence: true - # validates :release_date, presence: true validates :inventory, presence: true, numericality: true def available_inventory From 17a299c565c794caa39b46439af32838992440dd Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 15:17:55 -0700 Subject: [PATCH 44/49] updated testhelper to ignore certain files for simplecov --- test/test_helper.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 3f7dc7d3e..b6cd438f6 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,7 +2,15 @@ require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" require "minitest/rails" -require "minitest/reporters" # for Colorized output +require "minitest/reporters" +require "simplecov" +SimpleCov.start "rails" do + add_filter "/app/mailers/" + add_filter "/app/channels/" + add_filter "app/jobs/" +end + +# for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, From 023c52b3ef843d715c0a7578446fab5f8fd6e413 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Wed, 15 May 2019 15:35:02 -0700 Subject: [PATCH 45/49] added validation test for customer --- test/models/customer_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index d1d55786a..0abf1951f 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -9,6 +9,16 @@ expect(customer.valid?).must_equal true end + it "is not valid without a name" do + no_name = Customer.new(registered_at: "2019-05-14 12:53:58", + address: "123 Computer Way", + city: "Seattle", + state: "WA", + postal_code: '98199', + phone: 512-555-555) + expect(no_name.valid?).must_equal false + end + describe "relations" do it "can have zero rentals" do rentals = customer.rentals @@ -23,6 +33,7 @@ expect(rentals).must_include rental1 expect(rentals).must_include rental2 end + end From 8249030caad39bec4bd3acb4d0af0f11038c9673 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Wed, 15 May 2019 15:54:39 -0700 Subject: [PATCH 46/49] validation tests for movie model --- app/models/movie.rb | 3 +-- test/models/movie_test.rb | 45 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 97edf8fd7..2fb7066b7 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,11 +2,10 @@ class Movie < ApplicationRecord has_many :rentals validates :title, presence: true - validates :inventory, presence: true, numericality: true + validates :inventory, presence: true, numericality: { greater_than: -1 } def available_inventory available = inventory - Rental.where(check_in_date: nil).count return available end - end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index ae225069d..e914d2176 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -25,6 +25,51 @@ end end + describe "validations" do + it "must have a title" do + movie.title = nil + + expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include :title + expect(movie.errors.messages[:title]).must_equal ["can't be blank"] + end + + it "must have an inventory value" do + movie.inventory = nil + + expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include :inventory + expect(movie.errors.messages[:inventory]).must_include "can't be blank" + end + + it "iventory amount must be an integer" do + movie.inventory = "cat" + + expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include :inventory + expect(movie.errors.messages[:inventory]).must_equal ["is not a number"] + end + + it "must have an inventory amount greater than -1" do + inventory = [0, 1, 10, 100, 4000] + inventory.each do |amount| + movie.inventory = amount + expect(movie.valid?).must_equal true + end + + inventory = [-1, -5, -10, -100] + inventory.each do |amount| + movie.inventory = amount + + expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include :inventory + expect(movie.errors.messages[:inventory]).must_equal ["must be greater than -1"] + end + end + end + describe "custom methods" do + describe "available_inventory" do + end end end From a8a4274a24b22e495d079fec919f97d17ff140b1 Mon Sep 17 00:00:00 2001 From: Nidhi Date: Wed, 15 May 2019 16:01:49 -0700 Subject: [PATCH 47/49] added test to rental controllers --- test/controllers/rentals_controller_test.rb | 43 +++++++++++++++++++++ test/models/customer_test.rb | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 2aadac9b5..7f553c7bd 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -89,4 +89,47 @@ }.wont_change "Rental.count" end end + + describe "check in and check out" do + let(:rental_params) { + { + customer_id: customers(:customer1).id, + movie_id: movies(:movie1).id, + } + } + + it "changes movies checked out count when check out for customer" do + start_movies_count = customers(:customer1).movies_checked_out_count + + post check_out_path(rental_params) + end_movies_count = Customer.find_by(id: customers(:customer1).id).movies_checked_out_count + + expect(end_movies_count).must_equal start_movies_count + 1 + end + + it "changes movies checked out count when check in for customer" do + start_movies_count = customers(:customer1).movies_checked_out_count + + post check_out_path(rental_params) + mid_movies_count = Customer.find_by(id: customers(:customer1).id).movies_checked_out_count + post check_in_path(rental_params) + end_movies_count = Customer.find_by(id: customers(:customer1).id).movies_checked_out_count + + expect(mid_movies_count).must_equal start_movies_count + 1 + expect(end_movies_count).must_equal start_movies_count + end + + it "changes available inventory when check in and check out for movie" do + start_inventory = movies(:movie1).available_inventory + + post check_out_path(rental_params) + mid_inventory = Movie.find_by(id: movies(:movie1).id).available_inventory + post check_in_path(rental_params) + end_inventory = Movie.find_by(id: movies(:movie1).id).available_inventory + + expect(mid_inventory).must_equal start_inventory - 1 + expect(end_inventory).must_equal start_inventory + end + + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 0abf1951f..44431dfd4 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -15,7 +15,7 @@ city: "Seattle", state: "WA", postal_code: '98199', - phone: 512-555-555) + phone: "512-555-555") expect(no_name.valid?).must_equal false end From ba5621cb8040f2f8e26482704f9ac654723fabaa Mon Sep 17 00:00:00 2001 From: Nidhi Date: Thu, 16 May 2019 09:02:59 -0700 Subject: [PATCH 48/49] cleaned up rental controller test --- test/controllers/rentals_controller_test.rb | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 7f553c7bd..7f00012d5 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -90,7 +90,7 @@ end end - describe "check in and check out" do + describe "check in and check out inventory" do let(:rental_params) { { customer_id: customers(:customer1).id, @@ -98,15 +98,6 @@ } } - it "changes movies checked out count when check out for customer" do - start_movies_count = customers(:customer1).movies_checked_out_count - - post check_out_path(rental_params) - end_movies_count = Customer.find_by(id: customers(:customer1).id).movies_checked_out_count - - expect(end_movies_count).must_equal start_movies_count + 1 - end - it "changes movies checked out count when check in for customer" do start_movies_count = customers(:customer1).movies_checked_out_count From 82c2cd8c03c0e61423b06a2fcb0fb05032102e34 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Thu, 16 May 2019 09:18:50 -0700 Subject: [PATCH 49/49] testing for custom method in movie model --- test/models/movie_test.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index e914d2176..04867d465 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,6 +2,7 @@ describe Movie do let(:movie) { movies(:movie2) } + let(:customer) { customers(:customer2) } let(:rental1) { rentals(:rental1) } let(:rental2) { rentals(:rental2) } @@ -70,6 +71,18 @@ describe "custom methods" do describe "available_inventory" do + it "returns the available inventory for a movie" do + rental_params = { + customer_id: customers(:customer1).id, + movie_id: movies(:movie1).id, + } + + available = movie.available_inventory + inventory = movie.inventory + + expect(inventory).must_equal 2 + expect(available).must_equal 1 + end end end end