From 28e959bc299ee9829dc9daaad3746fe9c41707e3 Mon Sep 17 00:00:00 2001 From: Leah Date: Mon, 23 May 2016 15:12:28 -0700 Subject: [PATCH 01/27] setup rails project using pg --- Gemfile | 50 +++++ Gemfile.lock | 185 ++++++++++++++++++ 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 | 5 + 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 | 15 ++ config.ru | 4 + config/application.rb | 26 +++ config/boot.rb | 3 + config/database.yml | 28 +++ 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 | 10 + vendor/assets/javascripts/.keep | 0 vendor/assets/stylesheets/.keep | 0 54 files changed, 977 insertions(+) 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/Gemfile b/Gemfile new file mode 100644 index 0000000..713fd59 --- /dev/null +++ b/Gemfile @@ -0,0 +1,50 @@ +source 'https://rubygems.org' +ruby '2.3.1' +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '4.2.6' +# postgres +gem 'pg', '~> 0.15' +# 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 + +gem 'simplecov', :require => false, :group => :test +# 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' +end + +group :development do + # Access an IRB console on exception pages or by using <%= console %> in views + gem 'web-console', '~> 2.0' + gem 'spring' + gem 'better_errors' + gem 'pry-rails' + + # 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 new file mode 100644 index 0000000..bf15753 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,185 @@ +GEM + remote: https://rubygems.org/ + specs: + actionmailer (4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.6) + actionview (= 4.2.6) + activesupport (= 4.2.6) + 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.6) + activesupport (= 4.2.6) + 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.6) + activesupport (= 4.2.6) + globalid (>= 0.3.0) + activemodel (4.2.6) + activesupport (= 4.2.6) + builder (~> 3.1) + activerecord (4.2.6) + activemodel (= 4.2.6) + activesupport (= 4.2.6) + arel (~> 6.0) + activesupport (4.2.6) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + 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.4) + 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.6) + activesupport (>= 4.1.0) + i18n (0.7.0) + jbuilder (2.4.1) + activesupport (>= 3.0.0, < 5.1) + multi_json (~> 1.2) + jquery-rails (4.1.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) + method_source (0.8.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.0.0) + minitest (5.9.0) + multi_json (1.12.1) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + pg (0.18.4) + pry (0.10.3) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) + rack (1.6.4) + rack-test (0.6.3) + rack (>= 1.0) + rails (4.2.6) + actionmailer (= 4.2.6) + actionpack (= 4.2.6) + actionview (= 4.2.6) + activejob (= 4.2.6) + activemodel (= 4.2.6) + activerecord (= 4.2.6) + activesupport (= 4.2.6) + bundler (>= 1.3.0, < 2.0) + railties (= 4.2.6) + sprockets-rails + 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.6) + actionpack (= 4.2.6) + activesupport (= 4.2.6) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (11.1.2) + rdoc (4.2.2) + json (~> 1.4) + sass (3.4.22) + sass-rails (5.0.4) + railties (>= 4.0.0, < 5.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sdoc (0.4.1) + json (~> 1.7, >= 1.7.7) + rdoc (~> 4.0) + simplecov (0.11.2) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + slop (3.6.0) + spring (1.7.1) + sprockets (3.6.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.0.4) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (0.19.1) + thread_safe (0.3.5) + tilt (2.0.4) + turbolinks (2.5.3) + coffee-rails + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (3.0.0) + 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 + pg (~> 0.15) + pry-rails + rails (= 4.2.6) + sass-rails (~> 5.0) + sdoc (~> 0.4.0) + simplecov + spring + turbolinks + uglifier (>= 1.3.0) + web-console (~> 2.0) + +RUBY VERSION + ruby 2.3.1p112 + +BUNDLED WITH + 1.12.4 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..d83690e --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,5 @@ +class ApplicationController < ActionController::Base + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + protect_from_forgery with: :exception +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..8cb1788 --- /dev/null +++ b/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + ShippingServiceApi + <%= 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..7fe232c --- /dev/null +++ b/bin/spring @@ -0,0 +1,15 @@ +#!/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' + + if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)) + Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) } + gem 'spring', match[1] + 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..319a080 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,26 @@ +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 ShippingServiceApi + class Application < Rails::Application + # 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..8c7b7ab --- /dev/null +++ b/config/database.yml @@ -0,0 +1,28 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# +default: &default + adapter: postgresql + encoding: unicode + pool: 5 + # timeout: 5000 + +development: + <<: *default + database: shipping_service_api_development + +# 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: shipping_service_api_test + + +production: + <<: *default + database: shipping_service_api_production + 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..2a3c8e3 --- /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_api_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..92e39b2 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require File.expand_path('../../config/environment', __FILE__) +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/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 fed4ffd11c552316157d6191583d3f94a3a1005e Mon Sep 17 00:00:00 2001 From: Jillian Boshart Date: Mon, 23 May 2016 15:39:17 -0700 Subject: [PATCH 02/27] Removed superflous gem --- Gemfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 713fd59..2680fb7 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 0.4.0', group: :doc -gem 'simplecov', :require => false, :group => :test +gem 'simplecov', :require => false, :group => :test # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' @@ -40,11 +40,9 @@ end group :development do # Access an IRB console on exception pages or by using <%= console %> in views gem 'web-console', '~> 2.0' - gem 'spring' gem 'better_errors' gem 'pry-rails' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' end - From d11cb6c4000fe04bcf0af5e5f6f1341a0ebcd524 Mon Sep 17 00:00:00 2001 From: Jillian Boshart Date: Mon, 23 May 2016 15:57:38 -0700 Subject: [PATCH 03/27] Trying to solve heroku secret key issue --- db/schema.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 db/schema.rb diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..ea89ed5 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,19 @@ +# 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: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end From ed25f2d64c3e1ccbfeba19567adab50eeaa559a7 Mon Sep 17 00:00:00 2001 From: Leah Date: Mon, 23 May 2016 16:53:24 -0700 Subject: [PATCH 04/27] added active_shipping gem --- Gemfile | 1 + Gemfile.lock | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/Gemfile b/Gemfile index 2680fb7..c53a8c9 100644 --- a/Gemfile +++ b/Gemfile @@ -26,6 +26,7 @@ gem 'simplecov', :require => false, :group => :test # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' +gem 'active_shipping' # Use Unicorn as the app server # gem 'unicorn' diff --git a/Gemfile.lock b/Gemfile.lock index bf15753..2382dc0 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.7.2) + active_utils (~> 3.2.0) + activesupport (>= 3.2, < 5.0.0) + nokogiri (>= 1.6) + quantified (~> 1.0.1) + active_utils (3.2.0) + activesupport (>= 3.2) + i18n activejob (4.2.6) activesupport (= 4.2.6) globalid (>= 0.3.0) @@ -89,6 +97,7 @@ GEM slop (~> 3.4) pry-rails (0.3.4) pry (>= 0.9.10) + quantified (1.0.1) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) @@ -162,6 +171,7 @@ PLATFORMS ruby DEPENDENCIES + active_shipping better_errors byebug coffee-rails (~> 4.1.0) From e49ec199a49ad5644db6d35f8f0ae39e6fc7bf66 Mon Sep 17 00:00:00 2001 From: Leah Date: Tue, 24 May 2016 10:20:40 -0700 Subject: [PATCH 05/27] added scaffoling for shipping controller, fedex, ups models, going to get secrets for fedex and ups apis now --- app/assets/javascripts/shipping.coffee | 3 +++ app/assets/stylesheets/shipping.scss | 3 +++ app/controllers/shipping_controller.rb | 9 +++++++++ app/helpers/shipping_helper.rb | 2 ++ app/models/FedEx.rb | 4 ++++ app/models/UPS.rb | 4 ++++ test/controllers/shipping_controller_test.rb | 7 +++++++ 7 files changed, 32 insertions(+) create mode 100644 app/assets/javascripts/shipping.coffee create mode 100644 app/assets/stylesheets/shipping.scss create mode 100644 app/controllers/shipping_controller.rb create mode 100644 app/helpers/shipping_helper.rb create mode 100644 app/models/FedEx.rb create mode 100644 app/models/UPS.rb create mode 100644 test/controllers/shipping_controller_test.rb diff --git a/app/assets/javascripts/shipping.coffee b/app/assets/javascripts/shipping.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/shipping.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/shipping.scss b/app/assets/stylesheets/shipping.scss new file mode 100644 index 0000000..899c36e --- /dev/null +++ b/app/assets/stylesheets/shipping.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the shipping controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb new file mode 100644 index 0000000..40608ba --- /dev/null +++ b/app/controllers/shipping_controller.rb @@ -0,0 +1,9 @@ +class ShippingController < ApplicationController + + def index + end + + # use suggestions_controller from tunes-takeout as inspiration + # these methods should take in json from betsy and query ups/usps via wrappers then return info to betsy + +end diff --git a/app/helpers/shipping_helper.rb b/app/helpers/shipping_helper.rb new file mode 100644 index 0000000..4495a84 --- /dev/null +++ b/app/helpers/shipping_helper.rb @@ -0,0 +1,2 @@ +module ShippingHelper +end diff --git a/app/models/FedEx.rb b/app/models/FedEx.rb new file mode 100644 index 0000000..393bc36 --- /dev/null +++ b/app/models/FedEx.rb @@ -0,0 +1,4 @@ +require 'active_shipping' + +class FedEx +end \ No newline at end of file diff --git a/app/models/UPS.rb b/app/models/UPS.rb new file mode 100644 index 0000000..82b570a --- /dev/null +++ b/app/models/UPS.rb @@ -0,0 +1,4 @@ +require 'active_shipping' + +class Ups +end \ No newline at end of file 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 07bba9bfc14340264f4324af33afbca0324b433f Mon Sep 17 00:00:00 2001 From: Leah Date: Tue, 24 May 2016 10:32:40 -0700 Subject: [PATCH 06/27] added .env dotenv gem --- Gemfile | 1 + Gemfile.lock | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Gemfile b/Gemfile index c53a8c9..f2e92b4 100644 --- a/Gemfile +++ b/Gemfile @@ -36,6 +36,7 @@ gem 'active_shipping' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' + gem 'dotenv-rails' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 2382dc0..89d9950 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,6 +64,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.6) @@ -175,6 +179,7 @@ DEPENDENCIES better_errors byebug coffee-rails (~> 4.1.0) + dotenv-rails jbuilder (~> 2.0) jquery-rails pg (~> 0.15) From 0ebef313cd1311a262a02c86038008cc2eabe23a Mon Sep 17 00:00:00 2001 From: Leah Date: Tue, 24 May 2016 11:24:56 -0700 Subject: [PATCH 07/27] set up keys and initialers in models with activeshipping --- .gitignore | 3 +++ app/controllers/shipping_controller.rb | 21 +++++++++++++++++++++ app/models/FedEx.rb | 4 ---- app/models/UPS.rb | 1 + app/models/UsPostalService.rb | 6 ++++++ 5 files changed, 31 insertions(+), 4 deletions(-) delete mode 100644 app/models/FedEx.rb create mode 100644 app/models/UsPostalService.rb diff --git a/.gitignore b/.gitignore index 14e3ed5..11aa5c5 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,6 @@ bower.json # Ignore pow environment settings .powenv + +# ignore fedex ups secrets +/.env diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index 40608ba..3c9899f 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -5,5 +5,26 @@ def index # use suggestions_controller from tunes-takeout as inspiration # these methods should take in json from betsy and query ups/usps via wrappers then return info to betsy + # packages = [ + # ActiveShipping::Package.new(100, # 100 grams + # [93,10], # 93 cm long, 10 cm diameter + # cylinder: true), # cylinders have different volume calculations + + # ActiveShipping::Package.new(7.5 * 16, # 7.5 lbs, times 16 oz/lb. + # [15, 10, 4.5], # 15x10x4.5 inches + # units: :imperial) # not grams, not centimetres + # ] + + # # You live in Beverly Hills, he lives in Ottawa + # origin = ActiveShipping::Location.new(country: 'US', + # state: 'CA', + # city: 'Beverly Hills', + # zip: '90210') + + # destination = ActiveShipping::Location.new(country: 'CA', + # province: 'ON', + # city: 'Ottawa', + # postal_code: 'K1P 1J1') + end diff --git a/app/models/FedEx.rb b/app/models/FedEx.rb deleted file mode 100644 index 393bc36..0000000 --- a/app/models/FedEx.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'active_shipping' - -class FedEx -end \ No newline at end of file diff --git a/app/models/UPS.rb b/app/models/UPS.rb index 82b570a..46025b1 100644 --- a/app/models/UPS.rb +++ b/app/models/UPS.rb @@ -1,4 +1,5 @@ require 'active_shipping' class Ups + ups = ActiveShipping::UPS.new(login: ENV["UPS_LOGIN"], password: ENV["UPS_PASSWORD"], key: ENV["UPS_KEY"]) end \ No newline at end of file diff --git a/app/models/UsPostalService.rb b/app/models/UsPostalService.rb new file mode 100644 index 0000000..36589b4 --- /dev/null +++ b/app/models/UsPostalService.rb @@ -0,0 +1,6 @@ +require 'active_shipping' + +class USPS + usps = ActiveShipping::USPS.new(login: ENV['USPS_USERNAME']) + response = usps.find_rates(origin, destination, packages) +end \ No newline at end of file From 72e17a7dd84564ffc929dabf6365b332722efde5 Mon Sep 17 00:00:00 2001 From: Leah Date: Tue, 24 May 2016 15:17:01 -0700 Subject: [PATCH 08/27] trying to direct to root index to see if the deployment is working --- config/routes.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 3f66539..c9fd7d3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Rails.application.routes.draw do + + root 'shipping#index' # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From eb6f6220292e28b80e1a1a39d9832532c943f161 Mon Sep 17 00:00:00 2001 From: Leah Date: Tue, 24 May 2016 15:20:55 -0700 Subject: [PATCH 09/27] trying to get index hello world to display --- app/controllers/shipping_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index 3c9899f..16e9b04 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -1,6 +1,7 @@ class ShippingController < ApplicationController def index + render :text => "hello world" end # use suggestions_controller from tunes-takeout as inspiration From 1d6fac2fc360f30702088eb6de9156fafd666f7a Mon Sep 17 00:00:00 2001 From: Leah Date: Tue, 24 May 2016 15:25:43 -0700 Subject: [PATCH 10/27] commented out line in usps class, hello world displaying --- app/models/UsPostalService.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/UsPostalService.rb b/app/models/UsPostalService.rb index 36589b4..3c0dfee 100644 --- a/app/models/UsPostalService.rb +++ b/app/models/UsPostalService.rb @@ -2,5 +2,5 @@ class USPS usps = ActiveShipping::USPS.new(login: ENV['USPS_USERNAME']) - response = usps.find_rates(origin, destination, packages) + # response = usps.find_rates(@origin, @destination, @packages) end \ No newline at end of file From 50dc80c99f297f6f62254dcf1b530dbc4659b3f9 Mon Sep 17 00:00:00 2001 From: Leah Date: Tue, 24 May 2016 15:38:25 -0700 Subject: [PATCH 11/27] commented out secrets in gitignore --- .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 11aa5c5..f96f8ca 100644 --- a/.gitignore +++ b/.gitignore @@ -52,7 +52,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..27f2f12 --- /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: e1c40a13a65aafa31c837a0728d83b74a99f6b6f0f56f06523e6667761e44e6bb68f9be7349f211190d83ae51c4bc54c79258c5f1e586f34a020fcf7ef93f65d + +test: + secret_key_base: ae2630ce0b0b1389f476ab146245ab64d826d01aeafad8fec6855fb0ea95ddde78c14cffac317c96450b109b5161f59201971ecc2b4099d074c0ff96bf4edb3b + +# Do not keep production secrets in the repository, +# instead read values from the environment. +production: + secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> From 3c74623ccc73820b3e3a5dc8f56cc5fe44a74064 Mon Sep 17 00:00:00 2001 From: Leah Date: Tue, 24 May 2016 15:46:11 -0700 Subject: [PATCH 12/27] added search route and method to display json empty array --- app/controllers/shipping_controller.rb | 4 ++++ config/routes.rb | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index 16e9b04..3bca236 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -4,6 +4,10 @@ def index render :text => "hello world" end + def search + render json: [] + end + # use suggestions_controller from tunes-takeout as inspiration # these methods should take in json from betsy and query ups/usps via wrappers then return info to betsy # packages = [ diff --git a/config/routes.rb b/config/routes.rb index c9fd7d3..7e39f89 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,15 @@ Rails.application.routes.draw do root 'shipping#index' + get '/shipping/search' => 'shipping#search', as: :search + + + + # resources :shipping, only: [:index, :search] #do + # collection do + # post "search" + # end + # end # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". From bd4915e2807650e162af52b3a4c78438e9bbdad6 Mon Sep 17 00:00:00 2001 From: Leah Date: Tue, 24 May 2016 16:03:00 -0700 Subject: [PATCH 13/27] wrote a test for the index, currently returning json hello world --- app/controllers/shipping_controller.rb | 2 +- test/controllers/shipping_controller_test.rb | 31 ++++++++++++++++++-- test/fixtures/order1.yml.bak | 10 +++++++ 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 test/fixtures/order1.yml.bak diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index 3bca236..639b2b1 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -1,7 +1,7 @@ class ShippingController < ApplicationController def index - render :text => "hello world" + render json: ["hello world"] end def search diff --git a/test/controllers/shipping_controller_test.rb b/test/controllers/shipping_controller_test.rb index ea50b81..460a072 100644 --- a/test/controllers/shipping_controller_test.rb +++ b/test/controllers/shipping_controller_test.rb @@ -1,7 +1,34 @@ require 'test_helper' class ShippingControllerTest < ActionController::TestCase - # test "the truth" do - # assert true + setup do + @request.headers['Accept'] = Mime::JSON + @request.headers['Content-Type'] = Mime::JSON.to_s + + get :index + @body = JSON.parse(response.body) + end + + test "index returns 200" do + get :index + assert_response :success + end + + + + # test "returns an array of pet objects" do + + # assert_instance_of Array, @body + # assert_equal Hash, @body.map(&:class).uniq.first + # end + + # test "returns three pet objects" do + # assert_equal 5, @body.length + # end + + # test "each pet object contains the relevant keys" do + # keys = %w( age human id name ) + # assert_equal keys, @body.map(&:keys).flatten.uniq.sort + # end # end end diff --git a/test/fixtures/order1.yml.bak b/test/fixtures/order1.yml.bak new file mode 100644 index 0000000..05c03de --- /dev/null +++ b/test/fixtures/order1.yml.bak @@ -0,0 +1,10 @@ +shipping_info: + country: USA + state: WA + city: Seattle + zip: 98115 +package_info: + weight: 2 + height: 15 + width: 15 + units: imperial \ No newline at end of file From 2f4097aeb00fba2fc5fa3e2a01567f2bb4be4f42 Mon Sep 17 00:00:00 2001 From: Leah Date: Tue, 24 May 2016 16:37:05 -0700 Subject: [PATCH 14/27] added hash info to test search method --- config/routes.rb | 2 +- test/controllers/shipping_controller_test.rb | 54 ++++++++++++++++---- test/fixtures/order1.yml.bak | 10 ---- 3 files changed, 45 insertions(+), 21 deletions(-) delete mode 100644 test/fixtures/order1.yml.bak diff --git a/config/routes.rb b/config/routes.rb index 7e39f89..aabe715 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ Rails.application.routes.draw do root 'shipping#index' - get '/shipping/search' => 'shipping#search', as: :search + post '/shipping/search' => 'shipping#search', as: :search diff --git a/test/controllers/shipping_controller_test.rb b/test/controllers/shipping_controller_test.rb index 460a072..3dc9113 100644 --- a/test/controllers/shipping_controller_test.rb +++ b/test/controllers/shipping_controller_test.rb @@ -1,19 +1,52 @@ require 'test_helper' -class ShippingControllerTest < ActionController::TestCase - setup do - @request.headers['Accept'] = Mime::JSON - @request.headers['Content-Type'] = Mime::JSON.to_s - get :index - @body = JSON.parse(response.body) - end +module ShippingControllerTest + class IndexAction < ActionController::TestCase + setup do + @request.headers['Accept'] = Mime::JSON + @request.headers['Content-Type'] = Mime::JSON.to_s + + get :index + @body = JSON.parse(response.body) + end - test "index returns 200" do - get :index - assert_response :success + test "index returns 200" do + get :index + assert_response :success + end end + # class SearchAction < ActionController::TestCase + # setup do + # @request.headers['Accept'] = Mime::JSON + # @request.headers['Content-Type'] = Mime::JSON.to_s + + # @body = { + # shipping_info: { + # country: USA, + # state: WA, + # city: Seattle, + # zip: 98115 + # }, + # package_info: { + # weight: 2, + # height: 15, + # width: 15, + # units: :imperial + # } + # } + + # get :search + # @body = JSON.parse(response.body) + # end + + # # test "index returns 200" do + # # get :index + # # assert_response :success + # # end + # end + # test "returns an array of pet objects" do @@ -31,4 +64,5 @@ class ShippingControllerTest < ActionController::TestCase # assert_equal keys, @body.map(&:keys).flatten.uniq.sort # end # end + end diff --git a/test/fixtures/order1.yml.bak b/test/fixtures/order1.yml.bak deleted file mode 100644 index 05c03de..0000000 --- a/test/fixtures/order1.yml.bak +++ /dev/null @@ -1,10 +0,0 @@ -shipping_info: - country: USA - state: WA - city: Seattle - zip: 98115 -package_info: - weight: 2 - height: 15 - width: 15 - units: imperial \ No newline at end of file From 9b64a531382525652c65047f8747a9cddd2048ba Mon Sep 17 00:00:00 2001 From: Leah Date: Wed, 25 May 2016 09:53:58 -0700 Subject: [PATCH 15/27] adding new package instances to search method in shipping controller, we think we need to remove the colons on our post data --- app/controllers/application_controller.rb | 8 ++++++++ app/controllers/shipping_controller.rb | 9 +++++++++ app/models/UsPostalService.rb | 10 +++++----- test/controllers/shipping_controller_test.rb | 2 +- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e..555b4f8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,12 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception + + skip_before_action :verify_authenticity_token, if: :json_request? + + protected + + def json_request? + request.format.json? + end end diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index 639b2b1..3dc1d11 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -1,10 +1,19 @@ +require 'active_shipping' + class ShippingController < ApplicationController + USPS = ActiveShipping::USPS.new(login: ENV['USPS_USERNAME']) def index render json: ["hello world"] end def search + @origin = params["origin_info"] + @destination = params["destination_info"] + @packages = ActiveShipping::Package.new(params["package_info"]["weight"], params["package_info"]["dimensions"], params["package_info"]["units"]) + + usps_response = USPS.find_rates(@origin, @destination, @packages) + puts usps_response render json: [] end diff --git a/app/models/UsPostalService.rb b/app/models/UsPostalService.rb index 3c0dfee..acdc765 100644 --- a/app/models/UsPostalService.rb +++ b/app/models/UsPostalService.rb @@ -1,6 +1,6 @@ -require 'active_shipping' +# require 'active_shipping' -class USPS - usps = ActiveShipping::USPS.new(login: ENV['USPS_USERNAME']) - # response = usps.find_rates(@origin, @destination, @packages) -end \ No newline at end of file +# class USPS +# usps = ActiveShipping::USPS.new(login: ENV['USPS_USERNAME']) +# # response = usps.find_rates(@origin, @destination, @packages) +# end \ No newline at end of file diff --git a/test/controllers/shipping_controller_test.rb b/test/controllers/shipping_controller_test.rb index 3dc9113..f46198c 100644 --- a/test/controllers/shipping_controller_test.rb +++ b/test/controllers/shipping_controller_test.rb @@ -4,8 +4,8 @@ module ShippingControllerTest class IndexAction < ActionController::TestCase setup do - @request.headers['Accept'] = Mime::JSON @request.headers['Content-Type'] = Mime::JSON.to_s + @request.headers['Accept'] = Mime::JSON get :index @body = JSON.parse(response.body) From acdd70da73031569b7a7cb9a33b17fb343e593bd Mon Sep 17 00:00:00 2001 From: Leah Date: Wed, 25 May 2016 14:36:19 -0700 Subject: [PATCH 16/27] got package initializing with post data from betsy --- app/controllers/shipping_controller.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index 3dc1d11..3afe3aa 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -8,9 +8,13 @@ def index end def search - @origin = params["origin_info"] - @destination = params["destination_info"] - @packages = ActiveShipping::Package.new(params["package_info"]["weight"], params["package_info"]["dimensions"], params["package_info"]["units"]) + @origin_params = params["origin_info"] + @destination_params = params["destination_info"] + weight = params["package_info"]["weight"].to_i + dimensions = [params["package_info"]["height"].to_i, params["package_info"]["width"].to_i, params["package_info"]["length"].to_i] + + @packages = ActiveShipping::Package.new(weight * 16, dimensions, units: :imperial) + origin = ActiveShipping::Location.new usps_response = USPS.find_rates(@origin, @destination, @packages) puts usps_response From e7ad7957d0156572dd8039a17e8bf79343a9adc2 Mon Sep 17 00:00:00 2001 From: Leah Date: Wed, 25 May 2016 14:45:24 -0700 Subject: [PATCH 17/27] added find_rates for ups, returning rates --- app/controllers/shipping_controller.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index 3afe3aa..bc3ff33 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -8,16 +8,19 @@ def index end def search - @origin_params = params["origin_info"] - @destination_params = params["destination_info"] + origin_params = params["origin_info"] + destination_params = params["destination_info"] weight = params["package_info"]["weight"].to_i dimensions = [params["package_info"]["height"].to_i, params["package_info"]["width"].to_i, params["package_info"]["length"].to_i] @packages = ActiveShipping::Package.new(weight * 16, dimensions, units: :imperial) - origin = ActiveShipping::Location.new + @origin = ActiveShipping::Location.new(origin_params) + @destination = ActiveShipping::Location.new(destination_params) usps_response = USPS.find_rates(@origin, @destination, @packages) - puts usps_response + puts usps_response.rates + ups_rates = usps_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} + puts ups_rates render json: [] end From 8d23e336f898f1af4cc6223727b5df7792592c53 Mon Sep 17 00:00:00 2001 From: Leah Date: Wed, 25 May 2016 14:55:41 -0700 Subject: [PATCH 18/27] added find_rates method to ups, need to look at logging requests/responses --- app/controllers/shipping_controller.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index bc3ff33..a1f87b0 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -1,7 +1,9 @@ require 'active_shipping' class ShippingController < ApplicationController - USPS = ActiveShipping::USPS.new(login: ENV['USPS_USERNAME']) + USPS = ActiveShipping::USPS.new(login: ENV['USPS_USERNAME']) + UPS = ActiveShipping::UPS.new(login: ENV["UPS_LOGIN"], password: ENV["UPS_PASSWORD"], key: ENV["UPS_KEY"]) + def index render json: ["hello world"] @@ -18,9 +20,14 @@ def search @destination = ActiveShipping::Location.new(destination_params) usps_response = USPS.find_rates(@origin, @destination, @packages) - puts usps_response.rates - ups_rates = usps_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} + ups_response = UPS.find_rates(@origin, @destination, @packages) + puts ups_response + ups_rates = ups_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} + + # puts usps_response.rates + # ups_rates = usps_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} puts ups_rates + render json: [] end From 381c689c4cfb90e59ea32a19841e955bf2a069da Mon Sep 17 00:00:00 2001 From: Leah Date: Wed, 25 May 2016 15:11:37 -0700 Subject: [PATCH 19/27] cleaned up code, wrote some comments to guide the next steps --- app/controllers/shipping_controller.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index a1f87b0..21ae208 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -10,6 +10,7 @@ def index end def search + # save post request to db origin_params = params["origin_info"] destination_params = params["destination_info"] weight = params["package_info"]["weight"].to_i @@ -21,16 +22,20 @@ def search usps_response = USPS.find_rates(@origin, @destination, @packages) ups_response = UPS.find_rates(@origin, @destination, @packages) - puts ups_response - ups_rates = ups_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} - # puts usps_response.rates - # ups_rates = usps_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} - puts ups_rates + # put competing rates in array? -- hash? to send back as json + # save post response to db render json: [] end + # puts ups_response + # ups_rates = ups_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} + + # puts usps_response.rates + # ups_rates = usps_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} + # puts ups_rates + # use suggestions_controller from tunes-takeout as inspiration # these methods should take in json from betsy and query ups/usps via wrappers then return info to betsy # packages = [ From e53cf3481aa554c2a7e76795d47641f9b8b5467a Mon Sep 17 00:00:00 2001 From: Jillian Boshart Date: Wed, 25 May 2016 15:23:01 -0700 Subject: [PATCH 20/27] Created database for audit logs, and wrote method in model to...log those logs. --- app/models/UPS.rb | 5 ----- app/models/UsPostalService.rb | 6 ------ app/models/post_log.rb | 6 ++++++ db/migrate/20160525221440_create_post_logs.rb | 10 ++++++++++ db/schema.rb | 9 ++++++++- test/fixtures/post_logs.yml | 11 +++++++++++ test/models/post_log_test.rb | 7 +++++++ 7 files changed, 42 insertions(+), 12 deletions(-) delete mode 100644 app/models/UPS.rb delete mode 100644 app/models/UsPostalService.rb create mode 100644 app/models/post_log.rb create mode 100644 db/migrate/20160525221440_create_post_logs.rb create mode 100644 test/fixtures/post_logs.yml create mode 100644 test/models/post_log_test.rb diff --git a/app/models/UPS.rb b/app/models/UPS.rb deleted file mode 100644 index 46025b1..0000000 --- a/app/models/UPS.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'active_shipping' - -class Ups - ups = ActiveShipping::UPS.new(login: ENV["UPS_LOGIN"], password: ENV["UPS_PASSWORD"], key: ENV["UPS_KEY"]) -end \ No newline at end of file diff --git a/app/models/UsPostalService.rb b/app/models/UsPostalService.rb deleted file mode 100644 index acdc765..0000000 --- a/app/models/UsPostalService.rb +++ /dev/null @@ -1,6 +0,0 @@ -# require 'active_shipping' - -# class USPS -# usps = ActiveShipping::USPS.new(login: ENV['USPS_USERNAME']) -# # response = usps.find_rates(@origin, @destination, @packages) -# end \ No newline at end of file diff --git a/app/models/post_log.rb b/app/models/post_log.rb new file mode 100644 index 0000000..fd34654 --- /dev/null +++ b/app/models/post_log.rb @@ -0,0 +1,6 @@ +class PostLog < ActiveRecord::Base + + def log_request_response(request, response) + PostLog.create(post_request: request, post_response: response) + end +end diff --git a/db/migrate/20160525221440_create_post_logs.rb b/db/migrate/20160525221440_create_post_logs.rb new file mode 100644 index 0000000..c861ca6 --- /dev/null +++ b/db/migrate/20160525221440_create_post_logs.rb @@ -0,0 +1,10 @@ +class CreatePostLogs < ActiveRecord::Migration + def change + create_table :post_logs do |t| + t.string :post_request + t.string :post_response + + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index ea89ed5..d92365d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,9 +11,16 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20160525221440) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "post_logs", force: :cascade do |t| + t.string "post_request" + t.string "post_response" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + end diff --git a/test/fixtures/post_logs.yml b/test/fixtures/post_logs.yml new file mode 100644 index 0000000..937a0c0 --- /dev/null +++ b/test/fixtures/post_logs.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/post_log_test.rb b/test/models/post_log_test.rb new file mode 100644 index 0000000..ae5026b --- /dev/null +++ b/test/models/post_log_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PostLogTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From 4ef3cc78ad2a0e80e93d68e76c60d920e1430918 Mon Sep 17 00:00:00 2001 From: Jillian Boshart Date: Wed, 25 May 2016 15:40:49 -0700 Subject: [PATCH 21/27] Getting an error when trying to run curl. pushing to see if Leah can duplicate the error. --- app/controllers/shipping_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index 21ae208..724752e 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -10,7 +10,6 @@ def index end def search - # save post request to db origin_params = params["origin_info"] destination_params = params["destination_info"] weight = params["package_info"]["weight"].to_i @@ -23,7 +22,10 @@ def search usps_response = USPS.find_rates(@origin, @destination, @packages) ups_response = UPS.find_rates(@origin, @destination, @packages) + # usps_response.class + # response = [usps_response, ups_response] + # log_request_response(params, response) # put competing rates in array? -- hash? to send back as json # save post response to db render json: [] @@ -37,7 +39,7 @@ def search # puts ups_rates # use suggestions_controller from tunes-takeout as inspiration - # these methods should take in json from betsy and query ups/usps via wrappers then return info to betsy + # these methods should take in json from betsy and query ups/usps via wrappers then return info to betsy # packages = [ # ActiveShipping::Package.new(100, # 100 grams # [93,10], # 93 cm long, 10 cm diameter From b6528cd22267702e0fc69e75febffb1b9d898b77 Mon Sep 17 00:00:00 2001 From: Jillian Boshart Date: Thu, 26 May 2016 09:42:26 -0700 Subject: [PATCH 22/27] API request response is now working and logging to database. whoo. --- app/controllers/shipping_controller.rb | 36 +++++++------------------- app/models/post_log.rb | 4 --- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index 724752e..bad74df 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -1,4 +1,5 @@ require 'active_shipping' +require_relative '../models/post_log.rb' class ShippingController < ApplicationController USPS = ActiveShipping::USPS.new(login: ENV['USPS_USERNAME']) @@ -22,13 +23,18 @@ def search usps_response = USPS.find_rates(@origin, @destination, @packages) ups_response = UPS.find_rates(@origin, @destination, @packages) - # usps_response.class + usps_hash = usps_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} + ups_hash = ups_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} + response = [usps_hash, ups_hash] - # response = [usps_response, ups_response] - # log_request_response(params, response) + log_request_response(params, response) # put competing rates in array? -- hash? to send back as json # save post response to db - render json: [] + render json: response + end + + def log_request_response(request, response) + PostLog.create(post_request: request, post_response: response) end # puts ups_response @@ -40,26 +46,4 @@ def search # use suggestions_controller from tunes-takeout as inspiration # these methods should take in json from betsy and query ups/usps via wrappers then return info to betsy - # packages = [ - # ActiveShipping::Package.new(100, # 100 grams - # [93,10], # 93 cm long, 10 cm diameter - # cylinder: true), # cylinders have different volume calculations - - # ActiveShipping::Package.new(7.5 * 16, # 7.5 lbs, times 16 oz/lb. - # [15, 10, 4.5], # 15x10x4.5 inches - # units: :imperial) # not grams, not centimetres - # ] - - # # You live in Beverly Hills, he lives in Ottawa - # origin = ActiveShipping::Location.new(country: 'US', - # state: 'CA', - # city: 'Beverly Hills', - # zip: '90210') - - # destination = ActiveShipping::Location.new(country: 'CA', - # province: 'ON', - # city: 'Ottawa', - # postal_code: 'K1P 1J1') - - end diff --git a/app/models/post_log.rb b/app/models/post_log.rb index fd34654..622bb9c 100644 --- a/app/models/post_log.rb +++ b/app/models/post_log.rb @@ -1,6 +1,2 @@ class PostLog < ActiveRecord::Base - - def log_request_response(request, response) - PostLog.create(post_request: request, post_response: response) - end end From dd994aaa2e81782dc98b399320d23396f9453131 Mon Sep 17 00:00:00 2001 From: Jillian Boshart Date: Thu, 26 May 2016 10:02:07 -0700 Subject: [PATCH 23/27] Work on testing. Getting an error currently. --- app/controllers/shipping_controller.rb | 28 ++++---- test/controllers/shipping_controller_test.rb | 71 +++++++++++--------- 2 files changed, 54 insertions(+), 45 deletions(-) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index bad74df..891ec2d 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -5,45 +5,43 @@ class ShippingController < ApplicationController USPS = ActiveShipping::USPS.new(login: ENV['USPS_USERNAME']) UPS = ActiveShipping::UPS.new(login: ENV["UPS_LOGIN"], password: ENV["UPS_PASSWORD"], key: ENV["UPS_KEY"]) - + #Kept for testing purposes. def index render json: ["hello world"] end def search + #Information from Betsy: origin_params = params["origin_info"] destination_params = params["destination_info"] weight = params["package_info"]["weight"].to_i dimensions = [params["package_info"]["height"].to_i, params["package_info"]["width"].to_i, params["package_info"]["length"].to_i] + #New instances of the data ActiveShipping needs: @packages = ActiveShipping::Package.new(weight * 16, dimensions, units: :imperial) @origin = ActiveShipping::Location.new(origin_params) @destination = ActiveShipping::Location.new(destination_params) + #Send instances along to retrieve rates: usps_response = USPS.find_rates(@origin, @destination, @packages) ups_response = UPS.find_rates(@origin, @destination, @packages) - usps_hash = usps_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} - ups_hash = ups_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} + #Returned sorted rates data: + usps_results_array = usps_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} + usps_results_array = ups_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} + + #What we're sending back to betsy: response = [usps_hash, ups_hash] + #Save request/response to database: log_request_response(params, response) - # put competing rates in array? -- hash? to send back as json - # save post response to db + + #Render resonse: render json: response end + #Method to save logs for audit: def log_request_response(request, response) PostLog.create(post_request: request, post_response: response) end - - # puts ups_response - # ups_rates = ups_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} - - # puts usps_response.rates - # ups_rates = usps_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} - # puts ups_rates - - # use suggestions_controller from tunes-takeout as inspiration - # these methods should take in json from betsy and query ups/usps via wrappers then return info to betsy end diff --git a/test/controllers/shipping_controller_test.rb b/test/controllers/shipping_controller_test.rb index f46198c..29ef131 100644 --- a/test/controllers/shipping_controller_test.rb +++ b/test/controllers/shipping_controller_test.rb @@ -11,41 +11,52 @@ class IndexAction < ActionController::TestCase @body = JSON.parse(response.body) end - test "index returns 200" do + test "index returns 200" do get :index - assert_response :success + assert_response :success end end - # class SearchAction < ActionController::TestCase - # setup do - # @request.headers['Accept'] = Mime::JSON - # @request.headers['Content-Type'] = Mime::JSON.to_s - - # @body = { - # shipping_info: { - # country: USA, - # state: WA, - # city: Seattle, - # zip: 98115 - # }, - # package_info: { - # weight: 2, - # height: 15, - # width: 15, - # units: :imperial - # } - # } - - # get :search - # @body = JSON.parse(response.body) - # end + class SearchAction < ActionController::TestCase + setup do + @request.headers['Accept'] = Mime::JSON + @request.headers['Content-Type'] = Mime::JSON.to_s - # # test "index returns 200" do - # # get :index - # # assert_response :success - # # end - # end + @body = { + "origin_info": { + "country": "United States", + "state": "WA", + "city": "Seattle", + "zip": "98115" + }, + "destination_info": { + "country": "United States", + "state": "CA", + "city": "Los Angeles", + "zip": "90039" + }, + "package_info": { + "weight": "5", + "height": "15", + "width": "15", + "length": "15" + } + } + + get :search + @body = JSON.parse(response.body) + end + + test "there are four things in origin_params" do + assert_equal 4, @body[origin_params].keys + end + + + + # test "data being sent do API is JSON" do + # assert_match 'application/json', response.header['Content-Type'] + # end + end From d4c95be7c08e11099c0f8fa44b103913085a9e6b Mon Sep 17 00:00:00 2001 From: Leah Date: Thu, 26 May 2016 10:11:49 -0700 Subject: [PATCH 24/27] added 3 tests for shipping controller --- app/controllers/shipping_controller.rb | 2 +- test/controllers/shipping_controller_test.rb | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index 891ec2d..abaa81a 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -31,7 +31,7 @@ def search usps_results_array = ups_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} #What we're sending back to betsy: - response = [usps_hash, ups_hash] + response = [usps_results_array, usps_results_array] #Save request/response to database: log_request_response(params, response) diff --git a/test/controllers/shipping_controller_test.rb b/test/controllers/shipping_controller_test.rb index 29ef131..0e17504 100644 --- a/test/controllers/shipping_controller_test.rb +++ b/test/controllers/shipping_controller_test.rb @@ -43,19 +43,22 @@ class SearchAction < ActionController::TestCase } } - get :search + post :search, @body @body = JSON.parse(response.body) end - test "there are four things in origin_params" do - assert_equal 4, @body[origin_params].keys + test "body has two elements" do + assert_equal 2, @body.length end + test "data being sent do API is JSON" do + assert_match 'application/json', response.header['Content-Type'] + end - - # test "data being sent do API is JSON" do - # assert_match 'application/json', response.header['Content-Type'] - # end + test "body is an array of info arrays" do + assert_instance_of Array, @body + assert_equal Array, @body.map(&:class).uniq.first + end end From f646dab3ae52e08f53e9b9e640b33abed57130df Mon Sep 17 00:00:00 2001 From: Leah Date: Thu, 26 May 2016 10:21:17 -0700 Subject: [PATCH 25/27] 100% test coverage --- test/controllers/shipping_controller_test.rb | 24 ++++---------------- test/test_helper.rb | 6 ++++- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/test/controllers/shipping_controller_test.rb b/test/controllers/shipping_controller_test.rb index 0e17504..61d27b1 100644 --- a/test/controllers/shipping_controller_test.rb +++ b/test/controllers/shipping_controller_test.rb @@ -1,6 +1,7 @@ require 'test_helper' + module ShippingControllerTest class IndexAction < ActionController::TestCase setup do @@ -59,24 +60,9 @@ class SearchAction < ActionController::TestCase assert_instance_of Array, @body assert_equal Array, @body.map(&:class).uniq.first end - end - - - - # test "returns an array of pet objects" do - - # assert_instance_of Array, @body - # assert_equal Hash, @body.map(&:class).uniq.first - # end - - # test "returns three pet objects" do - # assert_equal 5, @body.length - # end - - # test "each pet object contains the relevant keys" do - # keys = %w( age human id name ) - # assert_equal keys, @body.map(&:keys).flatten.uniq.sort - # end - # end + # test "package, origin, destination instances of active_shipping objects" do + # assert_equal 4, @body.pa + # end + end end diff --git a/test/test_helper.rb b/test/test_helper.rb index 92e39b2..10ac469 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,4 +1,8 @@ -ENV['RAILS_ENV'] ||= 'test' +if ENV['RAILS_ENV'] ||= 'test' + require 'simplecov' + SimpleCov.start 'rails' + puts "required simplecov" +end require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' From 6e39eaf9f36232bab83d86cf706ee8d7ada3e3c5 Mon Sep 17 00:00:00 2001 From: Jillian Boshart Date: Thu, 26 May 2016 11:51:40 -0700 Subject: [PATCH 26/27] Added skip before action for authenticity token. --- app/controllers/application_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 555b4f8..e6beed2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,7 +2,6 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception - skip_before_action :verify_authenticity_token, if: :json_request? protected From e552d179cd4f12a535cf464347e426ffb70f2103 Mon Sep 17 00:00:00 2001 From: Leah Date: Thu, 26 May 2016 14:26:50 -0700 Subject: [PATCH 27/27] changed var name in search method --- app/controllers/shipping_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/shipping_controller.rb b/app/controllers/shipping_controller.rb index abaa81a..f103c4c 100644 --- a/app/controllers/shipping_controller.rb +++ b/app/controllers/shipping_controller.rb @@ -28,10 +28,10 @@ def search #Returned sorted rates data: usps_results_array = usps_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} - usps_results_array = ups_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} + ups_results_array = ups_response.rates.sort_by(&:price).collect {|rate| [rate.service_name, rate.price]} #What we're sending back to betsy: - response = [usps_results_array, usps_results_array] + response = [usps_results_array, ups_results_array] #Save request/response to database: log_request_response(params, response)