From be82818fc9d0123e0f5cc07dd641e45cd1f02408 Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 13:36:09 -0700 Subject: [PATCH 01/48] Initialize Rails API --- .gitignore | 23 +++ .ruby-version | 1 + Gemfile | 54 ++++++ Gemfile.lock | 169 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ bin/update | 28 +++ config.ru | 5 + config/application.rb | 41 +++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 54 ++++++ config/environments/production.rb | 85 +++++++++ config/environments/test.rb | 46 +++++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 34 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 24 +++ tmp/.keep | 0 vendor/.keep | 0 58 files changed, 935 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..ea4b32f59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development +/storage/* +!/storage/.keep + +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..25c81fe39 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..687a6f632 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..d43d20b6e --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,169 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (9.0.0) + bootsnap (1.4.4) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + erubi (1.8.0) + ffi (1.10.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.3.6) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + msgpack (1.2.10) + nio4r (2.3.1) + nokogiri (1.10.3) + mini_portile2 (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + ruby-progressbar (1.10.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.3) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + byebug + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.5.1p57 + +BUNDLED WITH + 1.16.6 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..a334d86a6 --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..67d0d4964 --- /dev/null +++ b/bin/update @@ -0,0 +1,28 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..641b5d08c --- /dev/null +++ b/config/application.rb @@ -0,0 +1,41 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0d86702e8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: VideoStoreAPI_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..94bbe4f1c --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +LSBXw9RzP2MFo+3UgfaP3Aa1q/nQGb+Q5fpvRW84zwSJfu4KIu+lZBVC2I/bCjmgrW8QSThuMz4jv6aLXdVrpvfQygjncJCl2RIhA63H1li6h1ZfT1xMG0P00prDkTx1YFvStvYo1DPdJniNfw2BrmbD9rgmSfwh2rMr4nAZXXXSHiig0JH3SLpSZzgiR8Pomr0Pesp3wCqt+4dC1kQBkGTZuIBfEczIBdgRK3QZi8OQSaOCambzXvSR9ge/UlEyvlXj292pUF95H4c8T4ZSjKnLcXq2BiZbEO5eEOSHVYt8ZzOuj0hPUBDQhfmFlhDW9hjGurHD5vSSjNblch5rYabA/5T1gK8I+jNQPcCPrn5vExEoxs5MC6fl143b14BC/3rmW8GTh64trd7YZgae3f2wjynh3/QztvcT--Db5FH6mgXZVeZ6Ml--H9uar2QI6hZqsjIC8FuoHw== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..d52ec9efb --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,54 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..5f44b9bda --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,85 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..2b5172a7d --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,24 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails"require "minitest/reporters" # for Colorized output +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 6c65b70952ac098b675bf4a1ae5a0d0877c61e29 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 13:39:15 -0700 Subject: [PATCH 02/48] generate models movie, rental, and customer --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 2 ++ db/migrate/20190514203739_create_movies.rb | 12 ++++++++++++ db/migrate/20190514203807_create_rentals.rb | 11 +++++++++++ db/migrate/20190514203853_create_customers.rb | 15 +++++++++++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/fixtures/rentals.yml | 11 +++++++++++ test/models/customer_test.rb | 9 +++++++++ test/models/movie_test.rb | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 12 files changed, 114 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20190514203739_create_movies.rb create mode 100644 db/migrate/20190514203807_create_rentals.rb create mode 100644 db/migrate/20190514203853_create_customers.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..79e3a65ca --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,2 @@ +class Rental < ApplicationRecord +end diff --git a/db/migrate/20190514203739_create_movies.rb b/db/migrate/20190514203739_create_movies.rb new file mode 100644 index 000000000..acf6962ef --- /dev/null +++ b/db/migrate/20190514203739_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.2] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.date :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20190514203807_create_rentals.rb b/db/migrate/20190514203807_create_rentals.rb new file mode 100644 index 000000000..9b84d6993 --- /dev/null +++ b/db/migrate/20190514203807_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[5.2] + def change + create_table :rentals do |t| + t.date :check_out + t.date :due_date + t.date :check_in + + t.timestamps + end + end +end diff --git a/db/migrate/20190514203853_create_customers.rb b/db/migrate/20190514203853_create_customers.rb new file mode 100644 index 000000000..bacf35c8f --- /dev/null +++ b/db/migrate/20190514203853_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.2] + def change + create_table :customers do |t| + t.string :name + t.datetime :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..380a6af3d --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: 2019-05-14 13:38:53 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: 2019-05-14 13:38:53 + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..e8afe187d --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: 2019-05-14 + inventory: 1 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..45af05fa0 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + check_out: 2019-05-14 + due_date: 2019-05-14 + check_in: 2019-05-14 + +two: + check_out: 2019-05-14 + due_date: 2019-05-14 + check_in: 2019-05-14 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From e3e0804913bc842383c83f393f1a5c9061f1b161 Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 13:39:16 -0700 Subject: [PATCH 03/48] Generated Rentals, Customers, and Movies controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ app/controllers/rentals_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ test/controllers/rentals_controller_test.rb | 7 +++++++ 6 files changed, 27 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From fb9ae978284e7e302b27616136213db6a4a0db57 Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 13:44:18 -0700 Subject: [PATCH 04/48] Update routes for all endpoints --- config/routes.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 787824f88..99b61ec90 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,8 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + resources :customers, only: [:index] + resources :movies, only: [:index, :show, :create] + + post 'rentals/check_out', to: 'rentals#check_out', as: "check_out" + post 'rentals/check_in', to: 'rentals#check_in', as: "check_in" end From 7025f6e61c7b6802005a5e02018de0d4e02a42eb Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 13:44:40 -0700 Subject: [PATCH 05/48] has_many and belongs_to relationships --- app/models/customer.rb | 1 + app/models/movie.rb | 1 + app/models/rental.rb | 2 ++ 3 files changed, 4 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..d2533dbf9 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,3 @@ class Customer < ApplicationRecord + has_many :rentals end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..b8b339cbc 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,3 @@ class Movie < ApplicationRecord + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb index 79e3a65ca..34d3f4df8 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,2 +1,4 @@ class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer end From 4b76487c7cb2228be4f05827690a5c8a7b885322 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 13:47:48 -0700 Subject: [PATCH 06/48] migrations to add foreign keys for movie and customer to rentals --- .../20190514204557_add_movie_id_to_rentals.rb | 5 ++ ...190514204639_add_customer_id_to_rentals.rb | 5 ++ db/schema.rb | 53 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 db/migrate/20190514204557_add_movie_id_to_rentals.rb create mode 100644 db/migrate/20190514204639_add_customer_id_to_rentals.rb create mode 100644 db/schema.rb diff --git a/db/migrate/20190514204557_add_movie_id_to_rentals.rb b/db/migrate/20190514204557_add_movie_id_to_rentals.rb new file mode 100644 index 000000000..67797e6d0 --- /dev/null +++ b/db/migrate/20190514204557_add_movie_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddMovieIdToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/migrate/20190514204639_add_customer_id_to_rentals.rb b/db/migrate/20190514204639_add_customer_id_to_rentals.rb new file mode 100644 index 000000000..0c5d8d5d6 --- /dev/null +++ b/db/migrate/20190514204639_add_customer_id_to_rentals.rb @@ -0,0 +1,5 @@ +class AddCustomerIdToRentals < ActiveRecord::Migration[5.2] + def change + add_reference :rentals, :customer, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..bb36e5df1 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,53 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_204639) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "check_out" + t.date "due_date" + t.date "check_in" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "movie_id" + t.bigint "customer_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" +end From 1049e1d0a5047ee0224f700d7e6d149472b7b16f Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 13:58:21 -0700 Subject: [PATCH 07/48] Movies index, show, create, zomg and strong params --- app/controllers/movies_controller.rb | 33 +++++++++++++++++++ config/routes.rb | 2 ++ db/schema.rb | 47 ++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 db/schema.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..c681f43a6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,35 @@ class MoviesController < ApplicationController + def index + @movies = Movie.all + end + + def show + movie = Movie.find_by(id: params[:id]) + + if movie + render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) + else + render status: :not_found, json: { errors: ["Movie with ID #{params[:id]} not found"] } + end + end + + def create + movie = Movie.new(movie_params) + + if movie.save + render status: :ok, json: { id: movie.id } + else + render status: :bad_request, json: { errors: movie.errors.messages } + end + end + + def zomg + render json: { works: "it works!" } + end + + private + + def movie_params + params.permit(:title, :overview, :release_date, :inventory) + end end diff --git a/config/routes.rb b/config/routes.rb index 99b61ec90..c55caac94 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,4 +5,6 @@ post 'rentals/check_out', to: 'rentals#check_out', as: "check_out" post 'rentals/check_in', to: 'rentals#check_in', as: "check_in" + + get '/zomg', to: 'movies#zomg', as: 'zomg' end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..5f8f0b37a --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,47 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_05_14_203853) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.datetime "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rentals", force: :cascade do |t| + t.date "check_out" + t.date "due_date" + t.date "check_in" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 6bbb5334183919ae1e6fc70e506e3919ff64e39d Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 14:15:25 -0700 Subject: [PATCH 08/48] add validations to models for presence based on api requirements --- app/models/customer.rb | 6 ++++++ app/models/movie.rb | 6 ++++++ app/models/rental.rb | 3 +++ 3 files changed, 15 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index d2533dbf9..dc81002ec 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,3 +1,9 @@ class Customer < ApplicationRecord has_many :rentals + has_many :movies, through: :rentals + + validates :name, presence: true + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :phone, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index b8b339cbc..0533a1b45 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,3 +1,9 @@ class Movie < ApplicationRecord has_many :rentals + has_many :customers, through: :rentals + + validates :title, presence: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true end diff --git a/app/models/rental.rb b/app/models/rental.rb index 34d3f4df8..4095c84e0 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,7 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer + + validates :check_out, presence: true + validates :check_in, presence: true end From 4ce0ab0833473a9caef6fc233d5f4129315ae1b3 Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 14:27:16 -0700 Subject: [PATCH 09/48] Rename columns Check In/Out to checkout_date and checkin_date --- db/migrate/20190514212438_change_check_in_check_out_name.rb | 6 ++++++ db/schema.rb | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20190514212438_change_check_in_check_out_name.rb diff --git a/db/migrate/20190514212438_change_check_in_check_out_name.rb b/db/migrate/20190514212438_change_check_in_check_out_name.rb new file mode 100644 index 000000000..66065b33b --- /dev/null +++ b/db/migrate/20190514212438_change_check_in_check_out_name.rb @@ -0,0 +1,6 @@ +class ChangeCheckInCheckOutName < ActiveRecord::Migration[5.2] + def change + rename_column(:rentals, :check_out, :checkout_date) + rename_column(:rentals, :check_in, :checkin_date) + end +end diff --git a/db/schema.rb b/db/schema.rb index bb36e5df1..9a36e97b4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_204639) do +ActiveRecord::Schema.define(version: 2019_05_14_212438) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,9 +37,9 @@ end create_table "rentals", force: :cascade do |t| - t.date "check_out" + t.date "checkout_date" t.date "due_date" - t.date "check_in" + t.date "checkin_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.bigint "movie_id" From b5ef87b8609c710bc478799bdc4e4bbaf0d46071 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 14:32:35 -0700 Subject: [PATCH 10/48] fix validations --- app/models/customer.rb | 1 - app/models/movie.rb | 1 - app/models/rental.rb | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index dc81002ec..619255d14 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,5 +5,4 @@ class Customer < ApplicationRecord validates :name, presence: true validates :registered_at, presence: true validates :postal_code, presence: true - validates :phone, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index 0533a1b45..602d3f9a0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,7 +3,6 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals validates :title, presence: true - validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true end diff --git a/app/models/rental.rb b/app/models/rental.rb index 4095c84e0..f6b0b3a2a 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -2,6 +2,6 @@ class Rental < ApplicationRecord belongs_to :movie belongs_to :customer - validates :check_out, presence: true - validates :check_in, presence: true + # don't think we need to, but validate for movie_id and customer_id if needed later + validates :checkout_date, presence: true end From e27520468a930159395f73ee16b6bd12daa5bef8 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 14:42:30 -0700 Subject: [PATCH 11/48] add default values for checkout and due date --- .../20190514213323_add_default_due_date_value_to_rental.rb | 5 +++++ ...90514213747_add_default_checkout_date_value_to_rental.rb | 5 +++++ db/schema.rb | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20190514213323_add_default_due_date_value_to_rental.rb create mode 100644 db/migrate/20190514213747_add_default_checkout_date_value_to_rental.rb diff --git a/db/migrate/20190514213323_add_default_due_date_value_to_rental.rb b/db/migrate/20190514213323_add_default_due_date_value_to_rental.rb new file mode 100644 index 000000000..02a2faa51 --- /dev/null +++ b/db/migrate/20190514213323_add_default_due_date_value_to_rental.rb @@ -0,0 +1,5 @@ +class AddDefaultDueDateValueToRental < ActiveRecord::Migration[5.2] + def change + change_column :rentals, :due_date, :date, default: Date.today + 7 + end +end diff --git a/db/migrate/20190514213747_add_default_checkout_date_value_to_rental.rb b/db/migrate/20190514213747_add_default_checkout_date_value_to_rental.rb new file mode 100644 index 000000000..29cedc58e --- /dev/null +++ b/db/migrate/20190514213747_add_default_checkout_date_value_to_rental.rb @@ -0,0 +1,5 @@ +class AddDefaultCheckoutDateValueToRental < ActiveRecord::Migration[5.2] + def change + change_column :rentals, :checkout_date, :date, default: Date.today + end +end diff --git a/db/schema.rb b/db/schema.rb index 9a36e97b4..6c4bad2bc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_212438) do +ActiveRecord::Schema.define(version: 2019_05_14_213747) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,8 +37,8 @@ end create_table "rentals", force: :cascade do |t| - t.date "checkout_date" - t.date "due_date" + t.date "checkout_date", default: "2019-05-14" + t.date "due_date", default: "2019-05-21" t.date "checkin_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false From 48dccbab7ea9195223512fc68b28c80dd11878b1 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 14:51:08 -0700 Subject: [PATCH 12/48] fix new line bug --- test/test_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 2b5172a7d..3f7dc7d3e 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ ENV["RAILS_ENV"] = "test" require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" -require "minitest/rails"require "minitest/reporters" # for Colorized output +require "minitest/rails" +require "minitest/reporters" # for Colorized output # For colorful output! Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, @@ -9,7 +10,6 @@ Minitest.backtrace_filter ) - # To add Capybara feature tests add `gem "minitest-rails-capybara"` # to the test group in the Gemfile and uncomment the following: # require "minitest/rails/capybara" From 17f96b33ac17de8f9c633cb8afb4f5f43e5b29d5 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 14:52:27 -0700 Subject: [PATCH 13/48] fix rentals fixture bug after column rename --- test/fixtures/rentals.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index 45af05fa0..ea4fdc633 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,11 +1,11 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - check_out: 2019-05-14 + checkout_date: 2019-05-14 due_date: 2019-05-14 - check_in: 2019-05-14 + checkin_date: 2019-05-14 two: - check_out: 2019-05-14 + checkout_date: 2019-05-14 due_date: 2019-05-14 - check_in: 2019-05-14 + checkin_date: 2019-05-14 From ad71d3422019a6373b414d04e2bab7b7e9d74585 Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 15:12:00 -0700 Subject: [PATCH 14/48] Customer validations and relationship passing all tests --- app/models/customer.rb | 2 +- test/models/customer_test.rb | 32 +++++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 619255d14..79656278d 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,6 @@ class Customer < ApplicationRecord has_many :rentals - has_many :movies, through: :rentals + # has_many :movies, through: :rentals validates :name, presence: true validates :registered_at, presence: true diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..421ca226e 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,35 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + describe "validations" do + let(:customer) { customers(:one) } - it "must be valid" do - value(customer).must_be :valid? + it "must be valid" do + value(customer).must_be :valid? + end + + it "must have a name" do + customer.name = nil + customer.valid?.must_equal false + end + + it "must be type datetime for registered at" do + customer.registered_at = "this is not a date" + customer.valid?.must_equal false + end + + it "must have a postal code" do + customer.postal_code = nil + customer.valid?.must_equal false + end + end + + describe "relationships" do + it "has many rentals" do + customer = Customer.first + customer.rentals.each do |rental| + rental.must_be_instance_of Rental + end + end end end From 3f1b38275785474fbff2d5f36d9f6f4ee02ed150 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 15:14:05 -0700 Subject: [PATCH 15/48] movie model tests --- app/models/movie.rb | 2 +- test/fixtures/movies.yml | 20 +++++++-------- test/models/movie_test.rb | 51 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 60 insertions(+), 13 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 602d3f9a0..e7301e341 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord has_many :rentals - has_many :customers, through: :rentals + # has_many :customers, through: :rentals validates :title, presence: true validates :release_date, presence: true diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index e8afe187d..210b8e424 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: 2019-05-14 - inventory: 1 +harrypotter: + title: Harry Potter and the Sorcerer's Stone + overview: Yer a wizard, Harry. + release_date: 2001-11-04 + inventory: 10 -two: - title: MyString - overview: MyString - release_date: 2019-05-14 - inventory: 1 +toalltheboys: + title: To All the Boys I've Loved Before + overview: Peter Kavinsky 5ever!!! + release_date: 2018-08-17 + inventory: 3 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..dcd4141b3 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,56 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } + let (:movie) { + movies(:harrypotter) + } it "must be valid" do - value(movie).must_be :valid? + valid_movie = movie.valid? + expect(valid_movie).must_equal true end + + describe "validations" do + it "requires a title" do + movie.title = nil + + valid_movie = movie.valid? + + expect(valid_movie).must_equal false + expect(movie.errors.messages).must_include :title + expect(movie.errors.messages[:title]).must_equal ["can't be blank"] + end + + it "requires a release date" do + movie.release_date = nil + + valid_movie = movie.valid? + + expect(valid_movie).must_equal false + expect(movie.errors.messages).must_include :release_date + expect(movie.errors.messages[:release_date]).must_equal ["can't be blank"] + end + + it "requires an inventory" do + movie.inventory = nil + + valid_movie = movie.valid? + + expect(valid_movie).must_equal false + expect(movie.errors.messages).must_include :inventory + expect(movie.errors.messages[:inventory]).must_equal ["can't be blank"] + end + end + + describe "relationships" do + it "has many rentals" do + movie.must_respond_to :rentals + movie.rentals.each do |rental| + rental.must_be_kind_of Rental + end + end + end + + # describe "custom methods" do + # end end From 4f239d56be447176631d64e6989e786226b0e4c9 Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 15:14:37 -0700 Subject: [PATCH 16/48] must respond to in relationship tests --- test/models/customer_test.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 421ca226e..a1d141a88 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -27,6 +27,7 @@ describe "relationships" do it "has many rentals" do customer = Customer.first + customer.must_respond_to :rentals customer.rentals.each do |rental| rental.must_be_instance_of Rental end From 6b76fefd9c8b4006e82da1b754e5c2eaf55bfb8a Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 15:18:01 -0700 Subject: [PATCH 17/48] rental yml file --- test/fixtures/rentals.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml index ea4fdc633..36c531896 100644 --- a/test/fixtures/rentals.yml +++ b/test/fixtures/rentals.yml @@ -1,11 +1,15 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: + movie: harrypotter + customer: hana checkout_date: 2019-05-14 - due_date: 2019-05-14 - checkin_date: 2019-05-14 + due_date: 2019-05-21 + checkin_date: nil two: - checkout_date: 2019-05-14 - due_date: 2019-05-14 - checkin_date: 2019-05-14 + movie: toalltheboys + customer: jessica + checkout_date: 2019-05-11 + due_date: 2019-05-18 + checkin_date: 2019-05-15 From a50a3210011377439c46426906b3191823c28dfb Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 15:18:59 -0700 Subject: [PATCH 18/48] Create and edit customer ymls --- test/fixtures/customers.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 380a6af3d..814332d32 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,19 +1,19 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html one: - name: MyString + name: Hana registered_at: 2019-05-14 13:38:53 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 123 Fake St + city: Seattle + state: WA + postal_code: 98103 + phone: (555) 555-5555 two: - name: MyString + name: Jessica registered_at: 2019-05-14 13:38:53 - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + address: 456 Faux Ave + city: Boston + state: MA + postal_code: 01451 + phone: (131) 313-1313 From ada8ff2091e416ad51bebd458956ae95355b90e4 Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 15:24:15 -0700 Subject: [PATCH 19/48] Tests include checking error messages --- test/models/customer_test.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index a1d141a88..2112c4d9e 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -11,16 +11,25 @@ it "must have a name" do customer.name = nil customer.valid?.must_equal false + + expect(customer.errors.messages).must_include :name + expect(customer.errors.messages[:name]).must_equal ["can't be blank"] end it "must be type datetime for registered at" do - customer.registered_at = "this is not a date" + customer.registered_at = nil customer.valid?.must_equal false + + expect(customer.errors.messages).must_include :registered_at + expect(customer.errors.messages[:registered_at]).must_equal ["can't be blank"] end it "must have a postal code" do customer.postal_code = nil customer.valid?.must_equal false + + expect(customer.errors.messages).must_include :postal_code + expect(customer.errors.messages[:postal_code]).must_equal ["can't be blank"] end end From 4b7693a55494de93574e3a0208a1d265a313b60e Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 15:31:42 -0700 Subject: [PATCH 20/48] fix customer yml and add rental model relation tests --- test/fixtures/customers.yml | 4 ++-- test/models/rental_test.rb | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 814332d32..59fb52104 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,6 +1,6 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: +hana: name: Hana registered_at: 2019-05-14 13:38:53 address: 123 Fake St @@ -9,7 +9,7 @@ one: postal_code: 98103 phone: (555) 555-5555 -two: +jessica: name: Jessica registered_at: 2019-05-14 13:38:53 address: 456 Faux Ave diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..828de746a 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,21 @@ require "test_helper" describe Rental do - let(:rental) { Rental.new } + let(:rental) { rentals(:two) } it "must be valid" do value(rental).must_be :valid? end + + describe "relations" do + it "has a movie" do + rental.must_respond_to :movie + rental.movie.must_be_kind_of Movie + end + + it "has a customer" do + rental.must_respond_to :customer + rental.customer.must_be_kind_of Customer + end + end end From 24679426831b8044f9e4861cdcc6bac43f9d612b Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 15:32:47 -0700 Subject: [PATCH 21/48] Refactor customer tests to pass with new yml info --- test/models/customer_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 2112c4d9e..3d5b54730 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,7 +2,7 @@ describe Customer do describe "validations" do - let(:customer) { customers(:one) } + let(:customer) { customers(:hana) } it "must be valid" do value(customer).must_be :valid? From e3f995b0605c67128cb122289df4d5eebf3be4a0 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 15:34:27 -0700 Subject: [PATCH 22/48] validation tests for rental model --- test/models/rental_test.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 828de746a..565145a6e 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -18,4 +18,16 @@ rental.customer.must_be_kind_of Customer end end + + describe "validations" do + it "requires a checkout date" do + rental.checkout_date = nil + + valid_rental = rental.valid? + + expect(valid_rental).must_equal false + expect(rental.errors.messages).must_include :checkout_date + expect(rental.errors.messages[:checkout_date]).must_equal ["can't be blank"] + end + end end From 4ea9175f6135b15cf863dc8a5ba9177441788071 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 15:40:35 -0700 Subject: [PATCH 23/48] make model test format uniform --- test/models/customer_test.rb | 54 +++++++++++++++++++----------------- test/models/movie_test.rb | 13 +++++---- test/models/rental_test.rb | 31 ++++++++++++--------- 3 files changed, 54 insertions(+), 44 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 3d5b54730..807c0c697 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,44 +1,48 @@ require "test_helper" describe Customer do - describe "validations" do + describe "validations" do let(:customer) { customers(:hana) } - it "must be valid" do - value(customer).must_be :valid? - end + describe "validations" do + it "is valid when all fields are present" do + result = customer.valid? + + expect(result).must_equal true + end - it "must have a name" do - customer.name = nil - customer.valid?.must_equal false + it "must have a name" do + customer.name = nil + customer.valid?.must_equal false - expect(customer.errors.messages).must_include :name - expect(customer.errors.messages[:name]).must_equal ["can't be blank"] - end + expect(customer.errors.messages).must_include :name + expect(customer.errors.messages[:name]).must_equal ["can't be blank"] + end - it "must be type datetime for registered at" do - customer.registered_at = nil - customer.valid?.must_equal false + it "must be type datetime for registered at" do + customer.registered_at = nil + customer.valid?.must_equal false - expect(customer.errors.messages).must_include :registered_at - expect(customer.errors.messages[:registered_at]).must_equal ["can't be blank"] - end + expect(customer.errors.messages).must_include :registered_at + expect(customer.errors.messages[:registered_at]).must_equal ["can't be blank"] + end - it "must have a postal code" do - customer.postal_code = nil - customer.valid?.must_equal false + it "must have a postal code" do + customer.postal_code = nil + customer.valid?.must_equal false - expect(customer.errors.messages).must_include :postal_code - expect(customer.errors.messages[:postal_code]).must_equal ["can't be blank"] + expect(customer.errors.messages).must_include :postal_code + expect(customer.errors.messages[:postal_code]).must_equal ["can't be blank"] + end end end - describe "relationships" do - it "has many rentals" do - customer = Customer.first + describe "relations" do + it "has many rentals" do + customer = Customer.first customer.must_respond_to :rentals customer.rentals.each do |rental| - rental.must_be_instance_of Rental + rental.must_be_instance_of Rental end end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index dcd4141b3..a517e8a25 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -5,12 +5,13 @@ movies(:harrypotter) } - it "must be valid" do - valid_movie = movie.valid? - expect(valid_movie).must_equal true - end - describe "validations" do + it "is valid when all fields are present" do + result = movie.valid? + + expect(result).must_equal true + end + it "requires a title" do movie.title = nil @@ -42,7 +43,7 @@ end end - describe "relationships" do + describe "relations" do it "has many rentals" do movie.must_respond_to :rentals movie.rentals.each do |rental| diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 565145a6e..5757fa986 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -3,8 +3,22 @@ describe Rental do let(:rental) { rentals(:two) } - it "must be valid" do - value(rental).must_be :valid? + describe "validations" do + it "is valid when all fields are present" do + result = rental.valid? + + expect(result).must_equal true + end + + it "requires a checkout date" do + rental.checkout_date = nil + + valid_rental = rental.valid? + + expect(valid_rental).must_equal false + expect(rental.errors.messages).must_include :checkout_date + expect(rental.errors.messages[:checkout_date]).must_equal ["can't be blank"] + end end describe "relations" do @@ -19,15 +33,6 @@ end end - describe "validations" do - it "requires a checkout date" do - rental.checkout_date = nil - - valid_rental = rental.valid? - - expect(valid_rental).must_equal false - expect(rental.errors.messages).must_include :checkout_date - expect(rental.errors.messages[:checkout_date]).must_equal ["can't be blank"] - end - end + # describe "custom methods" do + # end end From 87d88e22550c39a5c716a674401cd75cad219efe Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 15:43:22 -0700 Subject: [PATCH 24/48] create index action for customers --- app/controllers/customers_controller.rb | 4 ++++ app/controllers/movies_controller.rb | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..f3592f65d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,6 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index c681f43a6..d665bb227 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,6 +1,7 @@ class MoviesController < ApplicationController def index - @movies = Movie.all + movies = Movie.all + render status: :ok, json: movies.as_json(only: [:title, :overview, :release_date, :inventory]) end def show From 5d093ba63af487cdec55d0f5ebb80b4cb6c4831b Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 15:43:48 -0700 Subject: [PATCH 25/48] add test for checkout date and due date default values --- test/models/customer_test.rb | 3 +++ test/models/rental_test.rb | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 807c0c697..54977e268 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -46,4 +46,7 @@ end end end + + # describe "custom methods" do + # end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 5757fa986..3ba369221 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -33,6 +33,15 @@ end end - # describe "custom methods" do - # end + describe "custom methods" do + it "sets checkout date to current date" do + new_rental = Rental.new + expect(new_rental.checkout_date).must_equal Date.today + end + + it "sets due date to a week from today / checkout date" do + new_rental = Rental.new + expect(new_rental.due_date).must_equal new_rental.checkout_date + 7 + end + end end From 922c6eb2d7b3faa8d89b4d3dcc47f397335fcd70 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 15:53:50 -0700 Subject: [PATCH 26/48] add tests that rentals require movie and customer --- test/models/rental_test.rb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3ba369221..3b6c33c03 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,6 +2,8 @@ describe Rental do let(:rental) { rentals(:two) } + let(:customer) { customers(:hana) } + let(:movie) { movies(:toalltheboys) } describe "validations" do it "is valid when all fields are present" do @@ -31,6 +33,26 @@ rental.must_respond_to :customer rental.customer.must_be_kind_of Customer end + + it "requires a movie" do + rental.movie = nil + + valid_rental = rental.valid? + + expect(valid_rental).must_equal false + expect(rental.errors.messages).must_include :movie + expect(rental.errors.messages[:movie]).must_equal ["must exist"] + end + + it "requires a customer" do + rental.customer = nil + + valid_rental = rental.valid? + + expect(valid_rental).must_equal false + expect(rental.errors.messages).must_include :customer + expect(rental.errors.messages[:customer]).must_equal ["must exist"] + end end describe "custom methods" do From ffb9ac050bba879f48b3e80cb219f2c88f63b01e Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 16:12:53 -0700 Subject: [PATCH 27/48] start customers controller tests --- app/controllers/customers_controller.rb | 6 +-- app/controllers/movies_controller.rb | 54 +++++++++---------- test/controllers/customers_controller_test.rb | 42 +++++++++++++++ 3 files changed, 72 insertions(+), 30 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index f3592f65d..ba69a757c 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 + def index + customers = Customer.all render status: :ok, json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone]) - end + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index d665bb227..aedcdfcaa 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,36 +1,36 @@ class MoviesController < ApplicationController - def index - movies = Movie.all - render status: :ok, json: movies.as_json(only: [:title, :overview, :release_date, :inventory]) - end + # def index + # movies = Movie.all + # render status: :ok, json: movies.as_json(only: [:title, :overview, :release_date, :inventory]) + # end - def show - movie = Movie.find_by(id: params[:id]) + # def show + # movie = Movie.find_by(id: params[:id]) - if movie - render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) - else - render status: :not_found, json: { errors: ["Movie with ID #{params[:id]} not found"] } - end - end + # if movie + # render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) + # else + # render status: :not_found, json: { errors: ["Movie with ID #{params[:id]} not found"] } + # end + # end - def create - movie = Movie.new(movie_params) + # def create + # movie = Movie.new(movie_params) - if movie.save - render status: :ok, json: { id: movie.id } - else - render status: :bad_request, json: { errors: movie.errors.messages } - end - end + # if movie.save + # render status: :ok, json: { id: movie.id } + # else + # render status: :bad_request, json: { errors: movie.errors.messages } + # end + # end - def zomg - render json: { works: "it works!" } + def zomg + render json: {works: "it works!"} end - - private - def movie_params - params.permit(:title, :overview, :release_date, :inventory) - end + # private + + # def movie_params + # params.permit(:title, :overview, :release_date, :inventory) + # end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..48bfc0783 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -4,4 +4,46 @@ # it "must be a real test" do # flunk "Need real tests" # end + + # it "sends back ok and list of customers" do + # get customers_path + # must_respond_with :ok + # end + + describe "index" do + # These tests are a little verbose - yours do not need to be + # this explicit. + it "is a real working route" do + get customers_path + must_respond_with :success + end + + # it "returns json" do + # get pets_path + # expect(response.header["Content-Type"]).must_include "json" + # end + + # it "returns an Array" do + # get pets_path + + # body = JSON.parse(response.body) + # body.must_be_kind_of Array + # end + + # it "returns all of the pets" do + # get pets_path + + # body = JSON.parse(response.body) + # body.length.must_equal Pet.count + # end + + # it "returns pets with exactly the required fields" do + # keys = %w(age human id name) + # get pets_path + # body = JSON.parse(response.body) + # body.each do |pet| + # pet.keys.sort.must_equal keys + # end + # end + end end From 44056df5be1d26d6099ec71ac6c601aa4a345b9e Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 16:16:01 -0700 Subject: [PATCH 28/48] Add SimpleCov and add returns json tests --- .gitignore | 3 +++ Gemfile | 1 + Gemfile.lock | 8 ++++++++ test/controllers/customers_controller_test.rb | 8 ++++---- test/test_helper.rb | 10 ++++++++++ 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ea4b32f59..2e232f092 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +# Ignore generated files in coverage directory +coverage/* \ No newline at end of file diff --git a/Gemfile b/Gemfile index 687a6f632..619fcac1a 100644 --- a/Gemfile +++ b/Gemfile @@ -51,4 +51,5 @@ end group :test do gem 'minitest-rails' gem 'minitest-reporters' + gem 'simplecov', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index d43d20b6e..b6537c9b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,12 +51,14 @@ GEM coderay (1.1.2) concurrent-ruby (1.1.5) crass (1.0.4) + docile (1.3.1) erubi (1.8.0) ffi (1.10.0) globalid (0.4.2) activesupport (>= 4.2.0) i18n (1.6.0) concurrent-ruby (~> 1.0) + json (2.1.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -125,6 +127,11 @@ GEM ffi (~> 1.0) ruby-progressbar (1.10.0) ruby_dep (1.5.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) @@ -158,6 +165,7 @@ DEPENDENCIES pry-rails puma (~> 3.11) rails (~> 5.2.3) + simplecov spring spring-watcher-listen (~> 2.0.0) tzinfo-data diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 48bfc0783..f1316c73f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -18,10 +18,10 @@ must_respond_with :success end - # it "returns json" do - # get pets_path - # expect(response.header["Content-Type"]).must_include "json" - # end + it "returns json" do + get customers_path + expect(response.header["Content-Type"]).must_include "json" + end # it "returns an Array" do # get pets_path diff --git a/test/test_helper.rb b/test/test_helper.rb index 3f7dc7d3e..3c829ee9d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,4 +1,14 @@ ENV["RAILS_ENV"] = "test" +require 'simplecov' +SimpleCov.start "rails" do + add_filter "/bin/" + add_filter "/db/" + add_filter "/spec/" # for rspec + add_filter "/test/" # for minitest + add_filter "/channels/" + add_filter "/jobs/" + add_filter "/mailers/" +end require File.expand_path("../../config/environment", __FILE__) require "rails/test_help" require "minitest/rails" From 6282255d7e69c281d03a8dfaf87a44d8542cb169 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 16:16:48 -0700 Subject: [PATCH 29/48] customers returns an array --- test/controllers/customers_controller_test.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index f1316c73f..dd8034f8b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -23,12 +23,12 @@ expect(response.header["Content-Type"]).must_include "json" end - # it "returns an Array" do - # get pets_path + it "returns an Array" do + get customers_path - # body = JSON.parse(response.body) - # body.must_be_kind_of Array - # end + body = JSON.parse(response.body) + body.must_be_kind_of Array + end # it "returns all of the pets" do # get pets_path From 986893cd48461cf75f66da594817562b6ee82c78 Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 16:22:31 -0700 Subject: [PATCH 30/48] passing returns all the customers test --- test/controllers/customers_controller_test.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index dd8034f8b..54a48c2d6 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -30,12 +30,12 @@ body.must_be_kind_of Array end - # it "returns all of the pets" do - # get pets_path + it "returns all of the customers" do + get customers_path - # body = JSON.parse(response.body) - # body.length.must_equal Pet.count - # end + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end # it "returns pets with exactly the required fields" do # keys = %w(age human id name) From d84ab9368e3e71acaa52f6eff138635d17467fe7 Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 16:32:23 -0700 Subject: [PATCH 31/48] refactor required fields test for customer --- test/controllers/customers_controller_test.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 54a48c2d6..c89d089f0 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -37,13 +37,13 @@ body.length.must_equal Customer.count end - # it "returns pets with exactly the required fields" do - # keys = %w(age human id name) - # get pets_path - # body = JSON.parse(response.body) - # body.each do |pet| - # pet.keys.sort.must_equal keys - # end - # end + it "returns customers with exactly the required fields" do + keys = %w(name registered_at postal_code) + get pets_path + body = JSON.parse(response.body) + body.each do |pet| + customers.keys.sort.must_equal keys + end + end end end From 1671f8522cb0121bb5eb2aec01dd4ae55de9ace3 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 16:37:44 -0700 Subject: [PATCH 32/48] complete last customer index controller test --- test/controllers/customers_controller_test.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c89d089f0..c6a14d93f 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -38,11 +38,11 @@ end it "returns customers with exactly the required fields" do - keys = %w(name registered_at postal_code) - get pets_path + keys = %w(id name registered_at postal_code phone) + get customers_path body = JSON.parse(response.body) - body.each do |pet| - customers.keys.sort.must_equal keys + body.each do |customer| + customer.keys.must_equal keys end end end From 4daec784d16f103d6f05cc024d107f9f0274d9a4 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 16:41:52 -0700 Subject: [PATCH 33/48] movies index is a real working route --- app/controllers/movies_controller.rb | 8 ++-- test/controllers/customers_controller_test.rb | 11 ------ test/controllers/movies_controller_test.rb | 37 +++++++++++++++++-- 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index aedcdfcaa..f5ce6063f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,8 +1,8 @@ class MoviesController < ApplicationController - # def index - # movies = Movie.all - # render status: :ok, json: movies.as_json(only: [:title, :overview, :release_date, :inventory]) - # end + def index + movies = Movie.all + render status: :ok, json: movies.as_json(only: [:title, :overview, :release_date, :inventory]) + end # def show # movie = Movie.find_by(id: params[:id]) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c6a14d93f..aff9a930a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,18 +1,7 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end - - # it "sends back ok and list of customers" do - # get customers_path - # must_respond_with :ok - # end - describe "index" do - # These tests are a little verbose - yours do not need to be - # this explicit. it "is a real working route" do get customers_path must_respond_with :success diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..23d053496 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,38 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "index" do + it "is a real working route" do + get movies_path + must_respond_with :success + end + + # it "returns json" do + # get customers_path + # expect(response.header["Content-Type"]).must_include "json" + # end + + # it "returns an Array" do + # get customers_path + + # body = JSON.parse(response.body) + # body.must_be_kind_of Array + # end + + # it "returns all of the customers" do + # get customers_path + + # body = JSON.parse(response.body) + # body.length.must_equal Customer.count + # end + + # it "returns customers with exactly the required fields" do + # keys = %w(id name registered_at postal_code phone) + # get customers_path + # body = JSON.parse(response.body) + # body.each do |customer| + # customer.keys.must_equal keys + # end + # end + end end From a217d009006f6ff19432ec91afa0a122fd022a0b Mon Sep 17 00:00:00 2001 From: Hana Date: Tue, 14 May 2019 16:44:03 -0700 Subject: [PATCH 34/48] Return json and Array tests passing --- test/controllers/movies_controller_test.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 23d053496..11e43e244 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -7,17 +7,17 @@ must_respond_with :success end - # it "returns json" do - # get customers_path - # expect(response.header["Content-Type"]).must_include "json" - # end + it "returns json" do + get movies_path + expect(response.header["Content-Type"]).must_include "json" + end - # it "returns an Array" do - # get customers_path + it "returns an Array" do + get movies_path - # body = JSON.parse(response.body) - # body.must_be_kind_of Array - # end + body = JSON.parse(response.body) + body.must_be_kind_of Array + end # it "returns all of the customers" do # get customers_path From f3d61da2770f50db088de6b605ff686c21c55ecc Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 16:47:22 -0700 Subject: [PATCH 35/48] finish movies#index controller tests --- app/controllers/movies_controller.rb | 2 +- test/controllers/movies_controller_test.rb | 26 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f5ce6063f..140d7ec79 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,7 +1,7 @@ class MoviesController < ApplicationController def index movies = Movie.all - render status: :ok, json: movies.as_json(only: [:title, :overview, :release_date, :inventory]) + render status: :ok, json: movies.as_json(only: [:id, :title, :release_date]) end # def show diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 11e43e244..c14658234 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -19,20 +19,20 @@ body.must_be_kind_of Array end - # it "returns all of the customers" do - # get customers_path + it "returns all of the movies" do + get movies_path - # body = JSON.parse(response.body) - # body.length.must_equal Customer.count - # end + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end - # it "returns customers with exactly the required fields" do - # keys = %w(id name registered_at postal_code phone) - # get customers_path - # body = JSON.parse(response.body) - # body.each do |customer| - # customer.keys.must_equal keys - # end - # end + it "returns movies with exactly the required fields" do + keys = %w(id title release_date) + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.must_equal keys + end + end end end From d5e888144b201b29402451ab3df20bafd8596b71 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 16:48:43 -0700 Subject: [PATCH 36/48] add movies#show test outline --- test/controllers/movies_controller_test.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index c14658234..82c62a38f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -35,4 +35,22 @@ end end end + + # # this is from ada pets + # describe "show" do + # # This bit is up to you! + # it "can get a pet" do + # get pet_path(pets(:two).id) + # must_respond_with :success + # end + + # it "responds with error code and message if not found" do + # invalid_id = -1 + # get pet_path(invalid_id) + # must_respond_with :not_found + # body = JSON.parse(response.body) + # body.keys.first.must_equal "error" + # expect(body["error"]).must_equal "This pet doesn't exist :(" + # end + # end end From ed971ad19316d905eeb3e82a9046ab4204f1a916 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 16:53:25 -0700 Subject: [PATCH 37/48] add comment --- test/controllers/movies_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 82c62a38f..0e069e70b 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -36,7 +36,7 @@ end end - # # this is from ada pets + # # this is from ada pets -- might not work at all lol # describe "show" do # # This bit is up to you! # it "can get a pet" do From 2a5686b0ff6a81770b24e61443da170a4efd6691 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 17:05:56 -0700 Subject: [PATCH 38/48] got movies#show tests working (partial) --- app/controllers/movies_controller.rb | 16 +++++------ test/controllers/movies_controller_test.rb | 33 +++++++++++----------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 140d7ec79..789f38497 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -4,15 +4,15 @@ def index render status: :ok, json: movies.as_json(only: [:id, :title, :release_date]) end - # def show - # movie = Movie.find_by(id: params[:id]) + def show + movie = Movie.find_by(id: params[:id]) - # if movie - # render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) - # else - # render status: :not_found, json: { errors: ["Movie with ID #{params[:id]} not found"] } - # end - # end + if movie + render status: :ok, json: movie.as_json(only: [:title, :overview, :release_date, :inventory]) + else + render status: :not_found, json: {errors: ["Movie with ID #{params[:id]} not found"]} + end + end # def create # movie = Movie.new(movie_params) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 0e069e70b..098303649 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -36,21 +36,20 @@ end end - # # this is from ada pets -- might not work at all lol - # describe "show" do - # # This bit is up to you! - # it "can get a pet" do - # get pet_path(pets(:two).id) - # must_respond_with :success - # end - - # it "responds with error code and message if not found" do - # invalid_id = -1 - # get pet_path(invalid_id) - # must_respond_with :not_found - # body = JSON.parse(response.body) - # body.keys.first.must_equal "error" - # expect(body["error"]).must_equal "This pet doesn't exist :(" - # end - # end + describe "show" do + # This bit is up to you! + it "can get a movie" do + get movie_path(movies(:harrypotter).id) + must_respond_with :success + end + + it "responds with error code and message if not found" do + invalid_id = -1 + get movie_path(invalid_id) + must_respond_with :not_found + body = JSON.parse(response.body) + body.keys.first.must_equal "errors" + expect(body["errors"]).must_include "Movie with ID #{invalid_id} not found" + end + end end From cc67e25841f8112cd10f7062af17ab6c756b3da0 Mon Sep 17 00:00:00 2001 From: Jessica Date: Tue, 14 May 2019 17:17:48 -0700 Subject: [PATCH 39/48] finish movies#show tests --- test/controllers/movies_controller_test.rb | 25 ++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 098303649..89dcd0aa5 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,6 +1,8 @@ require "test_helper" describe MoviesController do + let(:movie) { movies(:harrypotter) } + describe "index" do it "is a real working route" do get movies_path @@ -37,9 +39,8 @@ end describe "show" do - # This bit is up to you! it "can get a movie" do - get movie_path(movies(:harrypotter).id) + get movie_path(movie.id) must_respond_with :success end @@ -51,5 +52,25 @@ body.keys.first.must_equal "errors" expect(body["errors"]).must_include "Movie with ID #{invalid_id} not found" end + + it "returns json" do + get movie_path(movie.id) + expect(response.header["Content-Type"]).must_include "json" + end + + it "returns a single Hash" do + get movie_path(movie.id) + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + end + + it "returns movie with exactly the required fields and correct title" do + keys = %w(title overview release_date inventory) + get movie_path(movie.id) + body = JSON.parse(response.body) + body.keys.must_equal keys + body["title"].must_equal "Harry Potter and the Sorcerer's Stone" + end end end From 8d8d17b21f92143f38021c1e276a9659b30b9a2c Mon Sep 17 00:00:00 2001 From: Hana Date: Wed, 15 May 2019 12:43:14 -0700 Subject: [PATCH 40/48] edge case for movie show --- Gemfile | 3 +++ Gemfile.lock | 5 +++++ test/controllers/movies_controller_test.rb | 10 ++++++++++ test/fixtures/movies.yml | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/Gemfile b/Gemfile index 619fcac1a..2a3f098a6 100644 --- a/Gemfile +++ b/Gemfile @@ -53,3 +53,6 @@ group :test do gem 'minitest-reporters' gem 'simplecov', require: false end + +gem 'rabl' +gem 'oj' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index b6537c9b4..8b10edf82 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,6 +87,7 @@ GEM nio4r (2.3.1) nokogiri (1.10.3) mini_portile2 (~> 2.4.0) + oj (3.7.12) pg (1.1.4) pry (0.12.2) coderay (~> 1.1.0) @@ -94,6 +95,8 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) puma (3.12.1) + rabl (0.14.1) + activesupport (>= 2.3.14) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -161,9 +164,11 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) minitest-rails minitest-reporters + oj pg (>= 0.18, < 2.0) pry-rails puma (~> 3.11) + rabl rails (~> 5.2.3) simplecov spring diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 89dcd0aa5..41cc5e7d8 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -72,5 +72,15 @@ body.keys.must_equal keys body["title"].must_equal "Harry Potter and the Sorcerer's Stone" end + + it "returns json even if movie is deleted" do + deleted_movie = movies(:deletedmovie) + movie_id = deleted_movie.id + deleted_movie.destroy + + get movie_path(movie_id) + must_respond_with :not_found + expect(response.header["Content-Type"]).must_include "json" + end end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 210b8e424..a89c164f9 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -11,3 +11,9 @@ toalltheboys: overview: Peter Kavinsky 5ever!!! release_date: 2018-08-17 inventory: 3 + +deletedmovie: + title: Test Movie Title + overview: This was meant to be deleted anyway + release_date: 2019-05-14 + inventory: 1 From e42bb5a5887052e159548a8b3c736a666753658f Mon Sep 17 00:00:00 2001 From: Hana Date: Wed, 15 May 2019 13:06:55 -0700 Subject: [PATCH 41/48] remove checkout_date and due_date defaults since rails is not dynamic :( --- ...200359_remove_default_from_checkout_date_and_due_date.rb | 6 ++++++ db/schema.rb | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20190515200359_remove_default_from_checkout_date_and_due_date.rb diff --git a/db/migrate/20190515200359_remove_default_from_checkout_date_and_due_date.rb b/db/migrate/20190515200359_remove_default_from_checkout_date_and_due_date.rb new file mode 100644 index 000000000..32f7d4b5f --- /dev/null +++ b/db/migrate/20190515200359_remove_default_from_checkout_date_and_due_date.rb @@ -0,0 +1,6 @@ +class RemoveDefaultFromCheckoutDateAndDueDate < ActiveRecord::Migration[5.2] + def change + change_column_default :rentals, :checkout_date, nil + change_column_default :rentals, :due_date, nil + end +end diff --git a/db/schema.rb b/db/schema.rb index 6c4bad2bc..cca38f5f0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_14_213747) do +ActiveRecord::Schema.define(version: 2019_05_15_200359) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,8 +37,8 @@ end create_table "rentals", force: :cascade do |t| - t.date "checkout_date", default: "2019-05-14" - t.date "due_date", default: "2019-05-21" + t.date "checkout_date" + t.date "due_date" t.date "checkin_date" t.datetime "created_at", null: false t.datetime "updated_at", null: false From 00d1983e60ba9ae30e39ec295713e117f3415d3a Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 15 May 2019 13:29:09 -0700 Subject: [PATCH 42/48] first movie#create test --- app/controllers/movies_controller.rb | 24 +++++------ app/controllers/rentals_controller.rb | 11 ++++++ config/environments/test.rb | 4 +- config/routes.rb | 6 +-- test/controllers/movies_controller_test.rb | 46 +++++++++++++++++++++- test/models/rental_test.rb | 22 +++++------ 6 files changed, 83 insertions(+), 30 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 789f38497..3606f143f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -14,23 +14,23 @@ def show end end - # def create - # movie = Movie.new(movie_params) + def create + movie = Movie.new(movie_params) - # if movie.save - # render status: :ok, json: { id: movie.id } - # else - # render status: :bad_request, json: { errors: movie.errors.messages } - # end - # end + if movie.save + render status: :ok, json: {id: movie.id} + else + render status: :bad_request, json: {errors: movie.errors.messages} + end + end def zomg render json: {works: "it works!"} end - # private + private - # def movie_params - # params.permit(:title, :overview, :release_date, :inventory) - # end + def movie_params + params.permit(:title, :overview, :release_date, :inventory) + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..2687c26e7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,13 @@ class RentalsController < ApplicationController + def check_out + # rental = Rental.new + + # rental.checkout_date = Date.current + # rental.due_date = rental.checkout_date + 7 + + # rental.save + end + + def check_in + end end diff --git a/config/environments/test.rb b/config/environments/test.rb index 0a38fd3ce..1231a86af 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -15,11 +15,11 @@ # 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}" + "Cache-Control" => "public, max-age=#{1.hour.to_i}", } # Show full error reports and disable caching. - config.consider_all_requests_local = true + config.consider_all_requests_local = true config.action_controller.perform_caching = false # Raise exceptions instead of rendering exception templates. diff --git a/config/routes.rb b/config/routes.rb index c55caac94..6f1c78ab4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,8 @@ resources :customers, only: [:index] resources :movies, only: [:index, :show, :create] - post 'rentals/check_out', to: 'rentals#check_out', as: "check_out" - post 'rentals/check_in', to: 'rentals#check_in', as: "check_in" + post "rentals/check_out", to: "rentals#check_out", as: "check_out" + post "rentals/check_in", to: "rentals#check_in", as: "check_in" - get '/zomg', to: 'movies#zomg', as: 'zomg' + get "/zomg", to: "movies#zomg", as: "zomg" end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 41cc5e7d8..39c951d9f 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -73,14 +73,56 @@ body["title"].must_equal "Harry Potter and the Sorcerer's Stone" end - it "returns json even if movie is deleted" do + it "returns json even if movie is deleted" do deleted_movie = movies(:deletedmovie) movie_id = deleted_movie.id - deleted_movie.destroy + deleted_movie.destroy get movie_path(movie_id) must_respond_with :not_found expect(response.header["Content-Type"]).must_include "json" end end + + describe "create" do + let(:movie_data) { + { + title: "Movie, the Movie", + overview: "A movie about a movie.", + release_date: "2010-05-12", + inventory: 7, + } + } + + it "creates a new movie given valid data" do + expect { + post movies_path, params: movie_data + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + # it "returns an error for invalid pet data" do + # # arrange + # pet_data["name"] = nil + + # expect { + # post pets_path, params: {pet: pet_data} + # }.wont_change "Pet.count" + + # body = JSON.parse(response.body) + + # expect(body).must_be_kind_of Hash + # expect(body).must_include "errors" + # expect(body["errors"]).must_include "name" + # must_respond_with :bad_request + # end + end end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 3b6c33c03..74fc47612 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -55,15 +55,15 @@ end end - describe "custom methods" do - it "sets checkout date to current date" do - new_rental = Rental.new - expect(new_rental.checkout_date).must_equal Date.today - end - - it "sets due date to a week from today / checkout date" do - new_rental = Rental.new - expect(new_rental.due_date).must_equal new_rental.checkout_date + 7 - end - end + # describe "custom methods" do + # it "sets checkout date to current date" do + # new_rental = Rental.new + # expect(new_rental.checkout_date).must_equal Date.current + # end + + # it "sets due date to a week from today / checkout date" do + # new_rental = Rental.new + # expect(new_rental.due_date).must_equal new_rental.checkout_date + 7 + # end + # end end From d8ba54569972393dc5b19762bf52ec6b7dd8a1ed Mon Sep 17 00:00:00 2001 From: Hana Date: Wed, 15 May 2019 13:35:30 -0700 Subject: [PATCH 43/48] invalid movie data create test passing --- test/controllers/movies_controller_test.rb | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 39c951d9f..d95e60990 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -109,20 +109,19 @@ must_respond_with :success end - # it "returns an error for invalid pet data" do - # # arrange - # pet_data["name"] = nil + it "returns an error for invalid movie data" do + movie_data["title"] = nil - # expect { - # post pets_path, params: {pet: pet_data} - # }.wont_change "Pet.count" + expect { + post movies_path, params: movie_data + }.wont_change "Movie.count" - # body = JSON.parse(response.body) + body = JSON.parse(response.body) - # expect(body).must_be_kind_of Hash - # expect(body).must_include "errors" - # expect(body["errors"]).must_include "name" - # must_respond_with :bad_request - # end + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "title" + must_respond_with :bad_request + end end end From 29b7a2819d817f65fae26009ca8b1ffbb5c56c60 Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 15 May 2019 13:43:58 -0700 Subject: [PATCH 44/48] add more movie#create tests --- test/controllers/movies_controller_test.rb | 65 +++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index d95e60990..b8c7e3eb8 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -94,6 +94,18 @@ } } + it "returns an error if no params" do + expect { + post movies_path + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + must_respond_with :bad_request + end + it "creates a new movie given valid data" do expect { post movies_path, params: movie_data @@ -106,10 +118,14 @@ movie = Movie.find(body["id"].to_i) expect(movie.title).must_equal movie_data[:title] + expect(movie.overview).must_equal movie_data[:overview] + expect(movie.release_date).must_equal Date.parse(movie_data[:release_date]) + expect(movie.inventory).must_equal movie_data[:inventory] + must_respond_with :success end - it "returns an error for invalid movie data" do + it "returns an error if no title" do movie_data["title"] = nil expect { @@ -123,5 +139,52 @@ expect(body["errors"]).must_include "title" must_respond_with :bad_request end + + it "creates a new movie if no overview" do + movie_data["overview"] = nil + + expect { + post movies_path, params: movie_data + }.must_change "Movie.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + + movie = Movie.find(body["id"].to_i) + + expect(movie.title).must_equal movie_data[:title] + must_respond_with :success + end + + it "returns an error if no release date" do + movie_data["release_date"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "release_date" + must_respond_with :bad_request + end + + it "returns an error if no inventory" do + movie_data["inventory"] = nil + + expect { + post movies_path, params: movie_data + }.wont_change "Movie.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "inventory" + must_respond_with :bad_request + end end end From e0aa5f294a8e3c90da3f7f59fb301afd54dc0d62 Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 15 May 2019 13:47:59 -0700 Subject: [PATCH 45/48] rentals#checkout start controller action and tests --- app/controllers/rentals_controller.rb | 13 +++ test/controllers/rentals_controller_test.rb | 106 +++++++++++++++++++- 2 files changed, 116 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 2687c26e7..552134b89 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,12 @@ class RentalsController < ApplicationController def check_out + rental = Rental.new(rental_params) + + if rental.save + render status: :ok, json: {id: rental.id} + else + render status: :bad_request, json: {errors: rental.errors.messages} + end # rental = Rental.new # rental.checkout_date = Date.current @@ -10,4 +17,10 @@ def check_out def check_in end + + private + + def rental_params + params.permit(:customer_id, :movie_id) + end end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..984cbda08 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,107 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + describe "create" do + let(:customer) { customers(:jessica) } + let(:movie) { movies(:harrypotter) } + let(:rental_data) { + { + customer_id: customer.id, + movie_id: movie.id, + } + } + + # it "returns an error if no params" do + # expect { + # post movies_path + # }.wont_change "Movie.count" + + # body = JSON.parse(response.body) + + # expect(body).must_be_kind_of Hash + # expect(body).must_include "errors" + # must_respond_with :bad_request + # end + + # it "creates a new movie given valid data" do + # expect { + # post movies_path, params: movie_data + # }.must_change "Movie.count", 1 + + # body = JSON.parse(response.body) + # expect(body).must_be_kind_of Hash + # expect(body).must_include "id" + + # movie = Movie.find(body["id"].to_i) + + # expect(movie.title).must_equal movie_data[:title] + # expect(movie.overview).must_equal movie_data[:overview] + # expect(movie.release_date).must_equal Date.parse(movie_data[:release_date]) + # expect(movie.inventory).must_equal movie_data[:inventory] + + # must_respond_with :success + # end + + # it "returns an error if no title" do + # movie_data["title"] = nil + + # expect { + # post movies_path, params: movie_data + # }.wont_change "Movie.count" + + # body = JSON.parse(response.body) + + # expect(body).must_be_kind_of Hash + # expect(body).must_include "errors" + # expect(body["errors"]).must_include "title" + # must_respond_with :bad_request + # end + + # it "creates a new movie if no overview" do + # movie_data["overview"] = nil + + # expect { + # post movies_path, params: movie_data + # }.must_change "Movie.count", 1 + + # body = JSON.parse(response.body) + # expect(body).must_be_kind_of Hash + # expect(body).must_include "id" + + # movie = Movie.find(body["id"].to_i) + + # expect(movie.title).must_equal movie_data[:title] + # must_respond_with :success + # end + + # it "returns an error if no release date" do + # movie_data["release_date"] = nil + + # expect { + # post movies_path, params: movie_data + # }.wont_change "Movie.count" + + # body = JSON.parse(response.body) + + # expect(body).must_be_kind_of Hash + # expect(body).must_include "errors" + # expect(body["errors"]).must_include "release_date" + # must_respond_with :bad_request + # end + + # it "returns an error if no inventory" do + # movie_data["inventory"] = nil + + # expect { + # post movies_path, params: movie_data + # }.wont_change "Movie.count" + + # body = JSON.parse(response.body) + + # expect(body).must_be_kind_of Hash + # expect(body).must_include "errors" + # expect(body["errors"]).must_include "inventory" + # must_respond_with :bad_request + # end + end end From 3ef55b2d04dbf873000de0c6009520f70224ff09 Mon Sep 17 00:00:00 2001 From: Hana Date: Wed, 15 May 2019 14:05:33 -0700 Subject: [PATCH 46/48] creates an instance of rental test passing --- app/controllers/rentals_controller.rb | 4 +- test/controllers/rentals_controller_test.rb | 65 ++++++++++++--------- 2 files changed, 40 insertions(+), 29 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 552134b89..792804530 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -2,13 +2,15 @@ class RentalsController < ApplicationController def check_out rental = Rental.new(rental_params) + rental.checkout_date = Date.current if rental.save + rental.due_date = rental.checkout_date + 7 render status: :ok, json: {id: rental.id} else render status: :bad_request, json: {errors: rental.errors.messages} end # rental = Rental.new - + # rental.checkout_date = Date.current # rental.due_date = rental.checkout_date + 7 diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 984cbda08..8d8f0de74 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,16 +1,44 @@ require "test_helper" describe RentalsController do - describe "create" do - let(:customer) { customers(:jessica) } - let(:movie) { movies(:harrypotter) } - let(:rental_data) { - { - customer_id: customer.id, - movie_id: movie.id, - } + let(:customer) { customers(:jessica) } + let(:movie) { movies(:harrypotter) } + let(:rental_data) { + { + customer_id: customer.id, + movie_id: movie.id, } - + } + + describe "check_out" do + it "creates an instance of Rental" do + expect { + post check_out_path, params: rental_data + }.must_change "Rental.count", 1 + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + end + end + # it "creates a new movie given valid data" do + # expect { + # post movies_path, params: movie_data + # }.must_change "Movie.count", 1 + + # body = JSON.parse(response.body) + # expect(body).must_be_kind_of Hash + # expect(body).must_include "id" + + # movie = Movie.find(body["id"].to_i) + + # expect(movie.title).must_equal movie_data[:title] + # expect(movie.overview).must_equal movie_data[:overview] + # expect(movie.release_date).must_equal Date.parse(movie_data[:release_date]) + # expect(movie.inventory).must_equal movie_data[:inventory] + + # must_respond_with :success + # end # it "returns an error if no params" do # expect { # post movies_path @@ -23,24 +51,6 @@ # must_respond_with :bad_request # end - # it "creates a new movie given valid data" do - # expect { - # post movies_path, params: movie_data - # }.must_change "Movie.count", 1 - - # body = JSON.parse(response.body) - # expect(body).must_be_kind_of Hash - # expect(body).must_include "id" - - # movie = Movie.find(body["id"].to_i) - - # expect(movie.title).must_equal movie_data[:title] - # expect(movie.overview).must_equal movie_data[:overview] - # expect(movie.release_date).must_equal Date.parse(movie_data[:release_date]) - # expect(movie.inventory).must_equal movie_data[:inventory] - - # must_respond_with :success - # end # it "returns an error if no title" do # movie_data["title"] = nil @@ -103,5 +113,4 @@ # expect(body["errors"]).must_include "inventory" # must_respond_with :bad_request # end - end end From b38d30428fb50d8fee8fd9a6d89208aefd755438 Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 15 May 2019 14:13:26 -0700 Subject: [PATCH 47/48] added edge cases for rentals#create --- app/controllers/rentals_controller.rb | 9 +- test/controllers/rentals_controller_test.rb | 149 +++++++------------- 2 files changed, 56 insertions(+), 102 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 792804530..1c0998b33 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -3,18 +3,13 @@ def check_out rental = Rental.new(rental_params) rental.checkout_date = Date.current + rental.due_date = rental.checkout_date + 7 + if rental.save - rental.due_date = rental.checkout_date + 7 render status: :ok, json: {id: rental.id} else render status: :bad_request, json: {errors: rental.errors.messages} end - # rental = Rental.new - - # rental.checkout_date = Date.current - # rental.due_date = rental.checkout_date + 7 - - # rental.save end def check_in diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 8d8f0de74..b2907d93e 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -10,107 +10,66 @@ } } - describe "check_out" do - it "creates an instance of Rental" do + describe "check_out" do + it "creates an instance of Rental given valid data" do expect { post check_out_path, params: rental_data }.must_change "Rental.count", 1 body = JSON.parse(response.body) expect(body).must_be_kind_of Hash - expect(body).must_include "id" + expect(body).must_include "id" + + rental = Rental.find(body["id"].to_i) + + expect(rental.movie).must_equal movie + expect(rental.customer).must_equal customer + expect(rental.checkout_date).must_equal Date.current + expect(rental.due_date).must_equal Date.current + 7 + + must_respond_with :success + end + + it "returns an error if no params" do + expect { + post check_out_path + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + must_respond_with :bad_request + end + + it "returns an error if no customer" do + rental_data["customer_id"] = nil + + expect { + post check_out_path, params: rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "customer" + must_respond_with :bad_request + end + + it "returns an error if no customer" do + rental_data["customer_id"] = nil + + expect { + post check_out_path, params: rental_data + }.wont_change "Rental.count" + + body = JSON.parse(response.body) + + expect(body).must_be_kind_of Hash + expect(body).must_include "errors" + expect(body["errors"]).must_include "customer" + must_respond_with :bad_request end end - # it "creates a new movie given valid data" do - # expect { - # post movies_path, params: movie_data - # }.must_change "Movie.count", 1 - - # body = JSON.parse(response.body) - # expect(body).must_be_kind_of Hash - # expect(body).must_include "id" - - # movie = Movie.find(body["id"].to_i) - - # expect(movie.title).must_equal movie_data[:title] - # expect(movie.overview).must_equal movie_data[:overview] - # expect(movie.release_date).must_equal Date.parse(movie_data[:release_date]) - # expect(movie.inventory).must_equal movie_data[:inventory] - - # must_respond_with :success - # end - # it "returns an error if no params" do - # expect { - # post movies_path - # }.wont_change "Movie.count" - - # body = JSON.parse(response.body) - - # expect(body).must_be_kind_of Hash - # expect(body).must_include "errors" - # must_respond_with :bad_request - # end - - - # it "returns an error if no title" do - # movie_data["title"] = nil - - # expect { - # post movies_path, params: movie_data - # }.wont_change "Movie.count" - - # body = JSON.parse(response.body) - - # expect(body).must_be_kind_of Hash - # expect(body).must_include "errors" - # expect(body["errors"]).must_include "title" - # must_respond_with :bad_request - # end - - # it "creates a new movie if no overview" do - # movie_data["overview"] = nil - - # expect { - # post movies_path, params: movie_data - # }.must_change "Movie.count", 1 - - # body = JSON.parse(response.body) - # expect(body).must_be_kind_of Hash - # expect(body).must_include "id" - - # movie = Movie.find(body["id"].to_i) - - # expect(movie.title).must_equal movie_data[:title] - # must_respond_with :success - # end - - # it "returns an error if no release date" do - # movie_data["release_date"] = nil - - # expect { - # post movies_path, params: movie_data - # }.wont_change "Movie.count" - - # body = JSON.parse(response.body) - - # expect(body).must_be_kind_of Hash - # expect(body).must_include "errors" - # expect(body["errors"]).must_include "release_date" - # must_respond_with :bad_request - # end - - # it "returns an error if no inventory" do - # movie_data["inventory"] = nil - - # expect { - # post movies_path, params: movie_data - # }.wont_change "Movie.count" - - # body = JSON.parse(response.body) - - # expect(body).must_be_kind_of Hash - # expect(body).must_include "errors" - # expect(body["errors"]).must_include "inventory" - # must_respond_with :bad_request - # end end From dfbcb9ee83293041bb77a9b1492a35f900a49b9e Mon Sep 17 00:00:00 2001 From: Hana Date: Wed, 15 May 2019 15:16:21 -0700 Subject: [PATCH 48/48] rental for invalid rental id test passing --- app/controllers/rentals_controller.rb | 13 ++++++++++ config/routes.rb | 2 +- test/controllers/rentals_controller_test.rb | 27 ++++++++++++++++++++- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 1c0998b33..428deb563 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -13,6 +13,19 @@ def check_out end def check_in + rental = Rental.find_by(id: params[:id]) + unless rental + head :not_found + return + end + + rental.checkin_date = Date.current + + if rental.save + render status: :ok, json: {id: rental.id} + else + render status: :bad_request, json: {errors: rental.errors.messages} + end end private diff --git a/config/routes.rb b/config/routes.rb index 6f1c78ab4..4e261ac22 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,7 @@ resources :movies, only: [:index, :show, :create] post "rentals/check_out", to: "rentals#check_out", as: "check_out" - post "rentals/check_in", to: "rentals#check_in", as: "check_in" + post "rentals/:id/check_in", to: "rentals#check_in", as: "check_in" get "/zomg", to: "movies#zomg", as: "zomg" end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index b2907d93e..7c7421341 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -3,6 +3,7 @@ describe RentalsController do let(:customer) { customers(:jessica) } let(:movie) { movies(:harrypotter) } + let(:rental) { rentals(:one) } let(:rental_data) { { customer_id: customer.id, @@ -72,4 +73,28 @@ must_respond_with :bad_request end end -end + + describe "check_in" do + it "updates rental for valid request" do + expect { + post check_in_path(rental.id) + }.wont_change "Rental.count" + + rental.reload + expect(rental.checkin_date).must_equal Date.current + + body = JSON.parse(response.body) + expect(body).must_be_kind_of Hash + expect(body).must_include "id" + must_respond_with :success + end + + it "won't update rental for invalid rental id" do + expect { + post check_in_path(-1) + }.wont_change "Rental.count" + + must_respond_with :not_found + end + end +end \ No newline at end of file