From 832cf72676f3b735a11f4a6e096f23cd5e4a3aa0 Mon Sep 17 00:00:00 2001 From: janicewilson Date: Wed, 10 May 2017 14:24:19 -0700 Subject: [PATCH 01/11] Created rails app. API edition. --- .gitignore | 17 ++ Gemfile | 56 ++++++ Gemfile.lock | 177 ++++++++++++++++++ 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 | 33 ++++ 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 + db/schema.rb | 18 ++ 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 | 25 +++ tmp/.keep | 0 54 files changed, 931 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 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/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..d53d6032c --- /dev/null +++ b/Gemfile @@ -0,0 +1,56 @@ +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 'binding_of_caller' + gem 'pry-rails' + gem 'simplecov' + gem 'dotenv-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end + +gem 'awesome_print' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..564204926 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,177 @@ +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) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.3) + byebug (9.0.6) + coderay (1.1.1) + concurrent-ruby (1.0.5) + debug_inspector (0.0.3) + docile (1.1.5) + dotenv (2.2.1) + dotenv-rails (2.2.1) + dotenv (= 2.2.1) + railties (>= 3.2, < 5.2) + erubis (2.7.0) + ffi (1.9.18) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + json (2.1.0) + 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.3) + activesupport (>= 4.2.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) + simplecov (0.14.1) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + 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-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 + binding_of_caller + byebug + dotenv-rails + listen (~> 3.0.5) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.0) + rails (~> 5.0.2) + simplecov + 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..0399c4116 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,33 @@ +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| + 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..55c014aab --- /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: 31608b897c38c386a80ec3e0fa35060fdda44d8556e768bc3f075de1de9bf29bae02f248224aa39a0603ec6684ab52424cc917a6c86b6773241d0d546139d1c2 + +test: + secret_key_base: db8a84e0d4987b916a18ade5ee02fe579f48304c7aceee71a5dee55116ae5faf8bb7e3414229ea731810f6c1e68ab6106f32a5c80965fead908046685883b233 + +# 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/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..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..a60125bfa --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,25 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" + +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 832d1fc9a088782a7140cf4255e21279bfaad976 Mon Sep 17 00:00:00 2001 From: janicewilson Date: Wed, 10 May 2017 14:38:22 -0700 Subject: [PATCH 02/11] Added models for customer and movie. --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ db/migrate/20170510212501_create_movies.rb | 12 ++++++++++ db/migrate/20170510213339_create_customers.rb | 12 ++++++++++ db/schema.rb | 22 ++++++++++++++++++- test/fixtures/customers.yml | 11 ++++++++++ test/fixtures/movies.yml | 11 ++++++++++ test/models/customer_test.rb | 9 ++++++++ test/models/movie_test.rb | 9 ++++++++ 9 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20170510212501_create_movies.rb create mode 100644 db/migrate/20170510213339_create_customers.rb create mode 100644 test/fixtures/customers.yml create mode 100644 test/fixtures/movies.yml create mode 100644 test/models/customer_test.rb create mode 100644 test/models/movie_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..0b5277335 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,2 @@ +class Customer < ApplicationRecord +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..dc614df15 --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,2 @@ +class Movie < ApplicationRecord +end diff --git a/db/migrate/20170510212501_create_movies.rb b/db/migrate/20170510212501_create_movies.rb new file mode 100644 index 000000000..c097ac20a --- /dev/null +++ b/db/migrate/20170510212501_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.date :release_date + t.integer :inventory + t.integer :available_inventory + t.timestamps + end + end +end diff --git a/db/migrate/20170510213339_create_customers.rb b/db/migrate/20170510213339_create_customers.rb new file mode 100644 index 000000000..c3be0b8bc --- /dev/null +++ b/db/migrate/20170510213339_create_customers.rb @@ -0,0 +1,12 @@ +class CreateCustomers < ActiveRecord::Migration[5.0] + def change + create_table :customers do |t| + t.string :name + t.date :registered_at + t.string :postal_code + t.string :phone + t.integer :movies_checked_out_count + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 2611543b3..80d1f7b14 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,29 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20170510213339) 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.date "registered_at" + t.string "postal_code" + t.string "phone" + t.integer "movies_checked_out_count" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "overview" + t.date "release_date" + t.integer "inventory" + t.integer "available_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..dc3ee79b5 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..dc3ee79b5 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value 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 0aa8763aa7d2275b287f55f238d282cf2dcd9fbc Mon Sep 17 00:00:00 2001 From: janicewilson Date: Wed, 10 May 2017 14:46:03 -0700 Subject: [PATCH 03/11] Added two preliminary model test. --- test/models/customer_test.rb | 14 ++++++++++---- test/models/movie_test.rb | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..7db474cb8 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,15 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } - it "must be valid" do - value(customer).must_be :valid? - end + describe "purpose" do + + before do + @customer = Customer.create + end + + it "creates a customer" do + @customer.must_be_kind_of Customer + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..4cdf21137 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,15 @@ require "test_helper" describe Movie do - let(:movie) { Movie.new } - it "must be valid" do - value(movie).must_be :valid? - end + describe "purpose" do + + before do + @movie = Movie.create + end + + it "creates a movie" do + @movie.must_be_kind_of Movie + end + end end From dafd794be767ee88132ea9e6e04d6b39601c81c7 Mon Sep 17 00:00:00 2001 From: janicewilson Date: Wed, 10 May 2017 15:11:16 -0700 Subject: [PATCH 04/11] Lost my seeding virginity. --- db/seeds.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 5322340ba..af08d0d44 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1,7 @@ -JSON.parse(File.read('db/seeds/customers.json')).each do |customer| - Customer.create!(customer) +JSON.parse(File.read('db/seeds/customers.json')).each do | customer | + Customer.create!(customer.except('address', 'city', 'state', 'account_credit' )) end JSON.parse(File.read('db/seeds/movies.json')).each do |movie| - Movie.create!(movie) + Movie.create!(movie.except()) end From c557594664c57befe8dae4e78327a46e613417e0 Mon Sep 17 00:00:00 2001 From: janicewilson Date: Wed, 10 May 2017 15:31:21 -0700 Subject: [PATCH 05/11] Added customers controller, index route and test. --- app/controllers/customers_controller.rb | 8 ++++++++ config/routes.rb | 4 +++- test/controllers/customers_controller_test.rb | 9 +++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 app/controllers/customers_controller.rb create mode 100644 test/controllers/customers_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..bd42ae588 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,8 @@ +class CustomersController < ApplicationController + + def index + customers = Customer.all + render json: customers.as_json(only: [:id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count]), status: :ok + end + +end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..2092c1e1b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + + get '/customers', to: 'customers#index', as: 'customers' + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..610199c6a --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe CustomersController do + + it "should get index" do + get customers_path + must_respond_with :ok + end +end From 503ad34c692777947206b5cac4c41c25c1a850c8 Mon Sep 17 00:00:00 2001 From: janicewilson Date: Wed, 10 May 2017 15:37:50 -0700 Subject: [PATCH 06/11] Added movies controller, index route and test. --- app/controllers/movies_controller.rb | 8 ++++++++ config/routes.rb | 1 + test/controllers/customers_controller_test.rb | 1 + test/controllers/movies_controller_test.rb | 10 ++++++++++ 4 files changed, 20 insertions(+) create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..674e97dc9 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,8 @@ +class MoviesController < ApplicationController + + def index + movies = Movie.all + render json: movies.as_json(only: [:title, :release_date]), status: :ok + end + +end diff --git a/config/routes.rb b/config/routes.rb index 2092c1e1b..1d56f2145 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do get '/customers', to: 'customers#index', as: 'customers' + get '/movies', to: 'movies#index', as: 'movies' end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 610199c6a..ee0211a72 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -6,4 +6,5 @@ get customers_path must_respond_with :ok end + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..ebcaea378 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,10 @@ +require "test_helper" + +describe MoviesController do + + it "should get index" do + get movies_path + must_respond_with :ok + end + +end From 8dc462223c55b69fe6dcfd0d5ba7da3847a3fd27 Mon Sep 17 00:00:00 2001 From: janicewilson Date: Wed, 10 May 2017 15:59:35 -0700 Subject: [PATCH 07/11] Added movie route, action and test for show. --- app/controllers/movies_controller.rb | 11 +++++++++++ config/routes.rb | 2 ++ test/controllers/movies_controller_test.rb | 5 +++++ test/fixtures/movies.yml | 22 +++++++++++++++++----- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 674e97dc9..ac45e5f39 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -5,4 +5,15 @@ def index render json: movies.as_json(only: [:title, :release_date]), status: :ok end + def show + movie = Movie.find_by(title: params[:title]) + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok + end + + private + + def movie_params + params.require(:movie).permit(:title, :overview, :release_date, :inventory, :available_inventory) + end + end diff --git a/config/routes.rb b/config/routes.rb index 1d56f2145..af241c180 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,8 @@ Rails.application.routes.draw do get '/customers', to: 'customers#index', as: 'customers' + get '/movies/:title', to: 'movies#show', as: 'movie' get '/movies', to: 'movies#index', as: 'movies' + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index ebcaea378..305a18348 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -7,4 +7,9 @@ must_respond_with :ok end + it "should get show" do + get movie_path(movies(:one).title) + must_respond_with :ok + end + end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index dc3ee79b5..7b8cc8da9 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,8 +4,20 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +one: + title: Psycho + overview: When larcenous real estate clerk Marion Crane goes on the lam with a wad of cash and hopes of starting a new life, she ends up at the notorious Bates Motel, where manager Norman Bates cares for his housebound mother. The place seems quirky, but fine… until Marion decides to take a shower. + release_date: 1960-06-16 + inventory: 8 + +two: + title: Jaws + overview: An insatiable great white shark terrorizes the townspeople of Amity Island, The police chief, an oceanographer and a grizzled shark hunter seek to destroy the bloodthirsty beast. + release_date: 1975-06-19 + inventory: 6 + +three: + title: The Exorcist + overview: An insatiable great white shark terrorizes the townspeople of Amity Island, The police chief, an oceanographer and a grizzled shark hunter seek to destroy the bloodthirsty beast. + release_date: 1973-12-26 + inventory: 7 From 76501ad81293cf926db44d5255aacbd7bf4f4ea5 Mon Sep 17 00:00:00 2001 From: janicewilson Date: Mon, 15 May 2017 11:16:32 -0700 Subject: [PATCH 08/11] Not certain what this last update entails. But am pushing regardless. --- app/controllers/movies_controller.rb | 13 +++++++++---- app/models/movie.rb | 12 ++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index ac45e5f39..f521c5ea5 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,13 +1,18 @@ class MoviesController < ApplicationController def index - movies = Movie.all - render json: movies.as_json(only: [:title, :release_date]), status: :ok + movies = Movie.all + render json: movies.as_json(only: [:title, :release_date]), status: :ok end def show - movie = Movie.find_by(title: params[:title]) - render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok + movie = Movie.find_by(title: params[:title]) + + if movie + render json: movie.as_json(only: [:title, :overview, :release_date, :inventory, :available_inventory]), status: :ok + else + render json: { errors: { title: "#{params[:title]} was not found." } }, status: :not_found + end end private diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..66cb621b1 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,14 @@ class Movie < ApplicationRecord + + validates :title, presence: { message: ': Can\'t find a movie without a title.' }, + length: { minimum: 2 } + # validates :status, inclusion: { in: [true, false], message: 'Are you coming? Or are abandoning us on our special day?' } + # + # validates :number_of_guests, presence: { message: 'It takes at least one to RSVP.' }, + # numericality: { only_integer: true, message: 'Is it just you? Or do you have a +1?' } + # + # validates :second_guest, presence: { message: 'Don\'t forget about your +1.' }, if: :plus_one?, on: :update, + # uniqueness: { message: 'Oops. Looks like you\'ll need another +1. That particular +1 has already RSVP\'d.' } + # + # validates :paid, inclusion: { in: [true, false], message: 'Have you settled up?' } end From 110a102271f227ecf7e75b570681b0a1abcbf723 Mon Sep 17 00:00:00 2001 From: janicewilson Date: Sat, 20 May 2017 05:11:21 -0700 Subject: [PATCH 09/11] Fixed stale PID. Whatever the hell that means. Added SimpleCov. --- .gitignore | 6 ++++++ test/controllers/customers_controller_test.rb | 5 +---- test/controllers/movies_controller_test.rb | 13 ++++++------- test/test_helper.rb | 3 +++ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 48fb168f6..e7d4d1651 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,9 @@ # Ignore Byebug command history file. .byebug_history + +# Ignore SimpleCov updates. +coverage/ + +# Ignore .DS_Store files. +.DS_Store diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index ee0211a72..7cf8d2dc2 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,9 +2,6 @@ describe CustomersController do - it "should get index" do - get customers_path - must_respond_with :ok - end + end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 305a18348..642cd3760 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -2,14 +2,13 @@ describe MoviesController do - it "should get index" do - get movies_path - must_respond_with :ok - end + describe "index" do + + it "responds with movies" do + get movies_path + must_respond_with :success + end - it "should get show" do - get movie_path(movies(:one).title) - must_respond_with :ok end end diff --git a/test/test_helper.rb b/test/test_helper.rb index a60125bfa..d2ff26270 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,6 +4,9 @@ require "minitest/rails" require "minitest/reporters" +require 'simplecov' +SimpleCov.start + Minitest::Reporters.use!( Minitest::Reporters::SpecReporter.new, ENV, From fd90b75b4476fb8516622e33c38ee07013df1cba Mon Sep 17 00:00:00 2001 From: janicewilson Date: Sat, 20 May 2017 08:03:35 -0700 Subject: [PATCH 10/11] Added tests and validations for movie model. Added tests for movie controller. --- app/models/movie.rb | 18 +++--- test/controllers/movies_controller_test.rb | 64 +++++++++++++++++++++- test/models/movie_test.rb | 64 ++++++++++++++++++++++ 3 files changed, 134 insertions(+), 12 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 66cb621b1..1db4584cf 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,14 +1,10 @@ class Movie < ApplicationRecord - validates :title, presence: { message: ': Can\'t find a movie without a title.' }, - length: { minimum: 2 } - # validates :status, inclusion: { in: [true, false], message: 'Are you coming? Or are abandoning us on our special day?' } - # - # validates :number_of_guests, presence: { message: 'It takes at least one to RSVP.' }, - # numericality: { only_integer: true, message: 'Is it just you? Or do you have a +1?' } - # - # validates :second_guest, presence: { message: 'Don\'t forget about your +1.' }, if: :plus_one?, on: :update, - # uniqueness: { message: 'Oops. Looks like you\'ll need another +1. That particular +1 has already RSVP\'d.' } - # - # validates :paid, inclusion: { in: [true, false], message: 'Have you settled up?' } + validates :title, presence: true, + uniqueness: true + validates :overview, presence: true + validates :release_date, + presence: true + validates :inventory, presence: true, + numericality: { only_integer: true } end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 642cd3760..80e5c0e0b 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -4,11 +4,73 @@ describe "index" do - it "responds with movies" do + before do get movies_path + @json_response = JSON.parse(response.body) + end + + it "responds" do must_respond_with :success end + it "serves json" do + response.header['Content-Type'].must_include Mime[:json] + end + + it "responds with a string" do + response.body.must_be_kind_of String + end + + it "responds with a string containing an array" do + @json_response.must_be_kind_of Array + @json_response.length.must_equal Movie.count + + end + + it "contains title and release date intel" do + @json_response.each do | movie | + movie.respond_to? movie['title'] + movie.respond_to? movie['release_date'] + end + end end + describe "show" do + + before do + get movie_path(movies(:three).title) + @json_response = JSON.parse(response.body) + end + + it "retrieves movie within database" do + response.body.must_include movies(:three).title + must_respond_with :success + end + + it "doesn't retrieve movie not within database" do + get movie_path('empirestrikesback') + response.body.must_include "errors", "empirestrikesback" + must_respond_with :not_found + end + + it "contains movie specific intel" do + response.body.must_be_kind_of String + end + + it "responds with a string containing an hash" do + @json_response.must_be_kind_of Hash + @json_response.length.must_equal 5 + end + + it "contains movie specific intel" do + intel = %w(title overview release_date inventory available_inventory) + @json_response.keys.must_equal intel + end + + it "contains the right intel" do + @json_response['title'].must_equal movies(:three).title + @json_response['overview'].must_equal movies(:three).overview + end + + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 4cdf21137..f44f5b60b 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -12,4 +12,68 @@ @movie.must_be_kind_of Movie end end + + describe "validations" do + + it "creates movie with title" do + movie = Movie.create(title: "Empire Strikes Back") + movie.errors.messages.wont_include :title + end + + it "creates movie with overview" do + movie = Movie.create(overview: "An epic love story between father and son.") + movie.errors.messages.wont_include :overview + end + + it "creates movie with release date" do + movie = Movie.create(release_date: 1973) + movie.errors.messages.wont_include :release_date + end + + it "creates movie with inventory" do + movie = Movie.create(inventory: 0) + movie.errors.messages.wont_include :inventory + end + + it "requires title, overview, date and inventory to create a movie" do + movie = Movie.create + movie.title = "Empire Strikes Back" + movie.overview = "An epic love story between father and son." + movie.release_date = 1973 + movie.inventory = 0 + movie.valid?.must_equal true + end + + it "doesn't allow duplicate titles" do + movie = Movie.create + movie.title = "Jaws" + movie.overview = "An epic love story between father and son." + movie.release_date = 1973 + movie.inventory = 0 + movie.valid?.must_equal false + movie.errors.messages.must_include :title + end + + it "doesn't allow strings for inventory" do + movie = Movie.create + movie.title = "Empire Strikes Back" + movie.overview = "An epic love story between father and son." + movie.release_date = 1973 + movie.inventory = 'string' + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + + it "doesn't allow partial movies" do + movie = Movie.create + movie.title = "Empire Strikes Back" + movie.overview = "An epic love story between father and son." + movie.release_date = 1973 + movie.inventory = 1.6 + movie.valid?.must_equal false + movie.errors.messages.must_include :inventory + end + + + end end From fbc87435c52a07815abae8258dd65b832b5ed4a6 Mon Sep 17 00:00:00 2001 From: janicewilson Date: Sat, 20 May 2017 08:29:24 -0700 Subject: [PATCH 11/11] Created fixtures for customers, created customer tests for controller and model. --- app/models/customer.rb | 7 +++ test/controllers/customers_controller_test.rb | 32 ++++++++++++ test/fixtures/customers.yml | 25 ++++++++-- test/models/customer_test.rb | 50 +++++++++++++++++++ test/models/movie_test.rb | 2 - 5 files changed, 109 insertions(+), 7 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..3409feba1 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,9 @@ class Customer < ApplicationRecord + + validates :name, presence: true, + uniqueness: { scope: [:phone, :postal_code] } + validates :registered_at, presence: true + validates :postal_code, presence: true + validates :phone, presence: true + end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 7cf8d2dc2..4f2a86d85 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -2,6 +2,38 @@ describe CustomersController do + describe "index" do + before do + get customers_path + @json_response = JSON.parse(response.body) + end + it "responds" do + must_respond_with :success + end + + it "serves json" do + response.header['Content-Type'].must_include Mime[:json] + end + + it "responds with a string" do + response.body.must_be_kind_of String + end + + it "responds with a string containing an array" do + @json_response.must_be_kind_of Array + @json_response.length.must_equal Movie.count + end + + it "contains name, date regiesterd, postal code and phone" do + @json_response.each do | customer | + customer.respond_to? customer['name'] + customer.respond_to? customer['registered_at'] + customer.respond_to? customer['postal_code'] + customer.respond_to? customer['phone'] + + end + end + end end diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index dc3ee79b5..48ed4badf 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -4,8 +4,23 @@ # model remove the "{}" from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +one: + name: Princess Leia + registered_at: 1933-3-3 + postal_code: 33333 + phone: 333-3333 + movies_checked_out_count: 3 + +two: + name: Han Solo + registered_at: 1977-7-7 + postal_code: 77777 + phone: 777-7777 + movies_checked_out_count: 4 + +three: + name: Darth Vadar + registered_at: 1911-11-1 + postal_code: 11111 + phone: 111-1111 + movies_checked_out_count: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 7db474cb8..f998f41e6 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -12,4 +12,54 @@ @customer.must_be_kind_of Customer end end + + describe "validations" do + + it "creates customer with name" do + customer = Customer.create(name: "Chewie") + customer.errors.messages.wont_include :name + end + + it "creates customer with date registered" do + customer = Customer.create(registered_at: 1973) + customer.errors.messages.wont_include :registered_at + end + + it "creates movie with postal code" do + customer = Customer.create(postal_code: 37373) + customer.errors.messages.wont_include :postal_code + end + + it "creates movie with phone" do + customer = Customer.create(phone: '373-3737') + customer.errors.messages.wont_include :phone + end + + it "requires name, date, postal code and phone to create a customer" do + customer = Customer.create + customer.name = "Chewbacca" + customer.registered_at = 1973 + customer.postal_code = 37373 + customer.phone = '373-3737' + customer.valid?.must_equal true + end + + it "allows duplicate names if phone and postal code differ" do + customer = Customer.create + customer.name = "Princess Leia" + customer.registered_at = 1973 + customer.postal_code = 37373 + customer.phone = '373-3737' + customer.valid?.must_equal true + end + + it "doesn't allow duplicate names if phone and postal code are the same" do + customer = Customer.create + customer.name = "Princess Leia" + customer.registered_at = 1978 + customer.postal_code = 33333 + customer.phone = '333-3333' + customer.valid?.must_equal false + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index f44f5b60b..efbf2c38d 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -73,7 +73,5 @@ movie.valid?.must_equal false movie.errors.messages.must_include :inventory end - - end end