From caeecc41ec5dcad66000b4cb3f981291cd693a91 Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Tue, 9 May 2017 14:37:01 -0700 Subject: [PATCH 01/35] generated rails api app --- .gitignore | 17 ++ Gemfile | 53 ++++++ 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 | 34 ++++ config/boot.rb | 3 + config/cable.yml | 9 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 47 +++++ config/environments/production.rb | 78 ++++++++ config/environments/test.rb | 42 +++++ .../application_controller_renderer.rb | 6 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/new_framework_defaults.rb | 18 ++ config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/puma.rb | 47 +++++ config/routes.rb | 3 + config/secrets.yml | 22 +++ config/spring.rb | 6 + lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 26 +++ tmp/.keep | 0 53 files changed, 912 insertions(+) create mode 100644 .gitignore create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100755 bin/update create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/new_framework_defaults.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/secrets.yml create mode 100644 config/spring.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..48fb168f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore Byebug command history file. +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..8a3183d72 --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.0.2' +# Use postgresql as the database for Active Record +gem 'pg', '~> 0.18' +# Use Puma as the app server +gem 'puma', '~> 3.0' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +# gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 3.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platform: :mri +end + +group :development do + gem 'listen', '~> 3.0.5' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'foundation-rails' +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..6be8f4203 --- /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) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + 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) + erubis (2.7.0) + execjs (2.7.0) + ffi (1.9.18) + foundation-rails (6.3.1.0) + railties (>= 3.1.0) + sass (>= 3.3.0, < 3.5) + sprockets-es6 (>= 0.9.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.1) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.5) + mime-types (>= 1.16, < 4) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.1.14) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + nio4r (2.0.0) + nokogiri (1.7.2) + mini_portile2 (~> 2.1.0) + pg (0.20.0) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.8.2) + rack (2.0.2) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) + bundler (>= 1.3.0, < 2.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) + ffi (>= 0.5.0) + ruby-progressbar (1.8.1) + sass (3.4.23) + slop (3.6.0) + spring (2.0.1) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.19.4) + thread_safe (0.3.6) + tzinfo (1.2.3) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + byebug + foundation-rails + listen (~> 3.0.5) + minitest-rails + minitest-reporters + pg (~> 0.18) + pry-rails + puma (~> 3.0) + rails (~> 5.0.2) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +BUNDLED WITH + 1.14.6 diff --git a/Rakefile b/Rakefile new file mode 100644 index 000000000..e85f91391 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 000000000..d67269728 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 000000000..0ff5442f4 --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 000000000..4ac8823b0 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 000000000..cbd34d2e9 --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 000000000..37f0bddbd --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..e620b4dad --- /dev/null +++ b/bin/setup @@ -0,0 +1,34 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..54782d010 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,34 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + # Force new test files to be generated in the minitest-spec style + config.generators do |g| + g.test_framework :minitest, spec: true + end + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0bbde6f74 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,9 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..aead51124 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..082a013ab --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=172800' + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..49275a9d6 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,78 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..30587ef6d --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => 'public, max-age=3600' + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..51639b67a --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,6 @@ +# Be sure to restart your server when you modify this file. + +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb new file mode 100644 index 000000000..d859e4bea --- /dev/null +++ b/config/initializers/new_framework_defaults.rb @@ -0,0 +1,18 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.0 upgrade. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`. +# Previous versions had false. +ActiveSupport.to_time_preserves_timezone = true + +# Require `belongs_to` associations by default. Previous versions had false. +Rails.application.config.active_record.belongs_to_required_by_default = true + +# Do not halt callback chains when a callback returns false. Previous versions had true. +ActiveSupport.halt_callback_chains_on_return_false = false + +# Configure SSL options to enable HSTS with subdomains. Previous versions had false. +Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..065395716 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..c7f311f81 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,47 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum, this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests, default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted this block will be run, if you are using `preload_app!` +# option you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..787824f88 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 000000000..0afd34516 --- /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: 8804633b4edfbe9613de1e8139eec1a802568e0799cf677ca2be55f7c3b4f1b307e6675852126d0d512a2d4c93fe7b0c364aff3f0b649c53197f5cdbf48201f7 + +test: + secret_key_base: fa93cd75300d6b367e8e7af7d5a45ebfe3e90d7c558e131a4362187355e33df601c0dba8ab8dfe37f288dbadb37d431924775d5e6b0e5dd0eb0d8e684d20d2c1 + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..3c9c7c01f --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 000000000..10594a324 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,26 @@ +ENV["RAILS_ENV"] = "test" +require File.expand_path("../../config/environment", __FILE__) +require "rails/test_help" +require "minitest/rails" +require "minitest/reporters" # for Colorized output + +# For colorful output! +Minitest::Reporters.use!( + Minitest::Reporters::SpecReporter.new, + ENV, + Minitest.backtrace_filter +) + + +# To add Capybara feature tests add `gem "minitest-rails-capybara"` +# to the test group in the Gemfile and uncomment the following: +# require "minitest/rails/capybara" + +# Uncomment for awesome colorful output +# require "minitest/pride" + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb From feedcbb32cc20cac2d4b1582e51ce251600ba5e8 Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Tue, 9 May 2017 14:40:05 -0700 Subject: [PATCH 02/35] generated movie and user models --- app/models/customer.rb | 2 ++ app/models/movie.rb | 2 ++ db/migrate/20170509213849_create_movies.rb | 12 ++++++++++++ db/migrate/20170509213947_create_customers.rb | 15 +++++++++++++++ test/fixtures/customers.yml | 19 +++++++++++++++++++ test/fixtures/movies.yml | 13 +++++++++++++ test/models/customer_test.rb | 9 +++++++++ test/models/movie_test.rb | 9 +++++++++ 8 files changed, 81 insertions(+) create mode 100644 app/models/customer.rb create mode 100644 app/models/movie.rb create mode 100644 db/migrate/20170509213849_create_movies.rb create mode 100644 db/migrate/20170509213947_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/20170509213849_create_movies.rb b/db/migrate/20170509213849_create_movies.rb new file mode 100644 index 000000000..909b24e50 --- /dev/null +++ b/db/migrate/20170509213849_create_movies.rb @@ -0,0 +1,12 @@ +class CreateMovies < ActiveRecord::Migration[5.0] + def change + create_table :movies do |t| + t.string :title + t.string :overview + t.string :release_date + t.integer :inventory + + t.timestamps + end + end +end diff --git a/db/migrate/20170509213947_create_customers.rb b/db/migrate/20170509213947_create_customers.rb new file mode 100644 index 000000000..266f23535 --- /dev/null +++ b/db/migrate/20170509213947_create_customers.rb @@ -0,0 +1,15 @@ +class CreateCustomers < ActiveRecord::Migration[5.0] + def change + create_table :customers do |t| + t.string :name + t.string :registered_at + t.string :address + t.string :city + t.string :state + t.string :postal_code + t.string :phone + + t.timestamps + end + end +end 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/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..d774de5f1 --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 + +two: + title: MyString + overview: MyString + release_date: MyString + inventory: 1 diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..5ebc5c850 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Customer do + let(:customer) { Customer.new } + + it "must be valid" do + value(customer).must_be :valid? + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..34d1d30a5 --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Movie do + let(:movie) { Movie.new } + + it "must be valid" do + value(movie).must_be :valid? + end +end From e18303ca615bbc5402ccd5e85d48c993da95bd7f Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Tue, 9 May 2017 14:42:30 -0700 Subject: [PATCH 03/35] generated movie and customer controllers --- app/controllers/customers_controller.rb | 2 ++ app/controllers/movies_controller.rb | 2 ++ test/controllers/customers_controller_test.rb | 7 +++++++ test/controllers/movies_controller_test.rb | 7 +++++++ 4 files changed, 18 insertions(+) create mode 100644 app/controllers/customers_controller.rb create mode 100644 app/controllers/movies_controller.rb create mode 100644 test/controllers/customers_controller_test.rb create mode 100644 test/controllers/movies_controller_test.rb diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..ca3b6e024 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,2 @@ +class CustomersController < ApplicationController +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..6c4c51614 --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,2 @@ +class MoviesController < ApplicationController +end diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..5e123f6cd --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe CustomersController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..67fabbcfb --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe MoviesController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 086372bf7661bc16a8b486a5430f7feda247ed7d Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Tue, 9 May 2017 14:54:01 -0700 Subject: [PATCH 04/35] ran migration to add account_credit column to customers and seeded data --- ...09214734_add_account_credit_to_customer.rb | 5 +++ db/schema.rb | 40 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 db/migrate/20170509214734_add_account_credit_to_customer.rb create mode 100644 db/schema.rb diff --git a/db/migrate/20170509214734_add_account_credit_to_customer.rb b/db/migrate/20170509214734_add_account_credit_to_customer.rb new file mode 100644 index 000000000..52a5306e5 --- /dev/null +++ b/db/migrate/20170509214734_add_account_credit_to_customer.rb @@ -0,0 +1,5 @@ +class AddAccountCreditToCustomer < ActiveRecord::Migration[5.0] + def change + add_column :customers, :account_credit, :decimal + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..1ce565ed8 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,40 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20170509214734) 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 From bf75287fed05621872a497fe9d2c35f0e495a3a5 Mon Sep 17 00:00:00 2001 From: Emma Claire Philippides Date: Tue, 9 May 2017 15:55:15 -0700 Subject: [PATCH 05/35] zomg, validations, tests --- app/controllers/movies_controller.rb | 3 +++ app/models/customer.rb | 4 ++++ config/routes.rb | 4 +++- test/models/customer_test.rb | 32 +++++++++++++++++++++++++--- 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 6c4c51614..e0da8605f 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,2 +1,5 @@ class MoviesController < ApplicationController + def zomg + render :json => {message: "it works!"}, status: :ok + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 0b5277335..7581c4c89 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,2 +1,6 @@ class Customer < ApplicationRecord + validates :name, presence: true + validates :address, presence: true + validates :phone, presence: true + validates :registered_at, presence: true end diff --git a/config/routes.rb b/config/routes.rb index 787824f88..73f56f283 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 -end +get "zomg", to: "movies#zomg", as: "zomg" + + end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 5ebc5c850..7f07a285c 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -1,9 +1,35 @@ require "test_helper" describe Customer do - let(:customer) { Customer.new } + # let(:customer) { Customer.new } + # + # it "must be valid" do + # value(customer).must_be :valid? + # end + + it "must have a name" do + customer = Customer.new(address: "234 flower street", phone: "000-768-6252", registered_at: "some time") + customer.valid?.must_equal false + customer.errors.messages.must_include :name + + end + + it "must have a street address" do + customer = Customer.new(name: "Anna", phone: "000-768-6252", registered_at: "some time") + customer.valid?.must_equal false + customer.errors.messages.must_include :address + end + + it "must have a phone number" do + customer = Customer.new(name: "Anna", address: "234 flower street", registered_at: "some time") + customer.valid?.must_equal false + customer.errors.messages.must_include :phone - it "must be valid" do - value(customer).must_be :valid? end + +it "must have a registered_at " do + customer = Customer.new(name: "Anna", address: "234 flower street", phone: "000-768-6252") + customer.valid?.must_equal false + customer.errors.messages.must_include :registered_at +end end From 6e179626ecbbb5a0a6e6b33d26c6affe349318da Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Tue, 9 May 2017 15:59:54 -0700 Subject: [PATCH 06/35] title and release date validations --- app/models/movie.rb | 2 ++ test/fixtures/movies.yml | 2 +- test/models/movie_test.rb | 13 +++++++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index dc614df15..0e277c387 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,2 +1,4 @@ class Movie < ApplicationRecord + validates :title, presence: + validates :release_date, presence: end diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml index d774de5f1..18beb05ad 100644 --- a/test/fixtures/movies.yml +++ b/test/fixtures/movies.yml @@ -4,7 +4,7 @@ one: title: MyString overview: MyString release_date: MyString - inventory: 1 + inventory: 5 two: title: MyString diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 34d1d30a5..8b6b16a78 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -1,9 +1,14 @@ require "test_helper" - +#four fields title, overview, release_date,inventory describe Movie do - let(:movie) { Movie.new } + let(:no_title) { Movie.new(title:"", overview:"this is a movie", release_date:"2005/05/25", inventory:5) } + let(:no_release_date) { Movie.new(title:"2005/05/25", overview:"this is a movie", release_date:"", inventory:5) } + + it "must have a title"do + no_title.valid?.wont_equal true + end - it "must be valid" do - value(movie).must_be :valid? + it "must have a release_date"do + no_release_date.valid?.wont_equal true end end From 877d949321609633b5f104be6119d46c91088aaf Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Tue, 9 May 2017 16:24:35 -0700 Subject: [PATCH 07/35] type validation on all fields but release_date --- app/models/movie.rb | 14 ++++++++++++-- test/models/movie_test.rb | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index 0e277c387..b841307fa 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,14 @@ class Movie < ApplicationRecord - validates :title, presence: - validates :release_date, presence: + validates :title, presence:true + validates :title, format:{ with: /\A[a-zA-Z]+\z/, + message: "only allows letters" } + validates :release_date, presence:true + # Write in the format validation + validates :overview, presence:true + validates :overview, format:{ with: /\A[a-zA-Z]+\z/, + message: "only allows letters" } + + validates :inventory, presence:true + validates :inventory, numericality:true + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 8b6b16a78..d5565dd09 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -3,7 +3,14 @@ describe Movie do let(:no_title) { Movie.new(title:"", overview:"this is a movie", release_date:"2005/05/25", inventory:5) } let(:no_release_date) { Movie.new(title:"2005/05/25", overview:"this is a movie", release_date:"", inventory:5) } + let(:no_overview) { Movie.new(title:"2005/05/25", overview:"", release_date:"this is a movie", inventory:5) } + let(:no_inventory) { Movie.new(title:"2005/05/25", overview:"words", release_date:"this is a movie") } + let(:integer_title) { Movie.new(title:1, overview:"this is a movie", release_date:"2005/05/25", inventory:5) } + let(:integer_overview) { Movie.new(title:"words", overview:1, release_date:"2005/05/25", inventory:5) } + let(:string_inventory) { Movie.new(title:"title", overview:"this is a movie", release_date:"2005/05/25", inventory:"") } + +describe "validates presence" do it "must have a title"do no_title.valid?.wont_equal true end @@ -11,4 +18,30 @@ it "must have a release_date"do no_release_date.valid?.wont_equal true end + + it "must have an overview"do + no_overview.valid?.wont_equal true + end + + it "must have an inventory"do + no_inventory.valid?.wont_equal true + end +end + +describe "validates type" do + it "requires title to be a string" do + integer_title.valid?.wont_equal true + end + + it "requires overview to be a string" do + integer_overview.valid?.wont_equal true + end + + it "requires inventory to be an integer" do + string_inventory.valid?.wont_equal true + end +end + + + end From f93c4901912e89f7ddfef82e1ef82281b44016fe Mon Sep 17 00:00:00 2001 From: Emma Claire Philippides Date: Tue, 9 May 2017 16:34:48 -0700 Subject: [PATCH 08/35] tests --- app/models/customer.rb | 2 +- test/models/customer_test.rb | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 7581c4c89..abdcbac6c 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord - validates :name, presence: true + validates :name, presence: true, format: { with: /\A[a-zA-Z]+\z/, message: "letters only"} validates :address, presence: true validates :phone, presence: true validates :registered_at, presence: true diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 7f07a285c..7c449edb9 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -6,7 +6,7 @@ # it "must be valid" do # value(customer).must_be :valid? # end - +describe "validations" do it "must have a name" do customer = Customer.new(address: "234 flower street", phone: "000-768-6252", registered_at: "some time") customer.valid?.must_equal false @@ -14,6 +14,13 @@ end + it "name must be a string" do + customer = Customer.new(name: 212, address: "234 flower street", phone: "000-768-6252", registered_at: "some time") + customer.valid?.must_equal false + customer.errors.messages.must_include :name + + end + it "must have a street address" do customer = Customer.new(name: "Anna", phone: "000-768-6252", registered_at: "some time") customer.valid?.must_equal false @@ -32,4 +39,6 @@ customer.valid?.must_equal false customer.errors.messages.must_include :registered_at end +end # END of describe "validations" + end From b02bdabad26805d6582d75da991c794331faff98 Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Tue, 9 May 2017 16:49:06 -0700 Subject: [PATCH 09/35] begin valid_data? method --- app/models/movie.rb | 12 ++++++++++++ test/models/movie_test.rb | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index b841307fa..afd85a59c 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -11,4 +11,16 @@ class Movie < ApplicationRecord validates :inventory, presence:true validates :inventory, numericality:true + + + def valid_date?( str, format="%Y/%m/%d/" ) + format_ok = str.match(/\d{4}-\d{2}-\d{2}/) + # parseable = Date.strptime(str, '%Y-%m-%d') rescue false + + if str == format_ok #&& parseable + return true + else + return false + end + end end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index d5565dd09..0474d27a5 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -9,6 +9,9 @@ let(:integer_title) { Movie.new(title:1, overview:"this is a movie", release_date:"2005/05/25", inventory:5) } let(:integer_overview) { Movie.new(title:"words", overview:1, release_date:"2005/05/25", inventory:5) } let(:string_inventory) { Movie.new(title:"title", overview:"this is a movie", release_date:"2005/05/25", inventory:"") } + let(:bad_release) { Movie.new(title:"title", overview:"this is a movie", release_date:"20/05/25", inventory:5) } + let(:good_release) { Movie.new(title:"title", overview:"this is a movie", release_date:"2005/05/25", inventory:5) } + describe "validates presence" do it "must have a title"do @@ -40,6 +43,17 @@ it "requires inventory to be an integer" do string_inventory.valid?.wont_equal true end + + it "requires release_date to be in YYYY/MM/DD format" do + bad_release.valid_date?(bad_release.release_date).wont_equal true + end + + it "accepts a release_date in YYYY/MM/DD format" do + good_release.valid_date?(good_release.release_date).must_equal true + puts good_release.release_date.class + + + end end From b5918e8049bab928e7a50220e87af52efa9ea074 Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Tue, 9 May 2017 19:45:41 -0700 Subject: [PATCH 10/35] created routes and controller actions for movie#show --- app/controllers/movies_controller.rb | 12 ++++++++++++ config/routes.rb | 1 + 2 files changed, 13 insertions(+) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e0da8605f..3771d5786 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -2,4 +2,16 @@ class MoviesController < ApplicationController def zomg render :json => {message: "it works!"}, status: :ok end + + + + def show + @movie = Movie.find_by(title: params[:title]) + if @movie + render :json=> @movie.as_json(only: [:title, :release_date,:overview, :inventory]), status: :ok + else + render :json=>@movie.as_json, status: :not_found + end + + end end diff --git a/config/routes.rb b/config/routes.rb index 73f56f283..b0c19a79c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,6 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html get "zomg", to: "movies#zomg", as: "zomg" +get "movies/:title", to:'movies#show', as:"movie" end From c9e7118f7c1b46af99b830d4258243ae43c25b93 Mon Sep 17 00:00:00 2001 From: Emma Claire Philippides Date: Tue, 9 May 2017 21:49:50 -0700 Subject: [PATCH 11/35] movie controller methods and routes --- app/controllers/movies_controller.rb | 36 ++++++++++++-- app/models/customer.rb | 2 +- config/routes.rb | 8 +++- test/controllers/movies_controller_test.rb | 55 ++++++++++++++++++++-- test/models/customer_test.rb | 2 +- 5 files changed, 94 insertions(+), 9 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index e0da8605f..cad8115c6 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -1,5 +1,35 @@ class MoviesController < ApplicationController - def zomg - render :json => {message: "it works!"}, status: :ok - end + # def zomg + # render :json => {message: "it works!"}, status: :ok + # end + def index + movies = Movie.all + render :json => movies.to_json, :callback => params['callback'], + :status => :ok + end + + def show + movie = Movie.find(params[:title]) + + render :json => movie.to_json, :callback => params['callback'], + :status => :ok + end + + + def create + movie = Movie.new( + title: params[:title], + overview: params[:overview], + release_date:params[:release_date], + inventory: + params[:inventory] + ) + + if movie.save + render :json => movie.to_json, :callback => params['callback'], + :status => :ok + else + render :json => [], :callback => params['callback'], :status => :no_content + end + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index abdcbac6c..6470cbbd5 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,5 +1,5 @@ class Customer < ApplicationRecord - validates :name, presence: true, format: { with: /\A[a-zA-Z]+\z/, message: "letters only"} + validates :name, presence: true #, format: { with: /\A[a-zA-Z]+\z/, message: "letters only"} validates :address, presence: true validates :phone, presence: true validates :registered_at, presence: true diff --git a/config/routes.rb b/config/routes.rb index 73f56f283..3067fbfad 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,11 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html -get "zomg", to: "movies#zomg", as: "zomg" +# get "zomg", to: "movies#zomg", as: "zomg" + +get "movies", to: "movies#index", as: "movies" + +get "movie/:title", to: "movies#show", as: "movie" + + post "/movies", to: 'movies#create' end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index 67fabbcfb..aa0c0bfb7 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -1,7 +1,56 @@ 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_url + must_respond_with :success + + end + + it "returns json" do + get movies_url + response.header['Content-Type'].must_include 'json' + end + + it "returns and array" do + get movies_url + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all the movies" do + get movies_url + + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with the required fields" do + keys = %w(title overview release_date inventory) + get movies_url + body = JSON.parse(response.body) + body.each do |movie| + movie.keys.sort.must_equal keys + end + end + end + + describe "show" do + it "can get a movie" do + get movie_path(movies(:two).id) + must_respond_with :success + end + end + + describe "create" do + let(:movie_data) { + { + title: "Troy", + overview: "Prince Paris steals Agamemnon's wife bloodbath ensues", + release_date: "2012", + inventory: 30 + } + } + end end diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 7c449edb9..03a5ddee5 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -18,7 +18,7 @@ customer = Customer.new(name: 212, address: "234 flower street", phone: "000-768-6252", registered_at: "some time") customer.valid?.must_equal false customer.errors.messages.must_include :name - + end it "must have a street address" do From cc3376ac6761a3ac1469a61d59fbb7f77e408993 Mon Sep 17 00:00:00 2001 From: Emma Claire Philippides Date: Wed, 10 May 2017 10:48:40 -0700 Subject: [PATCH 12/35] movie controller, tests, model --- app/controllers/movies_controller.rb | 46 ++++++++++++++-------------- app/models/customer.rb | 4 +-- app/models/movie.rb | 8 ++--- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index cad8115c6..3afa0483e 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -3,33 +3,33 @@ class MoviesController < ApplicationController # render :json => {message: "it works!"}, status: :ok # end def index - movies = Movie.all - render :json => movies.to_json, :callback => params['callback'], - :status => :ok - end + movies = Movie.all + render :json => movies.to_json, :callback => params['callback'], + :status => :ok + end - def show - movie = Movie.find(params[:title]) + def show + movie = Movie.find(params[:title]) - render :json => movie.to_json, :callback => params['callback'], - :status => :ok - end + render :json => movie.to_json, :callback => params['callback'], + :status => :ok + end - def create - movie = Movie.new( - title: params[:title], - overview: params[:overview], - release_date:params[:release_date], - inventory: - params[:inventory] - ) + def create + movie = Movie.new( + title: params[:title], + overview: params[:overview], + release_date:params[:release_date], + inventory: + params[:inventory] + ) - if movie.save - render :json => movie.to_json, :callback => params['callback'], - :status => :ok - else - render :json => [], :callback => params['callback'], :status => :no_content - end + if movie.save + render :json => movie.to_json, :callback => params['callback'], + :status => :ok + else + render :json => [], :callback => params['callback'], :status => :no_content end + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 6470cbbd5..9e74afb34 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,6 @@ class Customer < ApplicationRecord - validates :name, presence: true #, format: { with: /\A[a-zA-Z]+\z/, message: "letters only"} + validates :name, format: { with: /\A[a-zA-Z +]+\z/, message: "letters only" } + validates :phone, format: { with: /\([0-9][0-9][0-9]\) [0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]/, message: "phone number must be of the NANP number format (xxx) xxx-xxxx "} validates :address, presence: true - validates :phone, presence: true validates :registered_at, presence: true end diff --git a/app/models/movie.rb b/app/models/movie.rb index afd85a59c..5641cd0a9 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,12 +1,12 @@ class Movie < ApplicationRecord validates :title, presence:true - validates :title, format:{ with: /\A[a-zA-Z]+\z/, - message: "only allows letters" } + # validates :title, format:{ with: /\A[a-z +A-Z0-9+ -:.,\n-&!]+\z/, + # message: "incorrect title format" } validates :release_date, presence:true # Write in the format validation validates :overview, presence:true - validates :overview, format:{ with: /\A[a-zA-Z]+\z/, - message: "only allows letters" } + # validates :overview, format:{ with: /\A[a-zA-Z + [0-9]]+\z/, + # message: "only allows letters" } validates :inventory, presence:true validates :inventory, numericality:true From cc639439b34cec7c8534cba9baeba3dd984c0699 Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Wed, 10 May 2017 11:13:59 -0700 Subject: [PATCH 13/35] wrote create test --- test/controllers/movies_controller_test.rb | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index aa0c0bfb7..b5dc70085 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -44,13 +44,31 @@ end describe "create" do - let(:movie_data) { + before do + movie_data = { title: "Troy", overview: "Prince Paris steals Agamemnon's wife bloodbath ensues", release_date: "2012", inventory: 30 } - } + + + it"sends status ok after a successful create" do + test_movie = Movie.new(movie_data) + post movies_url, params: { movie: test_movie} + end + + it"sends status :bad_request after a failed call" do + + end + + it "it successfully creates a movie in the database" do + + end + + it "returns movie details upon creation" do + + end end end From 0932ac3e3b81ee2d1e7cf921e5a9aafc6f566ea3 Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Wed, 10 May 2017 12:07:53 -0700 Subject: [PATCH 14/35] movies controller create tests --- app/controllers/movies_controller.rb | 14 ++++----- test/controllers/movies_controller_test.rb | 33 ++++++++++++++-------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3afa0483e..fe2d6e135 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -17,19 +17,19 @@ def show def create + movie = Movie.new( - title: params[:title], - overview: params[:overview], - release_date:params[:release_date], + title: params[:movie][:title], + overview: params[:movie][:overview], + release_date:params[:movie][:release_date], inventory: - params[:inventory] + params[:movie][:inventory] ) if movie.save - render :json => movie.to_json, :callback => params['callback'], - :status => :ok + render :json => movie.to_json, :status => :ok else - render :json => [], :callback => params['callback'], :status => :no_content + render :json => {errors: movie.errors.messages}, :callback => params['callback'], :status => :bad_request end end end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index b5dc70085..84d6ccf71 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -44,30 +44,41 @@ end describe "create" do - before do - movie_data = - { - title: "Troy", + def setup + @movie_data = + { "title"=> "Troy", + "overview"=> "Prince Paris steals Agamemnon's wife bloodbath ensues", + "release_date"=> "2012", + "inventory"=> 30 + } + @bad_data = + { title: "", overview: "Prince Paris steals Agamemnon's wife bloodbath ensues", release_date: "2012", inventory: 30 } - + end it"sends status ok after a successful create" do - test_movie = Movie.new(movie_data) - post movies_url, params: { movie: test_movie} + count = Movie.count + post movies_url, params:{"movie":@movie_data} + must_respond_with :success + new_count = Movie.count + new_count.must_equal count + 1 end it"sends status :bad_request after a failed call" do - + count = Movie.count + post movies_url, params:{"movie":@bad_data} + must_respond_with :bad_request + new_count = Movie.count + new_count.must_equal count end - it "it successfully creates a movie in the database" do - - end it "returns movie details upon creation" do + post movies_url, params:{"movie":@movie_data} + response.body[@movie_data["title"]].present?.wont_equal false end end From 883dd5dfe4e2e6d0043e6dc05afc5f345782c150 Mon Sep 17 00:00:00 2001 From: amb54 Date: Wed, 10 May 2017 14:59:14 -0700 Subject: [PATCH 15/35] Added the gem for serialiser and created a serializer for cutsomer --- Gemfile | 2 ++ Gemfile.lock | 9 +++++++++ app/serializers/customer_serializer.rb | 4 ++++ 3 files changed, 15 insertions(+) create mode 100644 app/serializers/customer_serializer.rb diff --git a/Gemfile b/Gemfile index 8a3183d72..489d55ea8 100644 --- a/Gemfile +++ b/Gemfile @@ -25,6 +25,8 @@ gem 'puma', '~> 3.0' # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible # gem 'rack-cors' +gem 'active_model_serializers', '~> 0.10.0' + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platform: :mri diff --git a/Gemfile.lock b/Gemfile.lock index 6be8f4203..08e0eb42a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,6 +24,11 @@ GEM erubis (~> 2.7.0) 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.0.2) activesupport (= 5.0.2) globalid (>= 0.3.6) @@ -52,6 +57,8 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (9.0.6) + case_transform (0.2) + activesupport coderay (1.1.1) concurrent-ruby (1.0.5) debug_inspector (0.0.3) @@ -65,6 +72,7 @@ GEM globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.1) + jsonapi-renderer (0.1.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -158,6 +166,7 @@ PLATFORMS ruby DEPENDENCIES + active_model_serializers (~> 0.10.0) better_errors binding_of_caller byebug diff --git a/app/serializers/customer_serializer.rb b/app/serializers/customer_serializer.rb new file mode 100644 index 000000000..07ca572ff --- /dev/null +++ b/app/serializers/customer_serializer.rb @@ -0,0 +1,4 @@ +class CustomerSerializer < ActiveModel::Serializer + attributes :id, :name, :registered_at, :postal_code, :phone, :movies_checked_out_count + +end # END of class CustomerSerializer From 64a9ff8bf2e662f58f3ac3686cab87fa27cc6055 Mon Sep 17 00:00:00 2001 From: amb54 Date: Wed, 10 May 2017 15:00:31 -0700 Subject: [PATCH 16/35] Updated the yml for customer --- test/fixtures/customers.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml index bf442fa90..6988a7405 100644 --- a/test/fixtures/customers.yml +++ b/test/fixtures/customers.yml @@ -1,13 +1,14 @@ # 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 + name: Shelley Rocha + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + address: Ap 292-5216 Ipsum Rd. + city: Hillsboro + state: OR + postal_code: x24309 + phone: (322) 510-8695 + account_credit: 13.15 two: name: MyString From 29e5df0b1af5d467d9f7920bfcfaf23b10151962 Mon Sep 17 00:00:00 2001 From: amb54 Date: Wed, 10 May 2017 15:01:54 -0700 Subject: [PATCH 17/35] added a get route for customers customerrs#index --- config/routes.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 3067fbfad..e197d27d9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,4 +8,6 @@ post "/movies", to: 'movies#create' - end + get '/customers', to: 'customers#index', as: 'customers' + +end From 5df1f29f8cf03908d3ef49401e711225a08cf8aa Mon Sep 17 00:00:00 2001 From: amb54 Date: Wed, 10 May 2017 15:04:27 -0700 Subject: [PATCH 18/35] Updated the tests for the customer model and the customer controller. --- test/controllers/customers_controller_test.rb | 56 +++++++++++- test/models/customer_test.rb | 85 ++++++++++++------- 2 files changed, 104 insertions(+), 37 deletions(-) diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index 5e123f6cd..c5cde9d40 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -1,7 +1,55 @@ require "test_helper" describe CustomersController do - # it "must be a real test" do - # flunk "Need real tests" - # end -end + + describe "index" do + it "is a working route" do + get customers_url + must_respond_with :success + end + + it "returns json" do + get customers_url + response.header['Content-Type'].must_include 'json' + response.header['Content-Type'].must_include 'application/json' + end + + it "returns an array" do + get customers_url + # response.body.must_be_kind_of Array # response.body is a string + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all customers" do + get customers_url + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + end # END of describe "index" + + describe "output from customer_serializer" do + + it "returns value for name" do + get customers_url + body = JSON.parse(response.body) + body[0].must_include "name" + end + + it "returns value for movies_checked_out_count" do + get customers_url + body = JSON.parse(response.body) + body[0].must_include "movies_checked_out_count" + end + + it "will not return value for city" do + get customers_url + body = JSON.parse(response.body) + body[0].wont_include "city" + end + + end # END of describe "output from customer_serializer" + + + +end # END of describe CustomersController diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 03a5ddee5..96b33c0f0 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -6,39 +6,58 @@ # it "must be valid" do # value(customer).must_be :valid? # end -describe "validations" do - it "must have a name" do - customer = Customer.new(address: "234 flower street", phone: "000-768-6252", registered_at: "some time") - customer.valid?.must_equal false - customer.errors.messages.must_include :name - - end - - it "name must be a string" do - customer = Customer.new(name: 212, address: "234 flower street", phone: "000-768-6252", registered_at: "some time") - customer.valid?.must_equal false - customer.errors.messages.must_include :name - - end - - it "must have a street address" do - customer = Customer.new(name: "Anna", phone: "000-768-6252", registered_at: "some time") - customer.valid?.must_equal false - customer.errors.messages.must_include :address + describe "validations" do + it "must have a name" do + customer = Customer.new(address: "234 flower street", phone: "(000) 768-6252", registered_at: "some time") + customer.valid?.must_equal false + customer.errors.messages.must_include :name + + end + + it "name must be a string, returns false when integers are entered" do + customer1 = Customer.new(name: 212, address: "234 flower street", phone: "(000) 768-6252", registered_at: "some time") + customer1.valid?.must_equal false + customer1.errors.messages.must_include :name + customer2 = Customer.new(name: "Adam the 2nd", address: "234 flower street", phone: "(000) 768-6252", registered_at: "some time") + customer2.valid?.must_equal false + customer2.errors.messages.must_include :name + customer3 = Customer.new(name: "Adam Smith", address: "234 flower street", phone: "(000) 768-6252", registered_at: "some time") + customer3.valid?.must_equal true + end + + + + it "name must be a string only including letters and spaces" do + customer = Customer.new(name: 212, address: "234 flower street", phone: "(000) 768-6252", registered_at: "some time") + customer.valid?.must_equal false + customer.errors.messages.must_include :name + end + + it "must have a street address" do + customer = Customer.new(name: "Anna", phone: "(000) 768-6252", registered_at: "some time") + customer.valid?.must_equal false + customer.errors.messages.must_include :address + end + + it "must have a phone number" do + customer = Customer.new(name: "Anna", address: "234 flower street", registered_at: "some time") + customer.valid?.must_equal false + customer.errors.messages.must_include :phone + + end + + it "must have a registered_at " do + customer = Customer.new(name: "Anna", address: "234 flower street", phone: "(000) 768-6252") + customer.valid?.must_equal false + customer.errors.messages.must_include :registered_at + end + end # END of describe "validations" + + describe "#movies_checked_out_count" do + it "first test: returns 0" do + customer = customers(:one) + customer.movies_checked_out_count.must_equal 0 + end end - it "must have a phone number" do - customer = Customer.new(name: "Anna", address: "234 flower street", registered_at: "some time") - customer.valid?.must_equal false - customer.errors.messages.must_include :phone - - end - -it "must have a registered_at " do - customer = Customer.new(name: "Anna", address: "234 flower street", phone: "000-768-6252") - customer.valid?.must_equal false - customer.errors.messages.must_include :registered_at -end -end # END of describe "validations" - end From 5cfd171d570f3619feeb2878da61c896969d2e38 Mon Sep 17 00:00:00 2001 From: amb54 Date: Wed, 10 May 2017 15:05:45 -0700 Subject: [PATCH 19/35] Updated the customer modelwith the method movies_checked_out_count returning 0 --- app/models/customer.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/models/customer.rb b/app/models/customer.rb index 9e74afb34..3ecc42f73 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -3,4 +3,9 @@ class Customer < ApplicationRecord validates :phone, format: { with: /\([0-9][0-9][0-9]\) [0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]/, message: "phone number must be of the NANP number format (xxx) xxx-xxxx "} validates :address, presence: true validates :registered_at, presence: true + + def movies_checked_out_count + return 0 + end + end From 4b08ad1cbda09aa5b2e231115746f2e682a67713 Mon Sep 17 00:00:00 2001 From: amb54 Date: Wed, 10 May 2017 15:06:36 -0700 Subject: [PATCH 20/35] Updated the customer controller with the action index. --- app/controllers/customers_controller.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index ca3b6e024..86615c26e 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -1,2 +1,10 @@ class CustomersController < ApplicationController -end + + def index + customers = Customer.all + render json: customers, status: :ok + + end + + +end # END of class CustomersController From 4824d94364e5a43853ee36257ff5b05c5f315bd7 Mon Sep 17 00:00:00 2001 From: Emma Claire Philippides Date: Wed, 10 May 2017 15:23:32 -0700 Subject: [PATCH 21/35] model relationships --- app/models/customer.rb | 2 ++ app/models/movie.rb | 5 +++++ app/models/rental.rb | 4 ++++ db/migrate/20170510221158_create_rentals.rb | 12 ++++++++++++ db/schema.rb | 15 ++++++++++++++- test/fixtures/rentals.yml | 9 +++++++++ test/models/rental_test.rb | 9 +++++++++ 7 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 app/models/rental.rb create mode 100644 db/migrate/20170510221158_create_rentals.rb create mode 100644 test/fixtures/rentals.yml create mode 100644 test/models/rental_test.rb diff --git a/app/models/customer.rb b/app/models/customer.rb index 3ecc42f73..9b206e7e7 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,4 +1,6 @@ class Customer < ApplicationRecord + has_many :rentals + has_many :movies, through: :rentals validates :name, format: { with: /\A[a-zA-Z +]+\z/, message: "letters only" } validates :phone, format: { with: /\([0-9][0-9][0-9]\) [0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]/, message: "phone number must be of the NANP number format (xxx) xxx-xxxx "} validates :address, presence: true diff --git a/app/models/movie.rb b/app/models/movie.rb index 5641cd0a9..b430b3ad0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -1,4 +1,7 @@ class Movie < ApplicationRecord + has_many :rentals + has_many :customers, through: :rentals + validates :title, presence:true # validates :title, format:{ with: /\A[a-z +A-Z0-9+ -:.,\n-&!]+\z/, # message: "incorrect title format" } @@ -13,6 +16,8 @@ class Movie < ApplicationRecord + + def valid_date?( str, format="%Y/%m/%d/" ) format_ok = str.match(/\d{4}-\d{2}-\d{2}/) # parseable = Date.strptime(str, '%Y-%m-%d') rescue false diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..34d3f4df8 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,4 @@ +class Rental < ApplicationRecord + belongs_to :movie + belongs_to :customer +end diff --git a/db/migrate/20170510221158_create_rentals.rb b/db/migrate/20170510221158_create_rentals.rb new file mode 100644 index 000000000..525e53cd1 --- /dev/null +++ b/db/migrate/20170510221158_create_rentals.rb @@ -0,0 +1,12 @@ +class CreateRentals < ActiveRecord::Migration[5.0] + def change + create_table :rentals do |t| + t.references :movie, foreign_key: true + t.references :customer, foreign_key: true + t.date :checkout_date + t.date :due_date + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 1ce565ed8..442fa5cf8 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: 20170509214734) do +ActiveRecord::Schema.define(version: 20170510221158) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -37,4 +37,17 @@ t.datetime "updated_at", null: false end + create_table "rentals", force: :cascade do |t| + t.integer "movie_id" + t.integer "customer_id" + t.date "checkout_date" + t.date "due_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["customer_id"], name: "index_rentals_on_customer_id", using: :btree + t.index ["movie_id"], name: "index_rentals_on_movie_id", using: :btree + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" end diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..6a1ad3712 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + movie: one + customer: one + +two: + movie: two + customer: two diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..6ea53d94f --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,9 @@ +require "test_helper" + +describe Rental do + let(:rental) { Rental.new } + + it "must be valid" do + value(rental).must_be :valid? + end +end From 6fb4537f206ec74ec414da9a8a73af05661aca7d Mon Sep 17 00:00:00 2001 From: Emma Claire Philippides Date: Wed, 10 May 2017 15:30:38 -0700 Subject: [PATCH 22/35] rental controller --- app/controllers/rentals_controller.rb | 2 ++ config/routes.rb | 2 ++ test/controllers/rentals_controller_test.rb | 7 +++++++ 3 files changed, 11 insertions(+) create mode 100644 app/controllers/rentals_controller.rb create mode 100644 test/controllers/rentals_controller_test.rb diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..58c72b791 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,2 @@ +class RentalsController < ApplicationController +end diff --git a/config/routes.rb b/config/routes.rb index e197d27d9..969212fba 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,4 +10,6 @@ get '/customers', to: 'customers#index', as: 'customers' + + end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..f0227216c --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +describe RentalsController do + # it "must be a real test" do + # flunk "Need real tests" + # end +end From 34093c931e3560e1988de52649581d3dd964450c Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Wed, 10 May 2017 16:00:42 -0700 Subject: [PATCH 23/35] assocation tests for movie customer through rentals --- test/models/customer_test.rb | 15 +++++++++++++++ test/models/movie_test.rb | 11 +++++++++++ 2 files changed, 26 insertions(+) diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index 96b33c0f0..d3279959a 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -60,4 +60,19 @@ end end + describe "associations" do + + it "has many rentals" do + active_record = Customer.reflect_on_association(:rentals) + active_record.macro.must_equal :has_many + end + + + it "has many customers" do + active_record = Customer.reflect_on_association(:movies) + active_record.macro.must_equal :has_many + end + + end + end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 0474d27a5..478d625f9 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -56,6 +56,17 @@ end end +describe "associations" do + it "has many rentals" do + active_record = Movie.reflect_on_association(:rentals) + active_record.macro.must_equal :has_many + end + + it "has many customers" do + active_record = Movie.reflect_on_association(:rentals) + active_record.macro.must_equal :has_many + end +end end From c4aafdd81b28a4ad4f62e6d330a59ff0d8eef904 Mon Sep 17 00:00:00 2001 From: Emma Claire Philippides Date: Thu, 11 May 2017 09:25:38 -0700 Subject: [PATCH 24/35] checkout-movie --- app/controllers/rentals_controller.rb | 3 +++ app/models/customer.rb | 4 ++-- config/routes.rb | 11 ++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 58c72b791..77d561751 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,2 +1,5 @@ class RentalsController < ApplicationController + def create + + end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 9b206e7e7..98dc3c4c3 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,7 +1,7 @@ class Customer < ApplicationRecord has_many :rentals - has_many :movies, through: :rentals - validates :name, format: { with: /\A[a-zA-Z +]+\z/, message: "letters only" } + has_many :movies, through: rentals + validates :name, format: { with: /\A[a-zA-Z + ]+\z/, message: "letters only" } validates :phone, format: { with: /\([0-9][0-9][0-9]\) [0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]/, message: "phone number must be of the NANP number format (xxx) xxx-xxxx "} validates :address, presence: true validates :registered_at, presence: true diff --git a/config/routes.rb b/config/routes.rb index 969212fba..edec65505 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,15 +1,16 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html -# get "zomg", to: "movies#zomg", as: "zomg" + # get "zomg", to: "movies#zomg", as: "zomg" -get "movies", to: "movies#index", as: "movies" + get "movies", to: "movies#index", as: "movies" -get "movie/:title", to: "movies#show", as: "movie" + get "movie/:title", to: "movies#show", as: "movie" - post "/movies", to: 'movies#create' + post "/movies", to: 'movies#create' - get '/customers', to: 'customers#index', as: 'customers' + get '/customers', to: 'customers#index', as: 'customers' #do + # post '/rentals/:title/check-out', to: 'rentals#create', as: 'check-out' end From 5416e4aae828679a69ffc508686c105b500bf1ad Mon Sep 17 00:00:00 2001 From: Emma Claire Philippides Date: Thu, 11 May 2017 09:29:28 -0700 Subject: [PATCH 25/35] changed show method for movies --- app/controllers/movies_controller.rb | 10 ++++++---- app/controllers/rentals_controller.rb | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index fe2d6e135..3be6d384d 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,10 +9,12 @@ def index end def show - movie = Movie.find(params[:title]) - - render :json => movie.to_json, :callback => params['callback'], - :status => :ok + @movie = Movie.find_by(title: params[:title]) + if @movie + render :json=> @movie.as_json(only: [:title, :release_date,:overview, :inventory]), status: :ok + else + render :json=>@movie.as_json, status: :not_found + end end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index 77d561751..fe95ce963 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,5 +1,8 @@ class RentalsController < ApplicationController def create + # rental = Rental.new( + # + # ) end end From 5c22a62212d602734a05f22dfcc9f749d5d3d5be Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Thu, 11 May 2017 09:42:02 -0700 Subject: [PATCH 26/35] fixed model association --- app/models/customer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index 98dc3c4c3..d0c163024 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,6 +1,6 @@ class Customer < ApplicationRecord has_many :rentals - has_many :movies, through: rentals + has_many :movies, through: :rentals validates :name, format: { with: /\A[a-zA-Z + ]+\z/, message: "letters only" } validates :phone, format: { with: /\([0-9][0-9][0-9]\) [0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]/, message: "phone number must be of the NANP number format (xxx) xxx-xxxx "} validates :address, presence: true From c5d44c12f9589afac37d44c71819e4c2c9160e0d Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Thu, 11 May 2017 09:53:09 -0700 Subject: [PATCH 27/35] passed smoketests fixed routes typo --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index edec65505..d8b24209e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,7 @@ get "movies", to: "movies#index", as: "movies" - get "movie/:title", to: "movies#show", as: "movie" + get "movies/:title", to: "movies#show", as: "movie" post "/movies", to: 'movies#create' From 6c41e68ae763ffe7409adee251e34520c5a99dad Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Thu, 11 May 2017 10:06:24 -0700 Subject: [PATCH 28/35] created serializer for movie model --- app/serializers/movie_serializer.rb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/serializers/movie_serializer.rb diff --git a/app/serializers/movie_serializer.rb b/app/serializers/movie_serializer.rb new file mode 100644 index 000000000..510aad5d6 --- /dev/null +++ b/app/serializers/movie_serializer.rb @@ -0,0 +1,3 @@ +class MovieSerializer < ActiveModel::Serializer + attributes :id, :title, :overview, :release_date, :inventory, :available_inventory +end From c9f111ee167dabee59a1f1c106bc89e500aa9507 Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Thu, 11 May 2017 10:06:48 -0700 Subject: [PATCH 29/35] avavailable inventory method for movie --- app/models/movie.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/movie.rb b/app/models/movie.rb index b430b3ad0..b1160da3b 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -28,4 +28,10 @@ def valid_date?( str, format="%Y/%m/%d/" ) return false end end + + + def available_inventory + return self.inventory + end + end From bec8b11051a2484de05fc5c961c6f46bfc98ba17 Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Thu, 11 May 2017 10:07:29 -0700 Subject: [PATCH 30/35] updated movie controler for serializer --- app/controllers/movies_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 3be6d384d..95a378246 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -9,11 +9,11 @@ def index end def show - @movie = Movie.find_by(title: params[:title]) - if @movie - render :json=> @movie.as_json(only: [:title, :release_date,:overview, :inventory]), status: :ok + movie = Movie.find_by(title: params[:title]) + if movie + render :json=> movie, status: :ok else - render :json=>@movie.as_json, status: :not_found + render :json=>movie.as_json, status: :not_found end end From 824035ce5796b0e93070511f27e328a652eb2786 Mon Sep 17 00:00:00 2001 From: Emma Claire Philippides Date: Thu, 11 May 2017 10:22:25 -0700 Subject: [PATCH 31/35] rental controller --- app/controllers/rentals_controller.rb | 11 ++++++----- config/routes.rb | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb index fe95ce963..36ce8c4b6 100644 --- a/app/controllers/rentals_controller.rb +++ b/app/controllers/rentals_controller.rb @@ -1,8 +1,9 @@ class RentalsController < ApplicationController - def create - # rental = Rental.new( - # - # ) - + def checkout + rental = Rental.new + rental.movie_id = Movie.find_by(title: params[:title].capitalize).id + rental.checkout_date = Date.today + rental.due_date = Date.today + 7.days + rental.customer_id = Costumer.find_by(name: params[:name].capitalize) end end diff --git a/config/routes.rb b/config/routes.rb index d8b24209e..5db46db92 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,9 +8,9 @@ post "/movies", to: 'movies#create' - get '/customers', to: 'customers#index', as: 'customers' #do - - # post '/rentals/:title/check-out', to: 'rentals#create', as: 'check-out' + get '/customers', to: 'customers#index', as: 'customers' do + post '/rentals/:title/check-out', to: 'rentals#check-out', as: 'check-out' + end end From a962fb669f89b781e494de969cc16b259ed69731 Mon Sep 17 00:00:00 2001 From: amb54 Date: Fri, 12 May 2017 15:44:59 -0700 Subject: [PATCH 32/35] added tests to the cutomer model and controller and updated customer model --- app/models/customer.rb | 7 ++- test/controllers/customers_controller_test.rb | 45 ++++++++++++++-- test/models/customer_test.rb | 54 +++++++++---------- 3 files changed, 72 insertions(+), 34 deletions(-) diff --git a/app/models/customer.rb b/app/models/customer.rb index d0c163024..7dff13950 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -1,9 +1,12 @@ class Customer < ApplicationRecord has_many :rentals has_many :movies, through: :rentals + validates :name, presence: true validates :name, format: { with: /\A[a-zA-Z + ]+\z/, message: "letters only" } - validates :phone, format: { with: /\([0-9][0-9][0-9]\) [0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]/, message: "phone number must be of the NANP number format (xxx) xxx-xxxx "} - validates :address, presence: true + validates :phone, presence: true + validates :phone, format: { with: /\([0-9]{3}\) [0-9]{3}-[0-9]{4}/, message: "phone number must be of the NANP number format (nnn) nnn-nnnn "} + validates :postal_code, presence: true + validates :postal_code, format: { with: /[0-9]{5}/, message: "postal code must be of the of the format nnnnn "} validates :registered_at, presence: true def movies_checked_out_count diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb index c5cde9d40..012521fc7 100644 --- a/test/controllers/customers_controller_test.rb +++ b/test/controllers/customers_controller_test.rb @@ -17,8 +17,19 @@ it "returns an array" do get customers_url # response.body.must_be_kind_of Array # response.body is a string - body = JSON.parse(response.body) + body = JSON.parse(response.body) # puts body gives the data in yml + body.must_be_kind_of Array + end + + it "returns an empty array if the model is empty" do + Rental.destroy_all + Customer.destroy_all + get customers_url + # response.body.must_be_kind_of Array # response.body is a string + body = JSON.parse(response.body) # puts body gives the data in yml body.must_be_kind_of Array + body.must_be_empty + body.must_equal [] end it "returns all customers" do @@ -26,9 +37,17 @@ body = JSON.parse(response.body) body.length.must_equal Customer.count end + + + end # END of describe "index" - describe "output from customer_serializer" do + describe "output for a customer" do + it "returns value for id" do + get customers_url + body = JSON.parse(response.body) + body[0].must_include "id" + end it "returns value for name" do get customers_url @@ -36,7 +55,25 @@ body[0].must_include "name" end - it "returns value for movies_checked_out_count" do + it "returns value for registered_at" do + get customers_url + body = JSON.parse(response.body) + body[0].must_include "registered_at" + end + + it "returns value for postal_code" do + get customers_url + body = JSON.parse(response.body) + body[0].must_include "postal_code" + end + + it "returns value for phone" do + get customers_url + body = JSON.parse(response.body) + body[0].must_include "phone" + end + + it "returns value for movies_checked_out_count (from customer_serializer)" do get customers_url body = JSON.parse(response.body) body[0].must_include "movies_checked_out_count" @@ -48,7 +85,7 @@ body[0].wont_include "city" end - end # END of describe "output from customer_serializer" + end # END of describe "output from customer_serializer" diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb index d3279959a..17c0c1524 100644 --- a/test/models/customer_test.rb +++ b/test/models/customer_test.rb @@ -8,71 +8,69 @@ # end describe "validations" do it "must have a name" do - customer = Customer.new(address: "234 flower street", phone: "(000) 768-6252", registered_at: "some time") + customer = Customer.new(postal_code: "12345", phone: "(000) 768-6252", registered_at: "some time") customer.valid?.must_equal false customer.errors.messages.must_include :name - end - it "name must be a string, returns false when integers are entered" do - customer1 = Customer.new(name: 212, address: "234 flower street", phone: "(000) 768-6252", registered_at: "some time") + it "name must be a string,only including letters and spaces" do + customer1 = Customer.new(name: 212, postal_code: "12345", phone: "(000) 768-6252", registered_at: "some time") customer1.valid?.must_equal false customer1.errors.messages.must_include :name - customer2 = Customer.new(name: "Adam the 2nd", address: "234 flower street", phone: "(000) 768-6252", registered_at: "some time") + customer2 = Customer.new(name: "Adam the 2nd", postal_code: "12345", phone: "(000) 768-6252", registered_at: "some time") customer2.valid?.must_equal false customer2.errors.messages.must_include :name - customer3 = Customer.new(name: "Adam Smith", address: "234 flower street", phone: "(000) 768-6252", registered_at: "some time") + customer3 = Customer.new(name: "Adam Smith", postal_code: "12345", phone: "(000) 768-6252", registered_at: "some time") customer3.valid?.must_equal true end - - - it "name must be a string only including letters and spaces" do - customer = Customer.new(name: 212, address: "234 flower street", phone: "(000) 768-6252", registered_at: "some time") - customer.valid?.must_equal false - customer.errors.messages.must_include :name - end - - it "must have a street address" do - customer = Customer.new(name: "Anna", phone: "(000) 768-6252", registered_at: "some time") - customer.valid?.must_equal false - customer.errors.messages.must_include :address + it "must have a postal_code that is a string with five numbers" do + customer1 = Customer.new(name: "Anna", phone: "(000) 768-6252", registered_at: "some time") + customer1.valid?.must_equal false + customer1.errors.messages.must_include :postal_code + customer2 = Customer.new(name: "Anna", postal_code: "1234", phone: "(000) 768-6252", registered_at: "some time") + customer2.valid?.must_equal false + customer2.errors.messages.must_include :postal_code + customer3 = Customer.new(name: "Anna", postal_code: "12345", phone: "(000) 768-6252", registered_at: "some time") + customer3.valid?.must_equal true end - it "must have a phone number" do - customer = Customer.new(name: "Anna", address: "234 flower street", registered_at: "some time") - customer.valid?.must_equal false - customer.errors.messages.must_include :phone - + it "must have a phone number and the phone number must be entered in the format (xxx) xxx-xxxx " do + customer1 = Customer.new(name: "Anna", postal_code: "12345", registered_at: "some time") + customer1.valid?.must_equal false + customer1.errors.messages.must_include :phone + customer2 = Customer.new(name: "Anna", postal_code: "12345", phone: "000-768-6252", registered_at: "some time") + customer2.valid?.must_equal false + customer2.errors.messages.must_include :phone + customer3 = Customer.new(name: "Anna", postal_code: "12345", phone: "(000) 768-6252", registered_at: "some time") + customer3.valid?.must_equal true end it "must have a registered_at " do - customer = Customer.new(name: "Anna", address: "234 flower street", phone: "(000) 768-6252") + customer = Customer.new(name: "Anna", postal_code: "12345", phone: "(000) 768-6252") customer.valid?.must_equal false customer.errors.messages.must_include :registered_at end end # END of describe "validations" describe "#movies_checked_out_count" do - it "first test: returns 0" do + it "basic requrements: returns 0, must be an integer" do customer = customers(:one) customer.movies_checked_out_count.must_equal 0 + customer.movies_checked_out_count.must_be_kind_of Integer end end describe "associations" do - it "has many rentals" do active_record = Customer.reflect_on_association(:rentals) active_record.macro.must_equal :has_many end - it "has many customers" do active_record = Customer.reflect_on_association(:movies) active_record.macro.must_equal :has_many end - end end From 26adb60917de00b17b5f6df4aacdd6ec34235998 Mon Sep 17 00:00:00 2001 From: amb54 Date: Fri, 12 May 2017 15:50:41 -0700 Subject: [PATCH 33/35] Updated the action index for the customer. --- app/controllers/customers_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index 86615c26e..ef99dd3f2 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -2,7 +2,11 @@ class CustomersController < ApplicationController def index customers = Customer.all - render json: customers, status: :ok + if customers == [] + render json: customers, status: :ok + else + render json: customers, status: :ok + end end From 3b0a6cd76b29179621558c9eb0e84f80ee2609b7 Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Fri, 12 May 2017 17:56:09 -0700 Subject: [PATCH 34/35] updated regex on validations for movie model --- app/models/movie.rb | 25 +++++-------------------- test/models/movie_test.rb | 6 +++--- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/app/models/movie.rb b/app/models/movie.rb index b1160da3b..4bf6ce9a0 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -3,33 +3,18 @@ class Movie < ApplicationRecord has_many :customers, through: :rentals validates :title, presence:true - # validates :title, format:{ with: /\A[a-z +A-Z0-9+ -:.,\n-&!]+\z/, - # message: "incorrect title format" } + validates :title, format:{ with: /([a-z]{1,})/, + message: "incorrect title format" } + validates :release_date, presence:true - # Write in the format validation +validates :release_date, format: {with: /\d{4}\/\d{2}\/\d{2}/, message: "Not a valid date"} validates :overview, presence:true - # validates :overview, format:{ with: /\A[a-zA-Z + [0-9]]+\z/, - # message: "only allows letters" } + validates :overview, format:{ with: /([a-z]{1,})/, message: "Must be a string" } validates :inventory, presence:true validates :inventory, numericality:true - - - - def valid_date?( str, format="%Y/%m/%d/" ) - format_ok = str.match(/\d{4}-\d{2}-\d{2}/) - # parseable = Date.strptime(str, '%Y-%m-%d') rescue false - - if str == format_ok #&& parseable - return true - else - return false - end - end - - def available_inventory return self.inventory end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb index 478d625f9..b9b735f0a 100644 --- a/test/models/movie_test.rb +++ b/test/models/movie_test.rb @@ -37,7 +37,7 @@ end it "requires overview to be a string" do - integer_overview.valid?.wont_equal true + integer_overview.valid?.must_equal false end it "requires inventory to be an integer" do @@ -45,11 +45,11 @@ end it "requires release_date to be in YYYY/MM/DD format" do - bad_release.valid_date?(bad_release.release_date).wont_equal true + bad_release.valid?(bad_release.release_date).wont_equal true end it "accepts a release_date in YYYY/MM/DD format" do - good_release.valid_date?(good_release.release_date).must_equal true + good_release.valid?.must_equal true puts good_release.release_date.class From 750594c11f062fb8decb9629ce12692bc21ca215 Mon Sep 17 00:00:00 2001 From: Tehut Getahun Date: Sun, 14 May 2017 16:42:58 -0700 Subject: [PATCH 35/35] got all tests but one working---serializer returns null with hash --- app/controllers/movies_controller.rb | 19 +++++++++++-------- app/models/movie.rb | 2 +- test/controllers/movies_controller_test.rb | 19 +++++++++++++++---- test/models/rental_test.rb | 18 +++++++++--------- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb index 7f77f90f8..eaf3a1e77 100644 --- a/app/controllers/movies_controller.rb +++ b/app/controllers/movies_controller.rb @@ -8,18 +8,18 @@ def index end def show - movie = Movie.find_by(title: params[:title].capitalize) - if movie == [] - render :json=> movie.as_json(only:[:id, :title, :overview, :release_date, :inventory], methods: :available_inventory), status: :ok + @movie = Movie.find_by(title: params[:title]) + if @movie == {} + render :json=> @movie.as_json(only:[:id, :title, :overview, :release_date, :inventory], methods: :available_inventory), :status => :ok else - render :json=> movie.as_json, status: :not_found + render :json=> @movie.as_json, status: :not_found end end def create - movie = Movie.new( + @movie = Movie.new( title: params[:movie][:title], overview: params[:movie][:overview], release_date:params[:movie][:release_date], @@ -27,12 +27,15 @@ def create params[:movie][:inventory] ) - if movie.save - render :json => movie.to_json, :status => :ok + if @movie.save + render :json => @movie.to_json, :status => :ok else - render :json => {errors: movie.errors.messages}, :status => :bad_request + render :json => {errors: @movie.errors.messages}, :status => :bad_request + end end + + end diff --git a/app/models/movie.rb b/app/models/movie.rb index a1021f1b8..0081d86f4 100644 --- a/app/models/movie.rb +++ b/app/models/movie.rb @@ -10,7 +10,7 @@ class Movie < ApplicationRecord validates :release_date, format: {with: /\d{4}\/\d{2}\/\d{2}/, message: "Not a valid date"} validates :overview, presence:true validates :overview, format:{ with: /([a-z]{1,})/, message: "Must be a string" } - +# validates :inventory, presence:true validates :inventory, numericality:true diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb index a48728b54..c6d61d3d7 100644 --- a/test/controllers/movies_controller_test.rb +++ b/test/controllers/movies_controller_test.rb @@ -38,11 +38,22 @@ describe "show" do it "can get a movie" do - params = {} - params[:title]="Pycho" - get movie_path(params[:title]) + + get movie_path("Psycho") must_respond_with :success end + + it "returns movie details" do + get movie_path("Psycho") + response.body.present?.wont_equal false + + end + + it "returns bad request for failed requests" do + get movie_path("halloween 3") + must_respond_with :not_found + + end end describe "create" do @@ -50,7 +61,7 @@ def setup @movie_data = { "title"=> "Troy", "overview"=> "Prince Paris steals Agamemnon's wife bloodbath ensues", - "release_date"=> "2012", + "release_date"=> "2012/05/02", "inventory"=> 30 } @bad_data = diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb index 6ea53d94f..b0f9a2ca1 100644 --- a/test/models/rental_test.rb +++ b/test/models/rental_test.rb @@ -1,9 +1,9 @@ -require "test_helper" - -describe Rental do - let(:rental) { Rental.new } - - it "must be valid" do - value(rental).must_be :valid? - end -end +# require "test_helper" +# +# describe Rental do +# let(:rental) { Rental.new } +# +# it "must be valid" do +# value(rental).must_be :valid? +# end +# end