From ba15cf93088a7b4bfe02e9a3cf5b945a09c7ea87 Mon Sep 17 00:00:00 2001 From: cojenco Date: Tue, 26 May 2020 14:08:23 -0700 Subject: [PATCH 01/34] rails api setup --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 57 +++++ Gemfile.lock | 212 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 6 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 7 + 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 | 105 +++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 +++ bin/spring | 17 ++ 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 | 52 +++++ config/environments/production.rb | 105 +++++++++ config/environments/test.rb | 49 ++++ 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 | 38 ++++ config/routes.rb | 6 + config/spring.rb | 6 + config/storage.yml | 34 +++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 + 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 | 21 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 59 files changed, 1104 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 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/channels/application_cable/connection_test.rb 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 tmp/pids/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8a1b1134b --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# 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 pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.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..57cf282eb --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.6.5 diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..b585a3d2b --- /dev/null +++ b/Gemfile @@ -0,0 +1,57 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.1' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', 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.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 :development do + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +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..4395591b3 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,212 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + mail (>= 2.7.1) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + nokogiri (>= 1.8.5) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) + globalid (>= 0.3.6) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + marcel (~> 0.3.1) + activesupport (6.0.3.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + ansi (1.5.0) + bootsnap (1.4.6) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.9) + erubi (1.9.0) + ffi (1.12.2) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.16.2) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.2.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + minitest-rails (6.0.1) + minitest (~> 5.10) + railties (~> 6.0.0) + minitest-reporters (1.4.2) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.3.3) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.2.3) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (4.3.5) + nio4r (~> 2.0) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) + bundler (>= 1.3.0) + railties (= 6.0.3.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + ruby-debug-ide (0.7.2) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + debase (>= 0.2.4.1) + guard + guard-minitest + listen (~> 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.1) + ruby-debug-ide (>= 0.7.0) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.5p114 + +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..5033a5eec --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,6 @@ +class ApplicationController < ActionController::API + + def zomg + render json: {message: "it runs!"}, status: :ok + end +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..d394c3d10 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +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..524dfd3f2 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,105 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 || ">= 0.a" + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= begin + env_var_version || cli_arg_version || + lockfile_version || "#{Gem::Requirement.default}.a" + end + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + # must dup string for RG < 1.8 compatibility + activate_bundler(bundler_version.dup) + end + + def activate_bundler(bundler_version) + if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0") + bundler_version = "< 2" + end + gem_error = activation_error_handling do + gem "bundler", bundler_version + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end 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..0e39e8cb1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # 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') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + 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..d89ee495f --- /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/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..43301a817 --- /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_mailbox/engine" +require "action_text/engine" +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 + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # 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..6b21ab7bc --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: video_store_api_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..d5e7f5649 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +iwWoIW7EdbO5VrXVbCT3tbs4QaCvtNOvt2qYJgDv6AerddcZHq75U+81wtsz4vsoGh80nsii+p4E0fMFCsvK1HHR+gkG2WWeL6MqUJtStMoMke9sYi/y5DxqDA5HRy7maziDMXjoKWVCVfEZX6xRJgK5hKEr5s0JGhObQUgZLbBRoC/7I8JugMtYGJC44mh1mJtU0AnMZ0RpBgU71lWEo38GvpZVrDghAvJFfyCpilJS0y05+lok1/Tw3ghKAoESQltLrKSaFZW+PAtacoCrZIH9gu0fXjy+hrBF7PaQHo0NmlK/ojub+0ZJaflChwSHM6HQJCUJOGPwrbiCSopYO9sv0rMbgk3tAprNMQxWE81X9+cQBRHJJExYyuyKBHfRG1mR42/Vu+O5NMJRlwyEgj2bh6cFAzVm8owb--xL3F1uLsZIf0zxMN--TQVkZBz2e8x5btVeWuWceA== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..8536d1cda --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.3 and up are supported. +# +# Install the pg driver: +# gem install pg +# On macOS with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On macOS 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 + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: video_store_api_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: video_store_api + + # 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: video_store_api_test + +# As with config/credentials.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 https://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: video_store_api_production + username: video_store_api + password: <%= ENV['VIDEO_STORE_API_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..698f159d8 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +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.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..7a3bb3e50 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +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 + + # 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 = "video_store_api_production" + + 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 + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0cb24249b --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# 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! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = 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 + config.cache_store = :null_store + + # 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..cf9b342d0 --- /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 https://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..5ed443774 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# 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. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_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 `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server 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..9ee34f6c3 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,6 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + + get "/zomg", to: "application#zomg", as: "zomg" + +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..db5bf1307 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) 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..c19f78ab6 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://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/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 000000000..800405f15 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end 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..b19af0d5b --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,21 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +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 +) + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + # parallelize(workers: :number_of_processors) # causes out of order output. + + # 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/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From b737a11ed43882d91d6b9f382f818607f1f659f8 Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Tue, 26 May 2020 14:26:14 -0700 Subject: [PATCH 02/34] initialize customer model --- app/models/customer.rb | 2 ++ db/migrate/20200526212125_create_customers.rb | 15 +++++++++++++++ test/models/customer_test.rb | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 db/migrate/20200526212125_create_customers.rb create mode 100644 test/models/customer_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/db/migrate/20200526212125_create_customers.rb b/db/migrate/20200526212125_create_customers.rb new file mode 100644 index 000000000..f4f43d6c5 --- /dev/null +++ b/db/migrate/20200526212125_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[6.0] + def change + create_table :customers do |t| + t.string :name + t.string :address + t.string :city + t.string :state + t.string :phone + t.string :postal_code + t.datetime :registered_at + + t.timestamps + end + end +end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..30d5c5309 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Customer do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 50505798cc8cc4eadd7dc9442d0fc8522ae893f5 Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Tue, 26 May 2020 14:29:45 -0700 Subject: [PATCH 03/34] initialize video model --- app/models/video.rb | 2 ++ db/migrate/20200526212935_create_videos.rb | 13 +++++++++++++ test/models/video_test.rb | 7 +++++++ 3 files changed, 22 insertions(+) create mode 100644 app/models/video.rb create mode 100644 db/migrate/20200526212935_create_videos.rb create mode 100644 test/models/video_test.rb diff --git a/app/models/video.rb b/app/models/video.rb new file mode 100644 index 000000000..dc572b44b --- /dev/null +++ b/app/models/video.rb @@ -0,0 +1,2 @@ +class Video < ApplicationRecord +end diff --git a/db/migrate/20200526212935_create_videos.rb b/db/migrate/20200526212935_create_videos.rb new file mode 100644 index 000000000..166cf0b96 --- /dev/null +++ b/db/migrate/20200526212935_create_videos.rb @@ -0,0 +1,13 @@ +class CreateVideos < ActiveRecord::Migration[6.0] + def change + create_table :videos do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :total_inventory + t.integer :available_inventory + + t.timestamps + end + end +end diff --git a/test/models/video_test.rb b/test/models/video_test.rb new file mode 100644 index 000000000..eead50d2f --- /dev/null +++ b/test/models/video_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Video do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 73fda2717c7e848e5b9f86a946ad4b49e3ff9e9c Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Tue, 26 May 2020 14:39:05 -0700 Subject: [PATCH 04/34] add videos_checked_out_count column to customer --- ...0526213353_add_videos_checked_out_count.rb | 5 +++ db/schema.rb | 41 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 db/migrate/20200526213353_add_videos_checked_out_count.rb create mode 100644 db/schema.rb diff --git a/db/migrate/20200526213353_add_videos_checked_out_count.rb b/db/migrate/20200526213353_add_videos_checked_out_count.rb new file mode 100644 index 000000000..8b71c0454 --- /dev/null +++ b/db/migrate/20200526213353_add_videos_checked_out_count.rb @@ -0,0 +1,5 @@ +class AddVideosCheckedOutCount < ActiveRecord::Migration[6.0] + def change + add_column :customers, :videos_checked_out_count, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..865a55e6f --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,41 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2020_05_26_213353) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "address" + t.string "city" + t.string "state" + t.string "phone" + t.string "postal_code" + t.datetime "registered_at" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.integer "videos_checked_out_count" + end + + create_table "videos", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "total_inventory" + t.integer "available_inventory" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + +end From 7505134446b7cbb52f57df13885d3d06b05f1600 Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Tue, 26 May 2020 14:43:03 -0700 Subject: [PATCH 05/34] create customer controller --- app/controllers/customers_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..61881e925 --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 5e04a0e433cd0284d6d7716ef26b105635e71e8c Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Tue, 26 May 2020 14:43:23 -0700 Subject: [PATCH 06/34] create video controller --- app/controllers/videos_controller.rb | 2 ++ test/controllers/videos_controller_test.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/controllers/videos_controller.rb create mode 100644 test/controllers/videos_controller_test.rb diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb new file mode 100644 index 000000000..fcd6eefb2 --- /dev/null +++ b/app/controllers/videos_controller.rb @@ -0,0 +1,2 @@ +class VideosController < ApplicationController +end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb new file mode 100644 index 000000000..7f1649fd0 --- /dev/null +++ b/test/controllers/videos_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe VideosController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 2515e292fc2407e0a95157f4dbb4ca849cf76ece Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Tue, 26 May 2020 14:56:15 -0700 Subject: [PATCH 07/34] add index route and action for customer --- app/controllers/customers_controller.rb | 5 +++++ config/routes.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..593257a3f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,7 @@ class CustomersController < ApplicationController + def index + customers = Customer.all.order(:name) + + render json: customers.as_json(except: [:created_at, :updated_at]), status: :ok + end end diff --git a/config/routes.rb b/config/routes.rb index 9ee34f6c3..be59068da 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html - get "/zomg", to: "application#zomg", as: "zomg" - + resources :customers, only: [:index] + resources :videos, only: [:index, :show, :create] end From a33a2f4a4db904d2aa342afa1df86d91ce98e764 Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Tue, 26 May 2020 14:56:37 -0700 Subject: [PATCH 08/34] add customer fixture and tests for index action --- test/controllers/customers_controller_test.rb | 34 +++++++++++++++++-- test/fixtures/customers.yml | 18 ++++++++++ 2 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 test/fixtures/customers.yml diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 61881e925..d6ed030e2 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,35 @@ require "test_helper" describe CustomersController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + CUSTOMER_FIELDS = ["id", "name", "address", "postal_code", "city", "state", "registered_at", "phone", "videos_checked_out_count"].sort + + it "must get index" do + get customers_path + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + end + + it "will return all proper fields for a list of customers" do + get customers_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + + body.each do |customer| + expect(customer).must_be_instance_of Hash + expect(customer.keys.sort).must_equal CUSTOMER_FIELDS + end + end + + it "returns an empty array if no customers exist" do + Customer.destroy_all + + get customers_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..b1d2c4460 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,18 @@ +jessica: + name: Jessica + address: 123 Street + city: Seattle + state: WA + postal_code: 12345 + phone: 123-345-5678 + registered_at: 2014-12-12T06:20:46.000Z + videos_checked_out_count: 1 +cathy: + name: Cathy + address: 456 Street + city: Seattle + state: WA + postal_code: 67890 + phone: 123-345-5765 + registered_at: 2015-03-16T23:45:12.000Z + videos_checked_out_count: 1 \ No newline at end of file From 17ba222f6e590b71b99b5327627e9748b77c6412 Mon Sep 17 00:00:00 2001 From: cojenco Date: Tue, 26 May 2020 15:09:39 -0700 Subject: [PATCH 09/34] add videos#index tests --- app/controllers/videos_controller.rb | 5 ++++ test/controllers/videos_controller_test.rb | 34 ++++++++++++++++++++-- test/fixtures/videos.yml | 12 ++++++++ 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 test/fixtures/videos.yml diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index fcd6eefb2..355b4fbae 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,2 +1,7 @@ class VideosController < ApplicationController + def index + videos = Video.all.order(:title) + + render json: videos.as_json(except: [:created_at, :updated_at]), status: :ok + end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 7f1649fd0..edc73b721 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,35 @@ require "test_helper" describe VideosController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + VIDEO_FIELDS = ["id", "title", "overview", "total_inventory", "available_inventory", "release_date"].sort + + it "must get index" do + get videos_path + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + end + + it "will return all proper fields for a list of customers" do + get videos_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal VIDEO_FIELDS + end + end + + it "returns an empty array if no customers exist" do + Video.destroy_all + + get videos_path + + body = JSON.parse(response.body) + + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end end diff --git a/test/fixtures/videos.yml b/test/fixtures/videos.yml new file mode 100644 index 000000000..86f104299 --- /dev/null +++ b/test/fixtures/videos.yml @@ -0,0 +1,12 @@ +toystory: + title: Toy Story + overview: Toys rule! + release_date: 1995-01-01 + total_inventory: 5 + available_inventory: 5 +jurassicpark: + title: Jurassic Park + overview: Dinosaurs!!! + release_date: 1993-01-01 + total_inventory: 10 + available_inventory: 9 \ No newline at end of file From a747e6f9b4e805e36db6ca8f6a43d8cce1e6936d Mon Sep 17 00:00:00 2001 From: cojenco Date: Tue, 26 May 2020 15:19:11 -0700 Subject: [PATCH 10/34] add videos#show tests --- app/controllers/videos_controller.rb | 14 ++++- test/controllers/videos_controller_test.rb | 63 +++++++++++++++------- 2 files changed, 57 insertions(+), 20 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 355b4fbae..a6f23350a 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,7 +1,19 @@ class VideosController < ApplicationController def index videos = Video.all.order(:title) - render json: videos.as_json(except: [:created_at, :updated_at]), status: :ok end + + def show + video = Video.find_by(id: params[:id]) + if video.nil? + render json: { + ok: false, + message: 'Not found', + }, status: :not_found + return + end + render json: video.as_json(except: [:created_at, :updated_at]), + status: :ok + end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index edc73b721..7bffae3ae 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -3,33 +3,58 @@ describe VideosController do VIDEO_FIELDS = ["id", "title", "overview", "total_inventory", "available_inventory", "release_date"].sort - it "must get index" do - get videos_path - must_respond_with :success - expect(response.header['Content-Type']).must_include 'json' - end + describe "index" do + it "must get index" do + get videos_path + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + end - it "will return all proper fields for a list of customers" do - get videos_path + it "will return all proper fields for a list of customers" do + get videos_path - body = JSON.parse(response.body) + body = JSON.parse(response.body) - expect(body).must_be_instance_of Array + expect(body).must_be_instance_of Array - body.each do |video| - expect(video).must_be_instance_of Hash - expect(video.keys.sort).must_equal VIDEO_FIELDS + body.each do |video| + expect(video).must_be_instance_of Hash + expect(video.keys.sort).must_equal VIDEO_FIELDS + end end - end - it "returns an empty array if no customers exist" do - Video.destroy_all + it "returns an empty array if no customers exist" do + Video.destroy_all + + get videos_path + + body = JSON.parse(response.body) - get videos_path + expect(body).must_be_instance_of Array + expect(body.length).must_equal 0 + end + end - body = JSON.parse(response.body) + describe "show" do + it "will return a hash with the proper fields for an existing video" do + video = videos(:jurassicpark) + # act + get video_path(video.id) + body = JSON.parse(response.body) + must_respond_with :ok + expect(response.header['Content-Type']).must_include 'json' + expect(body).must_be_instance_of Hash + expect(body.keys.sort).must_equal VIDEO_FIELDS + end + + it "will return a 404 request with json for a non-existant pet" do + get video_path(-1) + must_respond_with :not_found + body = JSON.parse(response.body) + expect(body).must_be_instance_of Hash + expect(body['ok']).must_equal false + expect(body['message']).must_equal 'Not found' + end - expect(body).must_be_instance_of Array - expect(body.length).must_equal 0 end end From 0f6b3cffa7c752734d2abd9e3d8b7947e64a1a82 Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 00:11:14 -0700 Subject: [PATCH 11/34] add video model validations --- app/models/video.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/video.rb b/app/models/video.rb index dc572b44b..40ab42493 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,2 +1,3 @@ class Video < ApplicationRecord + validates :title, :overview, :total_inventory, :available_inventory, :release_date, presence: true end From af3b2792873aaf14efa308ea3ac2dba3ba82b18e Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 00:12:41 -0700 Subject: [PATCH 12/34] add videos#create action and tests. add helper method to tests --- app/controllers/videos_controller.rb | 21 ++++ test/controllers/videos_controller_test.rb | 132 ++++++++++++++++++--- 2 files changed, 138 insertions(+), 15 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index a6f23350a..7d1cf42fd 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -16,4 +16,25 @@ def show render json: video.as_json(except: [:created_at, :updated_at]), status: :ok end + + def create + video = Video.new(video_params) + + if video.save + render json: video.as_json(only: [:id]), status: :created + return + else + render json: { + ok: false, + errors: video.errors.messages + }, status: :bad_request + return + end + end + + private + + def video_params + return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + end end diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 7bffae3ae..17e4ac361 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,21 +1,28 @@ require "test_helper" + describe VideosController do VIDEO_FIELDS = ["id", "title", "overview", "total_inventory", "available_inventory", "release_date"].sort + def check_response(expected_type:, expected_status: :success) + must_respond_with expected_status + expect(response.header['Content-Type']).must_include 'json' + + body = JSON.parse(response.body) + expect(body).must_be_kind_of expected_type + return body + end + describe "index" do it "must get index" do get videos_path - must_respond_with :success - expect(response.header['Content-Type']).must_include 'json' + check_response(expected_type: Array) end it "will return all proper fields for a list of customers" do get videos_path - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) body.each do |video| expect(video).must_be_instance_of Hash @@ -28,9 +35,7 @@ get videos_path - body = JSON.parse(response.body) - - expect(body).must_be_instance_of Array + body = check_response(expected_type: Array) expect(body.length).must_equal 0 end end @@ -40,21 +45,118 @@ video = videos(:jurassicpark) # act get video_path(video.id) - body = JSON.parse(response.body) - must_respond_with :ok - expect(response.header['Content-Type']).must_include 'json' - expect(body).must_be_instance_of Hash + body = check_response(expected_type: Hash, expected_status: :ok) + # body = JSON.parse(response.body) + # must_respond_with :ok + # expect(response.header['Content-Type']).must_include 'json' + # expect(body).must_be_instance_of Hash expect(body.keys.sort).must_equal VIDEO_FIELDS end it "will return a 404 request with json for a non-existant pet" do get video_path(-1) - must_respond_with :not_found - body = JSON.parse(response.body) - expect(body).must_be_instance_of Hash + body = check_response(expected_type: Hash, expected_status: :not_found) + # must_respond_with :not_found + # body = JSON.parse(response.body) + # expect(body).must_be_instance_of Hash expect(body['ok']).must_equal false expect(body['message']).must_equal 'Not found' end + end + + describe "create" do + let(:video_data) { + { + video: { + title: "Titanic", + overview: "You jump I jump!", + release_date: "1997-12-19", + total_inventory: 5, + available_inventory: 5, + } + } + } + + it "can create a new video" do + expect { + post videos_path, params: video_data + }.must_differ "Video.count", 1 + + check_response(expected_type: Hash, expected_status: :created) + end + + it "will respond with bad_request for invalid data" do + # Arrange - using let from above + # Need to add validation + video_data[:video][:title] = nil + + expect { + post videos_path, params: video_data + }.wont_change "Video.count" + + body = check_response(expected_type: Hash, expected_status: :bad_request) + expect(body["errors"].keys).must_include "title" + end end end + + +# describe VideosController do +# VIDEO_FIELDS = ["id", "title", "overview", "total_inventory", "available_inventory", "release_date"].sort + +# describe "index" do +# it "must get index" do +# get videos_path +# must_respond_with :success +# expect(response.header['Content-Type']).must_include 'json' +# end + +# it "will return all proper fields for a list of customers" do +# get videos_path + +# body = JSON.parse(response.body) + +# expect(body).must_be_instance_of Array + +# body.each do |video| +# expect(video).must_be_instance_of Hash +# expect(video.keys.sort).must_equal VIDEO_FIELDS +# end +# end + +# it "returns an empty array if no customers exist" do +# Video.destroy_all + +# get videos_path + +# body = JSON.parse(response.body) + +# expect(body).must_be_instance_of Array +# expect(body.length).must_equal 0 +# end +# end + +# describe "show" do +# it "will return a hash with the proper fields for an existing video" do +# video = videos(:jurassicpark) +# # act +# get video_path(video.id) +# body = JSON.parse(response.body) +# must_respond_with :ok +# expect(response.header['Content-Type']).must_include 'json' +# expect(body).must_be_instance_of Hash +# expect(body.keys.sort).must_equal VIDEO_FIELDS +# end + +# it "will return a 404 request with json for a non-existant pet" do +# get video_path(-1) +# must_respond_with :not_found +# body = JSON.parse(response.body) +# expect(body).must_be_instance_of Hash +# expect(body['ok']).must_equal false +# expect(body['message']).must_equal 'Not found' +# end + +# end +# end From 62380a39fd5465b117ba268467c2d79314fb89c9 Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 11:35:43 -0700 Subject: [PATCH 13/34] revise videos controller tests --- test/controllers/videos_controller_test.rb | 70 +--------------------- 1 file changed, 1 insertion(+), 69 deletions(-) diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 17e4ac361..96fcc137e 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,6 +1,5 @@ require "test_helper" - describe VideosController do VIDEO_FIELDS = ["id", "title", "overview", "total_inventory", "available_inventory", "release_date"].sort @@ -43,22 +42,15 @@ def check_response(expected_type:, expected_status: :success) describe "show" do it "will return a hash with the proper fields for an existing video" do video = videos(:jurassicpark) - # act + get video_path(video.id) body = check_response(expected_type: Hash, expected_status: :ok) - # body = JSON.parse(response.body) - # must_respond_with :ok - # expect(response.header['Content-Type']).must_include 'json' - # expect(body).must_be_instance_of Hash expect(body.keys.sort).must_equal VIDEO_FIELDS end it "will return a 404 request with json for a non-existant pet" do get video_path(-1) body = check_response(expected_type: Hash, expected_status: :not_found) - # must_respond_with :not_found - # body = JSON.parse(response.body) - # expect(body).must_be_instance_of Hash expect(body['ok']).must_equal false expect(body['message']).must_equal 'Not found' end @@ -100,63 +92,3 @@ def check_response(expected_type:, expected_status: :success) end end - - -# describe VideosController do -# VIDEO_FIELDS = ["id", "title", "overview", "total_inventory", "available_inventory", "release_date"].sort - -# describe "index" do -# it "must get index" do -# get videos_path -# must_respond_with :success -# expect(response.header['Content-Type']).must_include 'json' -# end - -# it "will return all proper fields for a list of customers" do -# get videos_path - -# body = JSON.parse(response.body) - -# expect(body).must_be_instance_of Array - -# body.each do |video| -# expect(video).must_be_instance_of Hash -# expect(video.keys.sort).must_equal VIDEO_FIELDS -# end -# end - -# it "returns an empty array if no customers exist" do -# Video.destroy_all - -# get videos_path - -# body = JSON.parse(response.body) - -# expect(body).must_be_instance_of Array -# expect(body.length).must_equal 0 -# end -# end - -# describe "show" do -# it "will return a hash with the proper fields for an existing video" do -# video = videos(:jurassicpark) -# # act -# get video_path(video.id) -# body = JSON.parse(response.body) -# must_respond_with :ok -# expect(response.header['Content-Type']).must_include 'json' -# expect(body).must_be_instance_of Hash -# expect(body.keys.sort).must_equal VIDEO_FIELDS -# end - -# it "will return a 404 request with json for a non-existant pet" do -# get video_path(-1) -# must_respond_with :not_found -# body = JSON.parse(response.body) -# expect(body).must_be_instance_of Hash -# expect(body['ok']).must_equal false -# expect(body['message']).must_equal 'Not found' -# end - -# end -# end From 3d267b040840929656c486c304998bcc78b09b4a Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 12:25:53 -0700 Subject: [PATCH 14/34] update controller actions to pass smoke tests --- app/controllers/customers_controller.rb | 2 +- app/controllers/videos_controller.rb | 14 +++++++----- test/controllers/customers_controller_test.rb | 2 +- test/controllers/videos_controller_test.rb | 22 +++++++++---------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 593257a3f..c8528fed3 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,6 @@ class CustomersController < ApplicationController def index customers = Customer.all.order(:name) - render json: customers.as_json(except: [:created_at, :updated_at]), status: :ok + render json: customers.as_json(except: [:created_at, :updated_at, :address, :city, :state]), status: :ok end end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 7d1cf42fd..e5e7e746f 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,19 +1,22 @@ class VideosController < ApplicationController def index videos = Video.all.order(:title) - render json: videos.as_json(except: [:created_at, :updated_at]), status: :ok + render json: videos.as_json(except: [:created_at, :updated_at, :total_inventory, :overview]), status: :ok end def show video = Video.find_by(id: params[:id]) if video.nil? + # render json: { + # ok: false, + # message: 'Not found', + # }, status: :not_found render json: { - ok: false, - message: 'Not found', + errors: ['Not Found'], }, status: :not_found return end - render json: video.as_json(except: [:created_at, :updated_at]), + render json: video.as_json(except: [:created_at, :updated_at, :id]), status: :ok end @@ -25,7 +28,6 @@ def create return else render json: { - ok: false, errors: video.errors.messages }, status: :bad_request return @@ -35,6 +37,6 @@ def create private def video_params - return params.require(:video).permit(:title, :overview, :release_date, :total_inventory, :available_inventory) + return params.permit(:title, :overview, :release_date, :total_inventory, :available_inventory) end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index d6ed030e2..e7152a95a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe CustomersController do - CUSTOMER_FIELDS = ["id", "name", "address", "postal_code", "city", "state", "registered_at", "phone", "videos_checked_out_count"].sort + CUSTOMER_FIELDS = ["id", "name", "postal_code", "registered_at", "phone", "videos_checked_out_count"].sort it "must get index" do get customers_path diff --git a/test/controllers/videos_controller_test.rb b/test/controllers/videos_controller_test.rb index 96fcc137e..cb02ce2d1 100644 --- a/test/controllers/videos_controller_test.rb +++ b/test/controllers/videos_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" describe VideosController do - VIDEO_FIELDS = ["id", "title", "overview", "total_inventory", "available_inventory", "release_date"].sort + VIDEO_FIELDS = ["id", "title", "available_inventory", "release_date"].sort def check_response(expected_type:, expected_status: :success) must_respond_with expected_status @@ -41,31 +41,29 @@ def check_response(expected_type:, expected_status: :success) describe "show" do it "will return a hash with the proper fields for an existing video" do + all_video_fields= ["title", "available_inventory", "release_date", "overview", "total_inventory"].sort video = videos(:jurassicpark) get video_path(video.id) body = check_response(expected_type: Hash, expected_status: :ok) - expect(body.keys.sort).must_equal VIDEO_FIELDS + expect(body.keys.sort).must_equal all_video_fields end it "will return a 404 request with json for a non-existant pet" do get video_path(-1) body = check_response(expected_type: Hash, expected_status: :not_found) - expect(body['ok']).must_equal false - expect(body['message']).must_equal 'Not found' + expect(body['errors']).must_include 'Not Found' end end describe "create" do let(:video_data) { { - video: { - title: "Titanic", - overview: "You jump I jump!", - release_date: "1997-12-19", - total_inventory: 5, - available_inventory: 5, - } + title: "Titanic", + overview: "You jump I jump!", + release_date: "1997-12-19", + total_inventory: 5, + available_inventory: 5, } } @@ -80,7 +78,7 @@ def check_response(expected_type:, expected_status: :success) it "will respond with bad_request for invalid data" do # Arrange - using let from above # Need to add validation - video_data[:video][:title] = nil + video_data[:title] = nil expect { post videos_path, params: video_data From 0176bc845ba8c80a0e65e1f786da76671d7bb991 Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 12:32:56 -0700 Subject: [PATCH 15/34] clean comments --- app/controllers/videos_controller.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index e5e7e746f..6d9631caf 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -7,10 +7,6 @@ def index def show video = Video.find_by(id: params[:id]) if video.nil? - # render json: { - # ok: false, - # message: 'Not found', - # }, status: :not_found render json: { errors: ['Not Found'], }, status: :not_found From 41a7ac6515fe6be54be386cf2bd3f6ec83c42bc2 Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Wed, 27 May 2020 14:21:42 -0700 Subject: [PATCH 16/34] initialize rentals and set up relationship --- app/models/customer.rb | 2 ++ app/models/rental.rb | 4 ++++ app/models/video.rb | 2 ++ db/migrate/20200527211828_create_rentals.rb | 8 ++++++++ test/models/rental_test.rb | 7 +++++++ 5 files changed, 23 insertions(+) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20200527211828_create_rentals.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..fd1dc21c8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,4 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :videos, through: :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..0449e1916 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :video +end diff --git a/app/models/video.rb b/app/models/video.rb index 40ab42493..1a97de594 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -1,3 +1,5 @@ class Video < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals validates :title, :overview, :total_inventory, :available_inventory, :release_date, presence: true end diff --git a/db/migrate/20200527211828_create_rentals.rb b/db/migrate/20200527211828_create_rentals.rb new file mode 100644 index 000000000..85f45ae24 --- /dev/null +++ b/db/migrate/20200527211828_create_rentals.rb @@ -0,0 +1,8 @@ +class CreateRentals < ActiveRecord::Migration[6.0] + def change + create_table :rentals do |t| + + t.timestamps + end + end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..3e64959b4 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe Rental do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From b5f1ec3366f6c37e442a277b6c1f8b759a868d08 Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Wed, 27 May 2020 14:25:46 -0700 Subject: [PATCH 17/34] add reference to rentals to customer and video --- ...527212209_relate_rental_to_customers_and_videos.rb | 6 ++++++ db/schema.rb | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20200527212209_relate_rental_to_customers_and_videos.rb diff --git a/db/migrate/20200527212209_relate_rental_to_customers_and_videos.rb b/db/migrate/20200527212209_relate_rental_to_customers_and_videos.rb new file mode 100644 index 000000000..3926baaf8 --- /dev/null +++ b/db/migrate/20200527212209_relate_rental_to_customers_and_videos.rb @@ -0,0 +1,6 @@ +class RelateRentalToCustomersAndVideos < ActiveRecord::Migration[6.0] + def change + add_reference :rentals, :customer, index: true + add_reference :rentals, :video, index: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 865a55e6f..03c857a0a 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: 2020_05_26_213353) do +ActiveRecord::Schema.define(version: 2020_05_27_212209) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -28,6 +28,15 @@ t.integer "videos_checked_out_count" end + create_table "rentals", force: :cascade do |t| + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.bigint "customer_id" + t.bigint "video_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["video_id"], name: "index_rentals_on_video_id" + end + create_table "videos", force: :cascade do |t| t.string "title" t.string "overview" From d043d13b9201a07393b30fdc9cd1f95810433b24 Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Wed, 27 May 2020 14:37:41 -0700 Subject: [PATCH 18/34] add validation to customer and video --- app/models/customer.rb | 1 + app/models/video.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index fd1dc21c8..6517105df 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,5 @@ class Customer < ApplicationRecord has_many :rentals has_many :videos, through: :rentals + validates :name, :address, :city, :state, :postal_code, :phone, presence: true end diff --git a/app/models/video.rb b/app/models/video.rb index 1a97de594..3d33b18ca 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -2,4 +2,5 @@ class Video < ApplicationRecord has_many :rentals has_many :customers, through: :rentals validates :title, :overview, :total_inventory, :available_inventory, :release_date, presence: true + validates :total_inventory, :available_inventory, numericality: { only_integer: true } end From d43fdc052e3c19cfa69dc22e22513faebfb44501 Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Wed, 27 May 2020 14:47:14 -0700 Subject: [PATCH 19/34] initialize Rentals controller --- app/controllers/rentals_controller.rb | 2 ++ test/controllers/rentals_controller_test.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..dc043d4df --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "does a thing" do + # value(1+1).must_equal 2 + # end +end From 8fb99921014813004315b7af2e89bc3f94cb622e Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Wed, 27 May 2020 18:42:00 -0700 Subject: [PATCH 20/34] add validation tests for customer model --- test/models/customer_test.rb | 115 ++++++++++++++++++++++++++++++++++- 1 file changed, 112 insertions(+), 3 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 30d5c5309..d95e16a92 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,7 +1,116 @@ require "test_helper" describe Customer do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + let (:new_customer) { + Customer.new( + name: "Jessica", + address: "123 Street", + city: "Seattle", + state: "WA", + postal_code: "12345", + phone: "123-345-5678", + registered_at: "2014-12-12T06:20:46.000Z", + videos_checked_out_count: 1 + ) + } + + it "can be instantiated" do + # Assert + expect(new_customer.valid?).must_equal true + end + + it "will have the required fields" do + # Arrange + new_customer.save + customer = Customer.first + [:name, :address, :city, :state, :postal_code, :phone].each do |field| + # Assert + expect(customer).must_respond_to field + end + end + + describe "relationships" do + it "can have many rentals" do + # Arrange + new_customer.save + new_video = Video.create( + title: "a video", + overview: "a cool video", + total_inventory: "5", + available_inventory: "3", + release_date: "1999-12-01" + ) + rental_1 = Rental.create(customer_id: new_customer.id, video_id: new_video.id) + rental_2 = Rental.create(customer_id: new_customer.id, video_id: new_video.id) + + # Assert + expect(new_customer.rentals.count).must_equal 2 + new_customer.rentals.each do |rental| + expect(rental).must_be_instance_of Rental + end + end + end + + describe "validations" do + it "must have a name" do + # Arrange + new_customer.name = nil + + # Assert + expect(new_customer.valid?).must_equal false + expect(new_customer.errors.messages).must_include :name + expect(new_customer.errors.messages[:name]).must_equal ["can't be blank"] + end + + it "must have an address" do + # Arrange + new_customer.address = nil + + # Assert + expect(new_customer.valid?).must_equal false + expect(new_customer.errors.messages).must_include :address + expect(new_customer.errors.messages[:address]).must_equal ["can't be blank"] + end + + it "must have a city" do + # Arrange + new_customer.city = nil + + # Assert + expect(new_customer.valid?).must_equal false + expect(new_customer.errors.messages).must_include :city + expect(new_customer.errors.messages[:city]).must_equal ["can't be blank"] + end + + it "must have a state" do + # Arrange + new_customer.state = nil + + # Assert + expect(new_customer.valid?).must_equal false + expect(new_customer.errors.messages).must_include :state + expect(new_customer.errors.messages[:state]).must_equal ["can't be blank"] + end + + it "must have a postal_code" do + # Arrange + new_customer.postal_code = nil + + # Assert + expect(new_customer.valid?).must_equal false + expect(new_customer.errors.messages).must_include :postal_code + expect(new_customer.errors.messages[:postal_code]).must_equal ["can't be blank"] + end + + it "must have a phone" do + # Arrange + new_customer.phone = nil + + # Assert + expect(new_customer.valid?).must_equal false + expect(new_customer.errors.messages).must_include :phone + expect(new_customer.errors.messages[:phone]).must_equal ["can't be blank"] + end + + end end From a480b32f7f2ccf1cfa669871b74627c0b1bd14c3 Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 19:03:04 -0700 Subject: [PATCH 21/34] add video model tests for validation and relations --- test/models/video_test.rb | 76 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 3 deletions(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index eead50d2f..e7a31067d 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -1,7 +1,77 @@ require "test_helper" describe Video do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + + let(:movie) {videos(:toystory)} + + describe "validations" do + it "is valid when all required fields are present" do + expect(movie.valid?).must_equal true + end + + it "is invalid when one of the required fileds is missing" do + required_fields= ["title", "available_inventory", "release_date", "overview", "total_inventory"] + + required_fields.each do |field| + movie[field] = nil + expect(movie.valid?).must_equal false + + movie.reload + end + end + + it "is invalid when either total_inventory or available_inventory is not an integer" do + inventory_fields = ["available_inventory", "total_inventory"] + + inventory_fields.each do |field| + movie[field] = 0.5 + expect(movie.valid?).must_equal false + + movie[field] = "number_as_string" + expect(movie.valid?).must_equal false + + movie.reload + end + end + end + + describe "relations" do + before do + @titanic = Video.new( + { + title: "Titanic", + overview: "You jump I jump!", + release_date: "1997-12-19", + total_inventory: 5, + available_inventory: 5, + } + ) + @customer01 = customers(:jessica) + @customer02 = customers(:cathy) + end + + it "can have many rental records" do + @titanic.save! + rental01 = Rental.create!(video_id: @titanic.id, customer_id: @customer01.id) + expect(@titanic.rentals.count).must_equal 1 + + expect { + Rental.create!(video_id: @titanic.id, customer_id: @customer02.id) + }.must_differ "@titanic.rentals.count", 1 + + @titanic.rentals.each do |rental| + expect(rental).must_be_instance_of Rental + end + end + + it "can have many customers through rentals" do + Rental.create!(video_id: movie.id, customer_id: @customer01.id) + Rental.create!(video_id: movie.id, customer_id: @customer02.id) + + movie.rentals.each do |rental| + rental_customer = Customer.find_by(id: rental.customer_id) + expect(rental_customer).must_be_instance_of Customer + end + end + end end From 570c1a63094df6c83d5fd518e7bfbad5a00a6e6a Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 20:09:14 -0700 Subject: [PATCH 22/34] add custom routes for check-out and check-in --- config/routes.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index be59068da..911a4ffbf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,4 +3,7 @@ resources :customers, only: [:index] resources :videos, only: [:index, :show, :create] + + post "/rentals/check-out", to: "rentals#checkout", as: "checkout" + post "/rentals/check-in", to: "rentals#checkin", as: "checkin" end From 1b3aa674c1c75743be443ff2e0d2186bff7265dd Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 20:10:53 -0700 Subject: [PATCH 23/34] revise index actions to pass smoke tests --- app/controllers/customers_controller.rb | 2 +- app/controllers/videos_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index c8528fed3..e41ffdf45 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,6 +1,6 @@ class CustomersController < ApplicationController def index - customers = Customer.all.order(:name) + customers = Customer.order(:name) render json: customers.as_json(except: [:created_at, :updated_at, :address, :city, :state]), status: :ok end diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb index 6d9631caf..d58c73b15 100644 --- a/app/controllers/videos_controller.rb +++ b/app/controllers/videos_controller.rb @@ -1,6 +1,6 @@ class VideosController < ApplicationController def index - videos = Video.all.order(:title) + videos = Video.order(:title) render json: videos.as_json(except: [:created_at, :updated_at, :total_inventory, :overview]), status: :ok end From 4376e063d27052834ce8a1690013bd8e459f33ae Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 20:11:23 -0700 Subject: [PATCH 24/34] add rentals#checkout and custom methods --- app/controllers/rentals_controller.rb | 45 +++++++++++++++++++++++++++ app/models/customer.rb | 5 +++ app/models/video.rb | 9 ++++++ 3 files changed, 59 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..dd0f019e5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,47 @@ class RentalsController < ApplicationController + + def checkout + customer = Customer.find_by(id: rental_params[:customer_id]) + video = Video.find_by(id: rental_params[:video_id]) + + if customer.nil? || video.nil? + render json: { + errors: ['Not Found'], + }, status: :not_found + return + end + + if !video.check_availability + render json: { + errors: ['No videos in stock'], + }, status: :bad_request + return + end + + rental = Rental.new(customer_id: customer.id, video_id: video.id) + if rental.save + video.decrease_inventory + customer.increase_videos_checked_out_count + render json: { + "customer_id": customer.id, + "video_id": video.id, + "videos_checked_out_count": customer.videos_checked_out_count, + "available_inventory": video.available_inventory, + }, status: :ok + else + render json: { + errors: rental.errors.messages + }, status: :bad_request + return + end + end + + def checkin + end + + private + + def rental_params + return params.permit(:customer_id, :video_id) + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 6517105df..74f68a7ca 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -2,4 +2,9 @@ class Customer < ApplicationRecord has_many :rentals has_many :videos, through: :rentals validates :name, :address, :city, :state, :postal_code, :phone, presence: true + + def increase_videos_checked_out_count + self.videos_checked_out_count += 1 + self.save + end end diff --git a/app/models/video.rb b/app/models/video.rb index 3d33b18ca..8b8811134 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -3,4 +3,13 @@ class Video < ApplicationRecord has_many :customers, through: :rentals validates :title, :overview, :total_inventory, :available_inventory, :release_date, presence: true validates :total_inventory, :available_inventory, numericality: { only_integer: true } + + def check_availability + return self.available_inventory > 0 + end + + def decrease_inventory + self.available_inventory -= 1 + self.save + end end From dc2034d72d68c017cf6ff70c4b0ed86d4e13eacf Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Wed, 27 May 2020 20:18:22 -0700 Subject: [PATCH 25/34] add due_date model method and json --- app/controllers/rentals_controller.rb | 1 + app/models/rental.rb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index dd0f019e5..addaa77d8 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -25,6 +25,7 @@ def checkout render json: { "customer_id": customer.id, "video_id": video.id, + "due_date": rental.due_date, "videos_checked_out_count": customer.videos_checked_out_count, "available_inventory": video.available_inventory, }, status: :ok diff --git a/app/models/rental.rb b/app/models/rental.rb index 0449e1916..05658458f 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,8 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :video + + def due_date + return Date.today + 7 + end end From bccdbaf7791837b8092119154d67d2456fb546b4 Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Wed, 27 May 2020 20:29:37 -0700 Subject: [PATCH 26/34] implement rental#checkin and business logic --- app/controllers/rentals_controller.rb | 19 +++++++++++++++++++ app/models/customer.rb | 5 +++++ app/models/video.rb | 5 +++++ 3 files changed, 29 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index addaa77d8..66f73c0e5 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -38,6 +38,25 @@ def checkout end def checkin + customer = Customer.find_by(id: rental_params[:customer_id]) + video = Video.find_by(id: rental_params[:video_id]) + + if customer.nil? || video.nil? + render json: { + errors: ['Not Found'], + }, status: :not_found + return + end + + video.increase_inventory + customer.decrease_videos_checked_out_count + render json: { + "customer_id": customer.id, + "video_id": video.id, + "videos_checked_out_count": customer.videos_checked_out_count, + "available_inventory": video.available_inventory, + }, status: :ok + return end private diff --git a/app/models/customer.rb b/app/models/customer.rb index 74f68a7ca..65e1faa99 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -7,4 +7,9 @@ def increase_videos_checked_out_count self.videos_checked_out_count += 1 self.save end + + def decrease_videos_checked_out_count + self.videos_checked_out_count -= 1 + self.save + end end diff --git a/app/models/video.rb b/app/models/video.rb index 8b8811134..9924b2ec1 100644 --- a/app/models/video.rb +++ b/app/models/video.rb @@ -12,4 +12,9 @@ def decrease_inventory self.available_inventory -= 1 self.save end + + def increase_inventory + self.available_inventory += 1 + self.save + end end From 2cbba8f4634cbd5dc21c17245fa4200241d9ef74 Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 21:02:59 -0700 Subject: [PATCH 27/34] add model tests for video#check_availability --- test/models/video_test.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index e7a31067d..195ce038c 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -74,4 +74,27 @@ end end end + + describe "check_availability" do + it "returns true if there is at least one available inventory count" do + expect(movie.available_inventory).must_equal 5 + expect(movie.check_availability).must_equal true + end + + it "returns false if there is zero available inventory" do + movie.update!(available_inventory: 0) + expect(movie.check_availability).must_equal false + end + end + + describe "decrease_inventory" do + it "decreases the available inventory count by 1" do + expect { + movie.decrease_inventory + }.must_differ "movie.available_inventory", -1 + end + end + + describe "decrease_inventory" do + end end From 5355011e913762901e35f6dfb40cee5a12286ff2 Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 21:05:32 -0700 Subject: [PATCH 28/34] add model tests for video#decrease_inventory and #increase_inventory --- test/models/video_test.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 195ce038c..4ad79b676 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -95,6 +95,11 @@ end end - describe "decrease_inventory" do + describe "increase_inventory" do + it "increases the available inventory count by 1" do + expect { + movie.increase_inventory + }.must_differ "movie.available_inventory", 1 + end end end From 6caf6a5b2763b6ddc5627587c99ac2d58d14bfcc Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 21:16:01 -0700 Subject: [PATCH 29/34] add more detailed assertions to video validation tests --- test/models/video_test.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/models/video_test.rb b/test/models/video_test.rb index 4ad79b676..d45e1d51d 100644 --- a/test/models/video_test.rb +++ b/test/models/video_test.rb @@ -15,6 +15,7 @@ required_fields.each do |field| movie[field] = nil expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include field.to_sym movie.reload end @@ -26,9 +27,13 @@ inventory_fields.each do |field| movie[field] = 0.5 expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include field.to_sym + expect(movie.errors.messages[field.to_sym]).must_equal ["must be an integer"] movie[field] = "number_as_string" expect(movie.valid?).must_equal false + expect(movie.errors.messages).must_include field.to_sym + expect(movie.errors.messages[field.to_sym]).must_equal ["is not a number"] movie.reload end From 0a226181e0c405d8ff4e22368396d0f6b3996c58 Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 21:18:10 -0700 Subject: [PATCH 30/34] add tests for customer decrease/increase_videos_checked_out_count methods --- test/models/customer_test.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index d95e16a92..a63151c40 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -111,6 +111,25 @@ expect(new_customer.errors.messages).must_include :phone expect(new_customer.errors.messages[:phone]).must_equal ["can't be blank"] end + end + + describe "increase_videos_checked_out_count" do + it "increases the videos checked out count by 1" do + new_customer.save! + expect { + new_customer.increase_videos_checked_out_count + }.must_differ "new_customer.videos_checked_out_count", 1 + end + end + + describe "decrease_videos_checked_out_count" do + it "decreases the videos checked out count by 1" do + new_customer.save! + + expect { + new_customer.decrease_videos_checked_out_count + }.must_differ "new_customer.videos_checked_out_count", -1 + end end end From 5419fc10a51e8901625b6de2bc0331b356911fa1 Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 21:26:14 -0700 Subject: [PATCH 31/34] add rental model tests for relations --- test/models/rental_test.rb | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3e64959b4..fbc81f8a2 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,7 +1,21 @@ require "test_helper" describe Rental do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "relations" do + before do + @customer = customers(:jessica) + @video = videos(:jurassicpark) + @rental = Rental.create!(customer_id: @customer.id, video_id: @video.id) + end + + it "belongs to one video" do + expect(@rental.video).must_be_instance_of Video + expect(@rental.video).must_equal @video + end + + it "belongs to one customer" do + expect(@rental.customer).must_be_instance_of Customer + expect(@rental.customer).must_equal @customer + end + end end From 48fb6d9f13487e3237ec39e9815488f1818b37fd Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 21:31:13 -0700 Subject: [PATCH 32/34] add model tests for rental#due_date --- test/models/rental_test.rb | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index fbc81f8a2..3635cca00 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,13 +1,14 @@ require "test_helper" describe Rental do + + before do + @customer = customers(:jessica) + @video = videos(:jurassicpark) + @rental = Rental.create!(customer_id: @customer.id, video_id: @video.id) + end + describe "relations" do - before do - @customer = customers(:jessica) - @video = videos(:jurassicpark) - @rental = Rental.create!(customer_id: @customer.id, video_id: @video.id) - end - it "belongs to one video" do expect(@rental.video).must_be_instance_of Video expect(@rental.video).must_equal @video @@ -18,4 +19,11 @@ expect(@rental.customer).must_equal @customer end end -end + + describe "due_date" do + it "returns a Date that is 7 days from today" do + expect(@rental.due_date).must_be_instance_of Date + expect(@rental.due_date - Date.today).must_equal 7 + end + end +end \ No newline at end of file From 737d5d38bf32e8268de0b96a1606fed40a698362 Mon Sep 17 00:00:00 2001 From: cojenco Date: Wed, 27 May 2020 21:31:46 -0700 Subject: [PATCH 33/34] add comments to customer model tests --- test/models/customer_test.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a63151c40..bb276040c 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -115,8 +115,10 @@ describe "increase_videos_checked_out_count" do it "increases the videos checked out count by 1" do + # Arrange new_customer.save! + # Assert expect { new_customer.increase_videos_checked_out_count }.must_differ "new_customer.videos_checked_out_count", 1 @@ -125,8 +127,10 @@ describe "decrease_videos_checked_out_count" do it "decreases the videos checked out count by 1" do + # Arrange new_customer.save! + # Assert expect { new_customer.decrease_videos_checked_out_count }.must_differ "new_customer.videos_checked_out_count", -1 From d797aff8aaa442658264a791257eff7897f89acb Mon Sep 17 00:00:00 2001 From: Jessica Stone Date: Fri, 29 May 2020 13:23:51 -0700 Subject: [PATCH 34/34] add tests for checkout and checkin --- test/controllers/rentals_controller_test.rb | 102 +++++++++++++++++++- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index dc043d4df..54aab1801 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,103 @@ require "test_helper" describe RentalsController do - # it "does a thing" do - # value(1+1).must_equal 2 - # end + describe "check-out" do + CHECKOUT_RENTAL_FIELDS = ["customer_id", "video_id", "due_date", "videos_checked_out_count", "available_inventory"].sort + + it "should change Rental count" do + customer = customers(:jessica) + video = videos(:toystory) + + expect { + post checkout_path, params: {customer_id: customer.id, video_id: video.id} + }.must_differ "Rental.count", 1 + end + + it "should respond with success and return json with correct fields if customer and video are valid" do + customer = customers(:jessica) + video = videos(:toystory) + + post checkout_path, params: {customer_id: customer.id, video_id: video.id} + + body = JSON.parse(response.body) + + expect(body.keys.sort).must_equal CHECKOUT_RENTAL_FIELDS + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + end + + it "renders not found json if customer is invalid" do + video = videos(:toystory) + + post checkout_path, params: {customer_id: -1, video_id: video.id} + + body = JSON.parse(response.body) + expect(body['errors']).must_include 'Not Found' + must_respond_with :not_found + end + + it "renders not found json if video is invalid" do + customer = customers(:jessica) + + post checkout_path, params: {customer_id: customer.id, video_id: -1} + + body = JSON.parse(response.body) + expect(body['errors']).must_include 'Not Found' + must_respond_with :not_found + end + + it "renders no videos in stock error message and bad request if no videos in stock" do + customer = customers(:jessica) + video = videos(:toystory) + + video.available_inventory = 0 + video.save + + post checkout_path, params: {customer_id: customer.id, video_id: video.id} + + body = JSON.parse(response.body) + expect(body['errors']).must_include 'No videos in stock' + must_respond_with :bad_request + end + + end + + describe "check-in" do + CHECKIN_RENTAL_FIELDS = ["customer_id", "video_id", "videos_checked_out_count", "available_inventory"].sort + + it "should respond with success and return json with correct fields if customer and video are valid" do + customer = customers(:jessica) + video = videos(:toystory) + + post checkin_path, params: {customer_id: customer.id, video_id: video.id} + + body = JSON.parse(response.body) + + expect(body.keys.sort).must_equal CHECKIN_RENTAL_FIELDS + must_respond_with :success + expect(response.header['Content-Type']).must_include 'json' + end + + it "renders not found json if customer is invalid" do + video = videos(:toystory) + + post checkin_path, params: {customer_id: -1, video_id: video.id} + + body = JSON.parse(response.body) + expect(body['errors']).must_include 'Not Found' + must_respond_with :not_found + end + + it "renders not found json if video is invalid" do + customer = customers(:jessica) + + post checkin_path, params: {customer_id: customer.id, video_id: -1} + + body = JSON.parse(response.body) + expect(body['errors']).must_include 'Not Found' + must_respond_with :not_found + end + + end + end