Skip to content

Commit

Permalink
Merge pull request #148 from bigcommerce/PEN-541
Browse files Browse the repository at this point in the history
PEN-541: Loosen faraday dependencies
  • Loading branch information
splittingred authored Dec 20, 2017
2 parents def011a + 38fad91 commit 0613deb
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 31 deletions.
7 changes: 7 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ AllCops:
- .bundle/**/*
- bin/**/*
- vendor/**/*
- examples/**/*

Metrics/LineLength:
Max: 120
Expand All @@ -17,3 +18,9 @@ Metrics/MethodLength:

Style/Documentation:
Enabled: false

Style/FormatStringToken:
Enabled: false

Gemspec/RequiredRubyVersion:
Enabled: false
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
language: ruby
sudo: false
cache: bundler

rvm:
- ruby-head
- 2.0
- 2.1
- 2.2
- 2.3.0

- 2.3
- 2.4
cache:
bundler: true
sudo: false
matrix:
allow_failures:
- rvm: ruby-head
fast_finish: true
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
source 'https://rubygems.org'

gemspec

group :development do
Expand Down
20 changes: 0 additions & 20 deletions LICENSE

This file was deleted.

14 changes: 14 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Copyright (c) 2017-present, BigCommerce Pty. Ltd. All rights reserved

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6 changes: 3 additions & 3 deletions bigcommerce.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 2.0.0'
s.license = 'MIT'

s.authors = ['Patrick Edelman']
s.authors = ['BigCommerce Engineering']
s.homepage = 'https://github.com/bigcommerce/bigcommerce-api-ruby'
s.summary = 'Ruby client library for the BigCommerce API'
s.description = s.summary
Expand All @@ -20,8 +20,8 @@ Gem::Specification.new do |s|
s.add_development_dependency 'bundler'
s.add_development_dependency 'rake'

s.add_dependency 'faraday', '~> 0.12.0'
s.add_dependency 'faraday_middleware', '~> 0.10.0'
s.add_dependency 'faraday', '~> 0.11'
s.add_dependency 'faraday_middleware', '~> 0.11'
s.add_dependency 'hashie', '~> 3.4'
s.add_dependency 'jwt', '~> 1.5.4'
end
2 changes: 1 addition & 1 deletion examples/exception_handling.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def bc_handle_exception
puts e.inspect
rescue Bigcommerce::BandwidthLimitExceeded => e
puts e.inspect
rescue => e
rescue StandardError => e
puts "Some other Error #{e.inspect}"
end

Expand Down
2 changes: 1 addition & 1 deletion lib/bigcommerce/exception.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def throw_http_exception!(code, env)
unless env.body.empty?
response_headers = begin
JSON.parse(env.body, symbolize_names: true)
rescue
rescue StandardError
{}
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/bigcommerce/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Bigcommerce
VERSION = '1.0.0'.freeze
VERSION = '1.0.1'.freeze
end

0 comments on commit 0613deb

Please sign in to comment.