forked from AdaGold/shipping-service
-
Notifications
You must be signed in to change notification settings - Fork 13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Nicole & Jess' Shipping API #3
Open
jweeber
wants to merge
24
commits into
Ada-C5:master
Choose a base branch
from
jweeber:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
5579fa1
pre-baseline stuff
nicosaki a0cc9f3
Carrier model generated
nicosaki f3fd69d
Added minitest reporters to gemfile
nicosaki a05ae47
Added three routes to start
nicosaki 4e51064
Carrier model
nicosaki b960667
Carrier controller started, some application controller methods
nicosaki 8e847d6
starting tests but failing because of secrets.yml file
jweeber 5c5ab52
model method calling to usps, one test with error
jweeber 7e7485a
test still not working
jweeber 937d858
Finally got a UPS and USPS account. Only took 24 fucking hours
nicosaki 71568ce
added params we need
jweeber db2b76b
Got our first GET from betsy to show response info YAYYAY
nicosaki bb89428
fixed key problems
jweeber dc9334f
V1 of log, saves all incoming info and response
nicosaki 6803719
Added two controller tests for select, and added theoretical logging …
nicosaki 2af6f85
Tracking number return success yay
nicosaki 0b4a09e
working on model tests
jweeber baa0d32
added model test
jweeber 4130002
testing carrier model errors
jweeber 13f74b1
finally fixed error handling in controller and view
jweeber 99b8c9b
mucking about in tests, no real progress
nicosaki 5ca06a1
Merge branch 'master' of github.com:jweeber/shipping-service
nicosaki 3f1a8a7
Testing complete, wooooOOOOOOO
nicosaki 7560ed8
Finished logging function. project complete
nicosaki File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
shipping-service |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
2.3.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
source 'https://rubygems.org' | ||
|
||
|
||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | ||
gem 'rails', '4.2.6' | ||
# Use sqlite3 as the database for Active Record | ||
gem 'pg' | ||
# 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 'active_shipping', '~> 1.7.2' | ||
|
||
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' | ||
gem 'dotenv-rails' | ||
gem 'pry-rails' | ||
gem 'minitest-vcr' | ||
gem 'minitest-reporters' | ||
gem 'webmock' | ||
end | ||
|
||
group :development do | ||
# Access an IRB console on exception pages or by using <%= console %> in views | ||
gem 'web-console', '~> 2.0' | ||
|
||
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring | ||
gem 'spring' | ||
end | ||
|
||
group :production do | ||
gem 'rails_12factor' | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,224 @@ | ||
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) | ||
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) | ||
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) | ||
addressable (2.4.0) | ||
ansi (1.5.0) | ||
arel (6.0.3) | ||
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) | ||
crack (0.4.3) | ||
safe_yaml (~> 1.0.0) | ||
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) | ||
activesupport (>= 4.1.0) | ||
hashdiff (0.3.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) | ||
minispec-metadata (2.0.0) | ||
minitest | ||
minitest (5.9.0) | ||
minitest-reporters (1.1.9) | ||
ansi | ||
builder | ||
minitest (>= 5.0) | ||
ruby-progressbar | ||
minitest-vcr (1.4.0) | ||
minispec-metadata (~> 2.0) | ||
minitest (>= 4.7.5) | ||
vcr (>= 2.9) | ||
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) | ||
quantified (1.0.1) | ||
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) | ||
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.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) | ||
ruby-progressbar (1.8.1) | ||
safe_yaml (1.0.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) | ||
vcr (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) | ||
webmock (2.0.3) | ||
addressable (>= 2.3.6) | ||
crack (>= 0.3.2) | ||
hashdiff | ||
|
||
PLATFORMS | ||
ruby | ||
|
||
DEPENDENCIES | ||
active_shipping (~> 1.7.2) | ||
byebug | ||
coffee-rails (~> 4.1.0) | ||
dotenv-rails | ||
jbuilder (~> 2.0) | ||
jquery-rails | ||
minitest-reporters | ||
minitest-vcr | ||
pg | ||
pry-rails | ||
rails (= 4.2.6) | ||
rails_12factor | ||
sass-rails (~> 5.0) | ||
sdoc (~> 0.4.0) | ||
simplecov | ||
spring | ||
turbolinks | ||
uglifier (>= 1.3.0) | ||
web-console (~> 2.0) | ||
webmock | ||
|
||
BUNDLED WITH | ||
1.12.4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
<tt>rake doc:app</tt>. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 . | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
*/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
// Place all the styles related to the Carriers controller here. | ||
// They will automatically be included in application.css. | ||
// You can use Sass (SCSS) here: http://sass-lang.com/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remember to delete these files you don't use. Otherwise your code reviewers have to scroll through them :(