From 57a635c9c20bce90b84ad7f13bc6333c8069fa67 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Tue, 9 May 2017 18:40:52 -0500 Subject: [PATCH 01/29] Initial API app made --- .gitignore | 17 ++ Gemfile | 53 ++++++ Gemfile.lock | 175 ++++++++++++++++++ Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 2 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/concerns/.keep | 0 app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 34 ++++ bin/spring | 17 ++ bin/update | 29 +++ config.ru | 5 + config/application.rb | 34 ++++ config/boot.rb | 3 + config/cable.yml | 9 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 +++++ config/environments/production.rb | 78 ++++++++ config/environments/test.rb | 42 +++++ .../application_controller_renderer.rb | 6 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/new_framework_defaults.rb | 18 ++ config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/puma.rb | 47 +++++ config/routes.rb | 3 + config/secrets.yml | 22 +++ config/spring.rb | 6 + lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 26 +++ tmp/.keep | 0 53 files changed, 910 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/new_framework_defaults.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..48fb168f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore Byebug command history file. +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..0ed2648fb --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.2' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platform: :mri +end + +group :development do + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development do + gem 'better_errors' + gem 'pry-rails' +end + +gem 'awesome_print' +gem 'foundation-rails' +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..9b4fc770f --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,175 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.2) + activesupport (= 5.0.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (7.1.4) + awesome_print (1.7.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + builder (3.2.3) + byebug (9.0.6) + coderay (1.1.1) + concurrent-ruby (1.0.5) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + foundation-rails (6.3.1.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.5) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.2) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.14) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.0.0) + nokogiri (1.7.2) + mini_portile2 (~> 2.1.0) + pg (0.20.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.8.2) + rack (2.0.2) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + ruby-progressbar (1.8.1) + sass (3.4.23) + slop (3.6.0) + spring (2.0.1) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.19.4) + thread_safe (0.3.6) + tzinfo (1.2.3) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + awesome_print + better_errors + byebug + foundation-rails + listen (~> 3.0.5) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.0) + rails (~> 5.0.2) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.14.6 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..e620b4dad --- /dev/null +++ b/bin/setup @@ -0,0 +1,34 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..54782d010 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,34 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + # Force new test files to be generated in the minitest-spec style + config.generators do |g| + g.test_framework :minitest, spec: true + end + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0bbde6f74 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..aead51124 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..082a013ab --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=172800' + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..49275a9d6 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,78 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..30587ef6d --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=3600' + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..51639b67a --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 000000000..d859e4bea --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,18 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..c7f311f81 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,47 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum, this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted this block will be run, if you are using `preload_app!` +# option you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..b0f6d8a16 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: e9235f1ff1cab4e395ca3cace0844c2471a9eb9949563453321561e1ad493b1dc50684c1e6ae78e6ac65925c7a52b2ce39aff54e8af5e4522c49249c449a8177 + +test: + secret_key_base: 8f49901ddc858aac4d80a013e92be377e2a91f3b2c56877d90b8ecf03a1fde8bd30ccaeae72bf21114b5fcc0843ff36344ff194c84d4d2f1889ffd9bf29e72b1 + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb From 920982334302b3fb101b5d229932990d6f3054f3 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Tue, 9 May 2017 18:43:56 -0500 Subject: [PATCH 02/29] Created initial models and seeded data --- app/models/customer.rb | 2 + app/models/movie.rb | 2 + config/routes.rb | 1 + db/migrate/20170509234217_create_movies.rb | 12 ++++++ db/migrate/20170509234312_create_customers.rb | 16 ++++++++ db/schema.rb | 40 +++++++++++++++++++ test/fixtures/customers.yml | 21 ++++++++++ test/fixtures/movies.yml | 13 ++++++ test/models/customer_test.rb | 9 +++++ test/models/movie_test.rb | 9 +++++ 10 files changed, 125 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20170509234217_create_movies.rb create mode 100644 db/migrate/20170509234312_create_customers.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..9a75ce61b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20170509234217_create_movies.rb b/db/migrate/20170509234217_create_movies.rb new file mode 100644 index 000000000..909b24e50 --- /dev/null +++ b/db/migrate/20170509234217_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.0] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20170509234312_create_customers.rb b/db/migrate/20170509234312_create_customers.rb new file mode 100644 index 000000000..dcbd3fa24 --- /dev/null +++ b/db/migrate/20170509234312_create_customers.rb @@ -0,0 +1,16 @@ +class CreateCustomers < ActiveRecord::Migration[5.0] + def change + create_table :customers do |t| + t.string :name + t.string :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + t.float :account_credit + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..855637cd9 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,40 @@ +# 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: 20170509234312) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "customers", force: :cascade do |t| + t.string "name" + t.string "registered_at" + t.string "address" + t.string "city" + t.string "state" + t.string "postal_code" + t.string "phone" + t.float "account_credit" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.string "release_date" + t.integer "inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..806115347 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,21 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + account_credit: 1.5 + +two: + name: MyString + registered_at: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + account_credit: 1.5 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..d774de5f1 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From f585e056fed15599bd6cbe5050a4f9afddfc5635 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Tue, 9 May 2017 18:53:31 -0500 Subject: [PATCH 03/29] Added controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ 4 files changed, 18 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..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/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 From 0d7503b72cb22b88d8e7991d1058bc7d676911d3 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Tue, 9 May 2017 19:02:23 -0500 Subject: [PATCH 04/29] Added index for customers and movies --- app/controllers/customers_controller.rb | 5 +++++ app/controllers/movies_controller.rb | 6 ++++++ config/routes.rb | 5 ++++- db/migrate/20170509235403_add_relationships.rb | 4 ++++ db/schema.rb | 2 +- 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20170509235403_add_relationships.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..98607089f 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,7 @@ class CustomersController < ApplicationController + def index + customers = Customer.all + render json: customers.as_json(except: + [:created_at, :updated_at]) + end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..000138d20 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,8 @@ class MoviesController < ApplicationController + + def index + movies = Movie.all + render json: movies.as_json(only: + [:id, :title, :overview, :release_date, :inventory]) + end end diff --git a/config/routes.rb b/config/routes.rb index 9a75ce61b..a8f36cd27 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do - + + get '/movies', to: 'movies#index', as: 'movies' + + get '/customers', to: 'customers#index', as: 'customers' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20170509235403_add_relationships.rb b/db/migrate/20170509235403_add_relationships.rb new file mode 100644 index 000000000..310ddedfb --- /dev/null +++ b/db/migrate/20170509235403_add_relationships.rb @@ -0,0 +1,4 @@ +class AddRelationships < ActiveRecord::Migration[5.0] + def change + end +end diff --git a/db/schema.rb b/db/schema.rb index 855637cd9..6544b712b 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: 20170509234312) do +ActiveRecord::Schema.define(version: 20170509235403) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" From c6a1e01def461f4dd7560d23068626b869846816 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Wed, 10 May 2017 22:14:14 -0500 Subject: [PATCH 05/29] Added model validations --- app/controllers/customers_controller.rb | 4 ++-- app/controllers/movies_controller.rb | 2 +- app/models/customer.rb | 4 ++++ app/models/movie.rb | 7 +++++++ test/models/movie_test.rb | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 98607089f..3af4a5615 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,7 +1,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.as_json(except: - [:created_at, :updated_at]) + render 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 000138d20..e8906c1aa 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,6 +3,6 @@ class MoviesController < ApplicationController def index movies = Movie.all render json: movies.as_json(only: - [:id, :title, :overview, :release_date, :inventory]) + [:title, :release_date ]) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..90526be83 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,6 @@ class Customer < ApplicationRecord + validates :title, presence: true, uniqueness: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..520b2ca4c 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,9 @@ class Movie < ApplicationRecord + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + validates :account_credit, presence: true end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..518f76d85 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -4,6 +4,6 @@ let(:movie) { Movie.new } it "must be valid" do - value(movie).must_be :valid? + movie.valid?.must_equal true end end From fc7767e9c70be0d97f1f55b1a2a570e01fed7da7 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Wed, 10 May 2017 22:23:44 -0500 Subject: [PATCH 06/29] First movie test green --- app/models/customer.rb | 12 ++++++++---- app/models/movie.rb | 11 ++++------- test/fixtures/movies.yml | 20 ++++++++++---------- test/models/customer_test.rb | 2 -- test/models/movie_test.rb | 5 ++--- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 90526be83..c6921f5b0 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,10 @@ class Customer < ApplicationRecord - validates :title, presence: true, uniqueness: true - validates :overview, presence: true - validates :release_date, presence: true - validates :inventory, presence: true + validates :name, presence: true + validates :registered_at, presence: true + validates :address, presence: true + validates :city, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + validates :account_credit, presence: true + end diff --git a/app/models/movie.rb b/app/models/movie.rb index 520b2ca4c..046f3512e 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,9 +1,6 @@ class Movie < ApplicationRecord - validates :name, presence: true - validates :registered_at, presence: true - validates :address, presence: true - validates :city, presence: true - validates :postal_code, presence: true - validates :phone, presence: true - validates :account_credit, presence: true + validates :title, presence: true, uniqueness: true + validates :overview, presence: true + validates :release_date, presence: true + validates :inventory, presence: true end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d774de5f1..87b5bd4ba 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -1,13 +1,13 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 +jaws: + title: "Jaws" + overview: "Shark does things" + release_date: "uh idk the 80s" + inventory: 10000 -two: - title: MyString - overview: MyString - release_date: MyString - inventory: 1 +starwars: + title: "Star Wars" + overview: "Why don't you go see one of those star war you like" + release_date: "197something" + inventory: 5 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..2cb01d38b 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,7 @@ 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 index 518f76d85..24ce26bd1 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,8 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } - it "must be valid" do - movie.valid?.must_equal true + it "must have all unique fields" do + movies(:jaws).valid?.must_equal true end end From 294b8848730a042dcbe581fbcbccaaad3b14ee7b Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Fri, 12 May 2017 14:43:07 -0700 Subject: [PATCH 07/29] Validation presence tests green --- app/models/movie.rb | 2 +- test/fixtures/movies.yml | 38 ++++++++++++++++++++++++++++++++++++++ test/models/movie_test.rb | 6 +++++- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 046f3512e..a8f90475f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,5 +2,5 @@ class Movie < ApplicationRecord validates :title, presence: true, uniqueness: true validates :overview, presence: true validates :release_date, presence: true - validates :inventory, presence: true + validates :inventory, presence: true, numericality: { greater_than: -1 } end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 87b5bd4ba..f0993eee9 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -11,3 +11,41 @@ starwars: overview: "Why don't you go see one of those star war you like" release_date: "197something" inventory: 5 + +no_title: + overview: "Nothing to see here" + release_date: "1988" + inventory: 1 + +no_overview: + title: "This movie has no overview" + release_date: "1999" + inventory: 20 + +no_date: + title: "A movie is here" + overview: "This movie doesn't have a release date!" + inventory: 5 + +no_inv: + title: "Some movie" + overview: "some movie" + release_date: "sometime" + +neg_inv: + title: "Another movie" + overview: "Yes i am movie" + release_date: "cool" + inventory: -1 + +rep_title: + title: "Title" + overview: "overview" + release_date: "date" + inventory: 1 + +test_title: + title: "Title" + overview: "overview" + release_date: "date" + inventory: 1 diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 24ce26bd1..859e3715a 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -2,7 +2,11 @@ describe Movie do - it "must have all unique fields" do + it "must have all field present" do movies(:jaws).valid?.must_equal true + movies(:no_title).valid?.must_equal false + movies(:no_overview).valid?.must_equal false + movies(:no_date).valid?.must_equal false + movies(:no_inv).valid?.must_equal false end end From 9fd41cb65927c165f55b35f4f36d6cc5f80404ab Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Fri, 12 May 2017 14:44:38 -0700 Subject: [PATCH 08/29] Testing negative inventory passed --- test/models/movie_test.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 859e3715a..096cb7d42 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -9,4 +9,9 @@ movies(:no_date).valid?.must_equal false movies(:no_inv).valid?.must_equal false end + + it "must have an inventory that is not in the negative" do + movies(:starwars).valid?.must_equal true + movies(:neg_inv).valid?.must_equal false + end end From 5a75609a46d91b7a1a853607d5a4dab4a2c4e08f Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Fri, 12 May 2017 14:45:57 -0700 Subject: [PATCH 09/29] unique title test passing --- test/models/movie_test.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 096cb7d42..2a02a5781 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -14,4 +14,9 @@ movies(:starwars).valid?.must_equal true movies(:neg_inv).valid?.must_equal false end + + it "must have a unique title" do + movies(:jaws).valid?.must_equal true + movies(:rep_title).valid?.must_equal false + end end From e51426a8c9d95febe3f735bde5ca2c3d4c800980 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Fri, 12 May 2017 14:51:04 -0700 Subject: [PATCH 10/29] added validation for legitimate year format --- app/models/movie.rb | 2 +- test/fixtures/movies.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index a8f90475f..970e62aae 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord validates :title, presence: true, uniqueness: true validates :overview, presence: true - validates :release_date, presence: true + validates :release_date, presence: true, format: { with: /\A(19|20)\d{2}\z/ } validates :inventory, presence: true, numericality: { greater_than: -1 } end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index f0993eee9..ba61a195e 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -3,13 +3,13 @@ jaws: title: "Jaws" overview: "Shark does things" - release_date: "uh idk the 80s" + release_date: "1960" inventory: 10000 starwars: title: "Star Wars" overview: "Why don't you go see one of those star war you like" - release_date: "197something" + release_date: "1972" inventory: 5 no_title: @@ -30,22 +30,22 @@ no_date: no_inv: title: "Some movie" overview: "some movie" - release_date: "sometime" + release_date: "1999" neg_inv: title: "Another movie" overview: "Yes i am movie" - release_date: "cool" + release_date: "1999" inventory: -1 rep_title: title: "Title" overview: "overview" - release_date: "date" + release_date: "1999" inventory: 1 test_title: title: "Title" overview: "overview" - release_date: "date" + release_date: "1999" inventory: 1 From 78b60ffe7f7f1adfdc7e01a7be9b35cada25db94 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Fri, 12 May 2017 15:18:50 -0700 Subject: [PATCH 11/29] Finished movies validation tests --- test/fixtures/movies.yml | 6 ++++++ test/models/movie_test.rb | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index ba61a195e..444f23e58 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -38,6 +38,12 @@ neg_inv: release_date: "1999" inventory: -1 +invalid_date: + title: "This movie yes" + overview: "cool beans" + release_date: "cool" + inventory: 2 + rep_title: title: "Title" overview: "overview" diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 2a02a5781..9091ff2cc 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -19,4 +19,9 @@ movies(:jaws).valid?.must_equal true movies(:rep_title).valid?.must_equal false end + + it "must have a valid year format" do + movies(:starwars).valid?.must_equal true + movies(:invalid_date).valid?.must_equal false + end end From 0a743be8250ea6bb01c646ba65ee3dfadad6e9d5 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 14:50:22 -0700 Subject: [PATCH 12/29] Starting on customer model validations --- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- test/fixtures/customers.yml | 30 +++++++++++++++--------------- test/fixtures/movies.yml | 6 ------ test/models/customer_test.rb | 3 ++- test/models/movie_test.rb | 4 ---- 6 files changed, 19 insertions(+), 28 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index c6921f5b0..62808ddbe 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -5,6 +5,6 @@ class Customer < ApplicationRecord validates :city, presence: true validates :postal_code, presence: true validates :phone, presence: true - validates :account_credit, presence: true + validates :account_credit, presence: true, numericality: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index 970e62aae..a8f90475f 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,6 +1,6 @@ class Movie < ApplicationRecord validates :title, presence: true, uniqueness: true validates :overview, presence: true - validates :release_date, presence: true, format: { with: /\A(19|20)\d{2}\z/ } + validates :release_date, presence: true validates :inventory, presence: true, numericality: { greater_than: -1 } end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 806115347..e7bf05518 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,21 +1,21 @@ # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html -one: - name: MyString - registered_at: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString +sam: + name: "MyString" + registered_at: "MyString" + address: "MyString" + city: "MyString" + state: "MyString" + postal_code: "MyString" + phone: "MyString" account_credit: 1.5 two: - name: MyString - registered_at: MyString - address: MyString - city: MyString - state: MyString - postal_code: MyString - phone: MyString + name: "MyString" + registered_at: "MyString" + address: "MyString" + city: "MyString" + state: "MyString" + postal_code: "MyString" + phone: "MyString" account_credit: 1.5 diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 444f23e58..ba61a195e 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -38,12 +38,6 @@ neg_inv: release_date: "1999" inventory: -1 -invalid_date: - title: "This movie yes" - overview: "cool beans" - release_date: "cool" - inventory: 2 - rep_title: title: "Title" overview: "overview" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 2cb01d38b..7823c0e6a 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -2,6 +2,7 @@ describe Customer do - it "must be valid" do + it "must have all fields present" do + customers(:sam).valid?.must_equal true end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 9091ff2cc..4a3758fb2 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -20,8 +20,4 @@ movies(:rep_title).valid?.must_equal false end - it "must have a valid year format" do - movies(:starwars).valid?.must_equal true - movies(:invalid_date).valid?.must_equal false - end end From 8a34a8c3cacf9fab5e68427b046358ab29dee2de Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 14:54:36 -0700 Subject: [PATCH 13/29] Basic validations for customers green --- app/models/customer.rb | 1 + test/fixtures/customers.yml | 66 ++++++++++++++++++++++++++++++++++-- test/models/customer_test.rb | 8 +++++ 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 62808ddbe..7024d6320 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,6 +3,7 @@ class Customer < ApplicationRecord validates :registered_at, presence: true validates :address, presence: true validates :city, presence: true + validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true validates :account_credit, presence: true, numericality: true diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index e7bf05518..7f49771c7 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -10,8 +10,7 @@ sam: phone: "MyString" account_credit: 1.5 -two: - name: "MyString" +no_name: registered_at: "MyString" address: "MyString" city: "MyString" @@ -19,3 +18,66 @@ two: postal_code: "MyString" phone: "MyString" account_credit: 1.5 + +no_reg: + name: "MyString" + address: "MyString" + city: "MyString" + state: "MyString" + postal_code: "MyString" + phone: "MyString" + account_credit: 1.5 + +no_add: + name: "MyString" + registered_at: "MyString" + city: "MyString" + state: "MyString" + postal_code: "MyString" + phone: "MyString" + account_credit: 1.5 + +no_city: + name: "MyString" + registered_at: "MyString" + address: "MyString" + state: "MyString" + postal_code: "MyString" + phone: "MyString" + account_credit: 1.5 + +no_state: + name: "MyString" + registered_at: "MyString" + address: "MyString" + city: "MyString" + postal_code: "MyString" + phone: "MyString" + account_credit: 1.5 + +no_code: + name: "MyString" + registered_at: "MyString" + address: "MyString" + city: "MyString" + state: "MyString" + phone: "MyString" + account_credit: 1.5 + +no_phone: + name: "MyString" + registered_at: "MyString" + address: "MyString" + city: "MyString" + state: "MyString" + postal_code: "MyString" + account_credit: 1.5 + +no_credit: + name: "MyString" + registered_at: "MyString" + address: "MyString" + city: "MyString" + state: "MyString" + postal_code: "MyString" + phone: "MyString" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 7823c0e6a..36d0d15fa 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,5 +4,13 @@ it "must have all fields present" do customers(:sam).valid?.must_equal true + customers(:no_name).valid?.must_equal false + customers(:no_reg).valid?.must_equal false + customers(:no_add).valid?.must_equal false + customers(:no_city).valid?.must_equal false + customers(:no_state).valid?.must_equal false + customers(:no_code).valid?.must_equal false + customers(:no_phone).valid?.must_equal false + customers(:no_credit).valid?.must_equal false end end From aa0edbbc9a5f607f582d557f11ce9ea1a1e0cb2e Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 15:10:58 -0700 Subject: [PATCH 14/29] Added default movies checked out count --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 2 +- app/models/customer.rb | 2 +- app/models/movie.rb | 2 +- db/migrate/20170513220658_add_check_out_count.rb | 5 +++++ db/schema.rb | 7 ++++--- test/fixtures/customers.yml | 10 ++++++++++ test/models/customer_test.rb | 1 + 8 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20170513220658_add_check_out_count.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 3af4a5615..4bb4bec2d 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,6 +2,6 @@ class CustomersController < ApplicationController def index customers = Customer.all render json: customers.as_json(only: - [:id, :name, :registered_at, :postal_code, :phone]) + [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), :status => :ok end end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e8906c1aa..f7220c842 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,6 +3,6 @@ class MoviesController < ApplicationController def index movies = Movie.all render json: movies.as_json(only: - [:title, :release_date ]) + [:title, :release_date ]), :status => :ok end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 7024d6320..72ef7f8b8 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -6,6 +6,6 @@ class Customer < ApplicationRecord validates :state, presence: true validates :postal_code, presence: true validates :phone, presence: true - validates :account_credit, presence: true, numericality: true + validates :account_credit, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index a8f90475f..cd01b88eb 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -2,5 +2,5 @@ class Movie < ApplicationRecord validates :title, presence: true, uniqueness: true validates :overview, presence: true validates :release_date, presence: true - validates :inventory, presence: true, numericality: { greater_than: -1 } + validates :inventory, presence: true, numericality: { greater_than: -1, only_integer: true } end diff --git a/db/migrate/20170513220658_add_check_out_count.rb b/db/migrate/20170513220658_add_check_out_count.rb new file mode 100644 index 000000000..aa95fc387 --- /dev/null +++ b/db/migrate/20170513220658_add_check_out_count.rb @@ -0,0 +1,5 @@ +class AddCheckOutCount < ActiveRecord::Migration[5.0] + def change + add_column :customers, :movies_checked_out_count, :integer, :default => 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 6544b712b..d375f0317 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: 20170509235403) do +ActiveRecord::Schema.define(version: 20170513220658) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,8 +24,9 @@ t.string "postal_code" t.string "phone" t.float "account_credit" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index 7f49771c7..778586ca4 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -81,3 +81,13 @@ no_credit: state: "MyString" postal_code: "MyString" phone: "MyString" + +not_num: + name: "MyString" + registered_at: "MyString" + address: "MyString" + city: "MyString" + state: "MyString" + postal_code: "MyString" + phone: "MyString" + account_credit: "string" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 36d0d15fa..bf60af786 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -13,4 +13,5 @@ customers(:no_phone).valid?.must_equal false customers(:no_credit).valid?.must_equal false end + end From 7dfda2aa62811bf48819a611542ade11f6e6ad22 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 15:15:16 -0700 Subject: [PATCH 15/29] Starting on movies show method --- app/controllers/movies_controller.rb | 9 +++++++++ config/routes.rb | 1 + 2 files changed, 10 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f7220c842..0a3988bc0 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,4 +5,13 @@ def index render json: movies.as_json(only: [:title, :release_date ]), :status => :ok end + + def show + movie = Movie.find_by title: params[:title] + if movie + render json: movie.as_json(only: + [:title, :release_date]), :status => :ok + end + end + end diff --git a/config/routes.rb b/config/routes.rb index a8f36cd27..41447ba14 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,7 @@ Rails.application.routes.draw do get '/movies', to: 'movies#index', as: 'movies' + get '/movies/:title', to: 'movies#show', as: 'movie' get '/customers', to: 'customers#index', as: 'customers' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html From a0b586286e731438506bf69ee59b9b4c66db3047 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 15:45:37 -0700 Subject: [PATCH 16/29] Added error handling for movie not found --- app/controllers/movies_controller.rb | 4 +++- test/controllers/movies_controller_test.rb | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 0a3988bc0..7517ea37f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,9 +8,11 @@ def index def show movie = Movie.find_by title: params[:title] - if movie + if movie render json: movie.as_json(only: [:title, :release_date]), :status => :ok + else + render status: :not_found, json: { error: "#{params[:title]} not found"} end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..cb5e77ba7 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,11 @@ require "test_helper" describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + it "must get the index" do + get movies_path + must_respond_with :success + end + + it "index must return outputted json" do + end end From b47278cb376e36d1b1d0375c7a84ab85732c5dec Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 15:53:53 -0700 Subject: [PATCH 17/29] Added rental model with relationships --- app/controllers/movies_controller.rb | 4 ++-- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ app/models/rental.rb | 4 ++++ db/migrate/20170513225246_create_rentals.rb | 11 +++++++++++ test/fixtures/rentals.yml | 11 +++++++++++ test/models/rental_test.rb | 9 +++++++++ 7 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20170513225246_create_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7517ea37f..741e4dd9c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,9 +8,9 @@ def index def show movie = Movie.find_by title: params[:title] - if movie + if movie render json: movie.as_json(only: - [:title, :release_date]), :status => :ok + [:title, :release_date, :overview, :inventory]), :status => :ok else render status: :not_found, json: { error: "#{params[:title]} not found"} end diff --git a/app/models/customer.rb b/app/models/customer.rb index 72ef7f8b8..21a3886bf 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -8,4 +8,6 @@ class Customer < ApplicationRecord validates :phone, presence: true validates :account_credit, presence: true + has_many :rentals + end diff --git a/app/models/movie.rb b/app/models/movie.rb index cd01b88eb..098352ded 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,4 +3,6 @@ class Movie < ApplicationRecord validates :overview, presence: true validates :release_date, presence: true validates :inventory, presence: true, numericality: { greater_than: -1, only_integer: true } + + has_many :rentals end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..e001ff37c --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :customer + belongs_to :movie +end diff --git a/db/migrate/20170513225246_create_rentals.rb b/db/migrate/20170513225246_create_rentals.rb new file mode 100644 index 000000000..3fec06ce8 --- /dev/null +++ b/db/migrate/20170513225246_create_rentals.rb @@ -0,0 +1,11 @@ +class CreateRentals < ActiveRecord::Migration[5.0] + def change + create_table :rentals do |t| + t.string :due_date + t.references :customer, foreign_key: true + t.references :movie, foreign_key: true + + t.timestamps + end + end +end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..e426a1079 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + due_date: MyString + customer: one + movie: one + +two: + due_date: MyString + customer: two + movie: two 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 b0f9f716d2be9c819488aef9968a09b5fa4694c4 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 17:00:00 -0700 Subject: [PATCH 18/29] Added rentals controller --- app/controllers/rentals_controller.rb | 2 ++ test/controllers/rentals_controller_test.rb | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..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 38fa756b0ccb0d95c98886143e1578437fc5e3e1 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 17:09:17 -0700 Subject: [PATCH 19/29] Added available inventory column to movie model --- app/controllers/movies_controller.rb | 3 ++- app/models/movie.rb | 1 + .../20170514000724_add_available_inventory.rb | 5 +++++ db/schema.rb | 19 ++++++++++++++++--- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20170514000724_add_available_inventory.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 741e4dd9c..59bdbc221 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,8 +9,9 @@ def index def show movie = Movie.find_by title: params[:title] if movie + movie.available_inventory = movie.inventory - movie.rentals.length render json: movie.as_json(only: - [:title, :release_date, :overview, :inventory]), :status => :ok + [:title, :release_date, :overview, :inventory, :available_inventory]), :status => :ok else render status: :not_found, json: { error: "#{params[:title]} not found"} end diff --git a/app/models/movie.rb b/app/models/movie.rb index 098352ded..61b65ebfd 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -5,4 +5,5 @@ class Movie < ApplicationRecord validates :inventory, presence: true, numericality: { greater_than: -1, only_integer: true } has_many :rentals + end diff --git a/db/migrate/20170514000724_add_available_inventory.rb b/db/migrate/20170514000724_add_available_inventory.rb new file mode 100644 index 000000000..cbf4b42f1 --- /dev/null +++ b/db/migrate/20170514000724_add_available_inventory.rb @@ -0,0 +1,5 @@ +class AddAvailableInventory < ActiveRecord::Migration[5.0] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index d375f0317..ab5d9ddf3 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: 20170513220658) do +ActiveRecord::Schema.define(version: 20170514000724) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,8 +34,21 @@ t.string "overview" t.string "release_date" t.integer "inventory" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.integer "available_inventory" end + create_table "rentals", force: :cascade do |t| + t.string "due_date" + t.integer "customer_id" + t.integer "movie_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["customer_id"], name: "index_rentals_on_customer_id", using: :btree + t.index ["movie_id"], name: "index_rentals_on_movie_id", using: :btree + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end From f4ffbff756c7569f1f5ca94e368fdf8b79a3499e Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 17:17:13 -0700 Subject: [PATCH 20/29] Started on check out functionality --- app/controllers/rentals_controller.rb | 10 ++++++++++ config/routes.rb | 2 ++ 2 files changed, 12 insertions(+) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..cb86ce3c7 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,12 @@ class RentalsController < ApplicationController + + def create + rental = Rental.new + rental.movie = Movie.find_by title: params[:title] + rental.customer = Customer.find(params[:rental][:customer_id]) + rental.due_date = params[:rental][:due_date] + rental.save + render status: :ok, json: { id: rental.id } + end + end diff --git a/config/routes.rb b/config/routes.rb index 41447ba14..1b01d74a4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,5 +4,7 @@ get '/movies/:title', to: 'movies#show', as: 'movie' get '/customers', to: 'customers#index', as: 'customers' + + post '/rentals/:title/checkout', to: 'rentals#create', as: 'new_rental' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end From 3352ac0bf61cd6739f06aa2a41d080501f97cc00 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 17:49:30 -0700 Subject: [PATCH 21/29] Figuring out available_inventory logic, changed it from model variable to class method --- app/controllers/movies_controller.rb | 3 +-- app/controllers/rentals_controller.rb | 8 ++++++-- app/models/movie.rb | 3 +++ db/migrate/20170514002906_add_check_out_date.rb | 5 +++++ .../20170514003912_add_default_available_inventory.rb | 5 +++++ db/migrate/20170514004128_delete_available_column.rb | 5 +++++ db/schema.rb | 8 ++++---- 7 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 db/migrate/20170514002906_add_check_out_date.rb create mode 100644 db/migrate/20170514003912_add_default_available_inventory.rb create mode 100644 db/migrate/20170514004128_delete_available_column.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 59bdbc221..f9e611154 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,9 +9,8 @@ def index def show movie = Movie.find_by title: params[:title] if movie - movie.available_inventory = movie.inventory - movie.rentals.length render json: movie.as_json(only: - [:title, :release_date, :overview, :inventory, :available_inventory]), :status => :ok + [:title, :release_date, :overview, :inventory], methods: :available_inventory) else render status: :not_found, json: { error: "#{params[:title]} not found"} end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index cb86ce3c7..77b77ecfb 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,8 +5,12 @@ def create rental.movie = Movie.find_by title: params[:title] rental.customer = Customer.find(params[:rental][:customer_id]) rental.due_date = params[:rental][:due_date] - rental.save - render status: :ok, json: { id: rental.id } + if rental.save + rental.movie.available_inventory = rental.movie.inventory - 1 + render status: :ok, json: { id: rental.id } + else + render statis: :bad_request, json: { errors: rental.error.messages } + end end end diff --git a/app/models/movie.rb b/app/models/movie.rb index 61b65ebfd..66f937522 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -6,4 +6,7 @@ class Movie < ApplicationRecord has_many :rentals + def available_inventory + return self.inventory - self.rentals.length + end end diff --git a/db/migrate/20170514002906_add_check_out_date.rb b/db/migrate/20170514002906_add_check_out_date.rb new file mode 100644 index 000000000..019447751 --- /dev/null +++ b/db/migrate/20170514002906_add_check_out_date.rb @@ -0,0 +1,5 @@ +class AddCheckOutDate < ActiveRecord::Migration[5.0] + def change + add_column :rentals, :check_out, :string + end +end diff --git a/db/migrate/20170514003912_add_default_available_inventory.rb b/db/migrate/20170514003912_add_default_available_inventory.rb new file mode 100644 index 000000000..497ef6132 --- /dev/null +++ b/db/migrate/20170514003912_add_default_available_inventory.rb @@ -0,0 +1,5 @@ +class AddDefaultAvailableInventory < ActiveRecord::Migration[5.0] + def change + change_column :movies, :available_inventory, :integer, :default => 0 + end +end diff --git a/db/migrate/20170514004128_delete_available_column.rb b/db/migrate/20170514004128_delete_available_column.rb new file mode 100644 index 000000000..eaecf7845 --- /dev/null +++ b/db/migrate/20170514004128_delete_available_column.rb @@ -0,0 +1,5 @@ +class DeleteAvailableColumn < ActiveRecord::Migration[5.0] + def change + remove_column :movies, :available_inventory + end +end diff --git a/db/schema.rb b/db/schema.rb index ab5d9ddf3..c96a0cd09 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: 20170514000724) do +ActiveRecord::Schema.define(version: 20170514004128) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -34,9 +34,8 @@ t.string "overview" t.string "release_date" t.integer "inventory" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.integer "available_inventory" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "rentals", force: :cascade do |t| @@ -45,6 +44,7 @@ t.integer "movie_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "check_out" t.index ["customer_id"], name: "index_rentals_on_customer_id", using: :btree t.index ["movie_id"], name: "index_rentals_on_movie_id", using: :btree end From e7c7bee4c7bd4ce126bae072613a3cc268727ce1 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 18:08:09 -0700 Subject: [PATCH 22/29] Got checkout functionality working --- app/controllers/rentals_controller.rb | 7 +++++-- ...eoStoreAPI_optional_smoke_tests.postman_collection.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 77b77ecfb..73a689867 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -5,9 +5,12 @@ def create rental.movie = Movie.find_by title: params[:title] rental.customer = Customer.find(params[:rental][:customer_id]) rental.due_date = params[:rental][:due_date] - if rental.save - rental.movie.available_inventory = rental.movie.inventory - 1 + rental.check_out = Date.today + if rental.movie.available_inventory < 0 + render status: :bad_request, json: { error: "Not enough inventory" } + elsif rental.save render status: :ok, json: { id: rental.id } + rental.customer.movies_checked_out_count += 1 else render statis: :bad_request, json: { errors: rental.error.messages } end diff --git a/test/VideoStoreAPI_optional_smoke_tests.postman_collection.json b/test/VideoStoreAPI_optional_smoke_tests.postman_collection.json index bb44bd3c0..1aacd6371 100644 --- a/test/VideoStoreAPI_optional_smoke_tests.postman_collection.json +++ b/test/VideoStoreAPI_optional_smoke_tests.postman_collection.json @@ -429,4 +429,4 @@ "response": [] } ] -} \ No newline at end of file +} From d1e3f679a0584edbc407b9b7bc445b7fde163164 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 18:54:18 -0700 Subject: [PATCH 23/29] Ok finally figured out controller testing --- config/routes.rb | 2 +- test/controllers/movies_controller_test.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 1b01d74a4..eb6234469 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,6 @@ get '/customers', to: 'customers#index', as: 'customers' - post '/rentals/:title/checkout', to: 'rentals#create', as: 'new_rental' + post '/rentals/:title/check-out', to: 'rentals#create', as: 'new_rental' # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index cb5e77ba7..4d532978d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -6,6 +6,8 @@ must_respond_with :success end - it "index must return outputted json" do + it "index must return outputted json" do + get movies_path + response.header['Content-Type'].must_include "json" end end From db4f71d6675936f27486f6e3c55ba79f07649cc8 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 18:55:33 -0700 Subject: [PATCH 24/29] Index tests for movie green: --- test/controllers/movies_controller_test.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 4d532978d..ae1705c72 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -8,6 +8,12 @@ it "index must return outputted json" do get movies_path - response.header['Content-Type'].must_include "json" + response.header['Content-Type'].must_include "json" + end + + it "returns the correct amount of movies" do + get movies_path + r = JSON.parse(response.body) + r.length.must_equal Movie.count end end From d6ca7d1fee17718394815974fdff1f0431f00e91 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 18:59:35 -0700 Subject: [PATCH 25/29] Finished show controller tests --- test/controllers/movies_controller_test.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ae1705c72..4fcdf8ad6 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -16,4 +16,19 @@ r = JSON.parse(response.body) r.length.must_equal Movie.count end + + it "can get one movie" do + get movie_path(movies(:starwars).title) + must_respond_with :success + end + + it "show returns json" do + get movie_path(movies(:starwars).title) + response.header['Content-Type'].must_include "json" + end + + it "returns a not found if the movie is not found" do + get movie_path("random movie") + must_respond_with :not_found + end end From 21a1e5e3185b8e27a0e2f520b40ea1e2571e90d1 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 21:42:53 -0700 Subject: [PATCH 26/29] Starting on customer controller tests --- test/controllers/customers_controller_test.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..58f0166eb 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,8 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end + it "gets an index" do + get customers_path + must_respond_with :success + end end From 7007f947959d391a61b026b7cc43a6f0a529ba23 Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 21:45:06 -0700 Subject: [PATCH 27/29] Customer index tests complete --- test/controllers/customers_controller_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 58f0166eb..70291d36a 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -5,4 +5,15 @@ get customers_path must_respond_with :success end + + it "the response must be of type json" do + get customers_path + response.header['Content-Type'].must_include "json" + end + + it "returns the correct amount of customers" do + get customers_path + r = JSON.parse(response.body) + r.length.must_equal Customer.count + end end From b37dd334cfd49a1ae76a4c0be55e97d654e7c10b Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 21:55:51 -0700 Subject: [PATCH 28/29] Starting on rentals controller tests --- test/controllers/rentals_controller_test.rb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index f0227216c..4340291af 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -1,7 +1,17 @@ require "test_helper" describe RentalsController do - # it "must be a real test" do - # flunk "Need real tests" - # end + let(:info) { + { + "customer_id" => customers(:sam).id, + "due_date" => "2018-01-23" + } + } + + it "Can create a new rental" do + proc { + post new_rental_path(movies(:starwars).title), params: { rental: info } + }.must_change 'Rental.count', 1 + must_respond_with :success + end end From 58f0afcf790593ed3798fae0afbf14f0a44d812e Mon Sep 17 00:00:00 2001 From: Anacelia Gillette Date: Sat, 13 May 2017 22:19:59 -0700 Subject: [PATCH 29/29] Working on rental check out tests --- app/controllers/rentals_controller.rb | 13 +++++++----- app/models/rental.rb | 4 ++++ test/controllers/rentals_controller_test.rb | 22 +++++++++++++++++++-- test/fixtures/movies.yml | 2 +- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 73a689867..79ded6b6c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,19 +1,22 @@ class RentalsController < ApplicationController def create - rental = Rental.new + rental = Rental.new(rental_params) rental.movie = Movie.find_by title: params[:title] - rental.customer = Customer.find(params[:rental][:customer_id]) - rental.due_date = params[:rental][:due_date] rental.check_out = Date.today - if rental.movie.available_inventory < 0 + if rental.movie.available_inventory == 0 render status: :bad_request, json: { error: "Not enough inventory" } elsif rental.save render status: :ok, json: { id: rental.id } rental.customer.movies_checked_out_count += 1 else - render statis: :bad_request, json: { errors: rental.error.messages } + render statis: :bad_request, json: { errors: rental.errors.messages } end end + private + + def rental_params + params.require(:rental).permit(:customer_id, :due_date) + end end diff --git a/app/models/rental.rb b/app/models/rental.rb index e001ff37c..22391cb10 100644 --- a/app/models/rental.rb +++ b/app/models/rental.rb @@ -1,4 +1,8 @@ class Rental < ApplicationRecord belongs_to :customer belongs_to :movie + + validates :customer_id, presence: true + validates :due_date, presence: true + validates :movie_id, presence: true end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb index 4340291af..0b26b3974 100644 --- a/test/controllers/rentals_controller_test.rb +++ b/test/controllers/rentals_controller_test.rb @@ -11,7 +11,25 @@ it "Can create a new rental" do proc { post new_rental_path(movies(:starwars).title), params: { rental: info } - }.must_change 'Rental.count', 1 - must_respond_with :success + }.must_change 'Rental.count', 1 + must_respond_with :success + end + + it "responds with an error if inventory goes over" do + post new_rental_path(movies(:jaws).title), params: { rental: info } + must_respond_with :success + post new_rental_path(movies(:jaws).title), params: { rental: info } + must_respond_with :bad_request + r = JSON.parse(response.body) + r.must_include "error" + end + + it "does not create a rental with a bad request" do + bad_info = { + "due_date" => "2018-01-23" + } + + post new_rental_path(movies(:jaws).title), params: { rental: bad_info } + must_respond_with :bad_request end end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index ba61a195e..c77519406 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,7 +4,7 @@ jaws: title: "Jaws" overview: "Shark does things" release_date: "1960" - inventory: 10000 + inventory: 1 starwars: title: "Star Wars"