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/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/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..c4bfc60a1 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,200 @@ +/* + * 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 + */ + + body { + background-color: whitesmoke; + font-family: 'Questrial', sans-serif; + display: flex; + flex-direction: column; + line-height: 1.5; + } + + nav { + background-color: grey; + color: whitesmoke; + overflow: hidden; + padding: 0.4px; + position: fixed; + top: 0; + left: 0; + z-index: 9999; + width: 100%; + } + + nav ul { + display: flex; + margin-block-start: 0.4em; + margin-block-end: 0.4em; + justify-content: space-around; +} + +.subnav { + overflow: hidden; + display: flex; + flex-direction: column; + justify-content: center; +} + +nav li { + padding-left: 0.4em; + padding-right: 0.4em; +} + +nav a { + padding-left: 0.4em; + padding-right: 0.4em; + text-align: center; + font-size: 1.25em; +} + +.subnav ul { + display: none; + position: absolute; + left: 0; + width: 100%; + z-index: 1; +} + +.subnav:hover ul { + display: block; + position: relative; +} + +nav .link:visited { + color: whitesmoke; + text-decoration: none + } + +nav .link:hover { + color: rgb(19, 89, 114); + text-decoration: underline + } + +nav .link:active { + color: black; + text-decoration: none + } + + ul { + list-style: none; + padding-inline-start: 2px; + } + +a, a:visited { + color:darkolivegreen; + text-decoration: none; +} +a:visited { + color: darkolivegreen; + text-decoration: none; +} +a:hover { + color: rgb(19, 89, 114); + text-decoration: underline +} + +a:active { + color: darkgrey; + text-decoration: none; +} + +main { + margin-top: 10em; +} + +h1 { + font-size: 3em; + margin-block-start: 0.1em; + margin-block-end: 0.1em; +} + +#homepage { + display: flex; + flex-direction: row; + justify-content: space-around; +} + +#homepage h1 { + display: inline-block; +} + +#index { + margin: 0 auto; +} + +#p-index li { + display: grid; + max-width: 50vw; + grid-template-columns: 1fr 3fr; + line-height: 2; +} + +#d-index li { + display: grid; + max-width: 80vw; + grid-template-columns: 1fr 3fr 1fr; + line-height: 2; +} + +#index .id { + grid-column-start: 1; + grid-column-end: 2; +} + +#index .name { + grid-column-start: 2; + grid-column-end: 3; +} + +#index .name a { + font-size: 1.25em; +} + +#index .index-toggle { + grid-column-start: 3; + grid-column-end: 4; +} + +.show { + display: flex; + flex-direction: column; +} + +.show > .row { + display: grid; + grid-template-columns: repeat(8, 1fr); + border-bottom: 1px solid black; + grid-gap: 0px; +} + +.show > .row > p { + display: inline-block; + text-align: center; +} + +.button-container { + display: inline-flex; + justify-content: center +} + +.button { + padding: 10px; + margin: 10px; +} + +.heading { + font-size: 1.1em; +} 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/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/controllers/drivers_controller.rb b/app/controllers/drivers_controller.rb new file mode 100644 index 000000000..a9558858d --- /dev/null +++ b/app/controllers/drivers_controller.rb @@ -0,0 +1,89 @@ +class DriversController < ApplicationController + def index + @drivers = Driver.all + end + + def show + @driver = Driver.find_by(id: params[: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) + return + else + render :new + return + end + end + + def edit + @driver = Driver.find_by(id: params[:id]) + + if @driver.nil? + head :not_found + return + end + end + + def update + @driver = Driver.find_by(id: params[:id]) + + if @driver.nil? + redirect_to drivers_path + return + end + + if @driver.update(driver_params) + redirect_to driver_path(@driver.id) + return + else + render :edit + return + end + end + + def destroy + @driver = Driver.find_by(id: params[:id]) + + if @driver.nil? + head :not_found + return + end + + @driver.destroy + + redirect_to drivers_path + return + end + + def toggle_active + @driver = Driver.find_by(id: params[:id]) + + if @driver.nil? + redirect_to edit_driver_path + return + end + + if @driver.active_toggle + redirect_to driver_path(@driver.id) + return + end + end + + private + def driver_params + return params.require(:driver).permit(:name, :vin, :car_make, :car_model) + end +end diff --git a/app/controllers/homepages_controller.rb b/app/controllers/homepages_controller.rb new file mode 100644 index 000000000..f200c8ac2 --- /dev/null +++ b/app/controllers/homepages_controller.rb @@ -0,0 +1,4 @@ +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..66533bf11 --- /dev/null +++ b/app/controllers/passengers_controller.rb @@ -0,0 +1,76 @@ +class PassengersController < ApplicationController + def index + @passengers = Passenger.all + end + + def show + @passenger = Passenger.find_by(id: params[:id]) + + if @passenger.nil? + head :not_found + 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) + return + else + render :new + return + end + end + + def edit + @passenger = Passenger.find_by(id: params[:id]) + + if @passenger.nil? + head :not_found + return + end + end + + def update + @passenger = Passenger.find_by(id: params[:id]) + + if @passenger.nil? + head :not_found + return + end + + if @passenger.update(passenger_params) + redirect_to passenger_path(@passenger.id) + return + else + render :edit + return + end + end + + def destroy + @passenger = Passenger.find_by(id: params[:id]) + + if @passenger.nil? + head :not_found + return + end + + @passenger.destroy + + redirect_to passengers_path + return + end + + private + + def passenger_params + return params.require(:passenger).permit(:name, :phone_number) + end +end diff --git a/app/controllers/trips_controller.rb b/app/controllers/trips_controller.rb new file mode 100644 index 000000000..139a03e8b --- /dev/null +++ b/app/controllers/trips_controller.rb @@ -0,0 +1,106 @@ +class TripsController < ApplicationController + def show + @trip = Trip.find_by(id: params[:id]) + + if @trip.nil? + head :not_found + return + end + + end + + def create + if Passenger.find_by(id: params[:passenger_id]).nil? + head :not_found + return + end + + new_date = Time.now + new_cost = rand(10..80) + new_passenger_id = params[:passenger_id] + new_driver_id = Driver.find_available.id + @trip = Trip.new(date: new_date, cost: new_cost, passenger_id: new_passenger_id, driver_id: new_driver_id) + + if @trip.save + @trip.driver.active_toggle + redirect_to trip_path(@trip.id) + return + else + redirect_to passenger_path(@trip.passenger_id) + return + end + end + + def edit + @trip = Trip.find_by(id: params[:id]) + + if @trip.nil? + head :not_found + return + end + end + + def update + @trip = Trip.find_by(id: params[:id]) + + if @trip.nil? + head :not_found + return + end + + + if @trip.update(changes_params) + redirect_to trip_path(@trip.id) + return + else + render :edit + return + end + + end + + def destroy + @trip = Trip.find_by(id: params[:id]) + + if @trip.nil? + head :not_found + return + end + + @trip.destroy + redirect_to passenger_path(@trip.passenger_id) + end + + def assign_rating_edit + @trip = Trip.find_by(id: params[:id]) + + if @trip.nil? + head :not_found + return + end + end + + def assign_rating_update + @trip = Trip.find_by(id: params[:id]) + + if @trip.nil? + head :not_found + return + end + + if @trip.update(rating: params[:trip][:rating]) + redirect_to trip_path(@trip.id) + return + else + render :assign_rating_edit + return + end + end + + private + + def changes_params + return params.require(:trip).permit(:date, :cost, :passenger_id, :driver_id, :rating) + end + +end 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/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/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 000000000..a009ace51 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 000000000..286b2239d --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 000000000..10a4cba84 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/models/driver.rb b/app/models/driver.rb new file mode 100644 index 000000000..6050edfa0 --- /dev/null +++ b/app/models/driver.rb @@ -0,0 +1,40 @@ +class Driver < ApplicationRecord + has_many :trips, dependent: :nullify + validates :name, presence: true + validates :vin, presence: true + + + def avg_rating + if self.trips.count == 0 + return 0 + end + sum = 0 + self.trips.each do |trip| + sum += trip.rating.to_f + end + return sum / self.trips.count + end + + def total_earnings + sum = 0 + self.trips.each do |trip| + sum += trip.cost.to_f + end + if sum < 1.65 + return 0 + else return 0.8 * (sum - 1.65) + end + end + + def self.find_available + return self.find_by(active: false) + end + + def active_toggle + if self.active + return self.update(active: false) + else + return self.update(active: true) + end + end +end diff --git a/app/models/passenger.rb b/app/models/passenger.rb new file mode 100644 index 000000000..32bc0cd70 --- /dev/null +++ b/app/models/passenger.rb @@ -0,0 +1,11 @@ +class Passenger < ApplicationRecord + has_many :trips, dependent: :nullify + + validates :name, presence: true + validates :phone_number, presence: true + + def total_charged + passengers_trips = self.trips.map {|trip| trip.cost.to_f }.sum + return passengers_trips + end +end diff --git a/app/models/trip.rb b/app/models/trip.rb new file mode 100644 index 000000000..53b5d5491 --- /dev/null +++ b/app/models/trip.rb @@ -0,0 +1,7 @@ +class Trip < ApplicationRecord + belongs_to :passenger + belongs_to :driver + + validates :date, presence: true + validates :cost, presence: true, numericality: true +end diff --git a/app/views/drivers/.keep b/app/views/drivers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/drivers/_form.html.erb b/app/views/drivers/_form.html.erb new file mode 100644 index 000000000..1c9a6800b --- /dev/null +++ b/app/views/drivers/_form.html.erb @@ -0,0 +1,27 @@ +<%= form_with model: @driver do |f| %> +

<%= action_name.capitalize %> Driver

+<%= f.label 'Name:' %> +<%= f.text_field :name %> +

+<%= f.label 'VIN:' %> +<%= f.text_field :vin %> +

+<%= f.label 'Car Make: '%> +<%= f.text_field :car_make %> +

+<%= f.label 'Car Model: '%> +<%= f.text_field :car_model%> + + <%= f.submit "#{action_name}" %> + + <% if @driver.errors.any? %> + +<% end %> + +<% end %> \ No newline at end of file diff --git a/app/views/drivers/edit.html.erb b/app/views/drivers/edit.html.erb new file mode 100644 index 000000000..721234afc --- /dev/null +++ b/app/views/drivers/edit.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: {action_name: "Edit"} %> \ No newline at end of file diff --git a/app/views/drivers/index.html.erb b/app/views/drivers/index.html.erb new file mode 100644 index 000000000..a7e491988 --- /dev/null +++ b/app/views/drivers/index.html.erb @@ -0,0 +1,15 @@ +
+

Drivers

+ + +
diff --git a/app/views/drivers/new.html.erb b/app/views/drivers/new.html.erb new file mode 100644 index 000000000..8ac3461ee --- /dev/null +++ b/app/views/drivers/new.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: {action_name: "New"} %> \ No newline at end of file diff --git a/app/views/drivers/show.html.erb b/app/views/drivers/show.html.erb new file mode 100644 index 000000000..5c1208391 --- /dev/null +++ b/app/views/drivers/show.html.erb @@ -0,0 +1,61 @@ +
+

Details for Driver: <%= @driver.name %>

+ +

Driver ID: <%= @driver.id %>

+

Name: <%= @driver.name %>

+

VIN: <%= @driver.vin %>

+<% if @driver.active == true %> +

Driver status: ACTIVE. (Driver is unavailable.)

+<% else %> +

Driver status: INACTIVE. (Driver is available.)

+<% end %> +

Car Make: <%= @driver.car_make %>

+

Car Model: <%= @driver.car_model %>

+

Total Earnings: $<%= sprintf "%.2f",@driver.total_earnings %>

+

Average Rating: <%= sprintf "%.2f",@driver.avg_rating %>

+ +
+<%= button_to "Edit Driver", edit_driver_path(@driver), class:"button", method: :get %> + +<%= button_to "Delete Driver", driver_path(@driver), class:"button", method: :delete, data: {confirm: "Please confirm!"} %> + +<%= button_to 'Change Status', toggle_active_path(@driver), class:"button", method: :put %> +
+ +
+

Trip ID

+

Date

+

Passenger ID

+

Passenger Name

+

Driver ID

+

Driver Name

+

Cost

+

Rating

+
+ +<% @driver.trips.each do |trip| %> +
+

<%= link_to trip.id, trip_path(trip) %>

+

<%= trip.date %>

+

+ <% if trip.passenger_id.nil? %> + [deleted] + <% else %> + <%= link_to trip.passenger_id, passenger_path(id: trip.passenger_id) %> + <% end %> +

+

+ <% if trip.passenger_id.nil? %> + [deleted] + <% else %> + <%= link_to trip.passenger.name, passenger_path(id: trip.passenger_id) %> + <% end %> +

+

<%= trip.driver_id %>

+

<%= trip.driver.name %>

+

$<%= number_with_precision(trip.cost, :precision => 2) %>

+

<%= trip.rating %>

+
+<% end %> + +
diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb new file mode 100644 index 000000000..5a94f37eb --- /dev/null +++ b/app/views/homepages/index.html.erb @@ -0,0 +1,5 @@ + +
+

<%= link_to 'Manage Drivers', drivers_path, class:"link" %>

+

<%= link_to 'Manage Passengers', passengers_path, class:"link"%>

+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 000000000..109741d2c --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,37 @@ + + + + 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/app/views/passengers/.keep b/app/views/passengers/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/passengers/_form.html.erb b/app/views/passengers/_form.html.erb new file mode 100644 index 000000000..7e8b2e9b9 --- /dev/null +++ b/app/views/passengers/_form.html.erb @@ -0,0 +1,24 @@ +<% if @passenger.errors.any? %> +

Errors

+ +<% end %> + +

<%= action_name.capitalize %> Passenger

+ +<%= form_with model: @passenger do |f| %> + + <%= f.label :name %> + <%= f.text_field :name %> + + <%= f.label :phone_number %> + <%= f.text_field :phone_number %> + + <%= f.submit action_name%> + +<% end %> diff --git a/app/views/passengers/edit.html.erb b/app/views/passengers/edit.html.erb new file mode 100644 index 000000000..5b350fe55 --- /dev/null +++ b/app/views/passengers/edit.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: { action_name: "Edit" } %> diff --git a/app/views/passengers/index.html.erb b/app/views/passengers/index.html.erb new file mode 100644 index 000000000..949ffccc9 --- /dev/null +++ b/app/views/passengers/index.html.erb @@ -0,0 +1,14 @@ +
+

Passengers

+ + +
+ + diff --git a/app/views/passengers/new.html.erb b/app/views/passengers/new.html.erb new file mode 100644 index 000000000..e8c2c44b4 --- /dev/null +++ b/app/views/passengers/new.html.erb @@ -0,0 +1 @@ +<%= render partial: "form", locals: { action_name: "New" } %> diff --git a/app/views/passengers/show.html.erb b/app/views/passengers/show.html.erb new file mode 100644 index 000000000..2a938e615 --- /dev/null +++ b/app/views/passengers/show.html.erb @@ -0,0 +1,54 @@ +
+

Details for Passenger: <%= @passenger.name %>

+ +
+

Passenger ID: <%= @passenger.id %>

+

Name: <%= @passenger.name %>

+

Phone Number: <%= @passenger.phone_number %>

+

Total Amount Charged: $<%= number_with_precision(@passenger.total_charged, :precision => 2) %>

+
+ +
+ <%= button_to "Edit Passenger".html_safe, edit_passenger_path(@passenger.id), class:"button", method: :get %> + + <%= button_to "Delete Passenger".html_safe, passenger_path(@passenger.id), method: :delete, data: {confirm: "Are you sure you want to delete this passenger?"}, class:"button" %> + + <%= button_to "Add Trip", passenger_trips_path(@passenger.id), method: :post, class:"button" %> +
+ +
+

Trip ID

+

Date

+

Passenger ID

+

Passenger Name

+

Driver ID

+

Driver Name

+

Cost

+

Rating

+
+ +<% @passenger.trips.each do |trip| %> +
+

<%= link_to trip.id, trip_path(id: trip.id) %>

+

<%= trip.date %>

+

<%= trip.passenger.id %>

+

<%= trip.passenger.name %>

+

+ <% if trip.driver_id.nil? %> + [deleted] + <% else %> + <%= link_to trip.driver_id, driver_path(id: trip.driver_id) %> + <% end %> +

+

+ <% if trip.driver_id.nil? %> + [deleted] + <% else %> + <%= link_to trip.driver.name, driver_path(id: trip.driver_id) %> + <% end %> +

+

$<%= number_with_precision(trip.cost, :precision => 2) %>

+

<%= trip.rating %>

+
+<% end %> +
diff --git a/app/views/trips/.keep b/app/views/trips/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/trips/assign_rating_edit.html.erb b/app/views/trips/assign_rating_edit.html.erb new file mode 100644 index 000000000..101930aea --- /dev/null +++ b/app/views/trips/assign_rating_edit.html.erb @@ -0,0 +1,34 @@ +<% if @trip.errors.any? %> +

Errors

+ +<% end %> + + +<%= form_with model: @trip, url: assign_rating_path do |f| %> +

<%= action_name %> Trip

+ + <%= f.label :rating %> + + <%= f.radio_button :rating, "1"%> + <%= f.label :rating, "1", :value => "1" %> + + <%= f.radio_button :rating, "2"%> + <%= f.label :rating, "2", :value => "2" %> + + <%= f.radio_button :rating, "3"%> + <%= f.label :rating, "3", :value => "3" %> + + <%= f.radio_button :rating, "4"%> + <%= f.label :rating, "4", :value => "4" %> + + <%= f.radio_button :rating, "5"%> + <%= f.label :rating, "5", :value => "5" %> + + <%= f.submit "Save" %> +<% end %> diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb new file mode 100644 index 000000000..752c24a89 --- /dev/null +++ b/app/views/trips/edit.html.erb @@ -0,0 +1,46 @@ +<% if @trip.errors.any? %> +

Errors

+ +<% end %> + +<%= form_with model: @trip do |f| %> +

<%= action_name.capitalize %> Trip

+ + <%= f.label :date %> + <%= f.text_field :date %> + + <%= f.label :passenger_id %> + <%= f.collection_select :passenger_id, Passenger.order(:id), :id, :id, include_blank: true %> + + <%# Source: https://stackoverflow.com/questions/14113057/how-to-have-a-drop-down-select-field-in-a-rails-form %> + <%= f.label :driver_id %> + <%= f.collection_select :driver_id, Driver.order(:id), :id, :id, include_blank: true %> + + <%= f.label :cost %> + <%= f.text_field :cost %> + + <%= f.label :rating %> + + <%= f.radio_button :rating, "1"%> + <%= f.label :rating, "1", :value => "1" %> + + <%= f.radio_button :rating, "2"%> + <%= f.label :rating, "2", :value => "2" %> + + <%= f.radio_button :rating, "3"%> + <%= f.label :rating, "3", :value => "3" %> + + <%= f.radio_button :rating, "4"%> + <%= f.label :rating, "4", :value => "4" %> + + <%= f.radio_button :rating, "5"%> + <%= f.label :rating, "5", :value => "5" %> + + <%= f.submit "Save" %> +<% end %> diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb new file mode 100644 index 000000000..689b683c0 --- /dev/null +++ b/app/views/trips/show.html.erb @@ -0,0 +1,62 @@ +
+ +

Trip ID: <%= @trip.id %>

+ +
+

Trip ID

+

Date

+

Passenger ID

+

Passenger Name

+

Driver ID

+

Driver Name

+

Cost

+

Rating

+
+ +
+

<%= @trip.id %>

+

<%= @trip.date %>

+

+ <% if @trip.passenger_id.nil? %> + [deleted] + <% else %> + <%= link_to @trip.passenger_id, passenger_path(id: @trip.passenger_id) %> + <% end %> +

+

+ <% if @trip.passenger_id.nil? %> + [deleted] + <% else %> + <%= link_to @trip.passenger.name, passenger_path(id: @trip.passenger_id) %> + <% end %> +

+

+ <% if @trip.driver_id.nil? %> + [deleted] + <% else %> + <%= link_to @trip.driver_id, driver_path(id: @trip.driver_id) %> + <% end %> +

+

+ <% if @trip.driver_id.nil? %> + [deleted] + <% else %> + <%= link_to @trip.driver.name, driver_path(id: @trip.driver_id) %> + <% end %> +

+

$<%= number_with_precision(@trip.cost, :precision => 2) %>

+

+ <% if @trip.rating == nil%> + <%= link_to 'Assign Rating', assign_rating_edit_path, class:"link" %> + <% else %> + <%= @trip.rating %> + <% end %> +

+
+ +
+ <%= button_to 'Edit', edit_trip_path, class:"button", method: :get %> + <%= button_to 'Delete', trip_path, method: :delete, data: {confirm: "Delete trip"}, class:"button" %> +
+ +
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..bd635f1e3 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +sk1bvmmhKmDfKvBsa2MjQpn9wJSb2BqBU5qqz1KBghpA6kJR73PUXZVa0MB9iVxTjgfqt7K+cQzDaQqPd8MoACZE/k6eqIwLlArbuKYqXSXsxZDawFDi/y9c1w5zs/abXPzxz5alOjw/YRMwssszlaj3q4dFO3jw9DxCuy+0VwFO5CbI92V5qyuSxWBJJ1D7dYMTaypllVKDu9Jko+VMmUxUM8WqBtxfxyBfUErHhgZqQ9S55YocJp2+kKUti/AAx3Ntq7R5a/EAq3WY5kjikMR1K5J++LpdXj0DrFdCO3EEqr+M1bsfLdowrus1Q39UxAuApJXhlI7W3xqWnFOl7pprtJW+MQPpYbqJk7tWLG+c6gjzpI8yb6CsqmC6jeYuFSDL8gaW8wOjV+K/MNVdpDgylSkHyRDf4cDM--huDel0K2y7cjGKXK--sbRowPBwvOfo6Ciyw3ufMQ== \ 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..cc64d3f06 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,19 @@ +Rails.application.routes.draw do + resources :drivers, except: [:update] + patch '/drivers/:id', to: 'drivers#update' + put '/drivers/:id/active', to: 'drivers#toggle_active', as: 'toggle_active' + + resources :passengers, except: [:update] do + resources :trips, only: [:create] + end + + patch '/passengers/:id', to: 'passengers#update' + + resources :trips, except: [:update, :index, :new, :create] + patch '/trips/:id', to: 'trips#update' + get '/trips/:id/assign_rating/edit', to: 'trips#assign_rating_edit', as: 'assign_rating_edit' + patch '/trips/:id/assign_rating', to: 'trips#assign_rating_update', as: 'assign_rating' + + root 'homepages#index' + get '/homepages', to: 'homepages#index', as: 'homepages' +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/db/migrate/20191007230137_create_passengers.rb b/db/migrate/20191007230137_create_passengers.rb new file mode 100644 index 000000000..5a97a2640 --- /dev/null +++ b/db/migrate/20191007230137_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_number + + t.timestamps + end + end +end diff --git a/db/migrate/20191007230318_create_drivers.rb b/db/migrate/20191007230318_create_drivers.rb new file mode 100644 index 000000000..bf624557d --- /dev/null +++ b/db/migrate/20191007230318_create_drivers.rb @@ -0,0 +1,13 @@ +class CreateDrivers < ActiveRecord::Migration[5.2] + def change + create_table :drivers do |t| + t.string :name + t.string :vin + t.boolean :active + t.string :car_make + t.string :car_model + + t.timestamps + end + end +end diff --git a/db/migrate/20191007232337_create_trips.rb b/db/migrate/20191007232337_create_trips.rb new file mode 100644 index 000000000..97080203d --- /dev/null +++ b/db/migrate/20191007232337_create_trips.rb @@ -0,0 +1,11 @@ +class CreateTrips < ActiveRecord::Migration[5.2] + def change + create_table :trips do |t| + t.date :date + t.string :rating + t.string :cost + + t.timestamps + end + end +end diff --git a/db/migrate/20191007233744_add_passenger_driver_id_to_trips.rb b/db/migrate/20191007233744_add_passenger_driver_id_to_trips.rb new file mode 100644 index 000000000..307cd26ef --- /dev/null +++ b/db/migrate/20191007233744_add_passenger_driver_id_to_trips.rb @@ -0,0 +1,6 @@ +class AddPassengerDriverIdToTrips < ActiveRecord::Migration[5.2] + def change + add_reference :trips, :passenger, foreign_key: true + add_reference :trips, :driver, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 000000000..6d2a74580 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,49 @@ +# 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_233744) 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.boolean "active" + t.string "car_make" + t.string "car_model" + 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_number" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "trips", force: :cascade do |t| + t.date "date" + t.string "rating" + t.string "cost" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "passenger_id" + t.bigint "driver_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 diff --git a/db/seeds.rb b/db/seeds.rb index eab2a92ee..46582d7c2 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -9,6 +9,7 @@ driver.id = row['id'] driver.name = row['name'] driver.vin = row['vin'] + driver.active = false successful = driver.save if !successful driver_failures << driver @@ -31,7 +32,7 @@ passenger = Passenger.new passenger.id = row['id'] passenger.name = row['name'] - passenger.phone_num = row['phone_num'] + passenger.phone_number = row['phone_num'] successful = passenger.save if !successful passenger_failures << passenger @@ -57,7 +58,7 @@ trip.passenger_id = row['passenger_id'] trip.date = Date.strptime(row['date'], '%Y-%m-%d') trip.rating = row['rating'] - trip.cost = row['cost'] + trip.cost = ((row['cost'].to_f)/100).to_s successful = trip.save if !successful trip_failures << trip 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/controllers/drivers_controller_test.rb b/test/controllers/drivers_controller_test.rb index 48aef7556..022092568 100644 --- a/test/controllers/drivers_controller_test.rb +++ b/test/controllers/drivers_controller_test.rb @@ -1,54 +1,57 @@ require "test_helper" 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. describe "index" do it "responds with success when there are many drivers saved" do # Arrange - # Ensure that there is at least one Driver saved - + Driver.create name: "Meatball Jones", vin: 41225, active: true, car_make: "Honda", car_model: "Accord" + Driver.create name: "Number One Benitez", vin: 53246, active: false, car_make: "Toyota", car_model: "Tacoma" + Driver.create name: "Fred Boutros", vin: 32960, active: true, car_make: "Volkswagen", car_model: "Eurovan" # Act - + get drivers_path # Assert - + must_respond_with :success end it "responds with success when there are no drivers saved" do # Arrange # Ensure that there are zero drivers saved + @fred = Driver.create name: "Fred Boutros", vin: 32960, active: true, car_make: "Volkswagen", car_model: "Eurovan" + delete driver_path(@fred.id) # Act - + get drivers_path # Assert - + must_respond_with :success end end describe "show" do it "responds with success when showing an existing valid driver" do # Arrange + @mb = Driver.create name: "Meatball Jones", vin: 41225, active: true, car_make: "Honda", car_model: "Accord" # Ensure that there is a driver saved - + if Driver.count != 1 + puts 'No driver saved' + end # Act - + get driver_path(@mb.id) # Assert - + must_respond_with :success 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(99999) + 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 @@ -56,120 +59,125 @@ it "can create a new driver with valid information accurately, and redirect" do # Arrange # Set up the form data - + driver_hash = { + driver: { + name: "Number One Benitez", + vin: "53246", + active: false, + car_make: "Toyota", + car_model: "Tacoma" + } + } # Act-Assert + expect { + post drivers_path, params: driver_hash + }.must_change "Driver.count", 1 # 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 - + number_one = Driver.find_by(name: driver_hash[:driver][:name]) + expect(number_one.vin).must_equal driver_hash[:driver][:vin] + expect(number_one.car_make).must_equal driver_hash[:driver][:car_make] + expect(number_one.car_model).must_equal driver_hash[:driver][:car_model] + must_respond_with :redirect + must_redirect_to driver_path(number_one.id) 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 - - # Act-Assert - # Ensure that there is no change in Driver.count - - # Assert - # Check that the controller redirects - + it "does not create a driver if the form data violates Driver validations" do + driver_hash = { + driver: { + vin: "53246", + active: false, + car_make: "Toyota", + car_model: "Tacoma" + } + } + expect { + post drivers_path, params: driver_hash + }.wont_change Driver.count end end - + describe "edit" do + before do + @mb = Driver.create name: "Meatball Jones", vin: 41225, active: true, car_make: "Honda", car_model: "Accord" + @driver_hash = { + driver: { + name: "Barbara Bush", + vin: "53246", + active: false, + car_make: "Toyota", + car_model: "Tacoma" + } + } + end 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(@mb) + must_respond_with :success 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 - + it "responds with not found when getting the edit page for a non-existing driver" do + get driver_path(9999) + must_respond_with :not_found 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 + mb = Driver.create name: "Meatball Jones", vin: "41225", active: true, car_make: "Honda", car_model: "Accord" - end + driver_hash = { + driver: { + name: "Barbara Bush", + vin: "53246", + active: false, + car_make: "Toyota", + car_model: "Tacoma" + }, + } - 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 + expect {patch driver_path(mb.id), params: driver_hash}.wont_change 'Driver.count' - # Act-Assert - # Ensure that there is no change in Driver.count + bb = Driver.find_by(id: mb.id) - # Assert - # Check that the controller gave back a 404 + expect(bb.name).must_equal driver_hash[:driver][:name] + expect(bb.vin).must_equal driver_hash[:driver][:vin] + expect(bb.car_make).must_equal driver_hash[:driver][:car_make] + expect(bb.car_model).must_equal driver_hash[:driver][:car_model] + must_respond_with :redirect end + 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 - # 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 + it "does not update any driver if given an invalid id, and responds with a 404" do + driver_hash = { + driver: { + name: "Barbara Bush", + vin: "53246", + active: false, + car_make: "Toyota", + car_model: "Tacoma" + } + } + expect { + patch driver_path(99999), params: driver_hash + }.wont_change "Driver.count" + must_redirect_to drivers_path 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 + num_one = Driver.create name: "Number One Benitez", vin: 53246, active: false, car_make: "Toyota", car_model: "Tacoma" - # Assert - # Check that the controller redirects + expect { delete driver_path(num_one.id) }.must_change 'Driver.count', -1 + deleted_driver = Driver.find_by(id: num_one.id) + expect(deleted_driver).must_be_nil + must_respond_with :redirect 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 - + it "does not change the db when the driver does not exist, then responds with not found" do + delete driver_path(-1) + must_respond_with :not_found end end end diff --git a/test/controllers/homepages_controller_test.rb b/test/controllers/homepages_controller_test.rb index 9dd7648db..09876637c 100644 --- a/test/controllers/homepages_controller_test.rb +++ b/test/controllers/homepages_controller_test.rb @@ -3,7 +3,7 @@ describe HomepagesController do it "can get the homepage" do get root_path - + must_respond_with :success end end diff --git a/test/controllers/passengers_controller_test.rb b/test/controllers/passengers_controller_test.rb index 60acbdfb6..7cd561273 100644 --- a/test/controllers/passengers_controller_test.rb +++ b/test/controllers/passengers_controller_test.rb @@ -1,31 +1,209 @@ require "test_helper" describe PassengersController do + let (:passenger) { + Passenger.create(name: "sample passenger", phone_number: "123456789") + } + + let (:no_phone_num_hash) { + { + passenger: { + name: "new passenger", + }, + } + } + + let (:no_name_hash) { + { + passenger: { + phone_number: "123456789", + }, + } + } + describe "index" do - # Your tests go here + it "can get the index path" do + get "/passengers" + must_respond_with :success + end + + it "responds with success when there are many passengers saved" do + 3.times do + Passenger.create name: "sample passenger", phone_number: "123456789" + end + + expect(Passenger.count).must_equal 3 + + + get "/passengers" + must_respond_with :success + end + + it "responds with success when there are no passengers saved" do + expect(Passenger.count).must_equal 0 + + get "/passengers" + must_respond_with :success + 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 + end + + it "responds with 404 with an invalid passenger id" do + get passenger_path(-1) + must_respond_with :not_found + end end - + describe "new" do - # Your tests go here + it "can get the new passenger page" 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_number: "123456789", + }, + } + + expect { + post passengers_path, params: passenger_hash + }.must_change "Passenger.count", 1 + + created_passenger = Passenger.find_by(name: passenger_hash[:passenger][:name]) + + expect(created_passenger.name).must_equal passenger_hash[:passenger][:name] + expect(created_passenger.phone_number).must_equal passenger_hash[:passenger][:phone_number] + + must_respond_with :redirect + must_redirect_to passenger_path(created_passenger.id) + end + + it "does not create a passenger if the form data violates Passenger validations" do + expect { + post passengers_path, params: no_phone_num_hash + }.wont_change "Passenger.count" + + expect { + post passengers_path, params: no_name_hash + }.wont_change "Passenger.count" + end end - + describe "edit" 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 + end + + it "will respond with redirect when attempting to edit a nonexistant passenger" do + get edit_passenger_path(-1) + must_respond_with :not_found + end end - + describe "update" do - # Your tests go here + before do + Passenger.create name: "sample passenger", phone_number: "123456789" + @existing_passenger = Passenger.first + end + + it "can update an existing passenger with valid information accurately, and redirect" do + expect(@existing_passenger).wont_be_nil + + update_hash = { + passenger: { + name: "Monica Geller", + phone_number: "9103222610", + }, + } + + expect { + patch passenger_path(@existing_passenger.id), params: update_hash + }.wont_change 'Passenger.count' + + updated_passenger = Passenger.find_by(id: @existing_passenger.id) + + expect(updated_passenger.name).must_equal "Monica Geller" + expect(updated_passenger.phone_number).must_equal "9103222610" + + must_respond_with :redirect + end + + it "does not update any passenger if given an invalid id, and responds with a 404" do + update_hash = { + passenger: { + name: "Monica Geller", + phone_number: "9103222610", + }, + } + + expect { + patch passenger_path(-1), params: update_hash + }.wont_change "Passenger.count" + + must_respond_with :not_found + end + + it "does not create a passenger if the form data violates Passenger validations, and responds with a redirect" do + expect { + patch assign_rating_path(@existing_passenger.id), params: no_name_hash + }.wont_change "Passenger.count" + + updated_passenger = Passenger.find_by(id: @existing_passenger.id) + + expect(updated_passenger.name).must_equal @existing_passenger[:name] + expect(updated_passenger.phone_number).must_equal @existing_passenger[:phone_number] + + expect { + patch assign_rating_path(@existing_passenger.id), params: no_phone_num_hash + }.wont_change "Passenger.count" + + updated_passenger = Passenger.find_by(id: @existing_passenger.id) + + expect(updated_passenger.name).must_equal @existing_passenger[:name] + expect(updated_passenger.phone_number).must_equal @existing_passenger[:phone_number] + end end - + describe "destroy" do - # Your tests go here + before do + Passenger.create name: "sample passenger", phone_number: "123456789" + @existing_passenger = Passenger.first + end + + it "destroys the driver instance in db when driver exists and redirects" do + expect(Passenger.count).must_be :>, 0 + + expect { + delete passenger_path(@existing_passenger.id) + }.must_change 'Passenger.count', 1 + + must_respond_with :redirect + must_redirect_to passengers_path + end + + it "does not change the number of trips" do + expect(Passenger.count).must_be :>, 0 + + expect { + delete passenger_path(@existing_passenger.id) + }.wont_change 'Trip.count' + end + + it "responds with not found when getting the edit page for a non-existing trip" do + delete trip_path(-1) + must_respond_with :not_found + end end end diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb index 59455c041..df4acd367 100644 --- a/test/controllers/trips_controller_test.rb +++ b/test/controllers/trips_controller_test.rb @@ -1,23 +1,196 @@ require "test_helper" describe TripsController do + before do + @driver = Driver.create name: "Meatball Jones", vin: "1234", active: false, car_make: "Honda", car_model: "Accord" + @passenger = Passenger.create name: "Squidward Squid", phone_number: "123-456-7890" + + @trip = Trip.create date: Date.new(2019,10,8), passenger_id: Passenger.first.id, driver_id: Driver.first.id, cost: "2310" + end + describe "show" do - # Your tests go here + it "responds with success when showing an existing valid trip" do + get trip_path(@trip.id) + must_respond_with :success + end + + it "will redirect to not_found for an invalid trip id" do + get trip_path("carrot") + must_respond_with :not_found + end end - + describe "create" do - # Your tests go here + it "can create a new trip with valid passenger_id, toggles driver status, and redirect" do + expect(Driver.count).must_equal 1 + expect(Driver.first.active).must_equal false + + id = Passenger.first.id + + expect { + post passenger_trips_path(passenger_id: id) + }.must_change "Trip.count", 1 + + created_trip = Trip.last + expect(created_trip.passenger_id).must_equal id + expect(created_trip.driver.active).must_equal true + + must_respond_with :redirect + must_redirect_to trip_path(created_trip.id) + end + + it "will redirect for an invalid passenger id" do + expect { + post passenger_trips_path(passenger_id: "carrot") + }.wont_change "Trip.count" + + must_respond_with :not_found + end end - + describe "edit" do - # Your tests go here + it "responds with success when getting the edit page for an existing, valid trip" do + get edit_trip_path(@trip.id) + must_respond_with :success + end + + it "responds with not found when getting the edit page for a non-existing trip" do + get edit_trip_path(-1) + must_respond_with :not_found + end end - - describe "update" do - # Your tests go here + + describe "update from edit form" do + let (:changes_hash) { + { + trip: { + date: Date.new(2019,2,3), + passenger_id: Passenger.first.id, + driver_id: Driver.first.id, + cost: "5678", + rating: "2" + }, + } + } + + it "can update an existing trip with valid information from edit form parameters accurately, and redirect" do + expect { + patch trip_path(@trip.id), params: changes_hash + }.wont_change "Trip.count" + + must_respond_with :redirect + + updated_trip = Trip.find_by(id: @trip.id) + + expect(updated_trip.date).must_equal changes_hash[:trip][:date] + expect(updated_trip.passenger_id).must_equal changes_hash[:trip][:passenger_id] + expect(updated_trip.driver_id).must_equal changes_hash[:trip][:driver_id] + expect(updated_trip.cost).must_equal changes_hash[:trip][:cost] + expect(updated_trip.rating).must_equal changes_hash[:trip][:rating] + end + + it "does not update any trip if given an invalid id, and responds with a 404" do + expect { + patch trip_path(-1), params: changes_hash + }.wont_change "Trip.count" + + must_respond_with :not_found + end + + it "will not update if params hash does not include changes" do + existing_trip = Trip.find_by(id: @trip.id) + + expect { + patch trip_path(existing_trip.id), params: {} + }.must_raise + + updated_trip = Trip.find_by(id: @trip.id) + + expect(updated_trip.date).must_equal existing_trip[:date] + expect(updated_trip.passenger_id).must_equal existing_trip[:passenger_id] + expect(updated_trip.driver_id).must_equal existing_trip[:driver_id] + expect(updated_trip.cost).must_equal existing_trip[:cost] + end end - + + describe "update from assign rating form" do + before do + @no_rating_trip = Trip.create date: Date.new(2019,10,9), passenger_id: Passenger.first.id, driver_id: Driver.first.id, cost: "2310" + end + + let (:changes_hash) { + { + trip: { + rating: "4", + }, + } + } + + it "can update the rating for an existing trip with valid information from form parameter accurately, and redirect" do + expect { + patch assign_rating_path(@no_rating_trip.id), params: changes_hash + }.wont_change "Trip.count" + + must_respond_with :redirect + + updated_trip = Trip.find_by(id: @no_rating_trip.id) + + expect(updated_trip.rating).must_equal changes_hash[:trip][:rating] + end + + it "does not update any trip if given an invalid id, and responds with a 404" do + expect { + patch assign_rating_path(-1), params: changes_hash + }.wont_change "Trip.count" + + must_respond_with :not_found + end + + it "does not update a trip if the form data does not include rating data, and responds with a redirect" do + existing_trip = Trip.find_by(id: @trip.id) + + expect { + patch assign_rating_path(existing_trip.id), params: {} + }.must_raise + + updated_trip = Trip.find_by(id: existing_trip.id) + + expect(updated_trip.date).must_equal existing_trip[:date] + expect(updated_trip.passenger_id).must_equal existing_trip[:passenger_id] + expect(updated_trip.driver_id).must_equal existing_trip[:driver_id] + expect(updated_trip.cost).must_equal existing_trip[:cost] + expect(updated_trip.rating).must_be_nil + end + end + describe "destroy" do - # Your tests go here + it "destroys the trip instance in db when trip exists, then redirects" do + id = @trip.id + + expect { delete trip_path(id) }.must_change 'Trip.count', -1 + + destroyed_trip = Trip.find_by(id: id) + + expect(destroyed_trip).must_be_nil + + must_respond_with :redirect + end + + it "does not change the db when the trip does not exist, then responds with a 404" do + delete trip_path(-1) + must_respond_with :not_found + end + end + + describe "assign_ratings_edit" do + it "responds with success when getting the assign_ratings_edit page for an existing, valid trip" do + get assign_rating_edit_path(@trip.id) + must_respond_with :success + end + + it "responds with not found when getting the edit page for a non-existing trip" do + get assign_rating_edit_path(-1) + must_respond_with :not_found + end end end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 000000000..e69de29bb diff --git a/test/fixtures/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/models/driver_test.rb b/test/models/driver_test.rb index 9f12d286c..9f3547fa3 100644 --- a/test/models/driver_test.rb +++ b/test/models/driver_test.rb @@ -2,31 +2,30 @@ 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, car_make: "Cherry", car_model: "DR5") } it "can be instantiated" do # 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, :car_make, :car_model].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| @@ -34,47 +33,92 @@ 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 - describe "average rating" do - # Your code here - end - - describe "total earnings" do - # Your code here + describe "average rating and total earnings" do + before do + @driver = Driver.create name: "Meatball Jones", vin: "1234", active: false, car_make: "Honda", car_model: "Accord" + @passenger = Passenger.create name: "Squidward Squid", phone_number: "123-456-7890" + + @trip1 = Trip.create date: Date.new(2019,10,8), passenger_id: Passenger.first.id, driver_id: @driver.id, cost: "2310", rating: "5" + @trip2 = Trip.create date: Date.new(2019,10,9), passenger_id: Passenger.first.id, driver_id: @driver.id, cost: "10", rating: "3" + @trip3 = Trip.create date: Date.new(2019,10,10), passenger_id: Passenger.first.id, driver_id: @driver.id, cost: "31", rating: "1" + end + it "must calculate the correct average rating" do + expect(@driver.avg_rating).must_equal 3 + end + it "must calculate the correct total earnings" do + expect(@driver.total_earnings).must_equal 1879.48 + end end - - describe "can go online" do - # Your code here + + describe "active_toggle" do + it "can go online" do + inactive_driver = Driver.create(name: "Available Driver", vin: "1234", active: false, car_make: "Toyota", car_model: "Prius") + before_status = inactive_driver.active + + expect(before_status).must_equal false + + inactive_driver.active_toggle + after_status = inactive_driver.active + + expect(after_status).must_equal true + end + + it "can go offline" do + active_driver = Driver.create(name: "Active Driver", vin: "1234", active: true, car_make: "Toyota", car_model: "Prius") + before_status = active_driver.active + + expect(before_status).must_equal true + + active_driver.active_toggle + after_status = active_driver.active + + expect(after_status).must_equal false + end end - - describe "can go offline" do - # Your code here + + describe "self.find_available" do + it "will only return an available (inactive) driver" do + active_driver = Driver.create(name: "Active Driver", vin: "1234", active: true, car_make: "Toyota", car_model: "Prius") + inactive_driver = Driver.create(name: "Available Driver", vin: "1234", active: false, car_make: "Toyota", car_model: "Prius") + + expect(Driver.count).must_equal 2 + + found_driver = Driver.find_available + + expect(found_driver).wont_be_nil + expect(found_driver.id).must_equal inactive_driver.id + + found_driver.active_toggle + + second_found_driver = Driver.find_available + expect(second_found_driver).must_be_nil + end 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 66ac353d3..ff5578d13 100644 --- a/test/models/passenger_test.rb +++ b/test/models/passenger_test.rb @@ -8,63 +8,67 @@ # 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_number].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 - + new_driver = Driver.create(name: "Waldo", vin: "ALWSS52P9NEYLVDE9") + trip_1 = Trip.create(driver_id: new_driver.id, passenger_id: new_passenger.id, date: Date.today, rating: 5, cost: 1234) + trip_2 = Trip.create(driver_id: new_driver.id, passenger_id: new_passenger.id, date: Date.today, rating: 3, cost: 6334) + # Assert - expect(passenger.trips.count).must_be :>, 0 - passenger.trips.each do |trip| + expect(new_passenger.trips.count).must_be :>, 0 + new_passenger.trips.each do |trip| expect(trip).must_be_instance_of Trip 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 - + # 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_number + expect(new_passenger.errors.messages[:phone_number]).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 + describe "total_charged" do + it "gives the correct sum" do + # new_passenger = Passenger.create(name: "Kari", phone_number: "111-111-1211") + # new_driver = Driver.create(name: "Waldo", vin: "ALWSS52P9NEYLVDE9") + # trip_1 = Trip.create(driver_id: new_driver.id, passenger_id: new_passenger.id, date: Date.today, rating: 5, cost: 12.34) + # trip_2 = Trip.create(driver_id: new_driver.id, passenger_id: new_passenger.id, date: Date.today, rating: 3, cost: 63.34) + + # expect(new_passenger.total_charged).must_equal 75.68 + end end - # You may have additional methods to test here end end diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb index 0b0b2da32..a57fd28e4 100644 --- a/test/models/trip_test.rb +++ b/test/models/trip_test.rb @@ -1,24 +1,54 @@ require "test_helper" describe Trip do + + before do + @driver = Driver.create name: "Meatball Jones", vin: "1234", active: false, car_make: "Honda", car_model: "Accord" + @passenger = Passenger.create name: "Squidward Squid", phone_number: "123-456-7890" + end + + let (:new_trip) { + Trip.new( + date: Date.new(2019,10,8), + passenger_id: Passenger.first.id, + driver_id: Driver.first.id, + cost: "23.10" + ) + } + it "can be instantiated" do - # Your code here + expect(new_trip.valid?).must_equal true end - + it "will have the required fields" do - # Your code here + new_trip.save + saved_trip = Trip.first + + [:date, :passenger_id, :driver_id, :cost].each do |field| + expect(saved_trip).must_respond_to field + end end - + describe "relationships" do - # Your tests go here + before do + new_trip.save + @saved_trip = Trip.first + end + + it "has a passenger" do + expect(@saved_trip.passenger).must_be_instance_of Passenger + end + + it "has a driver" do + expect(@saved_trip.driver).must_be_instance_of Driver + end end - + describe "validations" do - # Your tests go here + # Jared made a Project Notification post about how we don't need to test validations. end - - # Tests for methods you create should go here + describe "custom methods" do - # Your tests here + # No custom methods made for Trip class end end 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..70538117c --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,13 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' +require 'minitest/rails' +require 'minitest/autorun' +require 'minitest/reporters' + +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