From 0fde70075b22e6041f3b1b4e2202207a7933a1af Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Mon, 7 Oct 2019 15:46:09 -0700 Subject: [PATCH 01/43] News rails project created --- .gitignore | 30 ++ .ruby-version | 1 + Gemfile | 83 ++++++ Gemfile.lock | 277 ++++++++++++++++++ Guardfile | 9 + Rakefile | 6 + app/assets/config/manifest.js | 3 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 + app/assets/javascripts/cable.js | 13 + app/assets/javascripts/channels/.keep | 0 app/assets/stylesheets/application.css | 15 + 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/helpers/application_helper.rb | 2 + 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/application.html.erb | 15 + 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 | 36 +++ bin/spring | 17 ++ bin/update | 31 ++ bin/yarn | 11 + config.ru | 5 + config/application.rb | 26 ++ config/boot.rb | 4 + config/cable.yml | 10 + config/credentials.yml.enc | 1 + config/database.yml | 85 ++++++ config/environment.rb | 5 + config/environments/development.rb | 61 ++++ config/environments/production.rb | 94 ++++++ config/environments/test.rb | 46 +++ config/initializers/action_view.rb | 1 + .../application_controller_renderer.rb | 8 + config/initializers/assets.rb | 14 + config/initializers/backtrace_silencers.rb | 7 + .../initializers/content_security_policy.rb | 25 ++ config/initializers/cookies_serializer.rb | 5 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 + config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 + config/locales/en.yml | 33 +++ config/puma.rb | 34 +++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 +++ lib/assets/.keep | 0 lib/tasks/.keep | 0 log/.keep | 0 package.json | 5 + public/404.html | 67 +++++ public/422.html | 67 +++++ public/500.html | 66 +++++ public/apple-touch-icon-precomposed.png | 0 public/apple-touch-icon.png | 0 public/favicon.ico | 0 public/robots.txt | 1 + storage/.keep | 0 test/application_system_test_case.rb | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/fixtures/files/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/system/.keep | 0 test/test_helper.rb | 10 + tmp/.keep | 0 vendor/.keep | 0 80 files changed, 1385 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 Guardfile create mode 100644 Rakefile create mode 100644 app/assets/config/manifest.js create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/javascripts/cable.js create mode 100644 app/assets/javascripts/channels/.keep create mode 100644 app/assets/stylesheets/application.css 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/helpers/application_helper.rb 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/application.html.erb 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 100755 bin/yarn 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/credentials.yml.enc 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/action_view.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/content_security_policy.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 package.json create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/apple-touch-icon-precomposed.png create mode 100644 public/apple-touch-icon.png create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/application_system_test_case.rb create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/files/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/system/.keep create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..b37716faa --- /dev/null +++ b/.gitignore @@ -0,0 +1,30 @@ +# 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 uploaded files in development +/storage/* +!/storage/.keep + +/node_modules +/yarn-error.log + +/public/assets +.byebug_history + /coverage + .DS_Store + + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..160fe391c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.5 \ No newline at end of file diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..87a48610f --- /dev/null +++ b/Gemfile @@ -0,0 +1,83 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.5.5' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.3' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +# gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# 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 ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +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 + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + 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 + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +gem 'jquery-turbolinks' +gem 'jquery-rails' +group :development, :test do + gem 'pry-rails' +end + +group :development do + gem 'better_errors' + gem 'binding_of_caller' + gem 'guard' + gem 'guard-minitest' + gem 'debase', '>= 0.2.4.1' + gem 'ruby-debug-ide', '>= 0.7.0' +end + +group :test do + gem 'minitest-rails' + gem 'minitest-reporters' + gem 'minitest-skip' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..1696f55d3 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,277 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.3) + activesupport (= 5.2.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + ansi (1.5.0) + archive-zip (0.12.0) + io-like (~> 0.3.0) + arel (9.0.0) + better_errors (2.5.1) + coderay (>= 1.0.0) + erubi (>= 1.0.0) + rack (>= 0.9.0) + bindex (0.8.1) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + bootsnap (1.4.5) + msgpack (~> 1.0) + builder (3.2.3) + byebug (11.0.1) + capybara (3.29.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) + childprocess (3.0.0) + chromedriver-helper (2.1.1) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + concurrent-ruby (1.1.5) + crass (1.0.4) + debase (0.2.4.1) + debase-ruby_core_source (>= 0.10.2) + debase-ruby_core_source (0.10.6) + debug_inspector (0.0.3) + erubi (1.9.0) + execjs (2.7.0) + ffi (1.11.1) + formatador (0.2.5) + globalid (0.4.2) + activesupport (>= 4.2.0) + guard (2.15.1) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-minitest (2.4.6) + guard-compat (~> 1.2) + minitest (>= 3.0) + i18n (1.7.0) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.9.1) + activesupport (>= 4.2.0) + jquery-rails (4.3.5) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-turbolinks (2.1.0) + railties (>= 3.1.0) + turbolinks + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.3.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + lumberjack (1.0.13) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.12.2) + minitest-rails (5.2.0) + minitest (~> 5.10) + railties (~> 5.2.0) + minitest-reporters (1.4.0) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + minitest-skip (0.0.1) + minitest (~> 5.0) + msgpack (1.3.1) + nenv (0.3.0) + nio4r (2.5.2) + nokogiri (1.10.4) + mini_portile2 (~> 2.4.0) + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) + pg (1.1.4) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + pry-rails (0.3.9) + pry (>= 0.10.4) + public_suffix (4.0.1) + puma (3.12.1) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (13.0.0) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + regexp_parser (1.6.0) + ruby-debug-ide (0.7.0) + rake (>= 0.8.1) + ruby-progressbar (1.10.1) + ruby_dep (1.5.0) + rubyzip (2.0.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.1.0) + railties (>= 5.2.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) + shellany (0.0.1) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + 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.3) + thread_safe (0.3.6) + tilt (2.0.10) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + binding_of_caller + bootsnap (>= 1.1.0) + byebug + capybara (>= 2.15) + chromedriver-helper + debase (>= 0.2.4.1) + guard + guard-minitest + jbuilder (~> 2.5) + jquery-rails + jquery-turbolinks + listen (>= 3.0.5, < 3.2) + minitest-rails + minitest-reporters + minitest-skip + pg (>= 0.18, < 2.0) + pry-rails + puma (~> 3.11) + rails (~> 5.2.3) + ruby-debug-ide (>= 0.7.0) + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.5.5p157 + +BUNDLED WITH + 2.0.2 diff --git a/Guardfile b/Guardfile new file mode 100644 index 000000000..e34f706f4 --- /dev/null +++ b/Guardfile @@ -0,0 +1,9 @@ +guard :minitest, autorun: false, spring: true do + watch(%r{^app/(.+).rb$}) { |m| "test/#{m[1]}_test.rb" } + watch(%r{^app/controllers/application_controller.rb$}) { 'test/controllers' } + watch(%r{^app/controllers/(.+)_controller.rb$}) { |m| "test/integration/#{m[1]}_test.rb" } + watch(%r{^app/views/(.+)_mailer/.+}) { |m| "test/mailers/#{m[1]}_mailer_test.rb" } + watch(%r{^lib/(.+).rb$}) { |m| "test/lib/#{m[1]}_test.rb" } + watch(%r{^test/.+_test.rb$}) + watch(%r{^test/test_helper.rb$}) { 'test' } +end 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/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 000000000..b16e53d6d --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 000000000..82e6f0f6c --- /dev/null +++ b/app/assets/javascripts/application.js @@ -0,0 +1,16 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require rails-ujs +//= require activestorage +//= require turbolinks +//= require_tree . diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js new file mode 100644 index 000000000..739aa5f02 --- /dev/null +++ b/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/app/assets/javascripts/channels/.keep b/app/assets/javascripts/channels/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..d05ea0f51 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + *= require_tree . + *= require_self + */ 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..09705d12a --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::Base +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 000000000..de6be7945 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end 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/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..692ca547e --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,15 @@ + + + + RideShareRails + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + <%= yield %> + + 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..f19acf5b5 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +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..94fd4d797 --- /dev/null +++ b/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + # 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..d89ee495f --- /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..58bfaed51 --- /dev/null +++ b/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +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') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + 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/bin/yarn b/bin/yarn new file mode 100755 index 000000000..460dd565b --- /dev/null +++ b/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +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..c3cd1cf95 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,26 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module RideShareRails + 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.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 000000000..b9e460cef --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 000000000..0b6186ad8 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: ride-share-rails_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 000000000..b5e3666ad --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +VlX9JmO0XsR5iSPNUhDqXrQPu4Fe7FM4/X7AbiyHNBE3gU0vgO/7JSvnijB0dCyh7iHprTImTmlrtPo39wzDAZ3EGuZ1R2r3H/4TUWqI63bvycYUTJTJtYq+H06IIVgqS2T+m4eY12DddjEizLpW3b/pjnhdfmV/Rmyj7hvstiEtTAO5nixgsCv2ptJbZWspaN+86BEFwwNJUsjvMwM/UkPNoMapYYJAhTAh0/niqi6ql74UtfPWmsiy7ELrh8le1KXu9tZZfsn1BmJ5YL11Zb4DDxcow7gyFgkXYgscFHEeR4eZljRDcedWqWGN0P8WpWKIDNn3BqPSynFtX6NRBwthylmIVT4StkfRsXtnifo+39m7H6bVD5MA3ZZwmaKdIDXkqLxdBu+iDjEgBRL7v+sYuFQWLdjGX6ZB--KTZ2/wPH+JPQw4PA--TR8M7wTgc2oO43fII9RNGQ== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 000000000..684902e69 --- /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: ride-share-rails_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: ride-share-rails + + # 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: ride-share-rails_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: ride-share-rails_production + username: ride-share-rails + password: <%= ENV['RIDE-SHARE-RAILS_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..1311e3e4e --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,61 @@ +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. + # Run rails dev:cache to toggle caching. + 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.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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 + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # 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..cee449f7b --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,94 @@ +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 + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = 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? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # 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 + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # 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 = "ride-share-rails_#{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..0a38fd3ce --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,46 @@ +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.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 + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + 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/action_view.rb b/config/initializers/action_view.rb new file mode 100644 index 000000000..142d382f8 --- /dev/null +++ b/config/initializers/action_view.rb @@ -0,0 +1 @@ +Rails.application.config.action_view.form_with_generates_remote_forms = false 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/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..4b828e80c --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) 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/content_security_policy.rb b/config/initializers/content_security_policy.rb new file mode 100644 index 000000000..d3bcaa5ec --- /dev/null +++ b/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 000000000..5a6a32d37 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 000000000..4a994e1e7 --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 000000000..ac033bf9d --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 000000000..dc1899682 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 000000000..bbfc3961b --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 000000000..decc5a857 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 000000000..a5eccf816 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,34 @@ +# 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. +# +# preload_app! + +# 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/spring.rb b/config/spring.rb new file mode 100644 index 000000000..9fa7863f9 --- /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/config/storage.yml b/config/storage.yml new file mode 100644 index 000000000..d32f76e8f --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 000000000..e69de29bb 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/package.json b/package.json new file mode 100644 index 000000000..75b35d319 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "ride-share-rails", + "private": true, + "dependencies": {} +} diff --git a/public/404.html b/public/404.html new file mode 100644 index 000000000..2be3af26f --- /dev/null +++ b/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/422.html b/public/422.html new file mode 100644 index 000000000..c08eac0d1 --- /dev/null +++ b/public/422.html @@ -0,0 +1,67 @@ + + + + The change you wanted was rejected (422) + + + + + + +
+
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/500.html b/public/500.html new file mode 100644 index 000000000..78a030af2 --- /dev/null +++ b/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 000000000..e69de29bb diff --git a/public/favicon.ico b/public/favicon.ico 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/storage/.keep b/storage/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb new file mode 100644 index 000000000..d19212abd --- /dev/null +++ b/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end 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/helpers/.keep b/test/helpers/.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/system/.keep b/test/system/.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..3ab84e3d1 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 000000000..e69de29bb From 7533fdaec0214afaa4b581be504f3747eba48dcc Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Mon, 7 Oct 2019 15:57:13 -0700 Subject: [PATCH 02/43] Created Driver, Passenger, and Trip models --- app/models/driver.rb | 2 + app/models/passenger.rb | 2 + app/models/trip.rb | 2 + db/migrate/20191007224626_create_drivers.rb | 10 +++++ .../20191007224829_create_passengers.rb | 10 +++++ db/migrate/20191007225112_create_trips.rb | 11 +++++ db/schema.rb | 40 +++++++++++++++++++ 7 files changed, 77 insertions(+) create mode 100644 app/models/driver.rb create mode 100644 app/models/passenger.rb create mode 100644 app/models/trip.rb create mode 100644 db/migrate/20191007224626_create_drivers.rb create mode 100644 db/migrate/20191007224829_create_passengers.rb create mode 100644 db/migrate/20191007225112_create_trips.rb create mode 100644 db/schema.rb diff --git a/app/models/driver.rb b/app/models/driver.rb new file mode 100644 index 000000000..1ff364562 --- /dev/null +++ b/app/models/driver.rb @@ -0,0 +1,2 @@ +class Driver < ApplicationRecord +end diff --git a/app/models/passenger.rb b/app/models/passenger.rb new file mode 100644 index 000000000..2c5748ac2 --- /dev/null +++ b/app/models/passenger.rb @@ -0,0 +1,2 @@ +class Passenger < ApplicationRecord +end diff --git a/app/models/trip.rb b/app/models/trip.rb new file mode 100644 index 000000000..a8c077a10 --- /dev/null +++ b/app/models/trip.rb @@ -0,0 +1,2 @@ +class Trip < ApplicationRecord +end diff --git a/db/migrate/20191007224626_create_drivers.rb b/db/migrate/20191007224626_create_drivers.rb new file mode 100644 index 000000000..b166e4286 --- /dev/null +++ b/db/migrate/20191007224626_create_drivers.rb @@ -0,0 +1,10 @@ +class CreateDrivers < ActiveRecord::Migration[5.2] + def change + create_table :drivers do |t| + t.string :name + t.string :vin + + t.timestamps + end + end +end diff --git a/db/migrate/20191007224829_create_passengers.rb b/db/migrate/20191007224829_create_passengers.rb new file mode 100644 index 000000000..aeced4891 --- /dev/null +++ b/db/migrate/20191007224829_create_passengers.rb @@ -0,0 +1,10 @@ +class CreatePassengers < ActiveRecord::Migration[5.2] + def change + create_table :passengers do |t| + t.string :name + t.string :phone_num + + t.timestamps + end + end +end diff --git a/db/migrate/20191007225112_create_trips.rb b/db/migrate/20191007225112_create_trips.rb new file mode 100644 index 000000000..0082137f6 --- /dev/null +++ b/db/migrate/20191007225112_create_trips.rb @@ -0,0 +1,11 @@ +class CreateTrips < ActiveRecord::Migration[5.2] + def change + create_table :trips do |t| + t.date :date + t.integer :rating + t.float :cost + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..d089117fd --- /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: 2019_10_07_225112) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "drivers", force: :cascade do |t| + t.string "name" + t.string "vin" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "passengers", force: :cascade do |t| + t.string "name" + t.string "phone_num" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "trips", force: :cascade do |t| + t.date "date" + t.integer "rating" + t.float "cost" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end From 17db7e27981c37e53375d7c941d0438c270101a3 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Mon, 7 Oct 2019 16:07:23 -0700 Subject: [PATCH 03/43] Created driver_id and passenger_id column in trips table --- db/migrate/20191007225727_add_driver_id_to_trips.rb | 5 +++++ db/migrate/20191007225854_add_passenger_id_to_trips.rb | 5 +++++ db/schema.rb | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20191007225727_add_driver_id_to_trips.rb create mode 100644 db/migrate/20191007225854_add_passenger_id_to_trips.rb diff --git a/db/migrate/20191007225727_add_driver_id_to_trips.rb b/db/migrate/20191007225727_add_driver_id_to_trips.rb new file mode 100644 index 000000000..22c611432 --- /dev/null +++ b/db/migrate/20191007225727_add_driver_id_to_trips.rb @@ -0,0 +1,5 @@ +class AddDriverIdToTrips < ActiveRecord::Migration[5.2] + def change + add_reference :trips, :driver, foreign_key: true + end +end diff --git a/db/migrate/20191007225854_add_passenger_id_to_trips.rb b/db/migrate/20191007225854_add_passenger_id_to_trips.rb new file mode 100644 index 000000000..fffb1117a --- /dev/null +++ b/db/migrate/20191007225854_add_passenger_id_to_trips.rb @@ -0,0 +1,5 @@ +class AddPassengerIdToTrips < ActiveRecord::Migration[5.2] + def change + add_reference :trips, :passenger, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index d089117fd..14b32c5b3 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: 2019_10_07_225112) do +ActiveRecord::Schema.define(version: 2019_10_07_225854) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -35,6 +35,12 @@ t.float "cost" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "driver_id" + t.bigint "passenger_id" + t.index ["driver_id"], name: "index_trips_on_driver_id" + t.index ["passenger_id"], name: "index_trips_on_passenger_id" end + add_foreign_key "trips", "drivers" + add_foreign_key "trips", "passengers" end From 8be8b3c9c5ff9be8610b1f9d47c2db042038e604 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Mon, 7 Oct 2019 16:17:52 -0700 Subject: [PATCH 04/43] Set up relationships belongs_to and has_many in models --- app/models/driver.rb | 1 + app/models/passenger.rb | 1 + app/models/trip.rb | 2 ++ 3 files changed, 4 insertions(+) diff --git a/app/models/driver.rb b/app/models/driver.rb index 1ff364562..197e65507 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,2 +1,3 @@ class Driver < ApplicationRecord + has_many :trips end diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 2c5748ac2..2fef89192 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,2 +1,3 @@ class Passenger < ApplicationRecord + has_many :trips end diff --git a/app/models/trip.rb b/app/models/trip.rb index a8c077a10..8e2566cd8 100644 --- a/app/models/trip.rb +++ b/app/models/trip.rb @@ -1,2 +1,4 @@ class Trip < ApplicationRecord + belongs_to :driver + belongs_to :passenger end From da2adab5df50bf4eb6b50b5754153fdc21675ed0 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Tue, 8 Oct 2019 12:43:18 -0700 Subject: [PATCH 05/43] Created Homepage controller. Implemented index and show actions for Passenger and Driver controller. --- app/assets/javascripts/drivers.js | 2 ++ app/assets/javascripts/homepages.js | 2 ++ app/assets/javascripts/passengers.js | 2 ++ app/assets/javascripts/trips.js | 2 ++ app/assets/stylesheets/drivers.scss | 3 +++ app/assets/stylesheets/homepages.scss | 3 +++ app/assets/stylesheets/passengers.scss | 3 +++ app/assets/stylesheets/trips.scss | 3 +++ app/controllers/drivers_controller.rb | 15 +++++++++++++++ app/controllers/homepages_controller.rb | 5 +++++ app/controllers/passengers_controller.rb | 15 +++++++++++++++ app/controllers/trips_controller.rb | 2 ++ app/helpers/drivers_helper.rb | 2 ++ app/helpers/homepages_helper.rb | 2 ++ app/helpers/passengers_helper.rb | 2 ++ app/helpers/trips_helper.rb | 2 ++ app/views/drivers/index.html.erb | 11 +++++++++++ app/views/drivers/show.html.erb | 11 +++++++++++ app/views/homepages/index.html.erb | 0 app/views/layouts/application.html.erb | 15 +++++++++++++++ app/views/passengers/index.html.erb | 12 ++++++++++++ app/views/passengers/show.html.erb | 11 +++++++++++ config/routes.rb | 7 +++++++ 23 files changed, 132 insertions(+) create mode 100644 app/assets/javascripts/drivers.js create mode 100644 app/assets/javascripts/homepages.js create mode 100644 app/assets/javascripts/passengers.js create mode 100644 app/assets/javascripts/trips.js create mode 100644 app/assets/stylesheets/drivers.scss create mode 100644 app/assets/stylesheets/homepages.scss create mode 100644 app/assets/stylesheets/passengers.scss create mode 100644 app/assets/stylesheets/trips.scss create mode 100644 app/controllers/drivers_controller.rb create mode 100644 app/controllers/homepages_controller.rb create mode 100644 app/controllers/passengers_controller.rb create mode 100644 app/controllers/trips_controller.rb create mode 100644 app/helpers/drivers_helper.rb create mode 100644 app/helpers/homepages_helper.rb create mode 100644 app/helpers/passengers_helper.rb create mode 100644 app/helpers/trips_helper.rb create mode 100644 app/views/drivers/index.html.erb create mode 100644 app/views/drivers/show.html.erb create mode 100644 app/views/homepages/index.html.erb create mode 100644 app/views/passengers/index.html.erb create mode 100644 app/views/passengers/show.html.erb diff --git a/app/assets/javascripts/drivers.js b/app/assets/javascripts/drivers.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/drivers.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/homepages.js b/app/assets/javascripts/homepages.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/homepages.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/passengers.js b/app/assets/javascripts/passengers.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/passengers.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/javascripts/trips.js b/app/assets/javascripts/trips.js new file mode 100644 index 000000000..dee720fac --- /dev/null +++ b/app/assets/javascripts/trips.js @@ -0,0 +1,2 @@ +// Place all the behaviors and hooks related to the matching controller here. +// All this logic will automatically be available in application.js. diff --git a/app/assets/stylesheets/drivers.scss b/app/assets/stylesheets/drivers.scss new file mode 100644 index 000000000..8c1768a14 --- /dev/null +++ b/app/assets/stylesheets/drivers.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Drivers controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/homepages.scss b/app/assets/stylesheets/homepages.scss new file mode 100644 index 000000000..2305c36d1 --- /dev/null +++ b/app/assets/stylesheets/homepages.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Homepages controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/passengers.scss b/app/assets/stylesheets/passengers.scss new file mode 100644 index 000000000..0e27942f7 --- /dev/null +++ b/app/assets/stylesheets/passengers.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Passengers controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/trips.scss b/app/assets/stylesheets/trips.scss new file mode 100644 index 000000000..f1f72ad11 --- /dev/null +++ b/app/assets/stylesheets/trips.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Trips controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb new file mode 100644 index 000000000..cc34e651a --- /dev/null +++ b/app/controllers/drivers_controller.rb @@ -0,0 +1,15 @@ +class DriversController < ApplicationController + def index + @drivers = Driver.all + end + + def show + driver_id = params[:id] + + @driver = Driver.find_by(id: driver_id) + if @driver.nil? + head :not_found + return + end + end +end diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb new file mode 100644 index 000000000..18fe023eb --- /dev/null +++ b/app/controllers/homepages_controller.rb @@ -0,0 +1,5 @@ +class HomepagesController < ApplicationController + def index + + end +end diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb new file mode 100644 index 000000000..bd5e7f612 --- /dev/null +++ b/app/controllers/passengers_controller.rb @@ -0,0 +1,15 @@ +class PassengersController < ApplicationController + def index + @passengers = Passenger.all + end + + def show + passenger_id = params[:id] + + @passenger = Passenger.find_by(id: passenger_id) + if @passenger.nil? + head :not_found + return + end + end +end diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb new file mode 100644 index 000000000..4275f53c7 --- /dev/null +++ b/app/controllers/trips_controller.rb @@ -0,0 +1,2 @@ +class TripsController < ApplicationController +end diff --git a/app/helpers/drivers_helper.rb b/app/helpers/drivers_helper.rb new file mode 100644 index 000000000..e5fc532e4 --- /dev/null +++ b/app/helpers/drivers_helper.rb @@ -0,0 +1,2 @@ +module DriversHelper +end diff --git a/app/helpers/homepages_helper.rb b/app/helpers/homepages_helper.rb new file mode 100644 index 000000000..4bd8098f3 --- /dev/null +++ b/app/helpers/homepages_helper.rb @@ -0,0 +1,2 @@ +module HomepagesHelper +end diff --git a/app/helpers/passengers_helper.rb b/app/helpers/passengers_helper.rb new file mode 100644 index 000000000..1af9e68f1 --- /dev/null +++ b/app/helpers/passengers_helper.rb @@ -0,0 +1,2 @@ +module PassengersHelper +end diff --git a/app/helpers/trips_helper.rb b/app/helpers/trips_helper.rb new file mode 100644 index 000000000..04f333d46 --- /dev/null +++ b/app/helpers/trips_helper.rb @@ -0,0 +1,2 @@ +module TripsHelper +end diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb new file mode 100644 index 000000000..f0215213c --- /dev/null +++ b/app/views/drivers/index.html.erb @@ -0,0 +1,11 @@ +

Rideshare Drivers

+ +
+
    + <% @drivers.each do |driver| %> +
  • + <%= link_to driver.name, driver_path(driver.id) %> +
    • + <% end %> +
+
diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb new file mode 100644 index 000000000..2046732e3 --- /dev/null +++ b/app/views/drivers/show.html.erb @@ -0,0 +1,11 @@ +
+

<%=@driver.name%>

+
+ +
+

<%=@driver.vin%>

+

+ Driver Trips: <%= %> +

+ +
diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 692ca547e..65365ed96 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,21 @@ + + + <%= yield %> diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb new file mode 100644 index 000000000..5d9e0dd6c --- /dev/null +++ b/app/views/passengers/index.html.erb @@ -0,0 +1,12 @@ +

Rideshare Passengers

+ +
+
    + <% @passengers.each do |passenger| %> +
  • + <%= link_to passenger.name, passenger_path(passenger.id) %> +
    • + + <% end %> +
+
diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb new file mode 100644 index 000000000..4d30e53a1 --- /dev/null +++ b/app/views/passengers/show.html.erb @@ -0,0 +1,11 @@ +
+

<%=@passenger.name%>

+
+ +
+

<%=@passenger.phone_num%>

+

+ Driver Trips: <%= %> +

+ +
diff --git a/config/routes.rb b/config/routes.rb index 787824f88..0bdb759d1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,10 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root to: 'homepages#index' + + + resources :drivers, only: [:index, :show] + + resources :passengers, only: [:index, :show] + end From 8fe4a0e61c81b59b454ed035ce35c2d977e02823 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Tue, 8 Oct 2019 14:01:00 -0700 Subject: [PATCH 06/43] Implemented new and create actions to Driver and Passenger controllers --- app/controllers/drivers_controller.rb | 24 ++++++++++++++++++++++-- app/controllers/passengers_controller.rb | 20 ++++++++++++++++++++ app/views/drivers/_form.html.erb | 11 +++++++++++ app/views/drivers/new.html.erb | 3 +++ app/views/layouts/application.html.erb | 6 ++++++ app/views/passengers/_form.html.erb | 11 +++++++++++ app/views/passengers/new.html.erb | 3 +++ app/views/passengers/show.html.erb | 2 +- config/routes.rb | 4 ++-- 9 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 app/views/drivers/_form.html.erb create mode 100644 app/views/drivers/new.html.erb create mode 100644 app/views/passengers/_form.html.erb create mode 100644 app/views/passengers/new.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index cc34e651a..37fda7563 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -2,14 +2,34 @@ class DriversController < ApplicationController def index @drivers = Driver.all end - + def show driver_id = params[:id] - + @driver = Driver.find_by(id: driver_id) if @driver.nil? head :not_found return end end + + def new + @driver = Driver.new + end + + def create + @driver = Driver.new(driver_params) + + if @driver.save + redirect_to driver_path(@driver.id) + else + render new_driver_path + end + end + + private + + def driver_params + return params.require(:driver).permit(:name, :vin) + end end diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index bd5e7f612..96e7a00a1 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -12,4 +12,24 @@ def show return end end + + def new + @passenger = Passenger.new + end + + def create + @passenger = Passenger.new(passenger_params) + + if @passenger.save + redirect_to passenger_path(@passenger.id) + else + render new_passenger_path + end + end + + private + + def passenger_params + return params.require(:passenger).permit(:name, :phone_num) + end end diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb new file mode 100644 index 000000000..8ef067262 --- /dev/null +++ b/app/views/drivers/_form.html.erb @@ -0,0 +1,11 @@ +<%= form_with model: @driver, class: driver_form_class do |f| %> + + <%# f.text_field :somenameofsomeattributeonbook ... in this case, :title %> + <%= f.label :driver_name %> + <%= f.text_field :name %> + <%= f.label :vin %> + <%= f.text_field :vin %> + + <%= f.submit submit_button_label, class: "form-button" %> + +<% end %> diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb new file mode 100644 index 000000000..ae38f0b76 --- /dev/null +++ b/app/views/drivers/new.html.erb @@ -0,0 +1,3 @@ +

Add a Driver:

+ +<%= render partial: "form", locals: { submit_button_label: "Create", driver_form_class: "new-driver-form" } %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 65365ed96..c226ec502 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -22,6 +22,12 @@
  • <%= link_to "Passengers", passengers_path %>
    • +
  • + <%= link_to "Add a driver", new_driver_path %> +
    • +
  • + <%= link_to "Add a passenger", new_passenger_path %> +
    • diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb new file mode 100644 index 000000000..9d7b8701a --- /dev/null +++ b/app/views/passengers/_form.html.erb @@ -0,0 +1,11 @@ +<%= form_with model: @passenger, class: passenger_form_class do |f| %> + + <%# f.text_field :somenameofsomeattributeonbook ... in this case, :title %> + <%= f.label :passenger_name %> + <%= f.text_field :name %> + <%= f.label :phone_number %> + <%= f.text_field :phone_num %> + + <%= f.submit submit_button_label, class: "form-button" %> + +<% end %> diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb new file mode 100644 index 000000000..4a3678ecf --- /dev/null +++ b/app/views/passengers/new.html.erb @@ -0,0 +1,3 @@ +

    Add a Passenger:

    + +<%= render partial: "form", locals: { submit_button_label: "Create", passenger_form_class: "new-passenger-form" } %> diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 4d30e53a1..020a47885 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -5,7 +5,7 @@

    <%=@passenger.phone_num%>

    - Driver Trips: <%= %> + Passenger Trips: <%= %>

    diff --git a/config/routes.rb b/config/routes.rb index 0bdb759d1..7d1f67974 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,8 +3,8 @@ root to: 'homepages#index' - resources :drivers, only: [:index, :show] + resources :drivers, only: [:index, :show, :new, :create] - resources :passengers, only: [:index, :show] + resources :passengers, only: [:index, :show, :new, :create] end From 41c1515c58595dff9e84993ce72116280d12a5b2 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Tue, 8 Oct 2019 14:15:30 -0700 Subject: [PATCH 07/43] Implemented edit and update actions for Driver and Passenger --- app/controllers/drivers_controller.rb | 14 ++++++++++++++ app/controllers/passengers_controller.rb | 14 ++++++++++++++ app/views/drivers/edit.html.erb | 3 +++ app/views/drivers/index.html.erb | 3 +++ app/views/drivers/show.html.erb | 5 ++++- app/views/passengers/edit.html.erb | 3 +++ app/views/passengers/index.html.erb | 6 ++++-- app/views/passengers/show.html.erb | 5 ++++- config/routes.rb | 5 ++--- 9 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 app/views/drivers/edit.html.erb create mode 100644 app/views/passengers/edit.html.erb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 37fda7563..83ee2f53f 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -26,6 +26,20 @@ def create render new_driver_path end end + + def edit + @driver = Driver.find_by(id: params[:id]) + end + + def update + @driver = Driver.find_by(id: params[:id]) + + if @driver.update(driver_params) + redirect_to driver_path(@driver.id) + else + render new_driver_path + end + end private diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 96e7a00a1..07a3ebafc 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -27,6 +27,20 @@ def create end end + def edit + @passenger = Passenger.find_by(id: params[:id]) + end + + def update + @passenger = Passenger.find_by(id: params[:id]) + + if @passenger.update(passenger_params) + redirect_to passenger_path(@passenger.id) + else + render new_passenger_path + end + end + private def passenger_params diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb new file mode 100644 index 000000000..2fde1b948 --- /dev/null +++ b/app/views/drivers/edit.html.erb @@ -0,0 +1,3 @@ +

    Edit Driver:

    + +<%= render partial: "form", locals: { submit_button_label: "Edit", driver_form_class: "edit-driver-form" } %> diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index f0215213c..ff9895530 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -6,6 +6,9 @@
  • <%= link_to driver.name, driver_path(driver.id) %>
    • +
  • + <%= link_to "Edit", edit_driver_path(driver.id) %> +
    • <% end %> diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 2046732e3..f6d69d7b2 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -3,7 +3,10 @@
    -

    <%=@driver.vin%>

    +

    <%=@driver.vin%>

    +
    + <%= link_to "Edit", edit_driver_path(@driver.id) %> +

    Driver Trips: <%= %>

    diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb new file mode 100644 index 000000000..6c6e1b8fd --- /dev/null +++ b/app/views/passengers/edit.html.erb @@ -0,0 +1,3 @@ +

    Edit Passenger:

    + +<%= render partial: "form", locals: { submit_button_label: "Edit", passenger_form_class: "edit-passenger-form" } %> diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index 5d9e0dd6c..b07ade449 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -6,7 +6,9 @@
  • <%= link_to passenger.name, passenger_path(passenger.id) %>
    • - - <% end %> +
  • + <%= link_to "Edit", edit_passenger_path(passenger.id) %> +
    • + <% end %>
    diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 020a47885..8e2b309c1 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -3,7 +3,10 @@
    -

    <%=@passenger.phone_num%>

    +

    <%=@passenger.phone_num%>

    +
    + <%= link_to "Edit", edit_passenger_path(@passenger.id) %> +

    Passenger Trips: <%= %>

    diff --git a/config/routes.rb b/config/routes.rb index 7d1f67974..35544be22 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,9 +2,8 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root to: 'homepages#index' + resources :drivers - resources :drivers, only: [:index, :show, :new, :create] - - resources :passengers, only: [:index, :show, :new, :create] + resources :passengers end From 5d503b5e6eec4e661bd1d3a69143e4ee8e8ed705 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Tue, 8 Oct 2019 14:26:43 -0700 Subject: [PATCH 08/43] Implemented destroy action in Driver and Passenger --- app/controllers/drivers_controller.rb | 17 +++++++++++++++++ app/controllers/passengers_controller.rb | 13 +++++++++++++ app/views/drivers/index.html.erb | 5 ++++- app/views/drivers/show.html.erb | 3 ++- app/views/passengers/index.html.erb | 3 +++ app/views/passengers/show.html.erb | 3 ++- 6 files changed, 41 insertions(+), 3 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 83ee2f53f..25be1fb05 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -22,8 +22,10 @@ def create if @driver.save redirect_to driver_path(@driver.id) + return else render new_driver_path + return end end @@ -36,8 +38,23 @@ def update if @driver.update(driver_params) redirect_to driver_path(@driver.id) + return else render new_driver_path + return + end + end + + def destroy + driver = Driver.find_by(id: params[:id]) + + if driver.nil? + redirect_to drivers_path + return + else + driver.destroy + redirect_to drivers_path + return end end diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 07a3ebafc..032d03b1b 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -41,6 +41,19 @@ def update end end + def destroy + passenger = Passenger.find_by(id: params[:id]) + + if passenger.nil? + redirect_to passengers_path + return + else + passenger.destroy + redirect_to passengers_path + return + end + end + private def passenger_params diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index ff9895530..425c72af5 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -9,6 +9,9 @@
  • <%= link_to "Edit", edit_driver_path(driver.id) %>
    • - <% end %> +
  • + <%= link_to "Delete", driver_path(driver.id), method: :delete, data: { confirm: "Are you sure you want to delete this driver?" }, class: "index-delete-link" %> +
    • + <% end %>
    diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index f6d69d7b2..c59ba3020 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -4,8 +4,9 @@

    <%=@driver.vin%>

    -
    +
    <%= link_to "Edit", edit_driver_path(@driver.id) %> + <%= link_to "Delete", driver_path(@driver.id), method: :delete, data: { confirm: "Are you sure you want to delete this driver?" }, class: "index-delete-link" %>

    Driver Trips: <%= %> diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb index b07ade449..c05cf0315 100644 --- a/app/views/passengers/index.html.erb +++ b/app/views/passengers/index.html.erb @@ -9,6 +9,9 @@

  • <%= link_to "Edit", edit_passenger_path(passenger.id) %>
    • +
  • + <%= link_to "Delete", passenger_path(passenger.id), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }, class: "index-delete-link" %> +
    • <% end %>
    diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 8e2b309c1..f2b7946aa 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -4,8 +4,9 @@

    <%=@passenger.phone_num%>

    -
    +
    <%= link_to "Edit", edit_passenger_path(@passenger.id) %> + <%= link_to "Delete", passenger_path(@passenger.id), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }, class: "index-delete-link" %>

    Passenger Trips: <%= %> From 9429dbfd50c4b4f1b8d2ac5b9af5dbd47a14b47e Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Tue, 8 Oct 2019 15:10:15 -0700 Subject: [PATCH 09/43] Implemented tests for Driver and Passenger index, show, new, and create actions --- test/controllers/drivers_controller_test.rb | 75 +++++++++-------- .../controllers/passengers_controller_test.rb | 83 ++++++++++++++++--- test/controllers/trips_controller_test.rb | 28 +++++-- test/test_helper.rb | 7 ++ 4 files changed, 135 insertions(+), 58 deletions(-) diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 48aef7556..6607bc4a8 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -2,67 +2,70 @@ describe DriversController do # Note: If any of these tests have names that conflict with either the requirements or your team's decisions, feel empowered to change the test names. For example, if a given test name says "responds with 404" but your team's decision is to respond with redirect, please change the test name. + let (:driver) { + Driver.create(name: "sample driver", vin: "a sample vin") + } describe "index" do - it "responds with success when there are many drivers saved" do - # Arrange - # Ensure that there is at least one Driver saved - - # Act - - # Assert + it "responds with success when there is at least one Driver saved" do + Driver.create(name: "test driver", vin: "test vin") + get drivers_path + + must_respond_with :success + expect(Driver.count).must_be :>, 0 end it "responds with success when there are no drivers saved" do - # Arrange - # Ensure that there are zero drivers saved - - # Act - - # Assert - + get drivers_path + + must_respond_with :success + expect(Driver.count).must_equal 0 end end describe "show" do it "responds with success when showing an existing valid driver" do - # Arrange - # Ensure that there is a driver saved - - # Act - - # Assert - + get driver_path(driver.id) + + must_respond_with :success + expect(Driver.count).must_be :>, 0 end it "responds with 404 with an invalid driver id" do - # Arrange - # Ensure that there is an id that points to no driver - - # Act - - # Assert + get driver_path(-20) + must_respond_with :not_found end end describe "new" do it "responds with success" do + get new_driver_path + + must_respond_with :success end end describe "create" do it "can create a new driver with valid information accurately, and redirect" do - # Arrange - # Set up the form data - - # Act-Assert - # Ensure that there is a change of 1 in Driver.count - - # Assert - # Find the newly created Driver, and check that all its attributes match what was given in the form data - # Check that the controller redirected the user + driver_hash = { + driver: { + name: "new driver", + vin: "new vin" + } + } + + expect { + post drivers_path, params: driver_hash + }.must_change "Driver.count", 1 + + new_driver = Driver.find_by(name: driver_hash[:driver][:name]) + expect(new_driver.name).must_equal driver_hash[:driver][:name] + expect(new_driver.vin).must_equal driver_hash[:driver][:vin] + + must_respond_with :redirect + must_redirect_to driver_path(new_driver.id) end diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index 60acbdfb6..98cbe50aa 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -1,31 +1,88 @@ require "test_helper" describe PassengersController do + let (:passenger) { + Passenger.create(name: "sample passenger", phone_num: "sample number") + } + describe "index" do - # Your tests go here + it "responds with success when there is at least one Passenger saved" do + Passenger.create(name: "test passenger", phone_num: "test number") + + get passengers_path + + must_respond_with :success + expect(Passenger.count).must_be :>, 0 + end + + it "responds with success when there are no passengers saved" do + get passengers_path + + must_respond_with :success + expect(Passenger.count).must_equal 0 + end end - + describe "show" do - # Your tests go here + it "responds with success when showing an existing valid passenger" do + get passenger_path(passenger.id) + + must_respond_with :success + expect(Passenger.count).must_be :>, 0 + end + + it "responds with 404 with an invalid passenger id" do + get passenger_path(-20) + + must_respond_with :not_found + end end - + describe "new" do - # Your tests go here + it "responds with success" do + get new_passenger_path + + must_respond_with :success + end end - + describe "create" do - # Your tests go here + it "can create a new passenger with valid information accurately, and redirect" do + passenger_hash = { + passenger: { + name: "new passenger", + phone_num: "new phone number" + } + } + + expect { + post passengers_path, params: passenger_hash + }.must_change "Passenger.count", 1 + + new_passenger = Passenger.find_by(name: passenger_hash[:passenger][:name]) + expect(new_passenger.name).must_equal passenger_hash[:passenger][:name] + expect(new_passenger.phone_num).must_equal passenger_hash[:passenger][:phone_num] + + must_respond_with :redirect + must_redirect_to passenger_path(new_passenger.id) + end end - + describe "edit" do - # Your tests go here + it "" do + # Your tests go here + end end - + describe "update" do - # Your tests go here + it "" do + # Your tests go here + end end - + describe "destroy" do - # Your tests go here + it "" do + # Your tests go here + end end end diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index 59455c041..dae557efa 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -2,22 +2,32 @@ describe TripsController do describe "show" do - # Your tests go here + it "" do + # Your tests go here + end end - + describe "create" do - # Your tests go here + it "" do + # Your tests go here + end end - + describe "edit" do - # Your tests go here + it "" do + # Your tests go here + end end - + describe "update" do - # Your tests go here + it "" do + # Your tests go here + end end - + describe "destroy" do - # Your tests go here + it "" do + # Your tests go here + end end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab84e3d1..3632867d0 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -2,6 +2,13 @@ require_relative '../config/environment' require 'rails/test_help' +require "minitest/rails" +require "minitest/autorun" +require "minitest/reporters" +require "minitest/skip_dsl" + +Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new + class ActiveSupport::TestCase # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. fixtures :all From d2e754ab551d7fbc0efbcbc66221fffe67a4a390 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Tue, 8 Oct 2019 15:58:32 -0700 Subject: [PATCH 10/43] Implemented validation for driver vin and name when creating driver --- app/models/driver.rb | 3 +++ app/models/passenger.rb | 3 +++ app/views/drivers/new.html.erb | 10 ++++++++++ app/views/passengers/new.html.erb | 10 ++++++++++ test/controllers/drivers_controller_test.rb | 16 ++++++++-------- test/controllers/passengers_controller_test.rb | 13 +++++++++++++ 6 files changed, 47 insertions(+), 8 deletions(-) diff --git a/app/models/driver.rb b/app/models/driver.rb index 197e65507..5d88e3279 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,3 +1,6 @@ class Driver < ApplicationRecord has_many :trips + + validates :name, presence: true + validates :vin, presence: true end diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 2fef89192..5df27c9a8 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,3 +1,6 @@ class Passenger < ApplicationRecord has_many :trips + + validates :name, presence: true + validates :phone_num, presence: true end diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb index ae38f0b76..32ac0b003 100644 --- a/app/views/drivers/new.html.erb +++ b/app/views/drivers/new.html.erb @@ -1,3 +1,13 @@

    Add a Driver:

    +<% if @driver.errors.any? %> +
      + <% @driver.errors.each do |column, message| %> +
    • + <%= column.capitalize %> <%= message %> +
      • + <% end %> +
    +<% end %> + <%= render partial: "form", locals: { submit_button_label: "Create", driver_form_class: "new-driver-form" } %> diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb index 4a3678ecf..dddc2cda8 100644 --- a/app/views/passengers/new.html.erb +++ b/app/views/passengers/new.html.erb @@ -1,3 +1,13 @@

    Add a Passenger:

    +<% if @passenger.errors.any? %> +
      + <% @passenger.errors.each do |column, message| %> +
    • + <%= column.capitalize %> <%= message %> +
      • + <% end %> +
    +<% end %> + <%= render partial: "form", locals: { submit_button_label: "Create", passenger_form_class: "new-passenger-form" } %> diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 6607bc4a8..c0e1b1f2e 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -69,16 +69,16 @@ end - it "does not create a driver if the form data violates Driver validations, and responds with a redirect" do - # Note: This will not pass until ActiveRecord Validations lesson - # Arrange - # Set up the form data so that it violates Driver validations + it "does not create a driver if the form data violates Driver validations, and responds with a render of new driver page" do + new_driver = Driver.create(name: "", vin: "new vin") - # Act-Assert - # Ensure that there is no change in Driver.count + expect(Driver.count).must_equal 0 - # Assert - # Check that the controller redirects + expect(new_driver.valid?).must_equal false + + # # Assert + # # Check that the controller redirects + # must_redirect_with :render end end diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index 98cbe50aa..46fbdc24c 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -66,6 +66,19 @@ must_respond_with :redirect must_redirect_to passenger_path(new_passenger.id) end + + it "does not create a passenger if the form data violates Passenger validations, and responds with a render of new passenger page" do + new_passenger = Passenger.create(name: "", phone_num: "") + + expect(Passenger.count).must_equal 0 + + expect(new_passenger.valid?).must_equal false + + + # # Assert + # # Check that the controller redirects + # must_redirect_with :render + end end describe "edit" do From 327cbb30d92d831a6da459c418c50c7df122c5ed Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Tue, 8 Oct 2019 16:02:08 -0700 Subject: [PATCH 11/43] Implemented edit tests for Passenger and Driver --- app/controllers/drivers_controller.rb | 4 ++++ app/controllers/passengers_controller.rb | 4 ++++ test/controllers/drivers_controller_test.rb | 22 +++++++------------ .../controllers/passengers_controller_test.rb | 14 ++++++++++-- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 25be1fb05..e18bf6678 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -31,6 +31,10 @@ def create def edit @driver = Driver.find_by(id: params[:id]) + if @driver.nil? + redirect_to root_path + return + end end def update diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 032d03b1b..29c093f08 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -29,6 +29,10 @@ def create def edit @passenger = Passenger.find_by(id: params[:id]) + if @passenger.nil? + redirect_to root_path + return + end end def update diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index c0e1b1f2e..8407f083f 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -85,23 +85,17 @@ describe "edit" do it "responds with success when getting the edit page for an existing, valid driver" do - # Arrange - # Ensure there is an existing driver saved - - # Act - - # Assert - + get edit_driver_path(driver.id) + + must_respond_with :success + expect(Driver.count).must_be :>, 0 end it "responds with redirect when getting the edit page for a non-existing driver" do - # Arrange - # Ensure there is an invalid id that points to no driver - - # Act - - # Assert - + get edit_driver_path(-20) + + must_respond_with :redirect + must_redirect_to root_path end end diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index 46fbdc24c..5b133eb42 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -82,8 +82,18 @@ end describe "edit" do - it "" do - # Your tests go here + it "responds with success when getting the edit page for an existing, valid passenger" do + get edit_passenger_path(passenger.id) + + must_respond_with :success + expect(Passenger.count).must_be :>, 0 + end + + it "responds with redirect when getting the edit page for a non-existing driver" do + get edit_passenger_path(-20) + + must_respond_with :redirect + must_redirect_to root_path end end From 80f9360c5df033ff07b124453355e2c65ac603a3 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Tue, 8 Oct 2019 20:33:37 -0700 Subject: [PATCH 12/43] Implemented Passenger model test changes per instructor --- test/models/passenger_test.rb | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/test/models/passenger_test.rb b/test/models/passenger_test.rb index 66ac353d3..34580e2f0 100644 --- a/test/models/passenger_test.rb +++ b/test/models/passenger_test.rb @@ -2,7 +2,7 @@ describe Passenger do let (:new_passenger) { - Passenger.new(name: "Kari", phone_number: "111-111-1211") + Passenger.new(name: "Kari", phone_num: "111-111-1211") } it "can be instantiated" do # Assert @@ -13,8 +13,8 @@ # Arrange new_passenger.save passenger = Passenger.first - [:name, :phone_number].each do |field| - + [:name, :phone_num].each do |field| + # Assert expect(passenger).must_respond_to field end @@ -25,7 +25,7 @@ # Arrange new_passenger.save passenger = Passenger.first - + # Assert expect(passenger.trips.count).must_be :>, 0 passenger.trips.each do |trip| @@ -33,35 +33,35 @@ end end end - + describe "validations" do it "must have a name" do # Arrange new_passenger.name = nil - + # Assert expect(new_passenger.valid?).must_equal false expect(new_passenger.errors.messages).must_include :name expect(new_passenger.errors.messages[:name]).must_equal ["can't be blank"] end - + it "must have a phone number" do # Arrange - new_passenger.phone_number = nil - + new_passenger.phone_num = nil + # Assert expect(new_passenger.valid?).must_equal false - expect(new_passenger.errors.messages).must_include :new_passenger - expect(new_passenger.errors.messages[:new_passenger]).must_equal ["can't be blank"] + expect(new_passenger.errors.messages).must_include :phone_num + expect(new_passenger.errors.messages[:phone_num]).must_equal ["can't be blank"] end end - + # Tests for methods you create should go here describe "custom methods" do describe "request a ride" do # Your code here end - + describe "complete trip" do # Your code here end From b4067368ac6edaa9aeb2876a2629e9b39de6cf3a Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Tue, 8 Oct 2019 20:45:29 -0700 Subject: [PATCH 13/43] Implemented Updates tests for Driver and Passenger --- app/controllers/drivers_controller.rb | 15 +- app/controllers/passengers_controller.rb | 5 +- app/views/drivers/_form.html.erb | 10 ++ app/views/drivers/new.html.erb | 10 -- app/views/passengers/_form.html.erb | 11 ++ app/views/passengers/new.html.erb | 10 -- test/controllers/drivers_controller_test.rb | 139 ++++++++++-------- .../controllers/passengers_controller_test.rb | 78 ++++++++-- 8 files changed, 184 insertions(+), 94 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index e18bf6678..2f2ddbf39 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -28,7 +28,7 @@ def create return end end - + def edit @driver = Driver.find_by(id: params[:id]) if @driver.nil? @@ -36,11 +36,14 @@ def edit return end end - + def update @driver = Driver.find_by(id: params[:id]) - - if @driver.update(driver_params) + + if @driver.nil? + head :not_found + return + elsif @driver.update(driver_params) redirect_to driver_path(@driver.id) return else @@ -48,10 +51,10 @@ def update return end end - + def destroy driver = Driver.find_by(id: params[:id]) - + if driver.nil? redirect_to drivers_path return diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index 29c093f08..ae3e0b66f 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -38,7 +38,10 @@ def edit def update @passenger = Passenger.find_by(id: params[:id]) - if @passenger.update(passenger_params) + if @passenger.nil? + head :not_found + return + elsif @passenger.update(passenger_params) redirect_to passenger_path(@passenger.id) else render new_passenger_path diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb index 8ef067262..91d19cbe6 100644 --- a/app/views/drivers/_form.html.erb +++ b/app/views/drivers/_form.html.erb @@ -1,3 +1,13 @@ +<% if @driver.errors.any? %> +
      + <% @driver.errors.each do |column, message| %> +
    • + <%= column.capitalize %> <%= message %> +
      • + <% end %> +
    +<% end %> + <%= form_with model: @driver, class: driver_form_class do |f| %> <%# f.text_field :somenameofsomeattributeonbook ... in this case, :title %> diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb index 32ac0b003..ae38f0b76 100644 --- a/app/views/drivers/new.html.erb +++ b/app/views/drivers/new.html.erb @@ -1,13 +1,3 @@

    Add a Driver:

    -<% if @driver.errors.any? %> -
      - <% @driver.errors.each do |column, message| %> -
    • - <%= column.capitalize %> <%= message %> -
      • - <% end %> -
    -<% end %> - <%= render partial: "form", locals: { submit_button_label: "Create", driver_form_class: "new-driver-form" } %> diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index 9d7b8701a..d1d4c8fda 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -1,3 +1,14 @@ +<% if @passenger.errors.any? %> +
      + <% @passenger.errors.each do |column, message| %> +
    • + <%= column.capitalize %> <%= message %> +
      • + <% end %> +
    +<% end %> + + <%= form_with model: @passenger, class: passenger_form_class do |f| %> <%# f.text_field :somenameofsomeattributeonbook ... in this case, :title %> diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb index dddc2cda8..4a3678ecf 100644 --- a/app/views/passengers/new.html.erb +++ b/app/views/passengers/new.html.erb @@ -1,13 +1,3 @@

    Add a Passenger:

    -<% if @passenger.errors.any? %> -
      - <% @passenger.errors.each do |column, message| %> -
    • - <%= column.capitalize %> <%= message %> -
      • - <% end %> -
    -<% end %> - <%= render partial: "form", locals: { submit_button_label: "Create", passenger_form_class: "new-passenger-form" } %> diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 8407f083f..257effd7c 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -5,17 +5,17 @@ let (:driver) { Driver.create(name: "sample driver", vin: "a sample vin") } - + describe "index" do it "responds with success when there is at least one Driver saved" do Driver.create(name: "test driver", vin: "test vin") - + get drivers_path must_respond_with :success expect(Driver.count).must_be :>, 0 end - + it "responds with success when there are no drivers saved" do get drivers_path @@ -23,7 +23,7 @@ expect(Driver.count).must_equal 0 end end - + describe "show" do it "responds with success when showing an existing valid driver" do get driver_path(driver.id) @@ -31,14 +31,14 @@ must_respond_with :success expect(Driver.count).must_be :>, 0 end - + it "responds with 404 with an invalid driver id" do get driver_path(-20) - + must_respond_with :not_found end end - + describe "new" do it "responds with success" do get new_driver_path @@ -46,7 +46,7 @@ must_respond_with :success end end - + describe "create" do it "can create a new driver with valid information accurately, and redirect" do driver_hash = { @@ -55,31 +55,31 @@ vin: "new vin" } } - + expect { post drivers_path, params: driver_hash }.must_change "Driver.count", 1 - + new_driver = Driver.find_by(name: driver_hash[:driver][:name]) expect(new_driver.name).must_equal driver_hash[:driver][:name] expect(new_driver.vin).must_equal driver_hash[:driver][:vin] must_respond_with :redirect must_redirect_to driver_path(new_driver.id) - + end - + it "does not create a driver if the form data violates Driver validations, and responds with a render of new driver page" do new_driver = Driver.create(name: "", vin: "new vin") - + expect(Driver.count).must_equal 0 - + expect(new_driver.valid?).must_equal false - + # # Assert # # Check that the controller redirects - # must_redirect_with :render - + # must_respond_with :success + end end @@ -90,7 +90,7 @@ must_respond_with :success expect(Driver.count).must_be :>, 0 end - + it "responds with redirect when getting the edit page for a non-existing driver" do get edit_driver_path(-20) @@ -98,75 +98,98 @@ must_redirect_to root_path end end - + describe "update" do it "can update an existing driver with valid information accurately, and redirect" do - # Arrange - # Ensure there is an existing driver saved - # Assign the existing driver's id to a local variable - # Set up the form data - - # Act-Assert - # Ensure that there is no change in Driver.count - - # Assert - # Use the local variable of an existing driver's id to find the driver again, and check that its attributes are updated - # Check that the controller redirected the user + driver_hash = { + driver: { + name: "Updated name", + vin: "Updated vin" + } + } + driver_to_update = driver + + expect { + patch driver_path(driver_to_update.id), params: driver_hash + }.must_differ "Driver.count", 0 + + updated_driver = Driver.find_by(id: driver.id) + + expect(updated_driver.name).must_equal driver_hash[:driver][:name] + expect(updated_driver.vin).must_equal driver_hash[:driver][:vin] + + must_respond_with :redirect + must_redirect_to driver_path end - + it "does not update any driver if given an invalid id, and responds with a 404" do - # Arrange - # Ensure there is an invalid id that points to no driver - # Set up the form data + driver_hash = { + driver: { + name: "Updated name", + vin: "Updated vin" + } + } + + expect { + patch driver_path(-20), params: driver_hash + }.must_differ "Driver.count", 0 + + must_respond_with :not_found + end + + it "does not update a driver if the form data violates Driver validations, and responds with a render of current page" do + driver_hash = { + driver: { + name: "", + vin: "Updated vin" + } + } - # Act-Assert - # Ensure that there is no change in Driver.count + driver_to_update = driver - # Assert - # Check that the controller gave back a 404 + expect { + patch driver_path(driver_to_update.id), params: driver_hash + }.must_differ "Driver.count", 0 - end + validity = driver_to_update.update(name: "", vin: "updated vin") - it "does not create a driver if the form data violates Driver validations, and responds with a redirect" do + expect(validity).must_equal false + + + + # # Assert + # # Check that the controller redirects + # must_redirect_with :render # Note: This will not pass until ActiveRecord Validations lesson - # Arrange - # Ensure there is an existing driver saved - # Assign the existing driver's id to a local variable - # Set up the form data so that it violates Driver validations - - # Act-Assert - # Ensure that there is no change in Driver.count - - # Assert - # Check that the controller redirects + end end - + describe "destroy" do it "destroys the driver instance in db when driver exists, then redirects" do # Arrange # Ensure there is an existing driver saved - + # Act-Assert # Ensure that there is a change of -1 in Driver.count - + # Assert # Check that the controller redirects - + end - + it "does not change the db when the driver does not exist, then responds with " do # Arrange # Ensure there is an invalid id that points to no driver - + # Act-Assert # Ensure that there is no change in Driver.count - + # Assert # Check that the controller responds or redirects with whatever your group decides - + end end end diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index 5b133eb42..36a87536e 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -66,15 +66,15 @@ must_respond_with :redirect must_redirect_to passenger_path(new_passenger.id) end - + it "does not create a passenger if the form data violates Passenger validations, and responds with a render of new passenger page" do new_passenger = Passenger.create(name: "", phone_num: "") - + expect(Passenger.count).must_equal 0 - + expect(new_passenger.valid?).must_equal false - - + + # # Assert # # Check that the controller redirects # must_redirect_with :render @@ -88,8 +88,8 @@ must_respond_with :success expect(Passenger.count).must_be :>, 0 end - - it "responds with redirect when getting the edit page for a non-existing driver" do + + it "responds with redirect when getting the edit page for a non-existing passenger" do get edit_passenger_path(-20) must_respond_with :redirect @@ -98,8 +98,68 @@ end describe "update" do - it "" do - # Your tests go here + it "can update an existing passenger with valid information accurately, and redirect" do + passenger_hash = { + passenger: { + name: "Updated name", + phone_num: "Updated number" + } + } + + passenger_to_update = passenger + + expect { + patch passenger_path(passenger_to_update.id), params: passenger_hash + }.must_differ "Passenger.count", 0 + + updated_passenger = Passenger.find_by(id: passenger.id) + + expect(updated_passenger.name).must_equal passenger_hash[:passenger][:name] + expect(updated_passenger.phone_num).must_equal passenger_hash[:passenger][:phone_num] + + must_respond_with :redirect + must_redirect_to passenger_path + end + + it "does not update any passenger if given an invalid id, and responds with a 404" do + passenger_hash = { + passenger: { + name: "Updated name", + phone_num: "Updated number" + } + } + + expect { + patch passenger_path(-20), params: passenger_hash + }.must_differ "Passenger.count", 0 + + must_respond_with :not_found + end + + it "does not update a passenger if the form data violates Passenger validations, and responds with a render of current page" do + passenger_hash = { + passenger: { + name: "", + phone_num: "Updated number" + } + } + + passenger_to_update = passenger + + expect { + patch passenger_path(passenger_to_update.id), params: passenger_hash + }.must_differ "Passenger.count", 0 + + validity = passenger_to_update.update(name: "", phone_num: "Updated number") + + expect(validity).must_equal false + + # # Assert + # # Check that the controller redirects + # must_redirect_with :render + # Note: This will not pass until ActiveRecord Validations lesson + + end end From afc4285be82d7a30c1ded48916d24b4ee5ef9324 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Tue, 8 Oct 2019 20:52:49 -0700 Subject: [PATCH 14/43] Implemented Destroy tests for Driver and Passenger --- test/controllers/drivers_controller_test.rb | 35 ++++++++++++------- .../controllers/passengers_controller_test.rb | 35 +++++++++++++++++-- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 257effd7c..ba4b86e25 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -169,27 +169,38 @@ describe "destroy" do it "destroys the driver instance in db when driver exists, then redirects" do - # Arrange - # Ensure there is an existing driver saved + id_to_delete = driver.id - # Act-Assert - # Ensure that there is a change of -1 in Driver.count + expect { + delete driver_path(id_to_delete) + }.must_differ "Driver.count", -1 + + removed_driver = Driver.find_by(id: driver.id) + removed_driver.must_be_nil - # Assert - # Check that the controller redirects + must_redirect_to drivers_path end it "does not change the db when the driver does not exist, then responds with " do - # Arrange - # Ensure there is an invalid id that points to no driver + nonexistent_id = -20 - # Act-Assert - # Ensure that there is no change in Driver.count + expect { + delete driver_path(nonexistent_id) + }.must_differ "Driver.count", 0 - # Assert - # Check that the controller responds or redirects with whatever your group decides + must_redirect_to drivers_path + end + + it "will redirect to driver index page if driver was already deleted" do + id_to_delete = driver.id + Driver.destroy_all + + expect { + delete driver_path(id_to_delete) + }.must_differ "Driver.count", 0 + must_redirect_to drivers_path end end end diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index 36a87536e..928126c51 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -164,8 +164,39 @@ end describe "destroy" do - it "" do - # Your tests go here + it "destroys the passenger instance in db when passenger exists, then redirects" do + id_to_delete = passenger.id + + expect { + delete passenger_path(id_to_delete) + }.must_differ "Passenger.count", -1 + + removed_passenger = Passenger.find_by(id: passenger.id) + removed_passenger.must_be_nil + + must_redirect_to passengers_path + + end + + it "does not change the db when the passenger does not exist, then responds with " do + nonexistent_id = -20 + + expect { + delete passenger_path(nonexistent_id) + }.must_differ "Passenger.count", 0 + + must_redirect_to passengers_path + end + + it "will redirect to passenger index page if passenger was already deleted" do + id_to_delete = passenger.id + Passenger.destroy_all + + expect { + delete passenger_path(id_to_delete) + }.must_differ "Passenger.count", 0 + + must_redirect_to passengers_path end end end From 5d71526f21bd56fe06f08f7769d3a9d7fff138e0 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Wed, 9 Oct 2019 10:10:53 -0700 Subject: [PATCH 15/43] Implemented validation tests for success response --- test/controllers/drivers_controller_test.rb | 38 +++++++++---------- .../controllers/passengers_controller_test.rb | 34 +++++++++-------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index ba4b86e25..703f803c8 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -70,16 +70,19 @@ end it "does not create a driver if the form data violates Driver validations, and responds with a render of new driver page" do - new_driver = Driver.create(name: "", vin: "new vin") + assert Driver.create(name: "", vin: "new vin").valid? == false expect(Driver.count).must_equal 0 - expect(new_driver.valid?).must_equal false - - # # Assert - # # Check that the controller redirects - # must_respond_with :success + driver_hash = { + driver: { + name: "", + vin: "new vin" + } + } + post drivers_path, params: driver_hash + must_respond_with :success end end @@ -107,7 +110,7 @@ vin: "Updated vin" } } - + driver_to_update = driver expect { @@ -145,25 +148,20 @@ vin: "Updated vin" } } - + driver_to_update = driver - + expect { patch driver_path(driver_to_update.id), params: driver_hash }.must_differ "Driver.count", 0 - + + must_respond_with :success + validity = driver_to_update.update(name: "", vin: "updated vin") - - expect(validity).must_equal false - + expect(validity).must_equal false - # # Assert - # # Check that the controller redirects # must_redirect_with :render - # Note: This will not pass until ActiveRecord Validations lesson - - end end @@ -174,7 +172,7 @@ expect { delete driver_path(id_to_delete) }.must_differ "Driver.count", -1 - + removed_driver = Driver.find_by(id: driver.id) removed_driver.must_be_nil @@ -191,7 +189,7 @@ must_redirect_to drivers_path end - + it "will redirect to driver index page if driver was already deleted" do id_to_delete = driver.id Driver.destroy_all diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index 928126c51..e61de62b3 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -68,15 +68,20 @@ end it "does not create a passenger if the form data violates Passenger validations, and responds with a render of new passenger page" do - new_passenger = Passenger.create(name: "", phone_num: "") + assert Passenger.create(name: "", phone_num: "").valid? == false expect(Passenger.count).must_equal 0 - expect(new_passenger.valid?).must_equal false + passenger_hash = { + passenger: { + name: "", + phone_num: "new number" + } + } + post passengers_path, params: passenger_hash + must_respond_with :success - # # Assert - # # Check that the controller redirects # must_redirect_with :render end end @@ -120,7 +125,7 @@ must_respond_with :redirect must_redirect_to passenger_path end - + it "does not update any passenger if given an invalid id, and responds with a 404" do passenger_hash = { passenger: { @@ -143,23 +148,20 @@ phone_num: "Updated number" } } - + passenger_to_update = passenger - + expect { patch passenger_path(passenger_to_update.id), params: passenger_hash }.must_differ "Passenger.count", 0 - + + must_respond_with :success + validity = passenger_to_update.update(name: "", phone_num: "Updated number") - + expect(validity).must_equal false - # # Assert - # # Check that the controller redirects # must_redirect_with :render - # Note: This will not pass until ActiveRecord Validations lesson - - end end @@ -170,7 +172,7 @@ expect { delete passenger_path(id_to_delete) }.must_differ "Passenger.count", -1 - + removed_passenger = Passenger.find_by(id: passenger.id) removed_passenger.must_be_nil @@ -187,7 +189,7 @@ must_redirect_to passengers_path end - + it "will redirect to passenger index page if passenger was already deleted" do id_to_delete = passenger.id Passenger.destroy_all From 621e739d885a08b99f4926ec9196c2dbc319735a Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Wed, 9 Oct 2019 12:07:19 -0700 Subject: [PATCH 16/43] Implemented list of trips for Driver and Passenger show page --- app/controllers/drivers_controller.rb | 2 ++ app/controllers/trips_controller.rb | 3 +++ app/views/drivers/show.html.erb | 15 ++++++++++++--- app/views/passengers/show.html.erb | 15 ++++++++++++--- config/routes.rb | 5 +++-- 5 files changed, 32 insertions(+), 8 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 2f2ddbf39..76cbf4974 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -11,6 +11,8 @@ def show head :not_found return end + + # @driver_trips = @driver.trips end def new diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 4275f53c7..d22bf3b1f 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,2 +1,5 @@ class TripsController < ApplicationController + def show + + end end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index c59ba3020..51225abee 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -8,8 +8,17 @@ <%= link_to "Edit", edit_driver_path(@driver.id) %> <%= link_to "Delete", driver_path(@driver.id), method: :delete, data: { confirm: "Are you sure you want to delete this driver?" }, class: "index-delete-link" %>
    -

    - Driver Trips: <%= %> -

    + +
    + <% if @driver.trips.empty? %> +

    Driver has 0 trips

    + <% else %> +

    Driver Trips:

    +

    Passenger(s)

    + <% @driver.trips.each do |trip| %> + <%= trip.passenger.name %>
    + <% end %> + <% end %> +
    diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index f2b7946aa..8943a2b75 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -8,8 +8,17 @@ <%= link_to "Edit", edit_passenger_path(@passenger.id) %> <%= link_to "Delete", passenger_path(@passenger.id), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }, class: "index-delete-link" %>
    -

    - Passenger Trips: <%= %> -

    + +
    + <% if @passenger.trips.empty? %> +

    Passenger has 0 trips

    + <% else %> +

    Passenger Trips:

    +

    Driver(s)

    + <% @passenger.trips.each do |trip| %> + <%= trip.driver.name %>
    + <% end %> + <% end %> +
    diff --git a/config/routes.rb b/config/routes.rb index 35544be22..269ea2495 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,8 +2,9 @@ # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html root to: 'homepages#index' - resources :drivers + resources :drivers resources :passengers - + + resources :trips, except: [:index] end From 837b41c171e720383bda7c6900ce7db0f544ffaa Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Wed, 9 Oct 2019 13:50:30 -0700 Subject: [PATCH 17/43] Implemented Trip show action. Changed Driver active attribute default to false --- app/controllers/drivers_controller.rb | 2 - app/controllers/trips_controller.rb | 23 +++++++++++- app/views/drivers/show.html.erb | 8 ++-- app/views/passengers/show.html.erb | 8 ++-- app/views/trips/show.html.erb | 37 +++++++++++++++++++ config/routes.rb | 2 +- .../20191009192133_add_active_to_drivers.rb | 5 +++ ..._change_active_default_value_in_drivers.rb | 5 +++ db/schema.rb | 3 +- test/controllers/trips_controller_test.rb | 21 ++++++++++- test/models/driver_test.rb | 5 +-- 11 files changed, 103 insertions(+), 16 deletions(-) create mode 100644 app/views/trips/show.html.erb create mode 100644 db/migrate/20191009192133_add_active_to_drivers.rb create mode 100644 db/migrate/20191009204621_change_active_default_value_in_drivers.rb diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 76cbf4974..2f2ddbf39 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -11,8 +11,6 @@ def show head :not_found return end - - # @driver_trips = @driver.trips end def new diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index d22bf3b1f..7f78547b0 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -1,5 +1,26 @@ class TripsController < ApplicationController def show - + trip_id = params[:id] + @trip = Trip.find_by(id: trip_id) + if @trip.nil? + redirect_to trips_path + return + end + end + + def create + + end + + def edit + + end + + def update + + end + + def destroy + end end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 51225abee..3f8003530 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -15,9 +15,11 @@ <% else %>

    Driver Trips:

    Passenger(s)

    - <% @driver.trips.each do |trip| %> - <%= trip.passenger.name %>
    - <% end %> +
      + <% @driver.trips.each do |trip| %> +
    • <%= link_to trip.passenger.name, trip_path(trip.id) %>
      • + <% end %> +
    <% end %> diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 8943a2b75..d577776ec 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -15,9 +15,11 @@ <% else %>

    Passenger Trips:

    Driver(s)

    - <% @passenger.trips.each do |trip| %> - <%= trip.driver.name %>
    - <% end %> +
      + <% @passenger.trips.each do |trip| %> +
    • <%= link_to trip.driver.name, trip_path(trip.id)%>
      • + <% end %> +
    <% end %> diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb new file mode 100644 index 000000000..58354e8f5 --- /dev/null +++ b/app/views/trips/show.html.erb @@ -0,0 +1,37 @@ +

    Trip# <%= @trip.id %>

    + +
      +
    • + Date +
      • +
    • + Driver +
      • +
    • + Passenger +
      • +
    • + Cost +
      • +
    • + Rating +
      • +
    + +
      +
    • + <%= @trip.date %> +
      • +
    • + <%= @trip.driver.name %> +
      • +
    • + <%= @trip.passenger.name %> +
      • +
    • + <%= @trip.cost %> +
      • +
    • + <%= @trip.rating %> +
      • +
    diff --git a/config/routes.rb b/config/routes.rb index 269ea2495..1f6563f61 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,5 +6,5 @@ resources :passengers - resources :trips, except: [:index] + resources :trips, except: [:index, :new] end diff --git a/db/migrate/20191009192133_add_active_to_drivers.rb b/db/migrate/20191009192133_add_active_to_drivers.rb new file mode 100644 index 000000000..88c1c1631 --- /dev/null +++ b/db/migrate/20191009192133_add_active_to_drivers.rb @@ -0,0 +1,5 @@ +class AddActiveToDrivers < ActiveRecord::Migration[5.2] + def change + add_column :drivers, :active, :boolean, :default => true + end +end diff --git a/db/migrate/20191009204621_change_active_default_value_in_drivers.rb b/db/migrate/20191009204621_change_active_default_value_in_drivers.rb new file mode 100644 index 000000000..24a00fec7 --- /dev/null +++ b/db/migrate/20191009204621_change_active_default_value_in_drivers.rb @@ -0,0 +1,5 @@ +class ChangeActiveDefaultValueInDrivers < ActiveRecord::Migration[5.2] + def change + change_column :drivers, :active, :boolean, :default => false + end +end diff --git a/db/schema.rb b/db/schema.rb index 14b32c5b3..d9f56b25a 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: 2019_10_07_225854) do +ActiveRecord::Schema.define(version: 2019_10_09_204621) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -20,6 +20,7 @@ t.string "vin" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.boolean "active", default: false end create_table "passengers", force: :cascade do |t| diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index dae557efa..b5d14161e 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -1,9 +1,26 @@ require "test_helper" describe TripsController do + let (:driver) { + Driver.create(name: "sample driver", vin: "a sample vin") + } + let (:passenger) { + Passenger.create(name: "sample passenger", phone_num: "sample number") + } + let (:trip) { + Trip.create date: Date.today, rating: 4, cost: 23.00, driver: driver, passenger: passenger + } describe "show" do - it "" do - # Your tests go here + it "can get a valid trip" do + get trip_path(trip.id) + + must_respond_with :success + end + + it "will redirect for an invalid trip" do + get trip_path(-1) + + must_respond_with :redirect end end diff --git a/test/models/driver_test.rb b/test/models/driver_test.rb index 9f12d286c..58031f0e0 100644 --- a/test/models/driver_test.rb +++ b/test/models/driver_test.rb @@ -2,8 +2,7 @@ describe Driver do let (:new_driver) { - Driver.new(name: "Kari", vin: "123", active: true, - car_make: "Cherry", car_model: "DR5") + Driver.new(name: "Kari", vin: "123", active: true) } it "can be instantiated" do # Assert @@ -14,7 +13,7 @@ # Arrange new_driver.save driver = Driver.first - [:name, :vin, :active, :car_make, :car_model].each do |field| + [:name, :vin, :active].each do |field| # Assert expect(driver).must_respond_to field From f8da13dea488406b2a705e57a71094492053edd8 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Wed, 9 Oct 2019 15:51:57 -0700 Subject: [PATCH 18/43] Implemented Request Trip feature --- app/controllers/trips_controller.rb | 18 +++++++++ app/views/passengers/show.html.erb | 4 ++ config/routes.rb | 4 +- test/controllers/drivers_controller_test.rb | 2 +- test/controllers/trips_controller_test.rb | 44 +++++++++++++++++++-- 5 files changed, 66 insertions(+), 6 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 7f78547b0..1b3c24e85 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -9,7 +9,19 @@ def show end def create + driver_id = Driver.find_by(active: false).id + head :not_found if driver_id.nil? + + @trip = Trip.new(date: Date.today, rating: nil, cost: 13.00, driver_id: driver_id, passenger_id: params[:passenger_id]) + + if @trip.save + redirect_to trip_path(@trip.id) + return + else + redirect_to passenger_path(@trip.passenger_id) + return + end end def edit @@ -23,4 +35,10 @@ def update def destroy end + + # private + + # def trip_params + # return params.require(:trip).permit(:date, :rating, :cost, :driver_id, :passenger_id) + # end end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index d577776ec..d41e6bdf4 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -9,6 +9,10 @@ <%= link_to "Delete", passenger_path(@passenger.id), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }, class: "index-delete-link" %> +

    + <%= link_to "Request Ride", passenger_trips_path(@passenger.id), method: :post, data: { confirm: "Are you sure you want to request a trip?" } %> +

    +
    <% if @passenger.trips.empty? %>

    Passenger has 0 trips

    diff --git a/config/routes.rb b/config/routes.rb index 1f6563f61..c1948c22c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,9 @@ resources :drivers - resources :passengers + resources :passengers do + resources :trips, only: [:create] + end resources :trips, except: [:index, :new] end diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 703f803c8..99ea0fdbd 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -3,7 +3,7 @@ describe DriversController do # Note: If any of these tests have names that conflict with either the requirements or your team's decisions, feel empowered to change the test names. For example, if a given test name says "responds with 404" but your team's decision is to respond with redirect, please change the test name. let (:driver) { - Driver.create(name: "sample driver", vin: "a sample vin") + Driver.create(name: "sample driver", vin: "a sample vin", active: false) } describe "index" do diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index b5d14161e..e0fb28df3 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -2,13 +2,13 @@ describe TripsController do let (:driver) { - Driver.create(name: "sample driver", vin: "a sample vin") + Driver.create(name: "sample driver", vin: "a sample vin", active: false) } let (:passenger) { Passenger.create(name: "sample passenger", phone_num: "sample number") } let (:trip) { - Trip.create date: Date.today, rating: 4, cost: 23.00, driver: driver, passenger: passenger + Trip.create date: Date.today, rating: 4, cost: 23.00, driver_id: driver.id, passenger_id: passenger.id } describe "show" do it "can get a valid trip" do @@ -25,9 +25,45 @@ end describe "create" do - it "" do - # Your tests go here + it "can create a new trip with valid information accurately, and redirect" do + new_pass = Passenger.create(name: "sample passenger", phone_num: "sample number") + new_driver = Driver.create(name: "sample driver", vin: "a sample vin", active: false) + + + expect { + post passenger_trips_path(new_pass.id) + }.must_change "Trip.count", 1 + + new_trip = Trip.first + expect(new_trip.date).must_equal Date.today + expect(new_trip.rating).must_be_nil + expect(new_trip.cost).must_equal 13.00 + expect(new_trip.driver_id).must_equal new_driver.id + expect(new_trip.passenger_id).must_equal new_pass.id + + must_respond_with :redirect + must_redirect_to trip_path(new_trip.id) end + + it "must have a driver and passenger when a trip is created" do + new_pass = Passenger.create(name: "sample passenger", phone_num: "sample number") + new_driver = Driver.create(name: "sample driver", vin: "a sample vin", active: false) + + trip_hash = { + date: Date.today, + rating: 4, + cost: 15.00, + driver_id: new_driver.id, + passenger_id: new_pass.id + } + + new_trip = Trip.create(trip_hash) + + expect(new_trip.driver).wont_be_nil + expect(new_trip.passenger).wont_be_nil + end + + end describe "edit" do From f320afd7584e5dbcbde51f4493573ef509fe36ca Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Wed, 9 Oct 2019 22:16:46 -0700 Subject: [PATCH 19/43] Added additional test for create trip --- app/controllers/trips_controller.rb | 9 ++++--- test/controllers/trips_controller_test.rb | 29 ++++++++++++----------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 1b3c24e85..43c02a9f6 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -9,11 +9,14 @@ def show end def create - driver_id = Driver.find_by(active: false).id + driver = Driver.find_by(active: false) - head :not_found if driver_id.nil? + if driver.nil? + head :not_found + return + end - @trip = Trip.new(date: Date.today, rating: nil, cost: 13.00, driver_id: driver_id, passenger_id: params[:passenger_id]) + @trip = Trip.new(date: Date.today, rating: nil, cost: 13.00, driver_id: driver.id, passenger_id: params[:passenger_id]) if @trip.save redirect_to trip_path(@trip.id) diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index e0fb28df3..50e152d2a 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -8,7 +8,7 @@ Passenger.create(name: "sample passenger", phone_num: "sample number") } let (:trip) { - Trip.create date: Date.today, rating: 4, cost: 23.00, driver_id: driver.id, passenger_id: passenger.id + Trip.create(date: Date.today, rating: 4, cost: 23.00, driver_id: driver.id, passenger_id: passenger.id) } describe "show" do it "can get a valid trip" do @@ -26,35 +26,30 @@ describe "create" do it "can create a new trip with valid information accurately, and redirect" do - new_pass = Passenger.create(name: "sample passenger", phone_num: "sample number") - new_driver = Driver.create(name: "sample driver", vin: "a sample vin", active: false) - + available_driver = driver expect { - post passenger_trips_path(new_pass.id) + post passenger_trips_path(passenger.id) }.must_change "Trip.count", 1 new_trip = Trip.first expect(new_trip.date).must_equal Date.today expect(new_trip.rating).must_be_nil expect(new_trip.cost).must_equal 13.00 - expect(new_trip.driver_id).must_equal new_driver.id - expect(new_trip.passenger_id).must_equal new_pass.id + expect(new_trip.driver_id).must_equal available_driver.id + expect(new_trip.passenger_id).must_equal passenger.id must_respond_with :redirect must_redirect_to trip_path(new_trip.id) end - it "must have a driver and passenger when a trip is created" do - new_pass = Passenger.create(name: "sample passenger", phone_num: "sample number") - new_driver = Driver.create(name: "sample driver", vin: "a sample vin", active: false) - + it "must have a driver and passenger when a trip is created" do trip_hash = { date: Date.today, rating: 4, cost: 15.00, - driver_id: new_driver.id, - passenger_id: new_pass.id + driver_id: driver.id, + passenger_id: passenger.id } new_trip = Trip.create(trip_hash) @@ -63,7 +58,13 @@ expect(new_trip.passenger).wont_be_nil end - + it "if no driver is available, respond with not found error" do + unavailable_driver = Driver.create(name: "sample driver", vin: "a sample vin", active: true) + + post passenger_trips_path(passenger.id) + + must_respond_with :not_found + end end describe "edit" do From afa51ae4b5f472d968ee1b18a3b5a06730f132f6 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Wed, 9 Oct 2019 22:35:16 -0700 Subject: [PATCH 20/43] Implemented edit trip action --- app/controllers/trips_controller.rb | 35 ++++++++++++++++++++++++----- app/views/drivers/_form.html.erb | 1 - app/views/passengers/_form.html.erb | 1 - app/views/trips/edit.html.erb | 18 +++++++++++++++ app/views/trips/show.html.erb | 10 ++++++--- 5 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 app/views/trips/edit.html.erb diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 43c02a9f6..63b2e33e7 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -28,20 +28,43 @@ def create end def edit - + @trip = Trip.find_by(id: params[:id]) + if @trip.nil? + redirect_to root_path + return + end end def update - + @trip = Trip.find_by(id: params[:id]) + if @trip.nil? + redirect_to root_path + return + elsif @trip.update(trip_params) + redirect_to trip_path(@trip.id) + return + else + render edit_trip_path + return + end end def destroy + selected_trip = Trip.find_by(id: params[:id]) + if selected_trip.nil? + redirect_to trips_path + return + else + selected_trip.destroy + redirect_to trips_path + return + end end - # private + private - # def trip_params - # return params.require(:trip).permit(:date, :rating, :cost, :driver_id, :passenger_id) - # end + def trip_params + return params.require(:trip).permit(:date, :rating, :cost, :driver_id, :passenger_id) + end end diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb index 91d19cbe6..856db4a21 100644 --- a/app/views/drivers/_form.html.erb +++ b/app/views/drivers/_form.html.erb @@ -10,7 +10,6 @@ <%= form_with model: @driver, class: driver_form_class do |f| %> - <%# f.text_field :somenameofsomeattributeonbook ... in this case, :title %> <%= f.label :driver_name %> <%= f.text_field :name %> <%= f.label :vin %> diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb index d1d4c8fda..a159505fb 100644 --- a/app/views/passengers/_form.html.erb +++ b/app/views/passengers/_form.html.erb @@ -11,7 +11,6 @@ <%= form_with model: @passenger, class: passenger_form_class do |f| %> - <%# f.text_field :somenameofsomeattributeonbook ... in this case, :title %> <%= f.label :passenger_name %> <%= f.text_field :name %> <%= f.label :phone_number %> diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb new file mode 100644 index 000000000..a85c1ddc3 --- /dev/null +++ b/app/views/trips/edit.html.erb @@ -0,0 +1,18 @@ +

    Edit Trip #<%= @trip.id %>:

    + +<%= form_with model: @trip do |f| %> + + <%= f.label :trip_date %> + <%= f.text_field :date %> + <%= f.label :rating %> + <%= f.text_field :rating %> + <%= f.label :cost %> + <%= f.text_field :cost %> + <%= f.label :driver_id %> + <%= f.text_field :driver_id %> + <%= f.label :passenger_id %> + <%= f.text_field :passenger_id %> + + <%= f.submit "Edit", class: "form-button" %> + +<% end %> diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 58354e8f5..09d5c98cf 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -1,4 +1,8 @@ -

    Trip# <%= @trip.id %>

    +

    Trip #<%= @trip.id %>

    +
    + <%= link_to "Edit", edit_trip_path(@trip.id) %> + <%= link_to "Delete", trip_path(@trip.id), method: :delete, data: { confirm: "Are you sure you want to delete this trip?" }, class: "index-delete-link" %> +
    • @@ -23,10 +27,10 @@ <%= @trip.date %>
    • - <%= @trip.driver.name %> + <%= link_to @trip.driver.name, driver_path(@trip.driver.id) %>
    • - <%= @trip.passenger.name %> + <%= link_to @trip.passenger.name, passenger_path(@trip.passenger.id) %>
    • <%= @trip.cost %> From 19b49056dce233e4374fea84d111dc2b79c9f3f8 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Wed, 9 Oct 2019 22:36:03 -0700 Subject: [PATCH 21/43] Implemented delete trip action --- test/controllers/trips_controller_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index 50e152d2a..e16e8d4ab 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -69,7 +69,7 @@ describe "edit" do it "" do - # Your tests go here + # Your tests go here end end From 66f606900b49a6d0e4822ce5cbd31d8f3d000794 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Wed, 9 Oct 2019 22:41:02 -0700 Subject: [PATCH 22/43] Updated trip destroy action redirects --- app/controllers/trips_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 63b2e33e7..9eb1edcc9 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -51,13 +51,14 @@ def update def destroy selected_trip = Trip.find_by(id: params[:id]) + trip_passenger = selected_trip.passenger if selected_trip.nil? - redirect_to trips_path + redirect_to passenger_path(trip_passenger.id) return else selected_trip.destroy - redirect_to trips_path + redirect_to passenger_path(trip_passenger.id) return end end From 323ea5335bca9fc11c45eea3c21042439ba44b2b Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Wed, 9 Oct 2019 22:53:05 -0700 Subject: [PATCH 23/43] Refactored show pages --- app/views/drivers/show.html.erb | 14 +++++++++++--- app/views/passengers/show.html.erb | 14 +++++++++++--- app/views/trips/show.html.erb | 20 +++++--------------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 3f8003530..b035a651f 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -3,7 +3,7 @@
      -

      <%=@driver.vin%>

      +

      Vin #<%=@driver.vin%>

      <%= link_to "Edit", edit_driver_path(@driver.id) %> <%= link_to "Delete", driver_path(@driver.id), method: :delete, data: { confirm: "Are you sure you want to delete this driver?" }, class: "index-delete-link" %> @@ -14,10 +14,18 @@

      Driver has 0 trips

      <% else %>

      Driver Trips:

      -

      Passenger(s)

      +
        +

      • Date

        • +

      • Passenger

        • +

      • Cost

        • +

      • Rating

        • +
        <% @driver.trips.each do |trip| %> -
      • <%= link_to trip.passenger.name, trip_path(trip.id) %>
        • +
      • <%=link_to trip.date, trip_path(trip.id)%>
        • +
      • <%=link_to trip.passenger.name, passenger_path(trip.passenger.id)%>
        • +
      • <%=trip.cost%>
        • +
      • <%=trip.rating%>
        • <% end %>
      <% end %> diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index d41e6bdf4..f1165ec03 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -3,7 +3,7 @@
      -

      <%=@passenger.phone_num%>

      +

      Phone #<%=@passenger.phone_num%>

      <%= link_to "Edit", edit_passenger_path(@passenger.id) %> <%= link_to "Delete", passenger_path(@passenger.id), method: :delete, data: { confirm: "Are you sure you want to delete this passenger?" }, class: "index-delete-link" %> @@ -18,10 +18,18 @@

      Passenger has 0 trips

      <% else %>

      Passenger Trips:

      -

      Driver(s)

      +
        +

      • Date

        • +

      • Driver

        • +

      • Cost

        • +

      • Rating

        • +
        <% @passenger.trips.each do |trip| %> -
      • <%= link_to trip.driver.name, trip_path(trip.id)%>
        • +
      • <%=link_to trip.date, trip_path(trip.id)%>
        • +
      • <%=link_to trip.driver.name, driver_path(trip.driver.id)%>
        • +
      • <%=trip.cost%>
        • +
      • <%=trip.rating%>
        • <% end %>
      <% end %> diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 09d5c98cf..b125a0b71 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -5,21 +5,11 @@
        -
      • - Date -
        • -
      • - Driver -
        • -
      • - Passenger -
        • -
      • - Cost -
        • -
      • - Rating -
        • +

      • Date

        • +

      • Driver

        • +

      • Passenger

        • +

      • Cost

        • +

      • Rating

        From 9b4aae4593c7fa0c67ed990759b3557df1018ff2 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Wed, 9 Oct 2019 22:53:29 -0700 Subject: [PATCH 24/43] Implemented trip edit action tests --- test/controllers/trips_controller_test.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index e16e8d4ab..f6a9e697c 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -68,8 +68,18 @@ end describe "edit" do - it "" do - # Your tests go here + it "responds with success when getting the edit page for an existing, valid driver" do + get edit_trip_path(trip.id) + + must_respond_with :success + expect(Trip.count).must_be :>, 0 + end + + it "responds with redirect when getting the edit page for a non-existing driver" do + get edit_trip_path(-20) + + must_respond_with :redirect + must_redirect_to root_path end end From 84dd46c36a0adf5ce3b991a1e02127dbc68c9c36 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Thu, 10 Oct 2019 15:17:35 -0700 Subject: [PATCH 25/43] Implemented average_rating and total_earnings Driver methods --- app/controllers/drivers_controller.rb | 2 +- app/controllers/passengers_controller.rb | 6 +- app/controllers/trips_controller.rb | 17 ++-- app/models/driver.rb | 20 +++++ app/models/passenger.rb | 5 ++ app/views/drivers/show.html.erb | 2 +- app/views/trips/edit.html.erb | 4 + test/controllers/drivers_controller_test.rb | 5 +- .../controllers/passengers_controller_test.rb | 8 +- test/controllers/trips_controller_test.rb | 80 ++++++++++++++++++- test/models/driver_test.rb | 42 ++++++---- test/models/passenger_test.rb | 19 +++-- 12 files changed, 165 insertions(+), 45 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 2f2ddbf39..74dd4db31 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -47,7 +47,7 @@ def update redirect_to driver_path(@driver.id) return else - render new_driver_path + render :edit return end end diff --git a/app/controllers/passengers_controller.rb b/app/controllers/passengers_controller.rb index ae3e0b66f..b10327b88 100644 --- a/app/controllers/passengers_controller.rb +++ b/app/controllers/passengers_controller.rb @@ -22,8 +22,10 @@ def create if @passenger.save redirect_to passenger_path(@passenger.id) + return else render new_passenger_path + return end end @@ -43,8 +45,10 @@ def update return elsif @passenger.update(passenger_params) redirect_to passenger_path(@passenger.id) + return else - render new_passenger_path + render :edit + return end end diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 9eb1edcc9..4b2696acb 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -9,14 +9,15 @@ def show end def create - driver = Driver.find_by(active: false) + passenger = Passenger.find_by(id: params[:passenger_id]) + driver = passenger.find_driver if driver.nil? head :not_found return end - @trip = Trip.new(date: Date.today, rating: nil, cost: 13.00, driver_id: driver.id, passenger_id: params[:passenger_id]) + @trip = Trip.new(date: Date.today, rating: nil, cost: 13.00, driver_id: driver.id, passenger_id: passenger.id) if @trip.save redirect_to trip_path(@trip.id) @@ -37,28 +38,30 @@ def edit def update @trip = Trip.find_by(id: params[:id]) + if @trip.nil? - redirect_to root_path + head :not_found return elsif @trip.update(trip_params) + puts "trip updated" redirect_to trip_path(@trip.id) return else - render edit_trip_path + render :edit + puts "trip not updated" return end end def destroy selected_trip = Trip.find_by(id: params[:id]) - trip_passenger = selected_trip.passenger if selected_trip.nil? - redirect_to passenger_path(trip_passenger.id) + head :not_found return else selected_trip.destroy - redirect_to passenger_path(trip_passenger.id) + redirect_to passenger_path(selected_trip.passenger.id) return end end diff --git a/app/models/driver.rb b/app/models/driver.rb index 5d88e3279..3768c2ab1 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -3,4 +3,24 @@ class Driver < ApplicationRecord validates :name, presence: true validates :vin, presence: true + + def average_rating + all_trips = self.trips + total = 0 + all_trips.each do |trip| + total += trip.rating + end + + return total / all_trips.length + end + + def total_earnings + all_trips = self.trips + total = 0 + all_trips.each do |trip| + total += trip.cost + end + + return total + end end diff --git a/app/models/passenger.rb b/app/models/passenger.rb index 5df27c9a8..cbbf44245 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -3,4 +3,9 @@ class Passenger < ApplicationRecord validates :name, presence: true validates :phone_num, presence: true + + def find_driver + driver = Driver.find_by(active: false) + return driver + end end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index b035a651f..abe9ef179 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -1,5 +1,5 @@
        -

        <%=@driver.name%>

        +

        <%=@driver.name%> Id #<%=@driver.id%>

        diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb index a85c1ddc3..6869377fd 100644 --- a/app/views/trips/edit.html.erb +++ b/app/views/trips/edit.html.erb @@ -4,12 +4,16 @@ <%= f.label :trip_date %> <%= f.text_field :date %> + <%= f.label :rating %> <%= f.text_field :rating %> + <%= f.label :cost %> <%= f.text_field :cost %> + <%= f.label :driver_id %> <%= f.text_field :driver_id %> + <%= f.label :passenger_id %> <%= f.text_field :passenger_id %> diff --git a/test/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 99ea0fdbd..5184276a4 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -160,8 +160,6 @@ validity = driver_to_update.update(name: "", vin: "updated vin") expect(validity).must_equal false - - # must_redirect_with :render end end @@ -177,10 +175,9 @@ removed_driver.must_be_nil must_redirect_to drivers_path - end - it "does not change the db when the driver does not exist, then responds with " do + it "does not change the db when the driver does not exist, then responds with redirect" do nonexistent_id = -20 expect { diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index e61de62b3..5895b0477 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -80,9 +80,7 @@ } post passengers_path, params: passenger_hash - must_respond_with :success - - # must_redirect_with :render + must_respond_with :success end end @@ -160,8 +158,6 @@ validity = passenger_to_update.update(name: "", phone_num: "Updated number") expect(validity).must_equal false - - # must_redirect_with :render end end @@ -180,7 +176,7 @@ end - it "does not change the db when the passenger does not exist, then responds with " do + it "does not change the db when the passenger does not exist, then responds with redirect" do nonexistent_id = -20 expect { diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index f6a9e697c..8c3b9f426 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -84,14 +84,86 @@ end describe "update" do - it "" do - # Your tests go here + it "can update an existing trip accurately, and redirect" do + new_driver = Driver.create(name: "updated driver", vin: "updated vin", active: false) + new_passenger = Passenger.create(name: "updated passenger", phone_num: "updated number") + + new_trip = Trip.create(date: Date.today, rating: 4, cost: 23.00, driver_id: driver.id, passenger_id: passenger.id) + + + p driver + p passenger + + p new_driver + p new_passenger + p new_trip + + trip_hash = { + trip: { + date: Date.today + 1, + rating: 1, + cost: 10.00, + driver_id: new_driver, + passenger_id: new_passenger + } + } + + # trip_to_update = trip + + expect { + patch trip_path(new_trip.id), params: trip_hash + }.must_differ "Trip.count", 0 + + # updated_trip = Trip.find_by(id: new_trip.id) + + # expect(new_trip.date).must_equal trip_hash[:trip][:date] + # expect(new_trip.rating).must_equal trip_hash[:trip][:rating] + + must_respond_with :redirect + must_redirect_to trip_path + end + + it "does not update any trip if given an invalid id, and responds with a 404" do + trip_hash = { + trip: { + date: Date.today + 1, + rating: 1, + cost: 10.00, + driver_id: 1, + passenger_id: 1 + } + } + + expect { + patch trip_path(-20), params: trip_hash + }.must_differ "Trip.count", 0 + + must_respond_with :not_found end end describe "destroy" do - it "" do - # Your tests go here + it "destroys the trip instance in db when trip exists, then redirects" do + id_to_delete = trip.id + + expect { + delete trip_path(id_to_delete) + }.must_differ "Trip.count", -1 + + removed_trip = Trip.find_by(id: trip.id) + removed_trip.must_be_nil + + must_respond_with :redirect + end + + it "does not change the db when the trip does not exist, then responds with not found" do + nonexistent_id = -20 + + expect { + delete trip_path(nonexistent_id) + }.must_differ "Trip.count", 0 + + must_respond_with :not_found end end end diff --git a/test/models/driver_test.rb b/test/models/driver_test.rb index 58031f0e0..28ebc9079 100644 --- a/test/models/driver_test.rb +++ b/test/models/driver_test.rb @@ -8,24 +8,24 @@ # Assert expect(new_driver.valid?).must_equal true end - + it "will have the required fields" do # Arrange new_driver.save driver = Driver.first [:name, :vin, :active].each do |field| - + # Assert expect(driver).must_respond_to field end end - + describe "relationships" do it "can have many trips" do # Arrange new_driver.save driver = Driver.first - + # Assert expect(driver.trips.count).must_be :>=, 0 driver.trips.each do |trip| @@ -33,47 +33,59 @@ end end end - + describe "validations" do it "must have a name" do # Arrange new_driver.name = nil - + # Assert expect(new_driver.valid?).must_equal false expect(new_driver.errors.messages).must_include :name expect(new_driver.errors.messages[:name]).must_equal ["can't be blank"] end - + it "must have a VIN number" do # Arrange new_driver.vin = nil - + # Assert expect(new_driver.valid?).must_equal false expect(new_driver.errors.messages).must_include :vin expect(new_driver.errors.messages[:vin]).must_equal ["can't be blank"] end end - + # Tests for methods you create should go here describe "custom methods" do + before do + @test_driver = Driver.create(name: "Kari", vin: "123", active: true) + @new_passenger = Passenger.create(name: "sample passenger", phone_num: "sample number") + + @trip1 = Trip.create(date: Date.today, rating: 4, cost: 23.00, driver_id: @test_driver.id, passenger_id: @new_passenger.id) + @trip2 = Trip.create(date: Date.today, rating: 2, cost: 13.00, driver_id: @test_driver.id, passenger_id: @new_passenger.id) + end describe "average rating" do - # Your code here + it "calculates accurate rating average" do + expect(@test_driver.average_rating).must_equal 3 + end end - + describe "total earnings" do - # Your code here + it "calculates accurate cost total" do + expect(@test_driver.total_earnings).must_equal 36.00 + + end end - + describe "can go online" do # Your code here end - + describe "can go offline" do # Your code here end - + # You may have additional methods to test end end diff --git a/test/models/passenger_test.rb b/test/models/passenger_test.rb index 34580e2f0..1211e35f5 100644 --- a/test/models/passenger_test.rb +++ b/test/models/passenger_test.rb @@ -8,24 +8,27 @@ # Assert expect(new_passenger.valid?).must_equal true end - + it "will have the required fields" do # Arrange new_passenger.save passenger = Passenger.first [:name, :phone_num].each do |field| - + # Assert expect(passenger).must_respond_to field end end - + describe "relationships" do it "can have many trips" do # Arrange new_passenger.save passenger = Passenger.first - + + driver = Driver.create(name: "sample driver", vin: "a sample vin", active: false) + Trip.create(date: Date.today, rating: 4, cost: 23.00, driver_id: driver.id, passenger_id: passenger.id) + # Assert expect(passenger.trips.count).must_be :>, 0 passenger.trips.each do |trip| @@ -59,12 +62,16 @@ # Tests for methods you create should go here describe "custom methods" do describe "request a ride" do - # Your code here + it "can select an available driver" do + passenger = Passenger.create(name: "sample passenger", phone_num: "sample number") + trip = Trip.create(date: Date.today, rating: 4, cost: 23.00, driver_id: passenger.find_driver, passenger_id: passenger.id) + + expect(trip).wont_be_nil + end end describe "complete trip" do # Your code here end - # You may have additional methods to test here end end From 73d8b1d394867d302935799ee91c7e789d7bbb3a Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Thu, 10 Oct 2019 17:09:05 -0700 Subject: [PATCH 26/43] Implemented toggle_active --- app/assets/stylesheets/application.css | 4 ++++ app/controllers/drivers_controller.rb | 23 +++++++++++++++++++++++ app/models/driver.rb | 14 ++++++++++---- app/views/drivers/show.html.erb | 13 +++++++++++-- app/views/passengers/show.html.erb | 3 ++- app/views/trips/show.html.erb | 3 ++- config/routes.rb | 2 ++ test/models/driver_test.rb | 26 ++++++++++++++++---------- 8 files changed, 70 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index d05ea0f51..31fe228eb 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,3 +13,7 @@ *= require_tree . *= require_self */ +*{ + background: purple; + color: beige; +} diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 74dd4db31..35661bc2d 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -65,6 +65,29 @@ def destroy end end + def toggle_active + @driver = Driver.find_by(id: params[:id]) + + @driver.toggle + redirect_to driver_path(@driver.id) + + # if @driver.nil? + # puts "NO DRIVER FOUND" + # redirect_to drivers_path + # return + # elsif @driver.active == true + # puts "DRIVER CHANGED TO FALSE" + # @driver.update(active: false) + # redirect_to driver_path(@driver.id) + # return + # else + # puts "DRIVER CHANGED TO TRUE" + # @driver.update(active: true) + # redirect_to driver_path(@driver.id) + # return + # end + end + private def driver_params diff --git a/app/models/driver.rb b/app/models/driver.rb index 3768c2ab1..4b71cd2d6 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -8,7 +8,7 @@ def average_rating all_trips = self.trips total = 0 all_trips.each do |trip| - total += trip.rating + total += trip.rating unless trip.rating.nil? end return total / all_trips.length @@ -18,9 +18,15 @@ def total_earnings all_trips = self.trips total = 0 all_trips.each do |trip| - total += trip.cost + total += trip.cost unless trip.cost.nil? end - - return total + + # convert cents to dollars + return total / 100 + end + + def toggle + self.active = self.active ? false : true + self.save end end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index abe9ef179..680777197 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -1,14 +1,22 @@

        <%=@driver.name%> Id #<%=@driver.id%>

        +

        <%=@driver.active%>

        + <%if @driver.active%> + Unavailable + <%else%> + Available + <%end%>

        Vin #<%=@driver.vin%>

        +

        Average Rating: <%=@driver.average_rating%>

        +

        Total earnings: $<%='%.2f' % @driver.total_earnings%>

        <%= link_to "Edit", edit_driver_path(@driver.id) %> <%= link_to "Delete", driver_path(@driver.id), method: :delete, data: { confirm: "Are you sure you want to delete this driver?" }, class: "index-delete-link" %>
        - +

        <%=link_to "Toggle Active", toggle_active_path(@driver.id), method: :patch%>

        <% if @driver.trips.empty? %>

        Driver has 0 trips

        @@ -24,7 +32,8 @@ <% @driver.trips.each do |trip| %>
      • <%=link_to trip.date, trip_path(trip.id)%>
      • <%=link_to trip.passenger.name, passenger_path(trip.passenger.id)%>
        • -
      • <%=trip.cost%>
        • + <% trip_cost = trip.cost / 100 %> +
      • <%= '%.2f' % trip_cost %>
      • <%=trip.rating%>
        • <% end %>
      diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index f1165ec03..03210037b 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -28,7 +28,8 @@ <% @passenger.trips.each do |trip| %>
    • <%=link_to trip.date, trip_path(trip.id)%>
    • <%=link_to trip.driver.name, driver_path(trip.driver.id)%>
      • -
    • <%=trip.cost%>
      • + <% trip_cost = trip.cost / 100 %> +
    • <%= '%.2f' % trip_cost %>
    • <%=trip.rating%>
      • <% end %>
    diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index b125a0b71..4d8cad24c 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -23,7 +23,8 @@ <%= link_to @trip.passenger.name, passenger_path(@trip.passenger.id) %>
  • - <%= @trip.cost %> + <% trip_cost = @trip.cost / 100%> + <%= '%.2f' % trip_cost %>
  • <%= @trip.rating %> diff --git a/config/routes.rb b/config/routes.rb index c1948c22c..805e9511f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,4 +9,6 @@ end resources :trips, except: [:index, :new] + + patch 'drivers/:id/toggle_active', to: 'drivers#toggle_active', as: 'toggle_active' end diff --git a/test/models/driver_test.rb b/test/models/driver_test.rb index 28ebc9079..0076eb3ce 100644 --- a/test/models/driver_test.rb +++ b/test/models/driver_test.rb @@ -61,7 +61,7 @@ before do @test_driver = Driver.create(name: "Kari", vin: "123", active: true) @new_passenger = Passenger.create(name: "sample passenger", phone_num: "sample number") - + @trip1 = Trip.create(date: Date.today, rating: 4, cost: 23.00, driver_id: @test_driver.id, passenger_id: @new_passenger.id) @trip2 = Trip.create(date: Date.today, rating: 2, cost: 13.00, driver_id: @test_driver.id, passenger_id: @new_passenger.id) end @@ -74,18 +74,24 @@ describe "total earnings" do it "calculates accurate cost total" do expect(@test_driver.total_earnings).must_equal 36.00 - end end - describe "can go online" do - # Your code here - end - - describe "can go offline" do - # Your code here + describe "toggle_active" do + it "can go online - available (active:false)" do + inactive_driver = Driver.create(name: "Kari", vin: "123", active: true) + + patch toggle_active_path(inactive_driver.id) + + completed_ = Driver.find_by(name: "An incomplete task") + + expect (completed_task.completed).must_be_kind_of ActiveSupport::TimeWithZone + expect (completed_task.completed).must_be_close_to Time.now, 0.05 + end + + it "can go offline - unavailable (active:true)" do + # Your code here + end end - - # You may have additional methods to test end end From de6bcbb614a9d4682d6947e8b015f5ba284d220e Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Thu, 10 Oct 2019 17:49:59 -0700 Subject: [PATCH 27/43] Debugged trips_controller update test and implemented driver toggle_active tests --- app/controllers/drivers_controller.rb | 2 +- app/controllers/trips_controller.rb | 19 +++++++------ app/models/driver.rb | 20 +++++++------ test/controllers/trips_controller_test.rb | 34 ++++++++--------------- test/models/driver_test.rb | 19 +++++++------ 5 files changed, 45 insertions(+), 49 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 35661bc2d..81e43f492 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -68,7 +68,7 @@ def destroy def toggle_active @driver = Driver.find_by(id: params[:id]) - @driver.toggle + @driver.toggle_active redirect_to driver_path(@driver.id) # if @driver.nil? diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 4b2696acb..983ecb36f 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -7,19 +7,20 @@ def show return end end - + def create passenger = Passenger.find_by(id: params[:passenger_id]) driver = passenger.find_driver - + if driver.nil? head :not_found return end - - @trip = Trip.new(date: Date.today, rating: nil, cost: 13.00, driver_id: driver.id, passenger_id: passenger.id) + + @trip = Trip.new(date: Date.today, rating: nil, cost: 1300, driver_id: driver.id, passenger_id: passenger.id) if @trip.save + @trip.driver.toggle_active redirect_to trip_path(@trip.id) return else @@ -27,7 +28,7 @@ def create return end end - + def edit @trip = Trip.find_by(id: params[:id]) if @trip.nil? @@ -46,7 +47,7 @@ def update puts "trip updated" redirect_to trip_path(@trip.id) return - else + else render :edit puts "trip not updated" return @@ -55,7 +56,7 @@ def update def destroy selected_trip = Trip.find_by(id: params[:id]) - + if selected_trip.nil? head :not_found return @@ -65,9 +66,9 @@ def destroy return end end - + private - + def trip_params return params.require(:trip).permit(:date, :rating, :cost, :driver_id, :passenger_id) end diff --git a/app/models/driver.rb b/app/models/driver.rb index 4b71cd2d6..a8203ee51 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -1,31 +1,35 @@ class Driver < ApplicationRecord has_many :trips - + validates :name, presence: true validates :vin, presence: true - + def average_rating all_trips = self.trips total = 0 all_trips.each do |trip| total += trip.rating unless trip.rating.nil? end - - return total / all_trips.length + + if all_trips.length > 0 + return total / all_trips.length + else + return nil + end end - + def total_earnings all_trips = self.trips total = 0 all_trips.each do |trip| total += trip.cost unless trip.cost.nil? end - + # convert cents to dollars return total / 100 end - - def toggle + + def toggle_active self.active = self.active ? false : true self.save end diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index 8c3b9f426..1ae1f7992 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -8,7 +8,7 @@ Passenger.create(name: "sample passenger", phone_num: "sample number") } let (:trip) { - Trip.create(date: Date.today, rating: 4, cost: 23.00, driver_id: driver.id, passenger_id: passenger.id) + Trip.create(date: Date.today, rating: 4, cost: 2300, driver_id: driver.id, passenger_id: passenger.id) } describe "show" do it "can get a valid trip" do @@ -35,7 +35,7 @@ new_trip = Trip.first expect(new_trip.date).must_equal Date.today expect(new_trip.rating).must_be_nil - expect(new_trip.cost).must_equal 13.00 + expect(new_trip.cost).must_equal 1300 expect(new_trip.driver_id).must_equal available_driver.id expect(new_trip.passenger_id).must_equal passenger.id @@ -84,40 +84,30 @@ end describe "update" do - it "can update an existing trip accurately, and redirect" do - new_driver = Driver.create(name: "updated driver", vin: "updated vin", active: false) - new_passenger = Passenger.create(name: "updated passenger", phone_num: "updated number") - + it "can update an existing trip accurately, and redirect" do new_trip = Trip.create(date: Date.today, rating: 4, cost: 23.00, driver_id: driver.id, passenger_id: passenger.id) - - - p driver - p passenger - - p new_driver - p new_passenger - p new_trip - + trip_hash = { trip: { date: Date.today + 1, rating: 1, cost: 10.00, - driver_id: new_driver, - passenger_id: new_passenger + driver_id: driver.id, + passenger_id: passenger.id, } } - # trip_to_update = trip - expect { patch trip_path(new_trip.id), params: trip_hash }.must_differ "Trip.count", 0 - # updated_trip = Trip.find_by(id: new_trip.id) + new_trip.reload - # expect(new_trip.date).must_equal trip_hash[:trip][:date] - # expect(new_trip.rating).must_equal trip_hash[:trip][:rating] + expect(new_trip.date).must_equal trip_hash[:trip][:date] + expect(new_trip.rating).must_equal trip_hash[:trip][:rating] + expect(new_trip.cost).must_equal trip_hash[:trip][:cost] + expect(new_trip.driver_id).must_equal trip_hash[:trip][:driver_id] + expect(new_trip.passenger_id).must_equal trip_hash[:trip][:passenger_id] must_respond_with :redirect must_redirect_to trip_path diff --git a/test/models/driver_test.rb b/test/models/driver_test.rb index 0076eb3ce..64038cb07 100644 --- a/test/models/driver_test.rb +++ b/test/models/driver_test.rb @@ -62,8 +62,8 @@ @test_driver = Driver.create(name: "Kari", vin: "123", active: true) @new_passenger = Passenger.create(name: "sample passenger", phone_num: "sample number") - @trip1 = Trip.create(date: Date.today, rating: 4, cost: 23.00, driver_id: @test_driver.id, passenger_id: @new_passenger.id) - @trip2 = Trip.create(date: Date.today, rating: 2, cost: 13.00, driver_id: @test_driver.id, passenger_id: @new_passenger.id) + @trip1 = Trip.create(date: Date.today, rating: 4, cost: 2300, driver_id: @test_driver.id, passenger_id: @new_passenger.id) + @trip2 = Trip.create(date: Date.today, rating: 2, cost: 1300, driver_id: @test_driver.id, passenger_id: @new_passenger.id) end describe "average rating" do it "calculates accurate rating average" do @@ -79,18 +79,19 @@ describe "toggle_active" do it "can go online - available (active:false)" do - inactive_driver = Driver.create(name: "Kari", vin: "123", active: true) + test_driver = Driver.create(name: "Kari", vin: "123", active: true) - patch toggle_active_path(inactive_driver.id) + test_driver.toggle_active - completed_ = Driver.find_by(name: "An incomplete task") - - expect (completed_task.completed).must_be_kind_of ActiveSupport::TimeWithZone - expect (completed_task.completed).must_be_close_to Time.now, 0.05 + expect (test_driver.active).must_equal false end it "can go offline - unavailable (active:true)" do - # Your code here + test_driver = Driver.create(name: "Kari", vin: "123", active: false) + + test_driver.toggle_active + + expect (test_driver.active).must_equal true end end end From d85e49553aafac15c85ca29ea32c98d717773a82 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Thu, 10 Oct 2019 18:16:46 -0700 Subject: [PATCH 28/43] Implemented testing relationships and validation in Trip model --- test/models/trip_test.rb | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb index 0b0b2da32..fe01da359 100644 --- a/test/models/trip_test.rb +++ b/test/models/trip_test.rb @@ -1,22 +1,37 @@ require "test_helper" describe Trip do + let (:driver) { + Driver.create(name: "sample driver", vin: "a sample vin", active: false) + } + let (:passenger) { + Passenger.create(name: "sample passenger", phone_num: "sample number") + } + let (:trip) { + Trip.create(date: Date.today, rating: 4, cost: 2300, driver_id: driver.id, passenger_id: passenger.id) + } it "can be instantiated" do # Your code here end - + it "will have the required fields" do # Your code here end - + describe "relationships" do - # Your tests go here + it "has relationships to driver and passenger" do + expect(trip.driver).must_be_instance_of Driver + expect(trip.passenger).must_be_instance_of Passenger + end end - + describe "validations" do - # Your tests go here + it "won't create a trip if driver or passenger are invalid" do + invalid_trip = Trip.create(date: Date.today, rating: 4, cost: 2300, driver_id: nil, passenger_id: nil) + expect(invalid_trip.id).must_be_nil + end end - + # Tests for methods you create should go here describe "custom methods" do # Your tests here From 26a9e05849a0804cd49865550fc45b9ad27914b2 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Thu, 10 Oct 2019 18:30:18 -0700 Subject: [PATCH 29/43] Implemented Trip model tests --- test/models/trip_test.rb | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb index fe01da359..f0f8dec84 100644 --- a/test/models/trip_test.rb +++ b/test/models/trip_test.rb @@ -11,11 +11,21 @@ Trip.create(date: Date.today, rating: 4, cost: 2300, driver_id: driver.id, passenger_id: passenger.id) } it "can be instantiated" do - # Your code here + expect(trip.valid?).must_equal true + expect(trip).must_be_instance_of Trip + expect(trip).wont_be_nil end it "will have the required fields" do - # Your code here + expect(trip.date).wont_be_nil + expect(trip.rating).wont_be_nil + expect(trip.cost).wont_be_nil + expect(trip.driver_id).wont_be_nil + expect(trip.passenger_id).wont_be_nil + + [:date, :rating, :cost, :driver_id, :passenger_id].each do |field| + expect(trip).must_respond_to field + end end describe "relationships" do @@ -26,14 +36,16 @@ end describe "validations" do - it "won't create a trip if driver or passenger are invalid" do - invalid_trip = Trip.create(date: Date.today, rating: 4, cost: 2300, driver_id: nil, passenger_id: nil) + it "must have a driver" do + invalid_trip = Trip.create(date: Date.today, rating: 4, cost: 2300, driver_id: nil, passenger_id: passenger.id) expect(invalid_trip.id).must_be_nil + expect(invalid_trip.valid?).must_equal false + end + + it "must have a passenger" do + invalid_trip = Trip.create(date: Date.today, rating: 4, cost: 2300, driver_id: driver.id, passenger_id: nil) + expect(invalid_trip.id).must_be_nil + expect(invalid_trip.valid?).must_equal false end - end - - # Tests for methods you create should go here - describe "custom methods" do - # Your tests here end end From b772f6d40cdf697e14d8d5fb586d4ac12c0d32aa Mon Sep 17 00:00:00 2001 From: Stephanie Garcia Date: Thu, 10 Oct 2019 18:44:16 -0700 Subject: [PATCH 30/43] changed backgroumd color --- app/assets/stylesheets/application.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 31fe228eb..f5fc337e9 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -14,6 +14,6 @@ *= require_self */ *{ - background: purple; + background: plum; color: beige; } From 881738715d91fd6c12de7607d4c7e5c295f64ea3 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Thu, 10 Oct 2019 18:56:46 -0700 Subject: [PATCH 31/43] Updated homepage and driver show page --- app/views/drivers/show.html.erb | 8 ++++---- app/views/homepages/index.html.erb | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 680777197..bc95af792 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -1,17 +1,17 @@

    <%=@driver.name%> Id #<%=@driver.id%>

    -

    <%=@driver.active%>

    <%if @driver.active%> - Unavailable +

    Unavailable

    <%else%> - Available +

    Available

    <%end%>

    Vin #<%=@driver.vin%>

    Average Rating: <%=@driver.average_rating%>

    -

    Total earnings: $<%='%.2f' % @driver.total_earnings%>

    +

    Total Earnings: $<%='%.2f' % @driver.total_earnings%>

    +

    Total Trips Given: <%=@driver.trips.count%>

    <%= link_to "Edit", edit_driver_path(@driver.id) %> <%= link_to "Delete", driver_path(@driver.id), method: :delete, data: { confirm: "Are you sure you want to delete this driver?" }, class: "index-delete-link" %> diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb index e69de29bb..ce93513bf 100644 --- a/app/views/homepages/index.html.erb +++ b/app/views/homepages/index.html.erb @@ -0,0 +1,2 @@ +

    <%= link_to "Manage Drivers", drivers_path %>

    +

    <%= link_to "Manage Passengers", passengers_path %>

    From d29ce7d8421aef63eaac4eea26e050402cff7be4 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Thu, 10 Oct 2019 20:02:43 -0700 Subject: [PATCH 32/43] Implemented rate trip --- app/controllers/trips_controller.rb | 2 +- app/models/passenger.rb | 4 ++-- app/views/trips/show.html.erb | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 983ecb36f..0bd973029 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -17,7 +17,7 @@ def create return end - @trip = Trip.new(date: Date.today, rating: nil, cost: 1300, driver_id: driver.id, passenger_id: passenger.id) + @trip = Trip.new(date: Date.today, rating: nil, cost: rand(500..5000), driver_id: driver.id, passenger_id: passenger.id) if @trip.save @trip.driver.toggle_active diff --git a/app/models/passenger.rb b/app/models/passenger.rb index cbbf44245..f48096a28 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -1,9 +1,9 @@ class Passenger < ApplicationRecord has_many :trips - + validates :name, presence: true validates :phone_num, presence: true - + def find_driver driver = Driver.find_by(active: false) return driver diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 4d8cad24c..decc52380 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -4,6 +4,15 @@ <%= link_to "Delete", trip_path(@trip.id), method: :delete, data: { confirm: "Are you sure you want to delete this trip?" }, class: "index-delete-link" %>
    +

    + <% if @trip.rating.nil? %> + <%= form_with model: @trip do |f| %> + <%= f.label :rating %> + <%= f.select :rating, [1, 2, 3, 4, 5] %> + <%= f.submit "Complete Trip", class: "form-button" %> + <% end %> + <% end %> +

    • Date

    • Driver

      • From ab93be67c304f5464ac8a7fbb374eaac31fb2523 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Thu, 10 Oct 2019 20:27:31 -0700 Subject: [PATCH 33/43] Implement complete trip when assigning rating --- app/controllers/drivers_controller.rb | 16 ---------------- app/controllers/trips_controller.rb | 10 ++++++++++ app/views/trips/show.html.erb | 6 +++++- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 81e43f492..700272a4f 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -70,22 +70,6 @@ def toggle_active @driver.toggle_active redirect_to driver_path(@driver.id) - - # if @driver.nil? - # puts "NO DRIVER FOUND" - # redirect_to drivers_path - # return - # elsif @driver.active == true - # puts "DRIVER CHANGED TO FALSE" - # @driver.update(active: false) - # redirect_to driver_path(@driver.id) - # return - # else - # puts "DRIVER CHANGED TO TRUE" - # @driver.update(active: true) - # redirect_to driver_path(@driver.id) - # return - # end end private diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 0bd973029..35b521a6a 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -67,6 +67,16 @@ def destroy end end + def complete_trip + @trip = Trip.find_by(id: params[:id]) + + unless @trip.driver + @trip.driver.toggle_active + redirect_to trip_path(@trip.id) + return + end + end + private def trip_params diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index decc52380..f1838a075 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -1,4 +1,5 @@

      Trip #<%= @trip.id %>

      +
      <%= link_to "Edit", edit_trip_path(@trip.id) %> <%= link_to "Delete", trip_path(@trip.id), method: :delete, data: { confirm: "Are you sure you want to delete this trip?" }, class: "index-delete-link" %> @@ -9,9 +10,12 @@ <%= form_with model: @trip do |f| %> <%= f.label :rating %> <%= f.select :rating, [1, 2, 3, 4, 5] %> - <%= f.submit "Complete Trip", class: "form-button" %> + <%= f.submit "Submit Rating", class: "form-button" %> <% end %> <% end %> + <% if @trip.rating %> + <% @trip.driver.toggle_active %> + <% end %>

      • Date

        • From 0fab62ca89e2bbac8f1abd9b5fa72cdb097d0c55 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Thu, 10 Oct 2019 22:33:35 -0700 Subject: [PATCH 34/43] Implemented business logic for driver earnings --- app/controllers/trips_controller.rb | 6 ++---- app/models/driver.rb | 3 ++- app/models/passenger.rb | 11 +++++++++++ app/views/passengers/show.html.erb | 3 +++ app/views/trips/show.html.erb | 2 +- test/controllers/trips_controller_test.rb | 2 +- test/models/driver_test.rb | 2 +- 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 35b521a6a..3fe0563f0 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -20,7 +20,7 @@ def create @trip = Trip.new(date: Date.today, rating: nil, cost: rand(500..5000), driver_id: driver.id, passenger_id: passenger.id) if @trip.save - @trip.driver.toggle_active + @trip.driver.active redirect_to trip_path(@trip.id) return else @@ -44,12 +44,10 @@ def update head :not_found return elsif @trip.update(trip_params) - puts "trip updated" redirect_to trip_path(@trip.id) return else render :edit - puts "trip not updated" return end end @@ -71,7 +69,7 @@ def complete_trip @trip = Trip.find_by(id: params[:id]) unless @trip.driver - @trip.driver.toggle_active + @trip.driver.inactive redirect_to trip_path(@trip.id) return end diff --git a/app/models/driver.rb b/app/models/driver.rb index a8203ee51..88e626eec 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -22,7 +22,8 @@ def total_earnings all_trips = self.trips total = 0 all_trips.each do |trip| - total += trip.cost unless trip.cost.nil? + trip_cost = (trip.cost - 165) * 0.80 + total += trip_cost unless trip.cost.nil? end # convert cents to dollars diff --git a/app/models/passenger.rb b/app/models/passenger.rb index f48096a28..b926448cb 100644 --- a/app/models/passenger.rb +++ b/app/models/passenger.rb @@ -8,4 +8,15 @@ def find_driver driver = Driver.find_by(active: false) return driver end + + def total_paid + all_trips = self.trips + total = 0 + all_trips.each do |trip| + total += trip.cost unless trip.cost.nil? + end + + # convert cents to dollars + return total / 100 + end end diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb index 03210037b..e6eb72ae5 100644 --- a/app/views/passengers/show.html.erb +++ b/app/views/passengers/show.html.erb @@ -12,6 +12,9 @@

        <%= link_to "Request Ride", passenger_trips_path(@passenger.id), method: :post, data: { confirm: "Are you sure you want to request a trip?" } %>

        +

        + Total Paid: $<%= @passenger.total_paid %> +

        <% if @passenger.trips.empty? %> diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index f1838a075..59ab8d493 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -13,7 +13,7 @@ <%= f.submit "Submit Rating", class: "form-button" %> <% end %> <% end %> - <% if @trip.rating %> + <% if @trip.rating && @trip.driver.active %> <% @trip.driver.toggle_active %> <% end %> diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index 1ae1f7992..2abb35e1e 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -35,7 +35,7 @@ new_trip = Trip.first expect(new_trip.date).must_equal Date.today expect(new_trip.rating).must_be_nil - expect(new_trip.cost).must_equal 1300 + expect(new_trip.cost).must_be_instance_of Float expect(new_trip.driver_id).must_equal available_driver.id expect(new_trip.passenger_id).must_equal passenger.id diff --git a/test/models/driver_test.rb b/test/models/driver_test.rb index 64038cb07..b94e8d7cf 100644 --- a/test/models/driver_test.rb +++ b/test/models/driver_test.rb @@ -73,7 +73,7 @@ describe "total earnings" do it "calculates accurate cost total" do - expect(@test_driver.total_earnings).must_equal 36.00 + expect(@test_driver.total_earnings).must_equal 26.16 end end From 687ca58dd850e6f7892ffcd7161980d547f0fdc4 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Thu, 10 Oct 2019 23:39:51 -0700 Subject: [PATCH 35/43] Refactored complete_trip --- app/controllers/trips_controller.rb | 18 +++++++++--------- app/views/trips/show.html.erb | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 3fe0563f0..95e257b63 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -20,7 +20,7 @@ def create @trip = Trip.new(date: Date.today, rating: nil, cost: rand(500..5000), driver_id: driver.id, passenger_id: passenger.id) if @trip.save - @trip.driver.active + @trip.driver.toggle_active unless @trip.driver.active redirect_to trip_path(@trip.id) return else @@ -65,15 +65,15 @@ def destroy end end - def complete_trip - @trip = Trip.find_by(id: params[:id]) + # def complete_trip + # @trip = Trip.find_by(id: params[:id]) - unless @trip.driver - @trip.driver.inactive - redirect_to trip_path(@trip.id) - return - end - end + # unless @trip.driver + # @trip.driver.toggle_active if @trip.driver.active + # redirect_to trip_path(@trip.id) + # return + # end + # end private diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index 59ab8d493..ebe25e0e4 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -9,14 +9,14 @@ <% if @trip.rating.nil? %> <%= form_with model: @trip do |f| %> <%= f.label :rating %> - <%= f.select :rating, [1, 2, 3, 4, 5] %> + <%= f.select :rating, [5, 4, 3, 2, 1] %> <%= f.submit "Submit Rating", class: "form-button" %> <% end %> <% end %> - <% if @trip.rating && @trip.driver.active %> - <% @trip.driver.toggle_active %> - <% end %> + <% if @trip.driver.active && @trip.rating %> +

        <%= link_to "Complete Trip", toggle_active_path(@trip.driver.id), method: :patch %>

        + <% end %>

        • Date

        • Driver

          • From 616888d3cb6c734d83a65fecd9607ba5117f84f7 Mon Sep 17 00:00:00 2001 From: Julia Bouvier Date: Fri, 11 Oct 2019 11:27:43 -0700 Subject: [PATCH 36/43] Refactored toggle_active to separate make_active and make_inactive methods --- app/controllers/drivers_controller.rb | 11 +++++++++-- app/controllers/trips_controller.rb | 2 +- app/models/driver.rb | 9 +++++++-- app/views/drivers/show.html.erb | 6 +++++- app/views/trips/show.html.erb | 4 ++-- config/routes.rb | 3 ++- test/models/driver_test.rb | 4 ++-- 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/app/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb index 700272a4f..bbd91f2e5 100644 --- a/app/controllers/drivers_controller.rb +++ b/app/controllers/drivers_controller.rb @@ -65,10 +65,17 @@ def destroy end end - def toggle_active + def make_active @driver = Driver.find_by(id: params[:id]) - @driver.toggle_active + @driver.make_active + redirect_to driver_path(@driver.id) + end + + def make_inactive + @driver = Driver.find_by(id: params[:id]) + + @driver.make_inactive redirect_to driver_path(@driver.id) end diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb index 95e257b63..4dcfc8220 100644 --- a/app/controllers/trips_controller.rb +++ b/app/controllers/trips_controller.rb @@ -20,7 +20,7 @@ def create @trip = Trip.new(date: Date.today, rating: nil, cost: rand(500..5000), driver_id: driver.id, passenger_id: passenger.id) if @trip.save - @trip.driver.toggle_active unless @trip.driver.active + @trip.driver.make_active redirect_to trip_path(@trip.id) return else diff --git a/app/models/driver.rb b/app/models/driver.rb index 88e626eec..429a37b4a 100644 --- a/app/models/driver.rb +++ b/app/models/driver.rb @@ -30,8 +30,13 @@ def total_earnings return total / 100 end - def toggle_active - self.active = self.active ? false : true + def make_active + self.active = true + self.save + end + + def make_inactive + self.active = false self.save end end diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index bc95af792..8f37a5cc0 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -16,7 +16,11 @@ <%= link_to "Edit", edit_driver_path(@driver.id) %> <%= link_to "Delete", driver_path(@driver.id), method: :delete, data: { confirm: "Are you sure you want to delete this driver?" }, class: "index-delete-link" %>
        -

        <%=link_to "Toggle Active", toggle_active_path(@driver.id), method: :patch%>

        + <% if @driver.active %> +

        <%=link_to "Toggle Active", make_inactive_path(@driver.id), method: :patch%>

        + <% else %> +

        <%=link_to "Toggle Active", make_active_path(@driver.id), method: :patch%>

        + <% end %>
        <% if @driver.trips.empty? %>

        Driver has 0 trips

        diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb index ebe25e0e4..6d08c6851 100644 --- a/app/views/trips/show.html.erb +++ b/app/views/trips/show.html.erb @@ -14,8 +14,8 @@ <% end %> <% end %> - <% if @trip.driver.active && @trip.rating %> -

        <%= link_to "Complete Trip", toggle_active_path(@trip.driver.id), method: :patch %>

        + <% if @trip.rating && @trip.driver.active %> +

        <%= link_to "Complete Trip", make_inactive_path(@trip.driver.id), method: :patch %>

        <% end %>

        • Date

          • diff --git a/config/routes.rb b/config/routes.rb index 805e9511f..5d5d5dd93 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,5 +10,6 @@ resources :trips, except: [:index, :new] - patch 'drivers/:id/toggle_active', to: 'drivers#toggle_active', as: 'toggle_active' + patch 'drivers/:id/make_active', to: 'drivers#make_active', as: 'make_active' + patch 'drivers/:id/make_inactive', to: 'drivers#make_inactive', as: 'make_inactive' end diff --git a/test/models/driver_test.rb b/test/models/driver_test.rb index b94e8d7cf..6f1f8461b 100644 --- a/test/models/driver_test.rb +++ b/test/models/driver_test.rb @@ -81,7 +81,7 @@ it "can go online - available (active:false)" do test_driver = Driver.create(name: "Kari", vin: "123", active: true) - test_driver.toggle_active + test_driver.make_inactive expect (test_driver.active).must_equal false end @@ -89,7 +89,7 @@ it "can go offline - unavailable (active:true)" do test_driver = Driver.create(name: "Kari", vin: "123", active: false) - test_driver.toggle_active + test_driver.make_active expect (test_driver.active).must_equal true end From 5b9e28b84b8519deb2075daf96713494416ebbfb Mon Sep 17 00:00:00 2001 From: Stephanie Garcia Date: Fri, 11 Oct 2019 11:30:25 -0700 Subject: [PATCH 37/43] added some css --- app/assets/stylesheets/application.css | 68 +++++++++++++++++++++++++- app/assets/stylesheets/drivers.scss | 50 +++++++++++++++++++ app/views/drivers/index.html.erb | 24 ++++----- app/views/drivers/new.html.erb | 5 +- app/views/drivers/show.html.erb | 20 +++++--- app/views/layouts/application.html.erb | 8 ++- app/views/passengers/index.html.erb | 2 +- 7 files changed, 152 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f5fc337e9..cd62717d0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -13,7 +13,73 @@ *= require_tree . *= require_self */ + + + *{ + background: white; + color: black; + font-family:'Sawarabi Gothic', sans-serif; +} +.navheader { + width: 100%; + margin: 0 auto; +} + +header::after{ + content: ''; + display: table; + clear: both; +} + +nav{ + float: center; +} + +nav ul{ + margin: 0; + padding: 0; + list-style: none; + background: plum; +} + +nav li { + display: inline-block; + margin-left: 70px; + margin-right: 70px; + padding-top: 23px; + + position: relative; + background: plum; +} + +nav a { + color: black; + text-decoration: none; + text-transform: uppercase; + font-size: 25px; + font-weight: bolder; background: plum; - color: beige; } + +nav a:hover{ + color: purple; +} + +nav a::before { + content: ''; + display: block; + height: 5px; + background-color: #444; + + position: absolute; + top: 0; + width: 0% +} + +nav a:hover::before{ + transition: all ease-in-out 100%; + width: 100%; +} + + diff --git a/app/assets/stylesheets/drivers.scss b/app/assets/stylesheets/drivers.scss index 8c1768a14..00f9cd1fc 100644 --- a/app/assets/stylesheets/drivers.scss +++ b/app/assets/stylesheets/drivers.scss @@ -1,3 +1,53 @@ // Place all the styles related to the Drivers controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +.newDriver{ + padding-top: 6rem; + padding-bottom: 1rem; + + margin-left: 1.5rem; + margin-right: 1.5rem; + + text-align: center; + + color: black; +} + +.driver_form_class{ + color: black; + +} +.new-driver-form{ + text-align: center; +} + +.driversIndex ul li{ + text-align: left; + list-style: none; + padding-left: 5em; +} +.index-header{ + text-align: left; + padding-top: 2em; + padding-left: 5em; + margin-left: 2em; +} + + +.show-header{ + text-align: center; + padding-top: 1em; +} +.show-details{ + text-align: center; + padding-left: 1em; +} +.buttons{ + text-align: center; +} + +.drivertrips{ + text-align: left; + padding: 2em; +} diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb index 425c72af5..19d1e451b 100644 --- a/app/views/drivers/index.html.erb +++ b/app/views/drivers/index.html.erb @@ -1,17 +1,17 @@

          Rideshare Drivers

          -
          -
            +
            +
            <% @drivers.each do |driver| %> -
          • - <%= link_to driver.name, driver_path(driver.id) %> -
            • -
          • - <%= link_to "Edit", edit_driver_path(driver.id) %> -
            • -
          • - <%= link_to "Delete", driver_path(driver.id), method: :delete, data: { confirm: "Are you sure you want to delete this driver?" }, class: "index-delete-link" %> -
            • + <%#
          • %> +
            + <%#
            • +
          • %> +
            + <%#
            • +
          • %> +
            + <%#
            • %> <% end %> -
          +
        diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb index ae38f0b76..c29757ea7 100644 --- a/app/views/drivers/new.html.erb +++ b/app/views/drivers/new.html.erb @@ -1,3 +1,4 @@ -

        Add a Driver:

        +

        Input Drivers Information:

        -<%= render partial: "form", locals: { submit_button_label: "Create", driver_form_class: "new-driver-form" } %> +<%=render partial: "form", locals: { submit_button_label: "Create", driver_form_class: "new-driver-form" } %> +<%#
        %> \ No newline at end of file diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb index 680777197..be28b7726 100644 --- a/app/views/drivers/show.html.erb +++ b/app/views/drivers/show.html.erb @@ -9,25 +9,31 @@
        -

        Vin #<%=@driver.vin%>

        +

        Vin #<%=@driver.vin%>

        Average Rating: <%=@driver.average_rating%>

        Total earnings: $<%='%.2f' % @driver.total_earnings%>

        -
        +
        + +
        <%= link_to "Edit", edit_driver_path(@driver.id) %> <%= link_to "Delete", driver_path(@driver.id), method: :delete, data: { confirm: "Are you sure you want to delete this driver?" }, class: "index-delete-link" %> -
        -

        <%=link_to "Toggle Active", toggle_active_path(@driver.id), method: :patch%>

        -
        + <%=link_to "Toggle Active", toggle_active_path(@driver.id), method: :patch%> +
        + +
        <% if @driver.trips.empty? %>

        Driver has 0 trips

        - <% else %> -

        Driver Trips:

        + <% else %> +

        Driver Trips:

        • Date

        • Passenger

        • Cost

        • Rating

        +
        + +
          <% @driver.trips.each do |trip| %>
        • <%=link_to trip.date, trip_path(trip.id)%>
          • diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c226ec502..e8b8386ed 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,13 +5,17 @@ <%= csrf_meta_tags %> <%= csp_meta_tag %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%=stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + -