From 7f106ca0e34665fb91d36a7d9185e9d0679deb2d Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Mon, 6 Nov 2017 12:44:16 -0800 Subject: [PATCH 01/15] added models customer and movie --- .gitignore | 16 ++ Gemfile | 54 +++++ Gemfile.lock | 185 ++++++++++++++++++ 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/models/customer.rb | 2 + app/models/movie.rb | 2 + 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 | 35 ++++ bin/spring | 17 ++ bin/update | 29 +++ config.ru | 5 + config/application.rb | 40 ++++ config/boot.rb | 3 + config/cable.yml | 10 + config/database.yml | 85 ++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 +++++ config/environments/production.rb | 83 ++++++++ config/environments/test.rb | 42 ++++ .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 56 ++++++ config/routes.rb | 3 + config/secrets.yml | 32 +++ config/spring.rb | 6 + db/migrate/20171106204216_create_movies.rb | 12 ++ db/migrate/20171106204353_create_customers.rb | 15 ++ db/schema.rb | 18 ++ lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/customers.yml | 19 ++ test/fixtures/files/.keep | 0 test/fixtures/movies.yml | 13 ++ test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/customer_test.rb | 9 + test/models/movie_test.rb | 9 + test/test_helper.rb | 17 ++ tmp/.keep | 0 vendor/.keep | 0 62 files changed, 1032 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/models/customer.rb create mode 100644 app/models/movie.rb 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/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 db/migrate/20171106204216_create_movies.rb create mode 100644 db/migrate/20171106204353_create_customers.rb create mode 100644 db/schema.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/customers.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/movies.yml create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..68ac019ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# 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 + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..828d1be05 --- /dev/null +++ b/Gemfile @@ -0,0 +1,54 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.4' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.7' +# 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', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-turbolinks' +gem 'foundation-rails' +group :development do + gem 'better_errors' + gem 'pry-rails' + gem 'binding_of_caller' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..27976b195 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,185 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.4) + actionpack (= 5.1.4) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.4) + actionview (= 5.1.4) + activesupport (= 5.1.4) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.4) + activesupport (= 5.1.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.4) + activesupport (= 5.1.4) + globalid (>= 0.3.6) + activemodel (5.1.4) + activesupport (= 5.1.4) + activerecord (5.1.4) + activemodel (= 5.1.4) + activesupport (= 5.1.4) + arel (~> 8.0) + activesupport (5.1.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.4.0) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + binding_of_caller (0.7.3) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (9.1.0) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.2) + debug_inspector (0.0.3) + erubi (1.7.0) + execjs (2.7.0) + ffi (1.9.18) + foundation-rails (6.4.1.2) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.1.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (0.1.4) + mini_portile2 (2.3.0) + minitest (5.10.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.18) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + pg (0.21.0) + pry (0.11.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.10.0) + rack (2.0.3) + rack-test (0.7.0) + rack (>= 1.0, < 3) + rails (5.1.4) + actioncable (= 5.1.4) + actionmailer (= 5.1.4) + actionpack (= 5.1.4) + actionview (= 5.1.4) + activejob (= 5.1.4) + activemodel (= 5.1.4) + activerecord (= 5.1.4) + activesupport (= 5.1.4) + bundler (>= 1.3.0) + railties (= 5.1.4) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.1.4) + actionpack (= 5.1.4) + activesupport (= 5.1.4) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.2.1) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + sass (3.4.25) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.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.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.3) + tzinfo (1.2.4) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + foundation-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.7) + rails (~> 5.1.4) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.16.0 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/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/app/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..104e40c1c --- /dev/null +++ b/bin/setup @@ -0,0 +1,35 @@ +#!/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..7d3c866ff --- /dev/null +++ b/config/application.rb @@ -0,0 +1,40 @@ +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 + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + + # 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..ad59bcd88 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: VideoStoreAPI_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..abc82221c --- /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=#{2.days.seconds.to_i}" + } + 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..3bd8115ea --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,83 @@ +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 + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = 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..8e5cbde53 --- /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=#{1.hour.seconds.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + 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..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# 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 the `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, as 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..b717614db --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# 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. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: c80c76b3ce9d52552a87109e85d7fa523c92345430f215e3c6f2ac33fa708075582791adf1807e28f084fc6d7e3f5957f166b89739cfd1011acb0b46d100c169 + +test: + secret_key_base: ca3532ee4a7f9508d74f3bb7e286fbc8ee322fd32d56912ae18526f853cee65994328c6ebb5b72e5c0f2976cf9b26b9478f60b730a2c19ec14a07991159f4b29 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +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/db/migrate/20171106204216_create_movies.rb b/db/migrate/20171106204216_create_movies.rb new file mode 100644 index 000000000..84782a1b7 --- /dev/null +++ b/db/migrate/20171106204216_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + 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/20171106204353_create_customers.rb b/db/migrate/20171106204353_create_customers.rb new file mode 100644 index 000000000..0a05c4bad --- /dev/null +++ b/db/migrate/20171106204353_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + 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.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..2611543b3 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/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/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..bf442fa90 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + registered_at: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString + +two: + name: MyString + registered_at: MyString + address: MyString + city: MyString + state: MyString + postal_code: MyString + phone: MyString diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb 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/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/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..7c0fbfd6f --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,17 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 0acdc48c2b3b06d4255e4b37ed4d3c6230f66666 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Mon, 6 Nov 2017 13:22:43 -0800 Subject: [PATCH 02/15] added some testing --- ...4836_addding_account_credit_to_customer.rb | 5 ++++ db/schema.rb | 24 ++++++++++++++++++- test/models/customer_test.rb | 5 +++- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20171106204836_addding_account_credit_to_customer.rb diff --git a/db/migrate/20171106204836_addding_account_credit_to_customer.rb b/db/migrate/20171106204836_addding_account_credit_to_customer.rb new file mode 100644 index 000000000..a35c79508 --- /dev/null +++ b/db/migrate/20171106204836_addding_account_credit_to_customer.rb @@ -0,0 +1,5 @@ +class AdddingAccountCreditToCustomer < ActiveRecord::Migration[5.1] + def change + add_column :customers, :account_credit, :decimal + end +end diff --git a/db/schema.rb b/db/schema.rb index 2611543b3..e87dcfcc8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,31 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20171106204836) 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.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.decimal "account_credit" + 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/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..a754d884e 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -4,6 +4,9 @@ let(:customer) { Customer.new } it "must be valid" do - value(customer).must_be :valid? + customer.save + customer.valid?.must_equal true end + + end From 335cfdc77c338dc3e039d7ae452aad963382f175 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Mon, 6 Nov 2017 16:39:27 -0800 Subject: [PATCH 03/15] added model testing --- .DS_Store | Bin 0 -> 6148 bytes app/controllers/customers_controller.rb | 18 +++++++++ app/controllers/movies_controller.rb | 37 ++++++++++++++++++ app/models/customer.rb | 7 ++++ app/models/movie.rb | 2 + config/routes.rb | 4 ++ test/controllers/customers_controller_test.rb | 15 +++++++ test/controllers/movies_controller_test.rb | 7 ++++ test/fixtures/customers.yml | 30 +++++++------- test/fixtures/movies.yml | 18 ++++----- test/models/customer_test.rb | 26 +++++++++++- test/models/movie_test.rb | 17 +++++++- 12 files changed, 153 insertions(+), 28 deletions(-) create mode 100644 .DS_Store 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/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..380ad3887f52be96eeef8b471abe2a5fb1326501 GIT binary patch literal 6148 zcmeH~u?oUK42F~HP;lw!c#99<8yuxRfiECZaFGgv&iCm4$z`!ROOZd2e3x89+kfaa zBBK3c+>3M~(!!0hvoJG7-pDBD=kY#WZ_@?2)y$d-&r$1SwjbLB6`%rCfC^9nDzG30 z;v8=`3wkC#3KgIN%TU0+4+(C}!BXj;4g?jDS;a)h^^03>!4Z{cp(PqqMauvDS~ Date: Tue, 7 Nov 2017 11:06:35 -0800 Subject: [PATCH 04/15] test passing for movie controller index and show --- app/controllers/movies_controller.rb | 4 +- test/controllers/movies_controller_test.rb | 58 ++++++++++++++++++++-- test/fixtures/movies.yml | 10 ++-- 3 files changed, 62 insertions(+), 10 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index f2fd4a8ca..849960db9 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -10,7 +10,7 @@ def show if movie render json: movie.as_json(only: [:id, :title, :release_date]), status: :ok else - render json: {ok: false}, status: not_found + render json: {ok: false}, status: :not_found end end @@ -22,7 +22,7 @@ def create else render json: { errors: movie.errors.messages}, status: :bad_request - end + end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..a5e5aa47c 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,59 @@ require "test_helper" + describe MoviesController do - # it "must be a real test" do - # flunk "Need real tests" - # end + + describe "index" do + + it "is a working route" do + get movies_path + must_respond_with :success + end + it "returns json" do + get movies_path + response.header['Content-Type'].must_include 'json' + end + + it "returns and array" do + get movies_path + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all movies" do + get movies_path + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with the required keys" do + keys = %w(id release_date title) + get movies_path + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + end + + describe "show" do + + it "can find a movie by ID" do + get movie_path(movies(:movie_two).id) + must_respond_with :success + end + + it "responds with not_found if movie id doesn't exist" do + get movie_path(id: -1) + must_respond_with :not_found + end + end + + describe "create" do + it "creates a new movie" do + + end + end + end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index 5e8694336..ce48d5f5f 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -6,8 +6,8 @@ movie_one: release_date: December 25, 2013 inventory: 1 -# movie_two: -# title: Movie -# overview: This movie is yellow -# release_date: December 25, 2013 -# inventory: 5 +movie_two: + title: Movie + overview: This movie is yellow + release_date: December 25, 2013 + inventory: 5 From 4ce2d49a4d41a5b759dd6320d3c6d906b7c34fee Mon Sep 17 00:00:00 2001 From: Sara C Date: Tue, 7 Nov 2017 11:28:21 -0800 Subject: [PATCH 05/15] movie controller tests all pass --- test/controllers/movies_controller_test.rb | 33 +++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index a5e5aa47c..44fa32f9a 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -51,9 +51,40 @@ end describe "create" do + let(:movie_data) { + { + release_date: "Nov", + title: "10 Things I hate about you" + } + } it "creates a new movie" do - + assert_difference "Movie.count", 1 do + post movies_path, params: { movie: movie_data } + assert_response :success + end + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "id" + + + Movie.find(body["id"]).title.must_equal movie_data[:title] end + + it "Returns an error for an invalid movie" do + bad_data = movie_data.clone() + bad_data.delete(:title) + assert_no_difference "Movie.count" do + post movies_path, params: { movie: bad_data } + assert_response :bad_request + end + + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "errors" + body["errors"].must_include "title" + end + + end end From e73bf5d6cae30bd297ea1e6221e5633bd63f0dc3 Mon Sep 17 00:00:00 2001 From: Sara C Date: Tue, 7 Nov 2017 15:11:10 -0800 Subject: [PATCH 06/15] added migrations and tests for controllers --- .DS_Store | Bin 6148 -> 6148 bytes app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 8 ++-- app/models/movie.rb | 1 + ...d_movies_checked_out_count_to_customers.rb | 5 +++ ...20724_add_available_inventory_to_movies.rb | 5 +++ db/schema.rb | 4 +- test/controllers/customers_controller_test.rb | 36 ++++++++++++++++++ test/controllers/movies_controller_test.rb | 2 +- 9 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20171107220110_add_movies_checked_out_count_to_customers.rb create mode 100644 db/migrate/20171107220724_add_available_inventory_to_movies.rb diff --git a/.DS_Store b/.DS_Store index 380ad3887f52be96eeef8b471abe2a5fb1326501..420146e0bad16da5f70b564ae37eeb73e3dc94a2 100644 GIT binary patch literal 6148 zcmeHK(QeZ)6un+cmoN~0n6y3S1&N0WwSu8l6H+Oi&>oNwMeqP;M_M4~+n8$?wia*!CySCMTnZs)XS zTe@Z!D7cTb7sP3RC+^OgRlq9nuPeZNw?saTXmk=A`}YVfw|+^JL6j(`;9TY*)f z9;KAf8*m3ESL_wIZk|iGX-w0C$ESkF7KIcPI6pUWF1zC-PLl!J@MWSM%%_hZyb)`U zE->1VLbE60h(G5d-lj+J8Om5<>KE7?d7gdEWMhOFN?`t-pF$7rv1g7;h|SayLav_7Ot~*vvL3AZ20c|{KMko7c3`C@GHr7 zL%}NliqcAm!Yf>YK*LR&RJ=77^%62Bc+pcDn^MX}&2#0>z=+PyY67-k6|f3e1(X8( znevbrTN;-NHTcUp<5;=_FbTZEh8?3YZF%)MJ&;|KmU3|4k?RWEHRq{8tKya;MvA zBP4yct_8AjHu~68Qk%57Mi6Mm{sVulCFDE}Q9mofXfdCVP0`q}l0t_(u&4L_a pESnWLCNghk=iui68U+;j&ODi4M3IqkvZ;vjWPcux%`qY?m;vBP6CVHo diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 356cbbb99..1e8546103 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.to_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone]), status: :ok + render json: customers.to_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]), status: :ok end # def show diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 849960db9..6bc9704cf 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,13 +2,13 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.to_json(only: [:id, :title, :release_date]), status: :ok + render json: movies.to_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]), status: :ok end def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [:id, :title, :release_date]), status: :ok + render json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]), status: :ok else render json: {ok: false}, status: :not_found end @@ -18,7 +18,7 @@ def show def create movie = Movie.create(movie_params) if movie.save - render json: movie.as_json(only: [:id, :title, :release_date]), status: :created + render json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]), status: :created else render json: { errors: movie.errors.messages}, status: :bad_request @@ -31,7 +31,7 @@ def create private def movie_params - params.require(:movie).permit(:id, :title, :release_date) + params.require(:movie).permit(:id, :title, :release_date, :overview, :inventory, :available_inventory) end end diff --git a/app/models/movie.rb b/app/models/movie.rb index abdd35e2f..5603c1599 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,5 @@ class Movie < ApplicationRecord validates :title, presence: true validates :release_date, presence: true + end diff --git a/db/migrate/20171107220110_add_movies_checked_out_count_to_customers.rb b/db/migrate/20171107220110_add_movies_checked_out_count_to_customers.rb new file mode 100644 index 000000000..3369a9a4f --- /dev/null +++ b/db/migrate/20171107220110_add_movies_checked_out_count_to_customers.rb @@ -0,0 +1,5 @@ +class AddMoviesCheckedOutCountToCustomers < ActiveRecord::Migration[5.1] + def change + add_column :customers, :movies_checked_out_count, :integer, default: 0 + end +end diff --git a/db/migrate/20171107220724_add_available_inventory_to_movies.rb b/db/migrate/20171107220724_add_available_inventory_to_movies.rb new file mode 100644 index 000000000..05e1731c1 --- /dev/null +++ b/db/migrate/20171107220724_add_available_inventory_to_movies.rb @@ -0,0 +1,5 @@ +class AddAvailableInventoryToMovies < ActiveRecord::Migration[5.1] + def change + add_column :movies, :available_inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index e87dcfcc8..d4a0ce180 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: 20171106204836) do +ActiveRecord::Schema.define(version: 20171107220724) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -26,6 +26,7 @@ t.datetime "created_at", null: false t.datetime "updated_at", null: false t.decimal "account_credit" + t.integer "movies_checked_out_count", default: 0 end create_table "movies", force: :cascade do |t| @@ -35,6 +36,7 @@ t.integer "inventory" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.integer "available_inventory" end end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 74c044487..c5b981107 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -11,5 +11,41 @@ response.header['Content-Type'].must_include 'json' end + it "returns an array" do + get customers_path + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + get customers_path + + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with required fields" do + keys = %w(address city id movies_checked_out_count name phone postal_code registered_at state) + get customers_path + body = JSON.parse(response.body) + body.each do |customer| + customer.keys.sort.must_equal keys + end + end + + it "returns an empty array if there are no customers" do + + Customer.destroy_all + + + get customers_path + + + must_respond_with :success + body = JSON.parse(response.body) + body.must_be_kind_of Array + body.must_be :empty? + end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 44fa32f9a..66244f0dd 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -28,7 +28,7 @@ end it "returns movies with the required keys" do - keys = %w(id release_date title) + keys = %w(available_inventory id inventory overview release_date title) get movies_path body = JSON.parse(response.body) body.each do |movie| From 202593dbe5474311933295558e01b1d4e1074531 Mon Sep 17 00:00:00 2001 From: Sara C Date: Tue, 7 Nov 2017 15:31:38 -0800 Subject: [PATCH 07/15] added to errors --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6bc9704cf..6fc1153eb 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -10,7 +10,7 @@ def show if movie render json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]), status: :ok else - render json: {ok: false}, status: :not_found + render json: {ok: false, message: "No Movie with that ID"}, status: :not_found end end From 35ee8764a02e80c4c469835a346ced5473660e90 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Tue, 7 Nov 2017 17:24:25 -0800 Subject: [PATCH 08/15] added serializer and updated tests --- Gemfile | 2 +- Gemfile.lock | 9 +++++++++ app/controllers/movies_controller.rb | 6 +++--- app/serializers/movie_serializer.rb | 3 +++ test/controllers/movies_controller_test.rb | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 app/serializers/movie_serializer.rb diff --git a/Gemfile b/Gemfile index 828d1be05..56f2c0697 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) do |repo_name| "https://github.com/#{repo_name}.git" end - +gem "active_model_serializers" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.1.4' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 27976b195..8297e1302 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,6 +24,11 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) + active_model_serializers (0.10.6) + actionpack (>= 4.1, < 6) + activemodel (>= 4.1, < 6) + case_transform (>= 0.2) + jsonapi-renderer (>= 0.1.1.beta1, < 0.2) activejob (5.1.4) activesupport (= 5.1.4) globalid (>= 0.3.6) @@ -52,6 +57,8 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (9.1.0) + case_transform (0.2) + activesupport coderay (1.1.2) concurrent-ruby (1.0.5) crass (1.0.2) @@ -70,6 +77,7 @@ GEM jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks + jsonapi-renderer (0.1.3) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -165,6 +173,7 @@ PLATFORMS ruby DEPENDENCIES + active_model_serializers better_errors binding_of_caller byebug diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6fc1153eb..e9b726e2c 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,13 +2,13 @@ class MoviesController < ApplicationController def index movies = Movie.all - render json: movies.to_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]), status: :ok + render json: movies, status: :ok end def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]), status: :ok + render json: movie, status: :ok else render json: {ok: false, message: "No Movie with that ID"}, status: :not_found end @@ -18,7 +18,7 @@ def show def create movie = Movie.create(movie_params) if movie.save - render json: movie.as_json(only: [:id, :title, :release_date, :overview, :inventory, :available_inventory]), status: :created + render json: movie, status: :created else render json: { errors: movie.errors.messages}, status: :bad_request diff --git a/app/serializers/movie_serializer.rb b/app/serializers/movie_serializer.rb new file mode 100644 index 000000000..8a11687e6 --- /dev/null +++ b/app/serializers/movie_serializer.rb @@ -0,0 +1,3 @@ +class MovieSerializer < ActiveModel::Serializer + attributes :id, :title, :release_date, :overview, :inventory, :available_inventory +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 66244f0dd..23bf1edca 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -28,7 +28,7 @@ end it "returns movies with the required keys" do - keys = %w(available_inventory id inventory overview release_date title) + keys = %w(available_inventory created_at id inventory overview release_date title updated_at) get movies_path body = JSON.parse(response.body) body.each do |movie| From 82b084ec08ffd5590e91aed43fb32ae54d266029 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Wed, 8 Nov 2017 10:36:57 -0800 Subject: [PATCH 09/15] postman returns appropriate fields for mandatory requirements --- app/controllers/customers_controller.rb | 2 +- app/controllers/movies_controller.rb | 2 +- app/serializers/movie_serializer.rb | 2 +- test/controllers/customers_controller_test.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 1e8546103..416551273 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,7 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers.to_json(only: [:id, :name, :registered_at, :address, :city, :state, :postal_code, :phone, :movies_checked_out_count]), status: :ok + render json: customers.to_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok end # def show diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e9b726e2c..15fbd3cca 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,7 +8,7 @@ def index def show movie = Movie.find_by(id: params[:id]) if movie - render json: movie, status: :ok + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok else render json: {ok: false, message: "No Movie with that ID"}, status: :not_found end diff --git a/app/serializers/movie_serializer.rb b/app/serializers/movie_serializer.rb index 8a11687e6..08aa4b465 100644 --- a/app/serializers/movie_serializer.rb +++ b/app/serializers/movie_serializer.rb @@ -1,3 +1,3 @@ class MovieSerializer < ActiveModel::Serializer - attributes :id, :title, :release_date, :overview, :inventory, :available_inventory + attributes :id, :title, :release_date end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5b981107..ff155761b 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -26,7 +26,7 @@ end it "returns customers with required fields" do - keys = %w(address city id movies_checked_out_count name phone postal_code registered_at state) + keys = %w(id movies_checked_out_count name phone postal_code registered_at) get customers_path body = JSON.parse(response.body) body.each do |customer| From 020151ac0eb08011574807102307c9805c74b41f Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Wed, 8 Nov 2017 13:59:49 -0800 Subject: [PATCH 10/15] testing rental --- .DS_Store | Bin 6148 -> 6148 bytes app/controllers/movies_controller.rb | 5 +--- app/models/customer.rb | 2 ++ app/models/movie.rb | 4 +++- app/models/rental.rb | 5 ++++ db/migrate/20171108193113_create_rentals.rb | 8 +++++++ ...1108193142_add_columns_and_foreign_keys.rb | 7 ++++++ db/schema.rb | 14 ++++++++++- test/controllers/movies_controller_test.rb | 1 - test/fixtures/rentals.yml | 10 ++++++++ test/models/customer_test.rb | 2 +- test/models/rental_test.rb | 22 ++++++++++++++++++ 12 files changed, 72 insertions(+), 8 deletions(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20171108193113_create_rentals.rb create mode 100644 db/migrate/20171108193142_add_columns_and_foreign_keys.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/.DS_Store b/.DS_Store index 420146e0bad16da5f70b564ae37eeb73e3dc94a2..1dc7cebd6094ccaf8e1b80544ee6775bddabbeb5 100644 GIT binary patch delta 111 zcmZoMXfc=|#>CJzu~2NHo}wrd0|Nsi1A_oVPJUiGgw4P*u~2=ofe4Er6GI9^Qdw|O z9!zrbOm^wbA{@dj8yhT{H?wo_a{x`+EXeVlc{0CoNwMeqP;M_M4~+n8$?wia*!CySCMTnZs)XS zTe@Z!D7cTb7sP3RC+^OgRlq9nuPeZNw?saTXmk=A`}YVfw|+^JL6j(`;9TY*)f z9;KAf8*m3ESL_wIZk|iGX-w0C$ESkF7KIcPI6pUWF1zC-PLl!J@MWSM%%_hZyb)`U zE->1VLbE60h(G5d-lj+J8Om5<>KE7?d7gdEWMhOFN?`t-pF$7rv1g7;h|SayLav_7Ot~*vvL3AZ20c|{KMko7c3`C@GHr7 zL%}NliqcAm!Yf>YK*LR&RJ=77^%62Bc+pcDn^MX}&2#0>z=+PyY67-k6|f3e1(X8( znevbrTN;-NHTcUp<5;=_FbTZEh8?3YZF%)MJ&;|KmU3|4k?RWEHRq{8tKya;MvA zBP4yct_8 Date: Wed, 8 Nov 2017 15:59:43 -0800 Subject: [PATCH 11/15] fixed rental model test --- test/models/rental_test.rb | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 1e1e118d2..a0cc9f3a8 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,21 +2,20 @@ describe Rental do let(:rental_one) { rentals(:rental_one) } - let(:rental_new) { Rental.new } + let(:rental) { Rental.new } it "exists" do rental_one.valid?.must_equal true end + it "must have a due date, customer and movie id" do - rental_new.valid?.must_equal false - rental_new.due_date = "due date" - rental_new.valid?.must_equal false - rental_new.customer_id = customers(:customer_one) - rental_new.valid?.must_equal false - rental_new.movie_id = movies(:movie_one) - rental_new.valid?.must_equal false - rental_new.save - puts rental_new - # rental_new.valid?.must_equal true + rental.valid?.must_equal false + rental.due_date = "due date" + rental.valid?.must_equal false + rental.customer_id = customers(:customer_one).id + rental.valid?.must_equal false + rental.movie_id = movies(:movie_one).id + rental.valid?.must_equal true end + end From a39b96748ddc6e6bcf8970eb1ab8690d2da796f9 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Fri, 10 Nov 2017 18:15:15 -0800 Subject: [PATCH 12/15] fixed bug in smoke test --- app/controllers/movies_controller.rb | 4 +-- app/controllers/rentals_controller.rb | 27 +++++++++++++++++++++ config/routes.rb | 4 +++ test/controllers/movies_controller_test.rb | 2 +- test/controllers/rentals_controller_test.rb | 7 ++++++ 5 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index a51468a0c..4cfa6ac2f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,7 +18,7 @@ def show def create movie = Movie.create(movie_params) if movie.save - render json: movie, status: :created + render json: movie, status: :ok else render json: { errors: movie.errors.messages}, status: :bad_request @@ -28,7 +28,7 @@ def create private def movie_params - params.require(:movie).permit(:id, :title, :release_date, :overview, :inventory, :available_inventory) + params.permit(:title, :release_date, :overview, :inventory, :available_inventory) end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..5d3933dc6 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,27 @@ +class RentalsController < ApplicationController + +def create + rental = Rental.create(rental_params) + if rental.save + render json: movie, status: :created + else + render json: { errors: movie.errors.messages }, + status: :bad_request + end +end + +def update + +end + +def overdue + +end + +private + +def rental_params + params.require(:rental).permit(:due_date, :movie_id, :customer_id) +end + +end diff --git a/config/routes.rb b/config/routes.rb index d20da54d2..bf01e89ab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,8 @@ resources :movies, only: [:index, :show, :create] + post '/rentals/check-out', to: 'rentals#create' + post '/rentals/check-in', to: 'rentals#update' + get '/rentals/overdue', to: 'rentals#overdue' + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 7360c789d..4b18c336d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -28,7 +28,7 @@ end it "returns movies with the required keys" do - keys = %w(available_inventory created_at id inventory overview release_date title updated_at) + keys = %w(id release_date title) get movies_path body = JSON.parse(response.body) body.each do |movie| 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 a7c2162dbe86d063eae304d0558d689a12d397ee Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Fri, 10 Nov 2017 22:11:09 -0800 Subject: [PATCH 13/15] working on making smoke test pass for rentals check out --- app/controllers/movies_controller.rb | 2 +- app/controllers/rentals_controller.rb | 10 +++++----- config/routes.rb | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 4cfa6ac2f..21eb316a2 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -18,7 +18,7 @@ def show def create movie = Movie.create(movie_params) if movie.save - render json: movie, status: :ok + render json: movie, status: :ok #keep ok status to prevent smoke fail else render json: { errors: movie.errors.messages}, status: :bad_request diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 5d3933dc6..2cb3ac25c 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,16 +1,16 @@ class RentalsController < ApplicationController -def create +def checkout rental = Rental.create(rental_params) if rental.save - render json: movie, status: :created + render json: movie, status: :ok #keep ok status to prevent smoke fail else - render json: { errors: movie.errors.messages }, + render json: { errors: rental.errors.messages }, status: :bad_request end end -def update +def checkin end @@ -21,7 +21,7 @@ def overdue private def rental_params - params.require(:rental).permit(:due_date, :movie_id, :customer_id) + params.permit(:due_date, :movie_id, :customer_id) end end diff --git a/config/routes.rb b/config/routes.rb index bf01e89ab..5506d380a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,8 +4,8 @@ resources :movies, only: [:index, :show, :create] - post '/rentals/check-out', to: 'rentals#create' - post '/rentals/check-in', to: 'rentals#update' + post '/rentals/check-out', to: 'rentals#checkin' + post '/rentals/check-in', to: 'rentals#checkout' get '/rentals/overdue', to: 'rentals#overdue' end From 665af688409b1ec9d5cb855a87c6010c74047e54 Mon Sep 17 00:00:00 2001 From: Sara C Date: Sun, 12 Nov 2017 16:06:06 -0800 Subject: [PATCH 14/15] merging fixed with rental test and movie controller test --- test/controllers/movies_controller_test.rb | 2 +- test/models/rental_test.rb | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 7360c789d..4b18c336d 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -28,7 +28,7 @@ end it "returns movies with the required keys" do - keys = %w(available_inventory created_at id inventory overview release_date title updated_at) + keys = %w(id release_date title) get movies_path body = JSON.parse(response.body) body.each do |movie| diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 1e1e118d2..d877d3576 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -2,21 +2,20 @@ describe Rental do let(:rental_one) { rentals(:rental_one) } - let(:rental_new) { Rental.new } + let(:rental) { Rental.new } it "exists" do rental_one.valid?.must_equal true end + it "must have a due date, customer and movie id" do - rental_new.valid?.must_equal false - rental_new.due_date = "due date" - rental_new.valid?.must_equal false - rental_new.customer_id = customers(:customer_one) - rental_new.valid?.must_equal false - rental_new.movie_id = movies(:movie_one) - rental_new.valid?.must_equal false - rental_new.save - puts rental_new - # rental_new.valid?.must_equal true + rental.valid?.must_equal false + rental.due_date = "due date" + rental.valid?.must_equal false + rental.customer_id = customers(:customer_one).id + rental.valid?.must_equal false + rental.movie_id = movies(:movie_one).id + rental.valid?.must_equal true end + end From 79b0645d210ffc42f76f16ed0ab94b8b50eeb710 Mon Sep 17 00:00:00 2001 From: Jocelyn Gonzalez Date: Sun, 12 Nov 2017 17:54:11 -0800 Subject: [PATCH 15/15] added require to strong params --- app/controllers/movies_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 21eb316a2..361f29b92 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -28,7 +28,7 @@ def create private def movie_params - params.permit(:title, :release_date, :overview, :inventory, :available_inventory) + params.require(:movie).permit(:title, :release_date, :overview, :inventory, :available_inventory) end end