From d226c19f6fa3151dd51688f0ab698a1f10e88fce Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Mon, 7 Nov 2016 15:30:13 -0800 Subject: [PATCH 01/31] Initial setup of API, added needed gems, made applicable code changes --- .ruby-version | 1 + Gemfile | 53 +++++ Gemfile.lock | 189 ++++++++++++++++++ README.rdoc | 28 +++ Rakefile | 6 + app/assets/images/.keep | 0 app/assets/javascripts/application.js | 16 ++ app/assets/stylesheets/application.css | 15 ++ app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/helpers/application_helper.rb | 2 + app/mailers/.keep | 0 app/models/.keep | 0 app/models/concerns/.keep | 0 app/views/layouts/application.html.erb | 14 ++ bin/bundle | 3 + bin/rails | 9 + bin/rake | 9 + bin/setup | 29 +++ bin/spring | 16 ++ config.ru | 4 + config/application.rb | 28 +++ config/boot.rb | 3 + config/database.yml | 25 +++ config/environment.rb | 5 + config/environments/development.rb | 41 ++++ config/environments/production.rb | 79 ++++++++ config/environments/test.rb | 42 ++++ config/initializers/assets.rb | 11 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cookies_serializer.rb | 3 + .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/session_store.rb | 3 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 23 +++ config/routes.rb | 56 ++++++ db/seeds.rb | 7 + lib/assets/.keep | 0 lib/tasks/.keep | 0 public/404.html | 67 +++++++ public/422.html | 67 +++++++ public/500.html | 66 ++++++ public/favicon.ico | 0 public/robots.txt | 5 + test/controllers/.keep | 0 test/fixtures/.keep | 0 test/helpers/.keep | 0 test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/test_helper.rb | 15 ++ vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 55 files changed, 987 insertions(+) create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 README.rdoc create mode 100644 Rakefile create mode 100644 app/assets/images/.keep create mode 100644 app/assets/javascripts/application.js create mode 100644 app/assets/stylesheets/application.css create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/helpers/application_helper.rb create mode 100644 app/mailers/.keep create mode 100644 app/models/.keep create mode 100644 app/models/concerns/.keep create mode 100644 app/views/layouts/application.html.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/assets.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cookies_serializer.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/session_store.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/routes.rb create mode 100644 db/seeds.rb create mode 100644 lib/assets/.keep create mode 100644 lib/tasks/.keep create mode 100644 public/404.html create mode 100644 public/422.html create mode 100644 public/500.html create mode 100644 public/favicon.ico create mode 100644 public/robots.txt create mode 100644 test/controllers/.keep create mode 100644 test/fixtures/.keep create mode 100644 test/helpers/.keep create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/test_helper.rb create mode 100644 vendor/assets/javascripts/.keep create mode 100644 vendor/assets/stylesheets/.keep diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..2bf1c1c --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.3.1 diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..5716f71 --- /dev/null +++ b/Gemfile @@ -0,0 +1,53 @@ +source 'https://rubygems.org' +ruby '2.3.1' + +gem 'rails-api' +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.2.7' +# Use sqlite3 as the database for Active Record +gem 'sqlite3' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.1.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'therubyracer', platforms: :ruby + +# Use jquery as the JavaScript library +gem 'jquery-rails' +# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks +gem 'turbolinks' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.0' +# bundle exec rake doc:rails generates the API under doc/api. +gem 'sdoc', '~> 0.4.0', group: :doc + +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Unicorn as the app server +# gem 'unicorn' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug' + gem 'simplecov' +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> in views + gem 'web-console', '~> 2.0' + gem 'better_errors' + + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' +end + +group :test do + gem 'minitest-reporters' +end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..20c5b16 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,189 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.7) + actionview (= 4.2.7) + activesupport (= 4.2.7) + rack (~> 1.6) + rack-test (~> 0.6.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (4.2.7) + activesupport (= 4.2.7) + globalid (>= 0.3.0) + activemodel (4.2.7) + activesupport (= 4.2.7) + builder (~> 3.1) + activerecord (4.2.7) + activemodel (= 4.2.7) + activesupport (= 4.2.7) + arel (~> 6.0) + activesupport (4.2.7) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + ansi (1.5.0) + arel (6.0.3) + better_errors (2.1.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + rack (>= 0.9.0) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + builder (3.2.2) + byebug (9.0.6) + coderay (1.1.1) + coffee-rails (4.1.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.10.0) + concurrent-ruby (1.0.2) + debug_inspector (0.0.2) + docile (1.1.5) + erubis (2.7.0) + execjs (2.7.0) + globalid (0.3.7) + activesupport (>= 4.1.0) + i18n (0.7.0) + jbuilder (2.6.0) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.2.1) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + json (1.8.3) + loofah (2.0.3) + nokogiri (>= 1.5.9) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.1) + minitest-reporters (1.1.12) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + multi_json (1.12.1) + nokogiri (1.6.8.1) + mini_portile2 (~> 2.1.0) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.7) + actionmailer (= 4.2.7) + actionpack (= 4.2.7) + actionview (= 4.2.7) + activejob (= 4.2.7) + activemodel (= 4.2.7) + activerecord (= 4.2.7) + activesupport (= 4.2.7) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.7) + sprockets-rails + rails-api (0.4.0) + actionpack (>= 3.2.11) + railties (>= 3.2.11) + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.7) + activesupport (>= 4.2.0.beta, < 5.0) + nokogiri (~> 1.6.0) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.3) + loofah (~> 2.0) + railties (4.2.7) + actionpack (= 4.2.7) + activesupport (= 4.2.7) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.3.0) + rdoc (4.3.0) + ruby-progressbar (1.8.1) + sass (3.4.22) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sdoc (0.4.2) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + simplecov (0.12.0) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + spring (2.0.0) + activesupport (>= 4.2) + sprockets (3.7.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.12) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.5) + turbolinks (5.0.1) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.3) + execjs (>= 0.3.0, < 3) + web-console (2.3.0) + activemodel (>= 4.0) + binding_of_caller (>= 0.7.2) + railties (>= 4.0) + sprockets-rails (>= 2.0, < 4.0) + +PLATFORMS + ruby + +DEPENDENCIES + better_errors + byebug + coffee-rails (~> 4.1.0) + jbuilder (~> 2.0) + jquery-rails + minitest-reporters + rails (= 4.2.7) + rails-api + sass-rails (~> 5.0) + sdoc (~> 0.4.0) + simplecov + spring + sqlite3 + turbolinks + uglifier (>= 1.3.0) + web-console (~> 2.0) + +RUBY VERSION + ruby 2.3.1p112 + +BUNDLED WITH + 1.13.1 diff --git a/README.rdoc b/README.rdoc new file mode 100644 index 0000000..dd4e97e --- /dev/null +++ b/README.rdoc @@ -0,0 +1,28 @@ +== README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... + + +Please feel free to use a different markup language if you do not plan to run +rake doc:app. diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..ba6b733 --- /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 File.expand_path('../config/application', __FILE__) + +Rails.application.load_tasks diff --git a/app/assets/images/.keep b/app/assets/images/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js new file mode 100644 index 0000000..e07c5a8 --- /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, vendor/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. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require jquery +//= require jquery_ujs +//= require turbolinks +//= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 0000000..f9cd5b3 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/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 styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. + * + *= require_tree . + *= require_self + */ diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 0000000..4ac8823 --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb new file mode 100644 index 0000000..de6be79 --- /dev/null +++ b/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/app/mailers/.keep b/app/mailers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/models/.keep b/app/models/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb new file mode 100644 index 0000000..95e3963 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + ShippingService + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + + +<%= yield %> + + + diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 0000000..66e9889 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 0000000..0138d79 --- /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', __FILE__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 0000000..d87d5f5 --- /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 0000000..acdb2c1 --- /dev/null +++ b/bin/setup @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +require 'pathname' + +# path to your application root. +APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) + +Dir.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 || bundle install" + + # puts "\n== Copying sample files ==" + # unless File.exist?("config/database.yml") + # system "cp config/database.yml.sample config/database.yml" + # end + + puts "\n== Preparing database ==" + system "bin/rake db:setup" + + puts "\n== Removing old logs and tempfiles ==" + system "rm -f log/*" + system "rm -rf tmp/cache" + + puts "\n== Restarting application server ==" + system "touch tmp/restart.txt" +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 0000000..9bc076b --- /dev/null +++ b/bin/spring @@ -0,0 +1,16 @@ +#!/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) + if spring = lockfile.specs.detect { |spec| spec.name == "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/config.ru b/config.ru new file mode 100644 index 0000000..bd83b25 --- /dev/null +++ b/config.ru @@ -0,0 +1,4 @@ +# This file is used by Rack-based servers to start the application. + +require ::File.expand_path('../config/environment', __FILE__) +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 0000000..4dfc9eb --- /dev/null +++ b/config/application.rb @@ -0,0 +1,28 @@ +require File.expand_path('../boot', __FILE__) + +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 ShippingService + class Application < Rails::Application + config.eager_load_paths += %W(#{config.root}/lib) + config.eager_load_paths += Dir["#{config.root}/lib/**/"] + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. + # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. + # config.time_zone = 'Central Time (US & Canada)' + + # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. + # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + # config.i18n.default_locale = :de + + # Do not swallow errors in after_commit/after_rollback callbacks. + config.active_record.raise_in_transactional_callbacks = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 0000000..6b750f0 --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,3 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000..1c1a37c --- /dev/null +++ b/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# +default: &default + adapter: sqlite3 + pool: 5 + timeout: 5000 + +development: + <<: *default + database: db/development.sqlite3 + +# 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: db/test.sqlite3 + +production: + <<: *default + database: db/production.sqlite3 diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 0000000..ee8d90d --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require File.expand_path('../application', __FILE__) + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 0000000..b55e214 --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,41 @@ +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 and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = 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 + + # 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 + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # Adds additional error checking when serving assets at runtime. + # Checks for improperly declared sprockets dependencies. + # Raises helpful error messages. + config.assets.raise_runtime_errors = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 0000000..5c1b32e --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,79 @@ +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 + + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like + # NGINX, varnish or squid. + # config.action_dispatch.rack_cache = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.serve_static_files = 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 + + # Asset digests allow you to set far-future HTTP expiration dates on all assets, + # yet still be able to expire them through the digest params. + config.assets.digest = true + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # 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 + + # 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 = [ :subdomain, :uuid ] + + # Use a different logger for distributed setups. + # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # 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 + + # 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 0000000..1c19f08 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,42 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure static file server for tests with Cache-Control for performance. + config.serve_static_files = true + config.static_cache_control = 'public, max-age=3600' + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # 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 + + # Randomize the order test cases are executed. + config.active_support.test_order = :random + + # 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/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000..01ef3e6 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,11 @@ +# 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 + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. +# Rails.application.config.assets.precompile += %w( search.js ) diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000..59385cd --- /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/cookies_serializer.rb b/config/initializers/cookies_serializer.rb new file mode 100644 index 0000000..7f70458 --- /dev/null +++ b/config/initializers/cookies_serializer.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +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 0000000..4a994e1 --- /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 0000000..ac033bf --- /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 0000000..dc18996 --- /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/session_store.rb b/config/initializers/session_store.rb new file mode 100644 index 0000000..3487bbe --- /dev/null +++ b/config/initializers/session_store.rb @@ -0,0 +1,3 @@ +# Be sure to restart your server when you modify this file. + +Rails.application.config.session_store :cookie_store, key: '_shipping-service_session' diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000..33725e9 --- /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] if respond_to?(:wrap_parameters) +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 0000000..0653957 --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,23 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 0000000..3f66539 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,56 @@ +Rails.application.routes.draw do + # The priority is based upon order of creation: first created -> highest priority. + # See how all your routes lay out with "rake routes". + + # You can have the root of your site routed with "root" + # root 'welcome#index' + + # Example of regular route: + # get 'products/:id' => 'catalog#view' + + # Example of named route that can be invoked with purchase_url(id: product.id) + # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase + + # Example resource route (maps HTTP verbs to controller actions automatically): + # resources :products + + # Example resource route with options: + # resources :products do + # member do + # get 'short' + # post 'toggle' + # end + # + # collection do + # get 'sold' + # end + # end + + # Example resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end + + # Example resource route with more complex sub-resources: + # resources :products do + # resources :comments + # resources :sales do + # get 'recent', on: :collection + # end + # end + + # Example resource route with concerns: + # concern :toggleable do + # post 'toggle' + # end + # resources :posts, concerns: :toggleable + # resources :photos, concerns: :toggleable + + # Example resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end +end diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 0000000..4edb1e8 --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). +# +# Examples: +# +# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) +# Mayor.create(name: 'Emanuel', city: cities.first) diff --git a/lib/assets/.keep b/lib/assets/.keep new file mode 100644 index 0000000..e69de29 diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 0000000..e69de29 diff --git a/public/404.html b/public/404.html new file mode 100644 index 0000000..b612547 --- /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 0000000..a21f82b --- /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 0000000..061abc5 --- /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/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000..e69de29 diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000..3c9c7c0 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,5 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file +# +# To ban all spiders from the entire site uncomment the next two lines: +# User-agent: * +# Disallow: / diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/helpers/.keep b/test/helpers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 0000000..e69de29 diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 0000000..d782887 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,15 @@ +ENV['RAILS_ENV'] ||= 'test' +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' +require "minitest/reporters" +require 'simplecov' +SimpleCov.start +Rails.application.eager_load! + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + Minitest::Reporters.use! + + # Add more helper methods to be used by all tests here... +end diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep new file mode 100644 index 0000000..e69de29 diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep new file mode 100644 index 0000000..e69de29 From 6fd7bcc32d6dcdd0ad35191beb72a369a18aebc9 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Mon, 7 Nov 2016 17:18:03 -0800 Subject: [PATCH 02/31] Added shipping gem; shipping controller/test --- Gemfile | 2 ++ Gemfile.lock | 10 ++++++++++ app/controllers/shipping_controller.rb | 2 ++ test/controllers/shipping_controller_test.rb | 7 +++++++ 4 files changed, 21 insertions(+) create mode 100644 app/controllers/shipping_controller.rb create mode 100644 test/controllers/shipping_controller_test.rb diff --git a/Gemfile b/Gemfile index 5716f71..4c3beca 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,8 @@ source 'https://rubygems.org' ruby '2.3.1' +gem 'active_shipping' + gem 'rails-api' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.7' diff --git a/Gemfile.lock b/Gemfile.lock index 20c5b16..08efd67 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,6 +20,14 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) + active_shipping (1.8.3) + active_utils (~> 3.2.0) + activesupport (>= 3.2, < 5.1.0) + nokogiri (>= 1.6) + quantified (~> 1.0.1) + active_utils (3.2.2) + activesupport (>= 3.2, < 5.1.0) + i18n activejob (4.2.7) activesupport (= 4.2.7) globalid (>= 0.3.0) @@ -87,6 +95,7 @@ GEM multi_json (1.12.1) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) + quantified (1.0.1) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) @@ -165,6 +174,7 @@ PLATFORMS ruby DEPENDENCIES + active_shipping better_errors byebug coffee-rails (~> 4.1.0) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb new file mode 100644 index 0000000..d2a375b --- /dev/null +++ b/app/controllers/shipping_controller.rb @@ -0,0 +1,2 @@ +class ShippingController < ApplicationController +end diff --git a/test/controllers/shipping_controller_test.rb b/test/controllers/shipping_controller_test.rb new file mode 100644 index 0000000..ea50b81 --- /dev/null +++ b/test/controllers/shipping_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ShippingControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end From 73ebb652c2f8521000aa7a3dec0a2552411b06ab Mon Sep 17 00:00:00 2001 From: Yasmin Date: Tue, 8 Nov 2016 11:28:32 -0800 Subject: [PATCH 03/31] Generated Package and Location models; Package controller --- app/controllers/packages_controller.rb | 2 ++ app/models/location.rb | 2 ++ app/models/package.rb | 3 ++ config/routes.rb | 1 + db/migrate/20161108190730_create_packages.rb | 12 +++++++ db/migrate/20161108192520_create_locations.rb | 11 ++++++ db/schema.rb | 35 +++++++++++++++++++ test/controllers/packages_controller_test.rb | 7 ++++ test/fixtures/locations.yml | 11 ++++++ test/fixtures/packages.yml | 11 ++++++ test/models/location_test.rb | 7 ++++ test/models/package_test.rb | 7 ++++ 12 files changed, 109 insertions(+) create mode 100644 app/controllers/packages_controller.rb create mode 100644 app/models/location.rb create mode 100644 app/models/package.rb create mode 100644 db/migrate/20161108190730_create_packages.rb create mode 100644 db/migrate/20161108192520_create_locations.rb create mode 100644 db/schema.rb create mode 100644 test/controllers/packages_controller_test.rb create mode 100644 test/fixtures/locations.yml create mode 100644 test/fixtures/packages.yml create mode 100644 test/models/location_test.rb create mode 100644 test/models/package_test.rb diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb new file mode 100644 index 0000000..64d9e30 --- /dev/null +++ b/app/controllers/packages_controller.rb @@ -0,0 +1,2 @@ +class PackagesController < ApplicationController +end diff --git a/app/models/location.rb b/app/models/location.rb new file mode 100644 index 0000000..e3acd90 --- /dev/null +++ b/app/models/location.rb @@ -0,0 +1,2 @@ +class Location < ActiveRecord::Base +end diff --git a/app/models/package.rb b/app/models/package.rb new file mode 100644 index 0000000..e583a7f --- /dev/null +++ b/app/models/package.rb @@ -0,0 +1,3 @@ +class Package < ActiveRecord::Base + +end diff --git a/config/routes.rb b/config/routes.rb index 3f66539..d2eb754 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Rails.application.routes.draw do + resources :packages, except: [:new, :edit] # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/db/migrate/20161108190730_create_packages.rb b/db/migrate/20161108190730_create_packages.rb new file mode 100644 index 0000000..effb5bd --- /dev/null +++ b/db/migrate/20161108190730_create_packages.rb @@ -0,0 +1,12 @@ +class CreatePackages < ActiveRecord::Migration + def change + create_table :packages do |t| + t.float "weight" + t.integer "length" + t.integer "width" + t.integer "height" + t.boolean "cylinder" + t.timestamps null: false + end + end +end diff --git a/db/migrate/20161108192520_create_locations.rb b/db/migrate/20161108192520_create_locations.rb new file mode 100644 index 0000000..33edd07 --- /dev/null +++ b/db/migrate/20161108192520_create_locations.rb @@ -0,0 +1,11 @@ +class CreateLocations < ActiveRecord::Migration + def change + create_table :locations do |t| + t.string "country" + t.string "state" + t.string "city" + t.string "zip" + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..72c991a --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,35 @@ +# encoding: UTF-8 +# 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: 20161108192520) do + + create_table "locations", force: :cascade do |t| + t.string "country" + t.string "state" + t.string "city" + t.string "zip" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "packages", force: :cascade do |t| + t.float "weight" + t.integer "length" + t.integer "width" + t.integer "height" + t.boolean "cylinder" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/test/controllers/packages_controller_test.rb b/test/controllers/packages_controller_test.rb new file mode 100644 index 0000000..736532c --- /dev/null +++ b/test/controllers/packages_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PackagesControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/locations.yml b/test/fixtures/locations.yml new file mode 100644 index 0000000..937a0c0 --- /dev/null +++ b/test/fixtures/locations.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/packages.yml b/test/fixtures/packages.yml new file mode 100644 index 0000000..937a0c0 --- /dev/null +++ b/test/fixtures/packages.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/location_test.rb b/test/models/location_test.rb new file mode 100644 index 0000000..cd10e31 --- /dev/null +++ b/test/models/location_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class LocationTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/package_test.rb b/test/models/package_test.rb new file mode 100644 index 0000000..5c1413d --- /dev/null +++ b/test/models/package_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PackageTest < ActiveSupport::TestCase + + + +end From 1b454641ea5248cc575c54529eef3f479e35c611 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Tue, 8 Nov 2016 11:32:39 -0800 Subject: [PATCH 04/31] Deleted unnecessary files --- app/controllers/packages_controller.rb | 2 -- test/controllers/packages_controller_test.rb | 7 ------- 2 files changed, 9 deletions(-) delete mode 100644 app/controllers/packages_controller.rb delete mode 100644 test/controllers/packages_controller_test.rb diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb deleted file mode 100644 index 64d9e30..0000000 --- a/app/controllers/packages_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class PackagesController < ApplicationController -end diff --git a/test/controllers/packages_controller_test.rb b/test/controllers/packages_controller_test.rb deleted file mode 100644 index 736532c..0000000 --- a/test/controllers/packages_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class PackagesControllerTest < ActionController::TestCase - # test "the truth" do - # assert true - # end -end From 6c0237a2c4bec8e5aa47eaa66685289e37002bd0 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Tue, 8 Nov 2016 12:03:04 -0800 Subject: [PATCH 05/31] Location model and tests developed via TDD --- app/models/location.rb | 11 +++++++++++ test/fixtures/locations.yml | 16 +++++++++++----- test/models/location_test.rb | 18 +++++++++++++++--- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/app/models/location.rb b/app/models/location.rb index e3acd90..4335424 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -1,2 +1,13 @@ class Location < ActiveRecord::Base + + validates :country, :state, :city, :zip, presence: true + + attr_reader :country, :state, :city, :zip + + def initialize (country, state, city, zip) + @country = country + @state = state + @city = city + @zip = zip + end end diff --git a/test/fixtures/locations.yml b/test/fixtures/locations.yml index 937a0c0..9ce85c3 100644 --- a/test/fixtures/locations.yml +++ b/test/fixtures/locations.yml @@ -4,8 +4,14 @@ # model remove the '{}' from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} -# column: value -# -two: {} -# column: value +one: + country: United States + state: WA + city: Seattle + zip: 98000 + +two: + country: United States + state: RI + city: Providence + zip: 02905 diff --git a/test/models/location_test.rb b/test/models/location_test.rb index cd10e31..72138cb 100644 --- a/test/models/location_test.rb +++ b/test/models/location_test.rb @@ -1,7 +1,19 @@ require 'test_helper' class LocationTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end + test "should have all required fields" do + location = Location.new(country = "US", state = "California", city = "Los Angeles", zip = 90215) + + assert location.valid? + end + + test "Not valid location should result in incomplete-based errors" do + location = Location.new(country = nil, state = nil, city = nil, zip = nil) + + assert_not location.valid? + assert_includes location.errors, :country + assert_includes location.errors, :state + assert_includes location.errors, :city + assert_includes location.errors, :zip + end end From a80f121e63849f771e55bbb87a7e13d4d93fba41 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Tue, 8 Nov 2016 12:11:12 -0800 Subject: [PATCH 06/31] Modified packages table in db --- db/migrate/20161108200739_table_column_adjustments.rb | 5 +++++ db/schema.rb | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20161108200739_table_column_adjustments.rb diff --git a/db/migrate/20161108200739_table_column_adjustments.rb b/db/migrate/20161108200739_table_column_adjustments.rb new file mode 100644 index 0000000..565bfb6 --- /dev/null +++ b/db/migrate/20161108200739_table_column_adjustments.rb @@ -0,0 +1,5 @@ +class TableColumnAdjustments < ActiveRecord::Migration + def change + remove_column(:packages, :cylinder) + end +end diff --git a/db/schema.rb b/db/schema.rb index 72c991a..3904d81 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20161108192520) do +ActiveRecord::Schema.define(version: 20161108200739) do create_table "locations", force: :cascade do |t| t.string "country" @@ -27,7 +27,6 @@ t.integer "length" t.integer "width" t.integer "height" - t.boolean "cylinder" t.datetime "created_at", null: false t.datetime "updated_at", null: false end From f4231edc4117b6906fa00495d1b9d4ef1d181acd Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Tue, 8 Nov 2016 12:15:44 -0800 Subject: [PATCH 07/31] Package model and tests developed via TDD --- app/models/package.rb | 11 +++++++++++ test/models/package_test.rb | 16 +++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/models/package.rb b/app/models/package.rb index e583a7f..07a80be 100644 --- a/app/models/package.rb +++ b/app/models/package.rb @@ -1,3 +1,14 @@ class Package < ActiveRecord::Base + validates :weight, :length, :width, :height, presence: true + + attr_reader :weight, :length, :width, :height + + def initialize (weight, length, width, height) + @weight = weight + @length = length + @width = width + @height = height + end + end diff --git a/test/models/package_test.rb b/test/models/package_test.rb index 5c1413d..ac78a1c 100644 --- a/test/models/package_test.rb +++ b/test/models/package_test.rb @@ -2,6 +2,20 @@ class PackageTest < ActiveSupport::TestCase - + test "should have all required fields" do + package = Package.new(weight = 15, length = 10, width = 10, height = 10) + + assert package.valid? + end + + test "Not valid package should result in incomplete-based errors" do + package = Package.new(weight = nil, length = nil, width = nil, height = nil) + + assert_not package.valid? + assert_includes package.errors, :weight + assert_includes package.errors, :length + assert_includes package.errors, :width + assert_includes package.errors, :height + end end From 2199e6013e5dbffccb6f0f1e28d7bf16cffabe56 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Tue, 8 Nov 2016 12:31:19 -0800 Subject: [PATCH 08/31] WIP: Initial file content setup --- app/controllers/shipping_controller.rb | 2 ++ test/controllers/shipping_controller_test.rb | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index d2a375b..39a67b7 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -1,2 +1,4 @@ +require 'active_shipping' + class ShippingController < ApplicationController end diff --git a/test/controllers/shipping_controller_test.rb b/test/controllers/shipping_controller_test.rb index ea50b81..070cde9 100644 --- a/test/controllers/shipping_controller_test.rb +++ b/test/controllers/shipping_controller_test.rb @@ -1,7 +1,9 @@ require 'test_helper' class ShippingControllerTest < ActionController::TestCase - # test "the truth" do - # assert true - # end + + test "" do + + end + end From 25d911d4e7a1b5821cdbe94978f547595dbc8255 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Tue, 8 Nov 2016 15:56:42 -0800 Subject: [PATCH 09/31] Added carrier login and keys to the .env file --- .gitignore | 1 + Gemfile | 3 ++- Gemfile.lock | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 14e3ed5..ec080ba 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /test/tmp/ /test/version_tmp/ /tmp/ +.env ## Specific to RubyMotion: .dat* diff --git a/Gemfile b/Gemfile index 4c3beca..a4231b7 100644 --- a/Gemfile +++ b/Gemfile @@ -39,13 +39,14 @@ group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' gem 'simplecov' + gem 'dotenv-rails' end group :development do # Access an IRB console on exception pages or by using <%= console %> in views gem 'web-console', '~> 2.0' gem 'better_errors' - + gem 'binding_of_caller' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' end diff --git a/Gemfile.lock b/Gemfile.lock index 08efd67..ec7cb09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,6 +65,10 @@ GEM concurrent-ruby (1.0.2) debug_inspector (0.0.2) docile (1.1.5) + dotenv (2.1.1) + dotenv-rails (2.1.1) + dotenv (= 2.1.1) + railties (>= 4.0, < 5.1) erubis (2.7.0) execjs (2.7.0) globalid (0.3.7) @@ -176,8 +180,10 @@ PLATFORMS DEPENDENCIES active_shipping better_errors + binding_of_caller byebug coffee-rails (~> 4.1.0) + dotenv-rails jbuilder (~> 2.0) jquery-rails minitest-reporters @@ -196,4 +202,4 @@ RUBY VERSION ruby 2.3.1p112 BUNDLED WITH - 1.13.1 + 1.13.6 From 13d097bfd68e2d4ec2874a0ea26ab5074401cf6c Mon Sep 17 00:00:00 2001 From: Yasmin Date: Tue, 8 Nov 2016 15:58:43 -0800 Subject: [PATCH 10/31] Renamed shippings to shipments --- app/models/shipment.rb | 5 ++++ test/controllers/shipment_controller_test.rb | 24 ++++++++++++++++++++ test/fixtures/shipments.yml | 11 +++++++++ test/models/shipment_test.rb | 5 ++++ 4 files changed, 45 insertions(+) create mode 100644 app/models/shipment.rb create mode 100644 test/controllers/shipment_controller_test.rb create mode 100644 test/fixtures/shipments.yml create mode 100644 test/models/shipment_test.rb diff --git a/app/models/shipment.rb b/app/models/shipment.rb new file mode 100644 index 0000000..93a9d16 --- /dev/null +++ b/app/models/shipment.rb @@ -0,0 +1,5 @@ +class Shipment < ActiveRecord::Base + # def self.origin + # + # end +end diff --git a/test/controllers/shipment_controller_test.rb b/test/controllers/shipment_controller_test.rb new file mode 100644 index 0000000..58742e7 --- /dev/null +++ b/test/controllers/shipment_controller_test.rb @@ -0,0 +1,24 @@ +require 'test_helper' + +class ShipmentControllerTest < ActionController::TestCase + + setup do + @request.headers['Accept'] = Mime::JSON + @request.headers['Content-Type'] = Mime::JSON.to_s + end + + REWRITE THIS TEST COPIED FROM MODEL TEST + test "#get_rates_from_shipper returns json and rates from shipper" do + get_rates_from_shipper + assert_match 'application/json', response.header['Content-Type'] + + body = JSON.parse(response.body) + assert_instance_of Array, body + + body.each do |obj| + assert_kind_of RateEstimate, obj + end + end + + +end diff --git a/test/fixtures/shipments.yml b/test/fixtures/shipments.yml new file mode 100644 index 0000000..937a0c0 --- /dev/null +++ b/test/fixtures/shipments.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/shipment_test.rb b/test/models/shipment_test.rb new file mode 100644 index 0000000..30dbebb --- /dev/null +++ b/test/models/shipment_test.rb @@ -0,0 +1,5 @@ +require 'test_helper' + +class ShipmentTest < ActiveSupport::TestCase + +end From 2b992429a0e85ddebf1f32677315e8129bd8721a Mon Sep 17 00:00:00 2001 From: Yasmin Date: Tue, 8 Nov 2016 15:59:59 -0800 Subject: [PATCH 11/31] renamed shippings table to shipments --- db/migrate/20161108215033_create_shippings.rb | 8 ++++++++ db/migrate/20161108223100_shipment_table.rb | 8 ++++++++ db/schema.rb | 12 +++++++++++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20161108215033_create_shippings.rb create mode 100644 db/migrate/20161108223100_shipment_table.rb diff --git a/db/migrate/20161108215033_create_shippings.rb b/db/migrate/20161108215033_create_shippings.rb new file mode 100644 index 0000000..01b1737 --- /dev/null +++ b/db/migrate/20161108215033_create_shippings.rb @@ -0,0 +1,8 @@ +class CreateShippings < ActiveRecord::Migration + def change + create_table :shippings do |t| + + t.timestamps null: false + end + end +end diff --git a/db/migrate/20161108223100_shipment_table.rb b/db/migrate/20161108223100_shipment_table.rb new file mode 100644 index 0000000..f177f11 --- /dev/null +++ b/db/migrate/20161108223100_shipment_table.rb @@ -0,0 +1,8 @@ +class ShipmentTable < ActiveRecord::Migration + def change + create_table :shipments do |t| + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 3904d81..8fef0d7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20161108200739) do +ActiveRecord::Schema.define(version: 20161108223100) do create_table "locations", force: :cascade do |t| t.string "country" @@ -31,4 +31,14 @@ t.datetime "updated_at", null: false end + create_table "shipments", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "shippings", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end From 07103e2472805bd2aea6bf2d9dfae78ce259de80 Mon Sep 17 00:00:00 2001 From: Yasmin Date: Tue, 8 Nov 2016 16:00:58 -0800 Subject: [PATCH 12/31] Added some tests and modified package location models --- app/models/location.rb | 1 + app/models/package.rb | 1 + test/fixtures/packages.yml | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/location.rb b/app/models/location.rb index 4335424..85b5d60 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -1,4 +1,5 @@ class Location < ActiveRecord::Base + belongs_to :shipment validates :country, :state, :city, :zip, presence: true diff --git a/app/models/package.rb b/app/models/package.rb index 07a80be..86aabd9 100644 --- a/app/models/package.rb +++ b/app/models/package.rb @@ -1,4 +1,5 @@ class Package < ActiveRecord::Base + belongs_to :shipment validates :weight, :length, :width, :height, presence: true diff --git a/test/fixtures/packages.yml b/test/fixtures/packages.yml index 937a0c0..a7f1e46 100644 --- a/test/fixtures/packages.yml +++ b/test/fixtures/packages.yml @@ -4,7 +4,11 @@ # model remove the '{}' from the fixture names and add the columns immediately # below each fixture, per the syntax in the comments below # -one: {} +one: + weight: 15 + length: 10 + height: 10 + width: 10 # column: value # two: {} From e951313c5f1226094c339ee3c8ec8fff36fa92ee Mon Sep 17 00:00:00 2001 From: Yasmin Date: Tue, 8 Nov 2016 16:01:38 -0800 Subject: [PATCH 13/31] Added shipment controller methods --- app/controllers/shipment_controller.rb | 50 ++++++++++++++++++++ app/controllers/shipping_controller.rb | 4 -- config/routes.rb | 6 ++- test/controllers/shipping_controller_test.rb | 9 ---- 4 files changed, 55 insertions(+), 14 deletions(-) create mode 100644 app/controllers/shipment_controller.rb delete mode 100644 app/controllers/shipping_controller.rb delete mode 100644 test/controllers/shipping_controller_test.rb diff --git a/app/controllers/shipment_controller.rb b/app/controllers/shipment_controller.rb new file mode 100644 index 0000000..5ab1b79 --- /dev/null +++ b/app/controllers/shipment_controller.rb @@ -0,0 +1,50 @@ +require 'active_shipping' + +class ShipmentController < ApplicationController + before_action: :origin, :destination, :packages, :get_rates_from_shipper, :ups_rates, :fedex_rates, :usps_rates + + def index + + end + + def show + + end + + private + + # def shipment_params + # end + + def origin + Location.new(country: "US", state: "WA", city: "Seattle", zip: "98161") + end + + def destination + Location.new(params[:country], params[:state], params[:city], params[:zip]) + end + + def packages + package = Package.new(params[:weight], [length, width, height]) + end + + def get_rates_from_shipper(shipper) + response = shipper.find_rates(origin, destination, packages) + response.rates.sort_by(&:price) #might be total_price + end + + def ups_rates + ups = UPS.new(login: ENV['UPS_LOGIN'], password: ENV['UPS_PW'], key: ENV['UPS_KEY') + get_rates_from_shipper(ups) + end + + def fedex_rates + fedex = FedEx.new(login: ENV['FEDEX_METER_NO'], password: ENV['FEDEX_PW'], account: ENV['FEDEX_ACCT'], test: true) + get_rates_from_shipper(fedex) + end + + def usps_rates + usps = USPS.new(login: ENV['USPS_LOGIN']) + get_rates_from_shipper(usps) + end +end diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb deleted file mode 100644 index 39a67b7..0000000 --- a/app/controllers/shipping_controller.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'active_shipping' - -class ShippingController < ApplicationController -end diff --git a/config/routes.rb b/config/routes.rb index d2eb754..2548850 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,9 @@ Rails.application.routes.draw do - resources :packages, except: [:new, :edit] + # resources :shipment, except: [:new, :edit] + get 'rates/&:weight&:country&:state&:city&:zip', to: 'shipments#index', as: 'services' + + get 'rates/&:carrier&:weight&:country&:state&:city&:zip', to: 'shipments#show', as: 'carrier' + # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/test/controllers/shipping_controller_test.rb b/test/controllers/shipping_controller_test.rb deleted file mode 100644 index 070cde9..0000000 --- a/test/controllers/shipping_controller_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'test_helper' - -class ShippingControllerTest < ActionController::TestCase - - test "" do - - end - -end From 8950c09b4e053dcb73b8f3221a879b3d0bac25f1 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Tue, 8 Nov 2016 17:00:34 -0800 Subject: [PATCH 14/31] WIP: Tests erroring re: number of args in initialize. TO DO Fix it --- ..._controller.rb => shipments_controller.rb} | 6 +-- config/routes.rb | 6 +-- test/controllers/shipment_controller_test.rb | 24 ------------ test/controllers/shipments_controller_test.rb | 38 +++++++++++++++++++ test/models/shipment_test.rb | 5 --- test/models/shipments_test.rb | 5 +++ 6 files changed, 49 insertions(+), 35 deletions(-) rename app/controllers/{shipment_controller.rb => shipments_controller.rb} (83%) delete mode 100644 test/controllers/shipment_controller_test.rb create mode 100644 test/controllers/shipments_controller_test.rb delete mode 100644 test/models/shipment_test.rb create mode 100644 test/models/shipments_test.rb diff --git a/app/controllers/shipment_controller.rb b/app/controllers/shipments_controller.rb similarity index 83% rename from app/controllers/shipment_controller.rb rename to app/controllers/shipments_controller.rb index 5ab1b79..6365b49 100644 --- a/app/controllers/shipment_controller.rb +++ b/app/controllers/shipments_controller.rb @@ -1,7 +1,7 @@ require 'active_shipping' -class ShipmentController < ApplicationController - before_action: :origin, :destination, :packages, :get_rates_from_shipper, :ups_rates, :fedex_rates, :usps_rates +class ShipmentsController < ApplicationController + before_action :origin, :destination, :packages, :get_rates_from_shipper, :ups_rates, :fedex_rates, :usps_rates def index @@ -34,7 +34,7 @@ def get_rates_from_shipper(shipper) end def ups_rates - ups = UPS.new(login: ENV['UPS_LOGIN'], password: ENV['UPS_PW'], key: ENV['UPS_KEY') + ups = UPS.new(login: ENV['UPS_LOGIN'], password: ENV['UPS_PW'], key: ENV['UPS_KEY']) get_rates_from_shipper(ups) end diff --git a/config/routes.rb b/config/routes.rb index 2548850..d2b31ce 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,8 @@ Rails.application.routes.draw do - # resources :shipment, except: [:new, :edit] - get 'rates/&:weight&:country&:state&:city&:zip', to: 'shipments#index', as: 'services' - get 'rates/&:carrier&:weight&:country&:state&:city&:zip', to: 'shipments#show', as: 'carrier' + get 'rates/', to: 'shipments#index', as: 'services' + + get 'rates/', to: 'shipments#show', as: 'carrier' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/test/controllers/shipment_controller_test.rb b/test/controllers/shipment_controller_test.rb deleted file mode 100644 index 58742e7..0000000 --- a/test/controllers/shipment_controller_test.rb +++ /dev/null @@ -1,24 +0,0 @@ -require 'test_helper' - -class ShipmentControllerTest < ActionController::TestCase - - setup do - @request.headers['Accept'] = Mime::JSON - @request.headers['Content-Type'] = Mime::JSON.to_s - end - - REWRITE THIS TEST COPIED FROM MODEL TEST - test "#get_rates_from_shipper returns json and rates from shipper" do - get_rates_from_shipper - assert_match 'application/json', response.header['Content-Type'] - - body = JSON.parse(response.body) - assert_instance_of Array, body - - body.each do |obj| - assert_kind_of RateEstimate, obj - end - end - - -end diff --git a/test/controllers/shipments_controller_test.rb b/test/controllers/shipments_controller_test.rb new file mode 100644 index 0000000..8b24f30 --- /dev/null +++ b/test/controllers/shipments_controller_test.rb @@ -0,0 +1,38 @@ +require 'test_helper' + +class ShipmentsControllerTest < ActionController::TestCase + + setup do + @request.headers['Accept'] = Mime::JSON + @request.headers['Content-Type'] = Mime::JSON.to_s + end + + # REWRITE THIS TEST COPIED FROM MODEL TEST + test "(index) #get_rates_from_shipper returns json and all rates for user" do + get :index, {weight: 15, length: 10, width: 10, height: 10} + assert_match 'application/json', response.header['Content-Type'] + + body = JSON.parse(response.body) + assert_instance_of Array, body + + body.each do |obj| + assert_kind_of RateEstimate, obj + end + end + + test "(show) should return one of many potential carrier's rate estimate info" do + + get :show, { carrier: "ups" } + assert_match 'application/json', response.header['Content-Type'] + + body = JSON.parse(response.body) + assert_instance_of Array, body + + body.each do |obj| + assert_kind_of RateEstimate, obj + end + + end + + +end diff --git a/test/models/shipment_test.rb b/test/models/shipment_test.rb deleted file mode 100644 index 30dbebb..0000000 --- a/test/models/shipment_test.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'test_helper' - -class ShipmentTest < ActiveSupport::TestCase - -end diff --git a/test/models/shipments_test.rb b/test/models/shipments_test.rb new file mode 100644 index 0000000..a765381 --- /dev/null +++ b/test/models/shipments_test.rb @@ -0,0 +1,5 @@ +require 'test_helper' + +class ShipmentsTest < ActiveSupport::TestCase + +end From 07ec62db6a8b4ebb2019ad97c32a55167b8e9579 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Wed, 9 Nov 2016 14:56:30 -0800 Subject: [PATCH 15/31] WIP: Shipments controller test/file --- app/controllers/shipments_controller.rb | 52 ++++++++++--------- config/routes.rb | 4 +- test/controllers/shipments_controller_test.rb | 4 +- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/app/controllers/shipments_controller.rb b/app/controllers/shipments_controller.rb index 6365b49..876a15c 100644 --- a/app/controllers/shipments_controller.rb +++ b/app/controllers/shipments_controller.rb @@ -1,14 +1,37 @@ require 'active_shipping' class ShipmentsController < ApplicationController - before_action :origin, :destination, :packages, :get_rates_from_shipper, :ups_rates, :fedex_rates, :usps_rates + before_action :origin, :destination, :packages + + def get_rates_from_shipper(shipper) + response = shipper.find_rates(origin, destination, packages) + response.rates.sort_by(&:price) #might be total_price + end + + def ups_rates + ups = ActiveShipping::UPS.new(login: ENV['UPS_LOGIN'], password: ENV['UPS_PW'], key: ENV['UPS_KEY']) + get_rates_from_shipper(ups) + end + + def fedex_rates + fedex = ActiveShipping::FedEx.new(login: ENV['FEDEX_METER_NO'], password: ENV['FEDEX_PW'], account: ENV['FEDEX_ACCT'], test: true) + get_rates_from_shipper(fedex) + end + + def usps_rates + usps = ActiveShipping::USPS.new(login: ENV['USPS_LOGIN']) + get_rates_from_shipper(usps) + end def index + carrier_estimates = [] + carrier_estimates.push(ups_rates, fedex_rates, usps_rates) + render json: carrier_estimates end def show - + render :json => { ready_for_lunch: "yassss" } end private @@ -17,34 +40,15 @@ def show # end def origin - Location.new(country: "US", state: "WA", city: "Seattle", zip: "98161") + ActiveShipping::Location.new(country: "US", state: "WA", city: "Seattle", zip: "98161") end def destination - Location.new(params[:country], params[:state], params[:city], params[:zip]) + ActiveShipping::Location.new(country: "US", state: "RI", city: "Providence", zip: "02905") end def packages - package = Package.new(params[:weight], [length, width, height]) + ActiveShipping::Package.new(params[:weight].to_i, [10, 10, 10]) end - def get_rates_from_shipper(shipper) - response = shipper.find_rates(origin, destination, packages) - response.rates.sort_by(&:price) #might be total_price - end - - def ups_rates - ups = UPS.new(login: ENV['UPS_LOGIN'], password: ENV['UPS_PW'], key: ENV['UPS_KEY']) - get_rates_from_shipper(ups) - end - - def fedex_rates - fedex = FedEx.new(login: ENV['FEDEX_METER_NO'], password: ENV['FEDEX_PW'], account: ENV['FEDEX_ACCT'], test: true) - get_rates_from_shipper(fedex) - end - - def usps_rates - usps = USPS.new(login: ENV['USPS_LOGIN']) - get_rates_from_shipper(usps) - end end diff --git a/config/routes.rb b/config/routes.rb index d2b31ce..a2ea617 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,8 @@ Rails.application.routes.draw do - get 'rates/', to: 'shipments#index', as: 'services' + get '/index', to: 'shipments#index' - get 'rates/', to: 'shipments#show', as: 'carrier' + get '/show', to: 'shipments#show' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/test/controllers/shipments_controller_test.rb b/test/controllers/shipments_controller_test.rb index 8b24f30..19ed7dc 100644 --- a/test/controllers/shipments_controller_test.rb +++ b/test/controllers/shipments_controller_test.rb @@ -9,7 +9,9 @@ class ShipmentsControllerTest < ActionController::TestCase # REWRITE THIS TEST COPIED FROM MODEL TEST test "(index) #get_rates_from_shipper returns json and all rates for user" do - get :index, {weight: 15, length: 10, width: 10, height: 10} + + get :index, params: { weight: 20, country: "US", zip: "98136" } + assert_match 'application/json', response.header['Content-Type'] body = JSON.parse(response.body) From 0a9ba4033e13385fe4da2470cb05123487a4b8ca Mon Sep 17 00:00:00 2001 From: Yasmin Date: Wed, 9 Nov 2016 15:30:41 -0800 Subject: [PATCH 16/31] WIP: create controller method --- app/controllers/shipments_controller.rb | 25 ++++++++++++++++--------- app/models/shipment.rb | 5 ++--- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/app/controllers/shipments_controller.rb b/app/controllers/shipments_controller.rb index 876a15c..31d786d 100644 --- a/app/controllers/shipments_controller.rb +++ b/app/controllers/shipments_controller.rb @@ -13,10 +13,10 @@ def ups_rates get_rates_from_shipper(ups) end - def fedex_rates - fedex = ActiveShipping::FedEx.new(login: ENV['FEDEX_METER_NO'], password: ENV['FEDEX_PW'], account: ENV['FEDEX_ACCT'], test: true) - get_rates_from_shipper(fedex) - end + # def fedex_rates + # fedex = ActiveShipping::FedEx.new(login: ENV['FEDEX_METER_NO'], password: ENV['FEDEX_PW'], account: ENV['FEDEX_ACCT'], test: true) + # get_rates_from_shipper(fedex) + # end def usps_rates usps = ActiveShipping::USPS.new(login: ENV['USPS_LOGIN']) @@ -25,26 +25,33 @@ def usps_rates def index carrier_estimates = [] - carrier_estimates.push(ups_rates, fedex_rates, usps_rates) + carrier_estimates.push(ups_rates, usps_rates) render json: carrier_estimates - end def show render :json => { ready_for_lunch: "yassss" } end + def create + logger.info("Request for shipment of box size 10x10x10 from facility at Seattle, WA 98161. Weight of package and final destination: #{ params }") + shipment = Shipment.new(shipment_params) + shipment.save + + end + private - # def shipment_params - # end + def shipment_params + params.require(:shipment).permit(params[:weight], params[:country], params[:state], params[:city], params[:zip]) + end def origin ActiveShipping::Location.new(country: "US", state: "WA", city: "Seattle", zip: "98161") end def destination - ActiveShipping::Location.new(country: "US", state: "RI", city: "Providence", zip: "02905") + ActiveShipping::Location.new(params[:country], params[:state], params[:city], params[:zip]) end def packages diff --git a/app/models/shipment.rb b/app/models/shipment.rb index 93a9d16..7e3435d 100644 --- a/app/models/shipment.rb +++ b/app/models/shipment.rb @@ -1,5 +1,4 @@ class Shipment < ActiveRecord::Base - # def self.origin - # - # end + + end From 319fc80179692aad5e52b2c4b4b4d71850f55c6d Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Thu, 10 Nov 2016 13:33:10 -0800 Subject: [PATCH 17/31] WIP: transitioning driver/navigator --- app/controllers/shipments_controller.rb | 13 ++++++++----- config/routes.rb | 6 ++---- test/controllers/shipments_controller_test.rb | 7 +++++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/controllers/shipments_controller.rb b/app/controllers/shipments_controller.rb index 31d786d..bd23105 100644 --- a/app/controllers/shipments_controller.rb +++ b/app/controllers/shipments_controller.rb @@ -26,18 +26,20 @@ def usps_rates def index carrier_estimates = [] carrier_estimates.push(ups_rates, usps_rates) - render json: carrier_estimates - end - def show - render :json => { ready_for_lunch: "yassss" } + render json: carrier_estimates, status: :created end + # def show + # render :json => { ready_for_lunch: "yassss" } + # end + def create logger.info("Request for shipment of box size 10x10x10 from facility at Seattle, WA 98161. Weight of package and final destination: #{ params }") shipment = Shipment.new(shipment_params) shipment.save + render json: { "weight" => shipment.weight, "country" => shipment.country, "state" => shipment.state, "zip" => shipment.zip} , status: :created end private @@ -51,7 +53,8 @@ def origin end def destination - ActiveShipping::Location.new(params[:country], params[:state], params[:city], params[:zip]) + # ActiveShipping::Location.new(country: "US", state: "RI", city: "Providence", zip: "02905") + ActiveShipping::Location.new(country: params[:country], state: params[:state], city: params[:city], zip: params[:zip]) end def packages diff --git a/config/routes.rb b/config/routes.rb index a2ea617..666e6c9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,6 @@ Rails.application.routes.draw do - - get '/index', to: 'shipments#index' - - get '/show', to: 'shipments#show' +get 'shipments', to: "shipments#index", as: 'shipments' +post 'shipments', to: 'shipments#create' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/test/controllers/shipments_controller_test.rb b/test/controllers/shipments_controller_test.rb index 19ed7dc..5c6d3cf 100644 --- a/test/controllers/shipments_controller_test.rb +++ b/test/controllers/shipments_controller_test.rb @@ -1,4 +1,5 @@ require 'test_helper' +require 'active_shipping' class ShipmentsControllerTest < ActionController::TestCase @@ -17,8 +18,10 @@ class ShipmentsControllerTest < ActionController::TestCase body = JSON.parse(response.body) assert_instance_of Array, body - body.each do |obj| - assert_kind_of RateEstimate, obj + body.each do |array_item| + array_item.each do |hash| + assert_kind_of Hash, hash + end end end From 43d7408768204d7122a661b4b72bb94e80072caf Mon Sep 17 00:00:00 2001 From: Yasmin Date: Thu, 10 Nov 2016 13:34:09 -0800 Subject: [PATCH 18/31] routes --- config/routes.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index a2ea617..8bf736f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,7 @@ Rails.application.routes.draw do - get '/index', to: 'shipments#index' + get 'shipments', to: 'shipments#index', as: 'shipments' + post 'shipments', to: 'shipments#create' get '/show', to: 'shipments#show' From d0c34ab55becf64f1a3461e8c322371cd251ab8c Mon Sep 17 00:00:00 2001 From: Yasmin Date: Thu, 10 Nov 2016 13:45:10 -0800 Subject: [PATCH 19/31] shipment create method --- app/controllers/shipments_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/shipments_controller.rb b/app/controllers/shipments_controller.rb index bd23105..6f7edd8 100644 --- a/app/controllers/shipments_controller.rb +++ b/app/controllers/shipments_controller.rb @@ -38,8 +38,10 @@ def create logger.info("Request for shipment of box size 10x10x10 from facility at Seattle, WA 98161. Weight of package and final destination: #{ params }") shipment = Shipment.new(shipment_params) shipment.save + ups_rates = shipment.get_rates_from_shipper("UPS") + usps_rates = shipment.get_rates_from_shipper("USPS") - render json: { "weight" => shipment.weight, "country" => shipment.country, "state" => shipment.state, "zip" => shipment.zip} , status: :created + render json: { ups => ups_rates, usps => usps_rates } , status: :created end private From 6c553623cc20e210679ef27dbd92646303a3d71e Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Thu, 10 Nov 2016 14:12:59 -0800 Subject: [PATCH 20/31] Returning a shipping option successfully --- app/controllers/shipments_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/shipments_controller.rb b/app/controllers/shipments_controller.rb index 6f7edd8..224fe52 100644 --- a/app/controllers/shipments_controller.rb +++ b/app/controllers/shipments_controller.rb @@ -38,16 +38,16 @@ def create logger.info("Request for shipment of box size 10x10x10 from facility at Seattle, WA 98161. Weight of package and final destination: #{ params }") shipment = Shipment.new(shipment_params) shipment.save - ups_rates = shipment.get_rates_from_shipper("UPS") - usps_rates = shipment.get_rates_from_shipper("USPS") + ups_rates + usps_rates - render json: { ups => ups_rates, usps => usps_rates } , status: :created + render json: { "ups" => ups_rates }, status: :created end private def shipment_params - params.require(:shipment).permit(params[:weight], params[:country], params[:state], params[:city], params[:zip]) + params.permit([params[:shipment], params[:weight], params[:country], params[:state], params[:city], params[:zip]]) end def origin From 820336646cc3b317e4a593a990d8ba46326e322d Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Thu, 10 Nov 2016 14:26:20 -0800 Subject: [PATCH 21/31] Logging requirement met --- app/controllers/shipments_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/shipments_controller.rb b/app/controllers/shipments_controller.rb index 224fe52..ed90555 100644 --- a/app/controllers/shipments_controller.rb +++ b/app/controllers/shipments_controller.rb @@ -38,10 +38,9 @@ def create logger.info("Request for shipment of box size 10x10x10 from facility at Seattle, WA 98161. Weight of package and final destination: #{ params }") shipment = Shipment.new(shipment_params) shipment.save - ups_rates - usps_rates + logger.info("Response returned: ups => #{ ups_rates }, usps => #{ usps_rates }") - render json: { "ups" => ups_rates }, status: :created + render json: { "ups" => ups_rates, "usps" => usps_rates }, status: :created end private From b3d35f65118904b4cfb5c29d8f538171cfa87fe1 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Thu, 10 Nov 2016 14:49:29 -0800 Subject: [PATCH 22/31] Passing positive shipments controller test --- app/controllers/shipments_controller.rb | 11 ----- config/routes.rb | 3 +- test/controllers/shipments_controller_test.rb | 43 ++++++++++--------- 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/app/controllers/shipments_controller.rb b/app/controllers/shipments_controller.rb index ed90555..7a5f82f 100644 --- a/app/controllers/shipments_controller.rb +++ b/app/controllers/shipments_controller.rb @@ -23,17 +23,6 @@ def usps_rates get_rates_from_shipper(usps) end - def index - carrier_estimates = [] - carrier_estimates.push(ups_rates, usps_rates) - - render json: carrier_estimates, status: :created - end - - # def show - # render :json => { ready_for_lunch: "yassss" } - # end - def create logger.info("Request for shipment of box size 10x10x10 from facility at Seattle, WA 98161. Weight of package and final destination: #{ params }") shipment = Shipment.new(shipment_params) diff --git a/config/routes.rb b/config/routes.rb index 214bce1..303a9d3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,6 @@ Rails.application.routes.draw do -get 'shipments', to: "shipments#index", as: 'shipments' -post 'shipments', to: 'shipments#create' +post 'shipments', to: 'shipments#create', as: 'shipments' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/test/controllers/shipments_controller_test.rb b/test/controllers/shipments_controller_test.rb index 5c6d3cf..80081e5 100644 --- a/test/controllers/shipments_controller_test.rb +++ b/test/controllers/shipments_controller_test.rb @@ -8,36 +8,37 @@ class ShipmentsControllerTest < ActionController::TestCase @request.headers['Content-Type'] = Mime::JSON.to_s end - # REWRITE THIS TEST COPIED FROM MODEL TEST - test "(index) #get_rates_from_shipper returns json and all rates for user" do - - get :index, params: { weight: 20, country: "US", zip: "98136" } - - assert_match 'application/json', response.header['Content-Type'] - - body = JSON.parse(response.body) - assert_instance_of Array, body - - body.each do |array_item| - array_item.each do |hash| - assert_kind_of Hash, hash - end - end + def origin + ActiveShipping::Location.new(country: "US", state: "WA", city: "Seattle", zip: "98161") end - test "(show) should return one of many potential carrier's rate estimate info" do + test "create returns json and all rates for user" do + + post :create, { weight: 20, country: "US", state: "WA", city: "Seattle", zip: "98136" } - get :show, { carrier: "ups" } assert_match 'application/json', response.header['Content-Type'] body = JSON.parse(response.body) - assert_instance_of Array, body + assert_instance_of Hash, body - body.each do |obj| - assert_kind_of RateEstimate, obj + body.each do |item| + assert_kind_of Array, item end - end + # test "(show) should return one of many potential carrier's rate estimate info" do + # + # get :show, { carrier: "ups" } + # assert_match 'application/json', response.header['Content-Type'] + # + # body = JSON.parse(response.body) + # assert_instance_of Array, body + # + # body.each do |obj| + # assert_kind_of RateEstimate, obj + # end + + # end + end From 3a7a544c93d936aeb1596f8c557d14e17b77807a Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Thu, 10 Nov 2016 15:28:29 -0800 Subject: [PATCH 23/31] Added timeout error; modified controller tests --- app/controllers/shipments_controller.rb | 19 +++++++++++------ test/controllers/shipments_controller_test.rb | 10 ++++++--- test/models/location_test.rb | 19 ----------------- test/models/package_test.rb | 21 ------------------- 4 files changed, 20 insertions(+), 49 deletions(-) delete mode 100644 test/models/location_test.rb delete mode 100644 test/models/package_test.rb diff --git a/app/controllers/shipments_controller.rb b/app/controllers/shipments_controller.rb index 7a5f82f..0ea2616 100644 --- a/app/controllers/shipments_controller.rb +++ b/app/controllers/shipments_controller.rb @@ -1,4 +1,5 @@ require 'active_shipping' +require 'timeout' class ShipmentsController < ApplicationController before_action :origin, :destination, :packages @@ -24,12 +25,18 @@ def usps_rates end def create - logger.info("Request for shipment of box size 10x10x10 from facility at Seattle, WA 98161. Weight of package and final destination: #{ params }") - shipment = Shipment.new(shipment_params) - shipment.save - logger.info("Response returned: ups => #{ ups_rates }, usps => #{ usps_rates }") - - render json: { "ups" => ups_rates, "usps" => usps_rates }, status: :created + begin + Timeout::timeout(10) { + logger.info("Request for shipment of box size 10x10x10 from facility at Seattle, WA 98161. Weight of package and final destination: #{ params }") + shipment = Shipment.new(shipment_params) + shipment.save + logger.info("Response returned: ups => #{ ups_rates }, usps => #{ usps_rates }") + + render json: { "ups" => ups_rates, "usps" => usps_rates }, status: :created + } + rescue Timeout::Error + render json: { error: "This is taking too long. Try refreshing your page." } + end end private diff --git a/test/controllers/shipments_controller_test.rb b/test/controllers/shipments_controller_test.rb index 80081e5..46ee5d7 100644 --- a/test/controllers/shipments_controller_test.rb +++ b/test/controllers/shipments_controller_test.rb @@ -13,7 +13,6 @@ def origin end test "create returns json and all rates for user" do - post :create, { weight: 20, country: "US", state: "WA", city: "Seattle", zip: "98136" } assert_match 'application/json', response.header['Content-Type'] @@ -21,11 +20,16 @@ def origin body = JSON.parse(response.body) assert_instance_of Hash, body - body.each do |item| - assert_kind_of Array, item + body.keys.each do |k| + assert_kind_of String, k + end + + body.values.each do |v| + assert_kind_of Array, v end end + # test "(show) should return one of many potential carrier's rate estimate info" do # # get :show, { carrier: "ups" } diff --git a/test/models/location_test.rb b/test/models/location_test.rb deleted file mode 100644 index 72138cb..0000000 --- a/test/models/location_test.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'test_helper' - -class LocationTest < ActiveSupport::TestCase - test "should have all required fields" do - location = Location.new(country = "US", state = "California", city = "Los Angeles", zip = 90215) - - assert location.valid? - end - - test "Not valid location should result in incomplete-based errors" do - location = Location.new(country = nil, state = nil, city = nil, zip = nil) - - assert_not location.valid? - assert_includes location.errors, :country - assert_includes location.errors, :state - assert_includes location.errors, :city - assert_includes location.errors, :zip - end -end diff --git a/test/models/package_test.rb b/test/models/package_test.rb deleted file mode 100644 index ac78a1c..0000000 --- a/test/models/package_test.rb +++ /dev/null @@ -1,21 +0,0 @@ -require 'test_helper' - -class PackageTest < ActiveSupport::TestCase - - test "should have all required fields" do - package = Package.new(weight = 15, length = 10, width = 10, height = 10) - - assert package.valid? - end - - test "Not valid package should result in incomplete-based errors" do - package = Package.new(weight = nil, length = nil, width = nil, height = nil) - - assert_not package.valid? - assert_includes package.errors, :weight - assert_includes package.errors, :length - assert_includes package.errors, :width - assert_includes package.errors, :height - end - -end From 9471f8c94d6a1b121373e57302408ac093b44f36 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Thu, 10 Nov 2016 15:52:43 -0800 Subject: [PATCH 24/31] Added Response Error for incomplete request; added commented out tests re shipment creation and attribute validation (not currently working) --- app/controllers/shipments_controller.rb | 11 +++++++--- app/models/shipment.rb | 4 ++-- test/controllers/shipments_controller_test.rb | 22 ++++--------------- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/app/controllers/shipments_controller.rb b/app/controllers/shipments_controller.rb index 0ea2616..506967a 100644 --- a/app/controllers/shipments_controller.rb +++ b/app/controllers/shipments_controller.rb @@ -27,16 +27,21 @@ def usps_rates def create begin Timeout::timeout(10) { - logger.info("Request for shipment of box size 10x10x10 from facility at Seattle, WA 98161. Weight of package and final destination: #{ params }") + logger.info("Request for shipment of box size 10x10x10 from facility at Seattle, WA 98161. Weight ofpackage and final destination: #{ params }") shipment = Shipment.new(shipment_params) shipment.save logger.info("Response returned: ups => #{ ups_rates }, usps => #{ usps_rates }") - render json: { "ups" => ups_rates, "usps" => usps_rates }, status: :created + return render json: { "ups" => ups_rates, "usps" => usps_rates }, status: :created } + + rescue ActiveShipping::ResponseError + render json: { error: "Looks like some information isn't correct. Please try again."} + rescue Timeout::Error - render json: { error: "This is taking too long. Try refreshing your page." } + return render json: { error: "This is taking too long. Try refreshing your page." } end + end private diff --git a/app/models/shipment.rb b/app/models/shipment.rb index 7e3435d..064bd0f 100644 --- a/app/models/shipment.rb +++ b/app/models/shipment.rb @@ -1,4 +1,4 @@ class Shipment < ActiveRecord::Base - - + # TODO: Not working atm + # validates :weight, :country, :state, :city, :zip, presence: true end diff --git a/test/controllers/shipments_controller_test.rb b/test/controllers/shipments_controller_test.rb index 46ee5d7..8656ef0 100644 --- a/test/controllers/shipments_controller_test.rb +++ b/test/controllers/shipments_controller_test.rb @@ -8,10 +8,6 @@ class ShipmentsControllerTest < ActionController::TestCase @request.headers['Content-Type'] = Mime::JSON.to_s end - def origin - ActiveShipping::Location.new(country: "US", state: "WA", city: "Seattle", zip: "98161") - end - test "create returns json and all rates for user" do post :create, { weight: 20, country: "US", state: "WA", city: "Seattle", zip: "98136" } @@ -29,20 +25,10 @@ def origin end end - - # test "(show) should return one of many potential carrier's rate estimate info" do - # - # get :show, { carrier: "ups" } - # assert_match 'application/json', response.header['Content-Type'] - # - # body = JSON.parse(response.body) - # assert_instance_of Array, body - # - # body.each do |obj| - # assert_kind_of RateEstimate, obj + # TODO: Not working atm + # test "do not create new shipment without all valid params" do + # assert_no_difference('Shipment.count') do + # post :create, { weight: nil, country: nil, state: nil, city: nil, zip: nil } # end - # end - - end From e344dd14ae9724c30f86abf88119424d1968a6eb Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Fri, 11 Nov 2016 13:11:36 -0800 Subject: [PATCH 25/31] Added gems for Heroku deployment --- Gemfile | 8 ++++++-- Gemfile.lock | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index a4231b7..fe4f9a1 100644 --- a/Gemfile +++ b/Gemfile @@ -6,8 +6,6 @@ gem 'active_shipping' gem 'rails-api' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.7' -# Use sqlite3 as the database for Active Record -gem 'sqlite3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets @@ -35,11 +33,17 @@ gem 'sdoc', '~> 0.4.0', group: :doc # Use Capistrano for deployment # gem 'capistrano-rails', group: :development +group :production do + gem 'pg' + gem 'rails_12factor' +end + group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' gem 'simplecov' gem 'dotenv-rails' + gem 'sqlite3' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index ec7cb09..df24fa3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,6 +99,7 @@ GEM multi_json (1.12.1) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) + pg (0.19.0) quantified (1.0.1) rack (1.6.4) rack-test (0.6.3) @@ -125,6 +126,11 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) + rails_12factor (0.0.3) + rails_serve_static_assets + rails_stdout_logging + rails_serve_static_assets (0.0.5) + rails_stdout_logging (0.0.5) railties (4.2.7) actionpack (= 4.2.7) activesupport (= 4.2.7) @@ -187,8 +193,10 @@ DEPENDENCIES jbuilder (~> 2.0) jquery-rails minitest-reporters + pg rails (= 4.2.7) rails-api + rails_12factor sass-rails (~> 5.0) sdoc (~> 0.4.0) simplecov From 367b23311a54e71ab4413c91c36e92fd3fc934ec Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Fri, 11 Nov 2016 13:15:01 -0800 Subject: [PATCH 26/31] Removed shippings table --- db/migrate/20161111211403_remove_shippings_table.rb | 5 +++++ db/schema.rb | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 db/migrate/20161111211403_remove_shippings_table.rb diff --git a/db/migrate/20161111211403_remove_shippings_table.rb b/db/migrate/20161111211403_remove_shippings_table.rb new file mode 100644 index 0000000..3ae2098 --- /dev/null +++ b/db/migrate/20161111211403_remove_shippings_table.rb @@ -0,0 +1,5 @@ +class RemoveShippingsTable < ActiveRecord::Migration + def change + drop_table :shippings + end +end diff --git a/db/schema.rb b/db/schema.rb index 8fef0d7..8cab188 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20161108223100) do +ActiveRecord::Schema.define(version: 20161111211403) do create_table "locations", force: :cascade do |t| t.string "country" @@ -36,9 +36,4 @@ t.datetime "updated_at", null: false end - create_table "shippings", force: :cascade do |t| - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - end From 51cc6297ee2f5ad776a479c1b20425ef55ac3aaf Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Fri, 11 Nov 2016 13:37:31 -0800 Subject: [PATCH 27/31] Change to aid Heroku deployment --- config/application.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/application.rb b/config/application.rb index 4dfc9eb..e3c7a2c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -10,6 +10,7 @@ module ShippingService class Application < Rails::Application config.eager_load_paths += %W(#{config.root}/lib) config.eager_load_paths += Dir["#{config.root}/lib/**/"] + YAML.load_file("#{::Rails.root}/config/secrets.yml")[::Rails.env].each {|k,v| ENV[k] = v } # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. From 6626959253475a7e92e9b9844f6b0dba34cc8b69 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Fri, 11 Nov 2016 13:39:58 -0800 Subject: [PATCH 28/31] Change to aid Heroku deployment pt 2 --- config/application.rb | 1 - config/environment.rb | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index e3c7a2c..4dfc9eb 100644 --- a/config/application.rb +++ b/config/application.rb @@ -10,7 +10,6 @@ module ShippingService class Application < Rails::Application config.eager_load_paths += %W(#{config.root}/lib) config.eager_load_paths += Dir["#{config.root}/lib/**/"] - YAML.load_file("#{::Rails.root}/config/secrets.yml")[::Rails.env].each {|k,v| ENV[k] = v } # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. diff --git a/config/environment.rb b/config/environment.rb index ee8d90d..5df9605 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -2,4 +2,5 @@ require File.expand_path('../application', __FILE__) # Initialize the Rails application. +YAML.load_file("#{::Rails.root}/config/secrets.yml")[::Rails.env].each {|k,v| ENV[k] = v } Rails.application.initialize! From 3bf3344403622703399522445b7eecd1c22bfe81 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Fri, 11 Nov 2016 13:40:55 -0800 Subject: [PATCH 29/31] Change to aid Heroku deployment pt 3 --- config/environment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environment.rb b/config/environment.rb index 5df9605..33cf1cc 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -2,5 +2,5 @@ require File.expand_path('../application', __FILE__) # Initialize the Rails application. -YAML.load_file("#{::Rails.root}/config/secrets.yml")[::Rails.env].each {|k,v| ENV[k] = v } +YAML.load_file("#{::Rails.root}/config/env_provider.yml")[::Rails.env].each {|k,v| ENV[k] = v } Rails.application.initialize! From d8f5c10e09ea8de1185ff1df12ce30cdeed3c45b Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Fri, 11 Nov 2016 13:44:28 -0800 Subject: [PATCH 30/31] Change to aid Heroku deployment pt 4 --- .gitignore | 2 +- config/secrets.yml | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 config/secrets.yml diff --git a/.gitignore b/.gitignore index ec080ba..0c3ffd9 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,7 @@ pickle-email-*.html # TODO Comment out these rules if you are OK with secrets being uploaded to the repo config/initializers/secret_token.rb -config/secrets.yml +# config/secrets.yml ## Environment normalization: /.bundle diff --git a/config/secrets.yml b/config/secrets.yml new file mode 100644 index 0000000..1b4fa18 --- /dev/null +++ b/config/secrets.yml @@ -0,0 +1,22 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rake secret` to generate a secure secret key. + +# Make sure the secrets in this file are kept private +# if you're sharing your code publicly. + +development: + secret_key_base: 68c4716c46f5eb1fe4b3ccb2818fe78679bac709d92bf85dc9b1008b42d0f1d419f2ccbcdedcdc52dc0dd18524156f280b031bf5381347bec5b351fafc60ff9f + +test: + secret_key_base: 5b2867c88de7ddd555b4b992a74d563762e478c4a49615bf10c8839fb40d8f8bf55829a3826db203169e6af4dfd1509a071601f4070d194cf76b0cac1c9491e2 + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> From b7a3c98352cebb6faaa9a54b49c0bb3385e99299 Mon Sep 17 00:00:00 2001 From: Jennifer Owens Date: Fri, 11 Nov 2016 13:45:24 -0800 Subject: [PATCH 31/31] Change to aid Heroku deployment pt 5 --- config/environment.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/config/environment.rb b/config/environment.rb index 33cf1cc..ee8d90d 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -2,5 +2,4 @@ require File.expand_path('../application', __FILE__) # Initialize the Rails application. -YAML.load_file("#{::Rails.root}/config/env_provider.yml")[::Rails.env].each {|k,v| ENV[k] = v } Rails.application.initialize!