diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..68ac019ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +.byebug_history diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..e58b0e643 --- /dev/null +++ b/Gemfile @@ -0,0 +1,62 @@ +source 'https://rubygems.org' + +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.1.6' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.7' + +# RABL for json view +gem 'rabl' +gem 'oj' +# To fix API issue with rabl and rail 5 +gem 'jbuilder' + +gem 'has_scope', '~> 0.7.1' + +gem 'will_paginate', '~> 3.1.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', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem 'pry-rails' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..cb0fe578d --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,170 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.1.6) + actionpack (= 5.1.6) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.1.6) + actionview (= 5.1.6) + activesupport (= 5.1.6) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.1.6) + activesupport (= 5.1.6) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.1.6) + activesupport (= 5.1.6) + globalid (>= 0.3.6) + activemodel (5.1.6) + activesupport (= 5.1.6) + activerecord (5.1.6) + activemodel (= 5.1.6) + activesupport (= 5.1.6) + arel (~> 8.0) + activesupport (5.1.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (8.0.0) + builder (3.2.3) + byebug (10.0.2) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + erubi (1.7.1) + ffi (1.9.23) + globalid (0.4.1) + activesupport (>= 4.2.0) + has_scope (0.7.2) + actionpack (>= 4.1) + activesupport (>= 4.1) + i18n (1.0.1) + concurrent-ruby (~> 1.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + minitest-rails (3.0.0) + minitest (~> 5.8) + railties (~> 5.0) + minitest-reporters (1.2.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + multi_json (1.13.1) + nio4r (2.3.1) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + oj (3.6.0) + pg (1.0.0) + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.6) + pry (>= 0.10.4) + puma (3.11.4) + rabl (0.13.1) + activesupport (>= 2.3.14) + rack (2.0.5) + rack-test (1.0.0) + rack (>= 1.0, < 3) + rails (5.1.6) + actioncable (= 5.1.6) + actionmailer (= 5.1.6) + actionpack (= 5.1.6) + actionview (= 5.1.6) + activejob (= 5.1.6) + activemodel (= 5.1.6) + activerecord (= 5.1.6) + activesupport (= 5.1.6) + bundler (>= 1.3.0) + railties (= 5.1.6) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.1.6) + actionpack (= 5.1.6) + activesupport (= 5.1.6) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + ruby-progressbar (1.9.0) + ruby_dep (1.5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + will_paginate (3.1.6) + +PLATFORMS + ruby + +DEPENDENCIES + byebug + has_scope (~> 0.7.1) + jbuilder + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + oj + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.7) + rabl + rails (~> 5.1.6) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + will_paginate (~> 3.1.0) + +BUNDLED WITH + 1.16.1 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/controllers/customers_controller.rb b/app/controllers/customers_controller.rb new file mode 100644 index 000000000..6d912e612 --- /dev/null +++ b/app/controllers/customers_controller.rb @@ -0,0 +1,34 @@ +class CustomersController < ApplicationController + def zomg + message = "it works" + render json: message.as_json + end + + def index + params[:sort] ? (sort = params[:sort].to_sym) : sort = :id + + @customers = Customer.order(sort).paginate(page: params[:p], per_page: params[:n]) + end + + def create + customer = Customer.create(customers_params) + + if customer.valid? + customer.assign_registered_date + render json: {id: customer.id}, status: :ok + else + render json: {ok: false, errors: customer.errors}, status: :bad_request + end + end + + # (Show not required) + def show + @customer = Customer.find_by(id: params[:id]) + render json: {ok: false, error: :not_found}, status: :not_found if @customer.nil? + end + + private + def customers_params + params.permit(:name, :phone, :address, :city, :state, :postal_code, :p, :n, :sort) + end +end diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb new file mode 100644 index 000000000..ce21f4d5e --- /dev/null +++ b/app/controllers/movies_controller.rb @@ -0,0 +1,31 @@ +class MoviesController < ApplicationController + def index + + params[:sort] ? (sort = params[:sort].to_sym) : sort = :id + + @movies = Movie.order(sort).paginate(page: params[:p], per_page: params[:n]) + + end + + def show + + @movie = Movie.find_by(id: params[:id]) + + render json: {ok: false, error: :not_found}, status: :not_found if @movie.nil? + end + + def create + movie = Movie.create(movies_params) + + if movie.valid? + render json: {id: movie.id}, status: :ok + else + render json: {ok: false, errors: movie.errors}, status: :bad_request + end + end + + private + def movies_params + params.permit(:title, :release_date, :overview, :inventory, :p, :n, :sort) + end +end diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb new file mode 100644 index 000000000..75e07f745 --- /dev/null +++ b/app/controllers/rentals_controller.rb @@ -0,0 +1,48 @@ +class RentalsController < ApplicationController + def index + @rentals = Rental.all + end + + def show + @rental = Rental.find_by(id: params[:id]) + + if @rental.nil? + render json: { ok: false, error: :not_found }, status: :not_found + end + end + + def create + movie = Movie.find_by(id: params[:movie_id]) + + if movie.available? + rental = Rental.create(rental_params) + + if rental.valid? + rental.assign_due_date + render json: { id: rental.id }, status: :ok + else + render json: {ok: false, errors: rental.errors}, status: :bad_request + end + + else + render json: {ok: false, errors: "This will not work"}, status: :bad_request + end + end + + def update + rental = Rental.where(customer_id: params[:customer_id]).where(movie_id: params[:movie_id]).find_by(returned: false) + + if rental + rental.update_attributes(returned: true) + render json: { id: rental.id }, status: :ok + else + render json: { ok: false, errors: "This will not work" }, status: :bad_request + end + end + + private + + def rental_params + return params.permit(:customer_id, :movie_id) + end +end diff --git a/app/images/mads.jpg b/app/images/mads.jpg new file mode 100644 index 000000000..25cee128d Binary files /dev/null and b/app/images/mads.jpg differ diff --git a/app/images/madsgardens.jpg b/app/images/madsgardens.jpg new file mode 100644 index 000000000..2b1f31af9 Binary files /dev/null and b/app/images/madsgardens.jpg differ diff --git a/app/images/madsinhawaii.jpg b/app/images/madsinhawaii.jpg new file mode 100644 index 000000000..e2827b781 Binary files /dev/null and b/app/images/madsinhawaii.jpg differ diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/customer.rb b/app/models/customer.rb new file mode 100644 index 000000000..3b98a5fd4 --- /dev/null +++ b/app/models/customer.rb @@ -0,0 +1,15 @@ +class Customer < ApplicationRecord + validates :name, :phone, :address, :city, :state, :postal_code, presence: true + + has_many :rentals + + # scope :by_name, -> (name) { where(name: name) } + + def movies_checked_out_count + return Rental.where(customer_id: self.id).where(returned: false).count + end + + def assign_registered_date + self.update_attributes(registered_at: self.created_at) + end +end diff --git a/app/models/movie.rb b/app/models/movie.rb new file mode 100644 index 000000000..1882eaccd --- /dev/null +++ b/app/models/movie.rb @@ -0,0 +1,19 @@ +class Movie < ApplicationRecord + + validates :title, :release_date, :overview, :inventory, presence: true + has_many :rentals + + def available_inventory + if self.inventory + available_count = self.inventory - Rental.where(movie_id: self.id, returned: false).count + return available_count + else + return 0 + end + end + + def available? + return self.available_inventory > 0 + end + +end diff --git a/app/models/rental.rb b/app/models/rental.rb new file mode 100644 index 000000000..c81c1c0f9 --- /dev/null +++ b/app/models/rental.rb @@ -0,0 +1,12 @@ +class Rental < ApplicationRecord + ONE_WEEK = 7 + + validates :returned, inclusion: { in: [true, false] } + + belongs_to :customer + belongs_to :movie + + def assign_due_date + self.update_attributes(due_date: (self.created_at.to_date + ONE_WEEK)) + end +end diff --git a/app/styles/stylesheet.css b/app/styles/stylesheet.css new file mode 100644 index 000000000..97f17bd58 --- /dev/null +++ b/app/styles/stylesheet.css @@ -0,0 +1,182 @@ +html, +body, +.page { + height: 100%; +} + +body { + overflow: hidden; +} + +p { + margin-bottom: 1em; + font-family: 'Playfair Display', serif; + font-size: 30px; +} + +.about-me { + font-size: 16px; +} + +.email-me { + font-size: 16px; +} + +h1, h2, h3 { + font-family: 'Playfair Display', serif; +} + +li { + cursor: pointer; + list-style: none; +} + +a { + text-decoration: none; + color: #000; +} + +ul { + display: inline; + margin: 0; + padding: 0; +} + +.container { + display: flex; + flex-direction: column; +} + + +.home { + z-index: 1000; + width: 100%; + position: fixed; + background-color: #FFF; + opacity: .9; + /* border-bottom: 1px solid #d3d3d3; */ + margin-top: 10px; + margin-bottom: 10px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-around; + align-items: center; + padding-bottom: 25px; +} + +#hidden { + visibility: hidden; + opacity: 0; + transition: visibility 0.5s, opacity 0.5s linear; +} + +#visible:hover #hidden { + visibility: visible; + opacity: 1; +} + + +.home { + flex: 0 0 ; +} + +.main { + margin-top: 0vw; + /* padding-top: 100px; */ + flex: 1 1 ; + position: relative; + overflow-y: scroll; + justify-content: space-around; + align-items: center; +} + +.footer { + flex: 0 0 ; +} + +.home h3 { + order: 2; +} + +.home .categories { + order: 1; +} + +.home .connect { + order: 3; +} + +.categories ul, .connect ul { + + padding-top: 5px; + padding-bottom: 5px; + + letter-spacing: .2em; + position: absolute; +} + +.main { + + display: flex; + flex-direction: row; + flex-wrap: wrap; + + justify-content: center; + align-items: center; + margin-left: 22%; + margin-right: 22%; + +} + +.nav-padding { + clear: both; + padding: 0; + height: 12vw; +} + +.about-contact { + display: flex; + flex-direction: row; + flex-wrap: wrap; + + justify-content: center; + margin-top: 10px; +} + +.about { + text-transform: uppercase; + letter-spacing: .2em; + padding: 5px +} + +.contact { + text-transform: uppercase; + letter-spacing: .2em; + padding: 5px +} + +.social { + letter-spacing: .1em; + + display: flex; + flex-direction: row; + flex-wrap: wrap; + + justify-content: center; + align-items: center; + margin: 0px; + padding: 5px +} + +.linkedin { + padding: 5px +} + +.github { + padding: 5px +} + +.email { + padding: 5px +} diff --git a/app/views/customers/index.rabl b/app/views/customers/index.rabl new file mode 100644 index 000000000..f4f3f78b2 --- /dev/null +++ b/app/views/customers/index.rabl @@ -0,0 +1,2 @@ +collection @customers +attributes :id, :name, :registered_at, :phone, :address, :city, :state, :postal_code, :movies_checked_out_count diff --git a/app/views/customers/show.rabl b/app/views/customers/show.rabl new file mode 100644 index 000000000..b7ab8c467 --- /dev/null +++ b/app/views/customers/show.rabl @@ -0,0 +1,2 @@ +object @customer +attributes :id, :name, :registered_at, :phone, :address, :city, :state, :postal_code, :movies_checked_out_count 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/app/views/movies/index.rabl b/app/views/movies/index.rabl new file mode 100644 index 000000000..df9cdaf22 --- /dev/null +++ b/app/views/movies/index.rabl @@ -0,0 +1,2 @@ +collection @movies +attributes :id, :title, :release_date, :overview, :available_inventory, :inventory diff --git a/app/views/movies/show.rabl b/app/views/movies/show.rabl new file mode 100644 index 000000000..9257fbfc1 --- /dev/null +++ b/app/views/movies/show.rabl @@ -0,0 +1,2 @@ +object @movie +attributes :id, :title, :release_date, :overview, :available_inventory, :inventory diff --git a/app/views/rentals/index.rabl b/app/views/rentals/index.rabl new file mode 100644 index 000000000..e81f8ce82 --- /dev/null +++ b/app/views/rentals/index.rabl @@ -0,0 +1,2 @@ +collection @rentals +attributes :id, :returned, :due_date, :customer_id, :movie_id, :movies_checked_out_count diff --git a/app/views/rentals/show.rabl b/app/views/rentals/show.rabl new file mode 100644 index 000000000..290b0d33c --- /dev/null +++ b/app/views/rentals/show.rabl @@ -0,0 +1,3 @@ +object @rental +attributes :id, :customer_id, :movie_id +node(:ok, if: :nil?) { |rental| false } diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 000000000..66e9889e8 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 000000000..5badb2fde --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 000000000..d87d5f578 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 000000000..104e40c1c --- /dev/null +++ b/bin/setup @@ -0,0 +1,35 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 000000000..fb2ec2ebb --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/bin/update b/bin/update new file mode 100755 index 000000000..a8e4462f2 --- /dev/null +++ b/bin/update @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/config.ru b/config.ru new file mode 100644 index 000000000..f7ba0b527 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 000000000..2fe7718ea --- /dev/null +++ b/config/application.rb @@ -0,0 +1,40 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module VideoStoreAPI + class Application < Rails::Application + config.generators do |g| + # Force new test files to be generated in the minitest-spec style + g.test_framework :minitest, spec: true + + # Always use .js files, never .coffee + g.javascript_engine :js + end + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.1 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..30f5120df --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..ad59bcd88 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: redis://localhost:6379/1 + channel_prefix: VideoStoreAPI_production diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..720570700 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: VideoStoreAPI_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: VideoStoreAPI + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: VideoStoreAPI_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: VideoStoreAPI_production + username: VideoStoreAPI + password: <%= ENV['VIDEOSTOREAPI_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 000000000..426333bb4 --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 000000000..abc82221c --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,47 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + if Rails.root.join('tmp/caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 000000000..3bd8115ea --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,83 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Attempt to read encrypted secrets from `config/secrets.yml.enc`. + # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or + # `config/secrets.yml.key`. + config.read_encrypted_secrets = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "VideoStoreAPI_#{Rails.env}" + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 000000000..8e5cbde53 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 000000000..89d2efab2 --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 000000000..59385cdf3 --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 000000000..3b1c1b5ed --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/rabl_config.rb b/config/initializers/rabl_config.rb new file mode 100644 index 000000000..f11eb190d --- /dev/null +++ b/config/initializers/rabl_config.rb @@ -0,0 +1,3 @@ +Rabl.configure do |config| + config.include_json_root = false +end diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..1e19380dc --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,56 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. If you use this option +# you need to make sure to reconnect any threads in the `on_worker_boot` +# block. +# +# preload_app! + +# If you are preloading your application and using Active Record, it's +# recommended that you close any connections to the database before workers +# are forked to prevent connection leakage. +# +# before_fork do +# ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord) +# end + +# The code in the `on_worker_boot` will be called if you are using +# clustered mode by specifying a number of `workers`. After each worker +# process is booted, this block will be run. If you are using the `preload_app!` +# option, you will want to use this block to reconnect to any threads +# or connections that may have been created at application boot, as Ruby +# cannot share connections between processes. +# +# on_worker_boot do +# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) +# end +# + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 000000000..f107fbacc --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,18 @@ +Rails.application.routes.draw do + + get '/zomg', to: "customers#zomg" + + resources :movies, only: [:index, :show, :create] + + resources :customers, only: [ :index, :show, :create] + + resources :rentals, only: [:index, :show] + + post '/rentals/check-out', to: "rentals#create" + + post '/rentals/check-in', to: "rentals#update" + + + + # 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..88cfdbf86 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,32 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rails secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +# Shared secrets are available across all environments. + +# shared: +# api_key: a1B2c3D4e5F6 + +# Environmental secrets are only available for that specific environment. + +development: + secret_key_base: 6439286cdd79713e989205400860cb3f8390dfdb35ddd301b75143c6d5de7776e5f4a2329e375d00d5ff8a2e9b7c8668a18bac178c4830da81cc15635a2bcb84 + +test: + secret_key_base: 43de438415cbe2aabd0aae07dc868b31053bc31bcf13bfb741c6b9ab0109bed0a8da2969a3de0a14839699e6e0e51bb9a6c5be1eefe6169c4bececfffac0bd02 + +# Do not keep production secrets in the unencrypted secrets file. +# Instead, either read values from the environment. +# Or, use `bin/rails secrets:setup` to configure encrypted secrets +# and move the `production:` environment over there. + +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 000000000..c9119b40c --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +%w( + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +).each { |path| Spring.watch(path) } diff --git a/db/migrate/20180507193822_create_customers.rb b/db/migrate/20180507193822_create_customers.rb new file mode 100644 index 000000000..25f472960 --- /dev/null +++ b/db/migrate/20180507193822_create_customers.rb @@ -0,0 +1,12 @@ +class CreateCustomers < ActiveRecord::Migration[5.1] + def change + create_table :customers do |t| + t.string :name + t.string :registered_at + t.string :postal_code + t.string :phone_number + t.integer :checked_out_count + t.timestamps + end + end +end diff --git a/db/migrate/20180507193847_create_movies.rb b/db/migrate/20180507193847_create_movies.rb new file mode 100644 index 000000000..4480e5bae --- /dev/null +++ b/db/migrate/20180507193847_create_movies.rb @@ -0,0 +1,9 @@ +class CreateMovies < ActiveRecord::Migration[5.1] + def change + create_table :movies do |t| + t.string :title + t.string :release_date + t.timestamps + end + end +end diff --git a/db/migrate/20180507195256_create_rentals.rb b/db/migrate/20180507195256_create_rentals.rb new file mode 100644 index 000000000..02b274f6e --- /dev/null +++ b/db/migrate/20180507195256_create_rentals.rb @@ -0,0 +1,9 @@ +class CreateRentals < ActiveRecord::Migration[5.1] + def change + create_table :rentals do |t| + t.date :due_date + t.boolean :returned, default: false + t.timestamps + end + end +end diff --git a/db/migrate/20180507200703_add_customer_id_and_movie_id_to_rentals.rb b/db/migrate/20180507200703_add_customer_id_and_movie_id_to_rentals.rb new file mode 100644 index 000000000..7ea08529d --- /dev/null +++ b/db/migrate/20180507200703_add_customer_id_and_movie_id_to_rentals.rb @@ -0,0 +1,6 @@ +class AddCustomerIdAndMovieIdToRentals < ActiveRecord::Migration[5.1] + def change + add_reference :rentals, :customer, foreign_key: true + add_reference :rentals, :movie, foreign_key: true + end +end diff --git a/db/migrate/20180507204457_add_customers_address.rb b/db/migrate/20180507204457_add_customers_address.rb new file mode 100644 index 000000000..fb69b358c --- /dev/null +++ b/db/migrate/20180507204457_add_customers_address.rb @@ -0,0 +1,7 @@ +class AddCustomersAddress < ActiveRecord::Migration[5.1] + def change + add_column :customers, :address, :string + add_column :customers, :city, :string + add_column :customers, :state, :string + end +end diff --git a/db/migrate/20180507204922_change_phone_column_in_customers.rb b/db/migrate/20180507204922_change_phone_column_in_customers.rb new file mode 100644 index 000000000..52b870558 --- /dev/null +++ b/db/migrate/20180507204922_change_phone_column_in_customers.rb @@ -0,0 +1,5 @@ +class ChangePhoneColumnInCustomers < ActiveRecord::Migration[5.1] + def change +rename_column :customers, :phone_number, :phone + end +end diff --git a/db/migrate/20180507205316_add_overview_to_movies.rb b/db/migrate/20180507205316_add_overview_to_movies.rb new file mode 100644 index 000000000..2a5dd526d --- /dev/null +++ b/db/migrate/20180507205316_add_overview_to_movies.rb @@ -0,0 +1,6 @@ +class AddOverviewToMovies < ActiveRecord::Migration[5.1] + def change + add_column :movies, :overview, :string + add_column :movies, :inventory, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..d27a18b6e --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,53 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20180507205316) 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 "postal_code" + t.string "phone" + t.integer "checked_out_count" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "address" + t.string "city" + t.string "state" + end + + create_table "movies", force: :cascade do |t| + t.string "title" + t.string "release_date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "overview" + t.integer "inventory" + end + + create_table "rentals", force: :cascade do |t| + t.date "due_date" + t.boolean "returned", default: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "customer_id" + t.bigint "movie_id" + t.index ["customer_id"], name: "index_rentals_on_customer_id" + t.index ["movie_id"], name: "index_rentals_on_movie_id" + end + + add_foreign_key "rentals", "customers" + add_foreign_key "rentals", "movies" +end diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.keep b/log/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 000000000..37b576a4a --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/controllers/customers_controller_test.rb b/test/controllers/customers_controller_test.rb new file mode 100644 index 000000000..7b636c02d --- /dev/null +++ b/test/controllers/customers_controller_test.rb @@ -0,0 +1,151 @@ +require "test_helper" + +describe CustomersController do + it "should get index" do + # Action + get customers_url + + # Assert + value(response).must_be :success? + end + + it "returns json" do + # Action + get customers_url + + # Assert + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + # Action + get customers_url + + # Assert + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the customers" do + # Action + get customers_url + + # Assert + body = JSON.parse(response.body) + body.length.must_equal Customer.count + end + + it "returns customers with exactly the required fields" do + # Arrange + keys = %w(address city id movies_checked_out_count name phone postal_code registered_at state) + + # Action + get customers_url + + # Arrange + body = JSON.parse(response.body) + + body.each do |customer| + # Assert + customer.keys.sort.must_equal keys + end + end + + describe 'Create' do + let(:customer_data) { + { + name: "New Customer", + phone: "(206) 510-8695", + address: "Ap #292-5216 Ipsum Rd.", + city: "Seattle", + state: "OR", + postal_code: "24309", + } + } + + it "Can create a new customer" do + # Action / Assert + proc { + post customers_path, params: customer_data + }.must_change 'Customer.count', 1 + + # Assert + assert_response :success + end + + it "Assigns a registered_at date upon creation" do + # Action / Assert + proc { + post customers_path, params: customer_data + }.must_change 'Customer.count', 1 + + # Assert + assert_response :success + Customer.last.registered_at.to_date.must_equal Customer.last.created_at.to_date + end + + it 'Returns bad request for bad params data' do + # Arrange + customer_data.delete(:name) + + # Assert + proc { + post customers_path, params: {customer: customer_data} + }.wont_change 'Customer.count' + + # Arrange + body = JSON.parse(response.body) + + # Assert + must_respond_with :bad_request + body.must_be_kind_of Hash + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_include "name" + end + end + + describe 'Show' do + it "can get a customer" do + # Action + get customer_path(customers(:shelley).id) + + # Assert + must_respond_with :success + end + + it "returns a 404 for customers that are not found" do + # Arrange + customer = customers(:shelley) + Rental.destroy_all + customer.destroy + + # Action + get customer_path(customer.id) + + # Assert + must_respond_with :not_found + end + end + + describe 'Zomg ' do + it "should get zomg" do + # Action + get zomg_url + + # Assert + value(response).must_be :success? + end + + it "returns json" do + # Action + get zomg_url + + # Assert + response.header['Content-Type'].must_include 'json' + end + end + + +end diff --git a/test/controllers/movies_controller_test.rb b/test/controllers/movies_controller_test.rb new file mode 100644 index 000000000..6ee948df4 --- /dev/null +++ b/test/controllers/movies_controller_test.rb @@ -0,0 +1,123 @@ +require "test_helper" + +describe MoviesController do + describe 'index' do + it "should get index" do + # Action + get movies_url + + # Assert + value(response).must_be :success? + end + + it "returns json" do + # Action + get movies_url + + # Assert + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + # Action + get movies_url + + # Assert + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the movies" do + # Action + get movies_url + + # Assert + body = JSON.parse(response.body) + body.length.must_equal Movie.count + end + + it "returns movies with exactly the required fields" do + # Arrange + keys = %w(available_inventory id inventory overview release_date title) + + # Action + get movies_url + + # Arrange + body = JSON.parse(response.body) + + body.each do |movie| + # Assert + movie.keys.sort.must_equal keys + end + end + end + + describe 'Create' do + let(:movie_data) { + { + title: "The Creation", + release_date: "1979-01-18", + overview: "A very interesting overview", + inventory: 20, + available_inventory: 10 + } + } + + it "Can create a new movie" do + # Action / Assert + proc { + post movies_path, params: movie_data + }.must_change 'Movie.count', 1 + + + # Assert + assert_response :success + end + + it 'Returns bad request for bad params data' do + # Arrange + movie_data.delete(:title) + + # Assert + proc { + post movies_path, params: {movie: movie_data} + }.wont_change 'Movie.count' + + # Arrange + body = JSON.parse(response.body) + + # Assert + must_respond_with :bad_request + body.must_be_kind_of Hash + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_include "title" + end + end + + describe 'Show' do + it "can get a movie" do + # Action + get movie_path(movies(:blacksmith).id) + + # Assert + must_respond_with :success + end + + it "returns a 404 for movies that are not found" do + # Arrange + movie = movies(:blacksmith) + Rental.destroy_all + movie.destroy + + # Action + get movie_path(movie.id) + + # Assert + must_respond_with :not_found + end + end + +end diff --git a/test/controllers/rentals_controller_test.rb b/test/controllers/rentals_controller_test.rb new file mode 100644 index 000000000..961c01bf7 --- /dev/null +++ b/test/controllers/rentals_controller_test.rb @@ -0,0 +1,103 @@ +require "test_helper" + +describe RentalsController do + describe "index" do + it "is a real working route" do + get rentals_url + must_respond_with :success + end + + it "returns json" do + get rentals_url + response.header['Content-Type'].must_include 'json' + end + + it "returns an Array" do + get rentals_url + + body = JSON.parse(response.body) + body.must_be_kind_of Array + end + + it "returns all of the rentals" do + get rentals_url + + body = JSON.parse(response.body) + body.length.must_equal Rental.count + end + + it "returns rentals with exactly the required fields" do + keys = %w(customer_id due_date id movie_id returned) + + get rentals_url + body = JSON.parse(response.body) + body.each do |rental| + rental.keys.sort.must_equal keys + end + end + end + + describe "show" do + it "can get a rental" do + get rental_path(rentals(:rental_one).id) + must_respond_with :success + end + + it "returns a 404 for rentals that are not found" do + rental = rentals(:rental_one) + rental.destroy + get rental_path(rental.id) + must_respond_with :not_found + end + end + + describe "create" do + let(:rental_data) { + { + customer_id: customers(:shelley).id, + movie_id: movies(:blacksmith).id + } + } + + it "Creates a new rental" do + proc { + post rentals_check_out_path, params: rental_data + }.must_change 'Rental.count', 1 + + must_respond_with :success + end + + it "returns a bad request for incorrectly creating a rental" do + rental_data.delete(:customer_id) + + proc { + post rentals_check_out_path, params: rental_data + }.must_change 'Rental.count', 0 + + must_respond_with :bad_request + body = JSON.parse(response.body) + body.must_be_kind_of Hash + body.must_include "ok" + body["ok"].must_equal false + body.must_include "errors" + body["errors"].must_include "customer" + end + end + + describe "update" do + let(:rental) {rentals(:rental_one)} + + it "Updates a rental thats is checked-out to be checked-in" do + post rentals_check_in_path(customer_id: customers(:shelley).id, movie_id: movies(:blacksmith).id) + + rental.returned.must_equal true + end + + it "Updates a rental thats is checked-in to be checked-out " do + post rentals_check_out_path(customer_id: customers(:shelley).id, movie_id: movies(:blacksmith).id) + + rental.returned.must_equal false + end + + end +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml new file mode 100644 index 000000000..018276cf3 --- /dev/null +++ b/test/fixtures/customers.yml @@ -0,0 +1,26 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# + +shelley: + name: Shelley Rocha + registered_at: Wed, 29 Apr 2015 07:54:14 -0700 + postal_code: 24309 + phone: (322) 510-8695 + checked_out_count: nil + address: Ap#292-5216 Ipsum Rd. + city: Hillsboro + state: OR + +sane: + name: Kane Johnston + registered_at: Fri, 22 May 2015 09:56:42 -0700 + postal_code: 94282 + phone: (270) 219-2853 + checked_out_count: nil + address: P.O. Box 940, 1583 At, Street + city: Austin + state: Texas diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/movies.yml b/test/fixtures/movies.yml new file mode 100644 index 000000000..70ba6700e --- /dev/null +++ b/test/fixtures/movies.yml @@ -0,0 +1,18 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the "{}" from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below + + +blacksmith: + title: Blacksmith Of The Banished + release_date: 1979-01-18 + overview: The unexciting life of a boy will be permanently altered as a strange woman enters his life. + inventory: 10 + +elegance: + title: Elegance Of The Machines + release_date: 1991-05-19 + overview: But what if this neighbor is wrong about all this. Or what if the situation is worse than it appears. How could an ordinary girl be this lucky, or unlucky, depending on the turnout. We're about to find out. + inventory: 7 diff --git a/test/fixtures/rentals.yml b/test/fixtures/rentals.yml new file mode 100644 index 000000000..0bde2dcc4 --- /dev/null +++ b/test/fixtures/rentals.yml @@ -0,0 +1,17 @@ +rental_one: + due_date: 2019-01-18 + returned: false + customer: shelley + movie: blacksmith + +rental_two: + due_date: 2019-01-18 + returned: true + customer: shelley + movie: blacksmith + +rental_three: + due_date: + returned: + customer: + movie: diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb new file mode 100644 index 000000000..b8f74a875 --- /dev/null +++ b/test/models/customer_test.rb @@ -0,0 +1,83 @@ +require "test_helper" + +describe Customer do + + describe 'validations' do + let(:shelley) { customers(:shelley) } + + it "must be valid" do + value(shelley).must_be :valid? + end + + it "must have a name" do + shelley.name = nil + shelley.valid?.must_equal false + end + + it "must have a phone" do + shelley.phone = nil + shelley.valid?.must_equal false + end + + it "must have a address" do + shelley.phone = nil + shelley.valid?.must_equal false + end + + it "must have a city" do + shelley.phone = nil + shelley.valid?.must_equal false + end + + it "must have a state" do + shelley.phone = nil + shelley.valid?.must_equal false + end + + it "must have a postal_code" do + shelley.phone = nil + shelley.valid?.must_equal false + end + + it "must have a phone" do + shelley.phone = nil + shelley.valid?.must_equal false + end + end + + describe 'relations' do + let(:shelley) { customers(:shelley) } + it 'can have many rentals' do + shelley.must_respond_to :rentals + end + end + + describe 'movies_checked_out_count' do + let(:shelley) { customers(:shelley) } + + it 'can be called' do + shelley.must_respond_to :movies_checked_out_count + end + + it 'returns the number of 0 if costumer has no rental not returned' do + Rental.destroy_all + + shelley.movies_checked_out_count.must_equal 0 + end + + it 'returns the number of rentals a costumer has that are not returned yet' do + Rental.destroy_all + Rental.create(customer_id: shelley.id, movie_id: movies(:blacksmith).id) + + shelley.movies_checked_out_count.must_equal 1 + end + + it 'returns the number of 0 rentals if a costumer has only rentals that has been returned already' do + Rental.destroy_all + rental = Rental.create(customer_id: shelley.id, movie_id: movies(:blacksmith).id) + rental.update_attributes(returned: true) + + shelley.movies_checked_out_count.must_equal 0 + end + end +end diff --git a/test/models/movie_test.rb b/test/models/movie_test.rb new file mode 100644 index 000000000..578711e2f --- /dev/null +++ b/test/models/movie_test.rb @@ -0,0 +1,63 @@ +require "test_helper" + +describe Movie do + describe 'validations' do + let(:movie) { movies(:blacksmith) } + + it "must be valid" do + value(movie).must_be :valid? + end + + it 'must have a title' do + movie.title = nil + movie.valid?.must_equal false + end + + it "must have a release_date" do + movie.release_date = nil + movie.valid?.must_equal false + end + + it "must have an overview" do + movie.overview = nil + movie.valid?.must_equal false + end + + describe 'relations' do + it "can have many rentals" do + movie.must_respond_to :rentals + end + end + + describe 'available_inventory' do + it "returns a count of available 'copies'" do + Rental.destroy_all + count = movie.inventory + movie.available_inventory.must_equal count + end + + it "returns the count of 0 for when all the 'copies' are rented" do + while movie.available_inventory > 0 + Rental.create(customer_id: customers(:shelley).id, movie_id: movies(:blacksmith).id) + end + + movie.available_inventory.must_equal 0 + end + end + + describe 'available?' do + it "returns true if there are at least one available copies" do + Rental.destroy_all + movie.inventory = 1 + movie.available?.must_equal true + end + + it "returns false if all copies are rented" do + Rental.destroy_all + movie.inventory = 0 + movie.available_inventory.must_equal 0 + movie.available?.must_equal false + end + end + end +end diff --git a/test/models/rental_test.rb b/test/models/rental_test.rb new file mode 100644 index 000000000..0cbebf580 --- /dev/null +++ b/test/models/rental_test.rb @@ -0,0 +1,59 @@ +require "test_helper" +require "date" + +describe Rental do + let(:rental) { Rental.new } + + describe "validations" do + it "must be valid" do + rental_one = rentals(:rental_one) + rental_one.valid?.must_equal true + end + + it "must be valid if returned is true" do + rental_two = rentals(:rental_two) + rental_two.valid?.must_equal true + end + + it "must be invalid if due date, customer, and movie are blank" do + rental_three = rentals(:rental_three) + rental_three.valid?.must_equal false + end + end + + describe "relations" do + it "must have a Customer" do + rental_one = rentals(:rental_one) + rental_one.must_respond_to :customer + rental_one.customer.must_be_kind_of Customer + rental_one.customer.name.must_equal "Shelley Rocha" + rental_one.customer.must_equal customers(:shelley) + end + + it "must have a Movie" do + rental_one = rentals(:rental_one) + rental_one.must_respond_to :movie + rental_one.movie.must_be_kind_of Movie + rental_one.movie.title.must_equal "Blacksmith Of The Banished" + rental_one.movie.must_equal movies(:blacksmith) + end + end + + describe "assign_due_date" do + let(:rental) { rentals(:rental_one) } + + it "can assign a due date" do + rental.due_date = nil + rental.due_date.must_equal nil + rental.assign_due_date + rental.due_date.must_be_kind_of Date + end + + it "can assign a due date 7 days from Rental creation" do + rental.due_date = nil + rental.due_date.must_equal nil + rental.assign_due_date + rental.due_date.must_equal rental.created_at.to_date + 7 + end + end +end 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 diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb