Skip to content

Commit eec22ad

Browse files
authored
Merge pull request #173 from bc-johnhebron/loosen_faraday_dependency
Loosen Faraday dependency to ~> 1.1.0
2 parents 154df8e + aa3f8ac commit eec22ad

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

Diff for: CHANGELOG.md

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
## Next Release
22
Your contribution here.
33

4-
* [#170](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/170): Fix various Rubocop warnings and declare dotenv as a dev dependency - [@splittingred](https://github.com/splittingred)
5-
* [#169](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/169): Add frozen_string_literal magic comment to all files - [@splittingred](https://github.com/splittingred)
6-
* [#168](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/168): Move to CircleCI off of TravisCI - [@splittingred](https://github.com/splittingred)
7-
* [#168](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/168): Explicitly declare development dependencies in gemspec - [@splittingred](https://github.com/splittingred)
8-
* [#167](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/167): Changes handling of HTTP response headers to handle lowercased titles. - [@bc-zachary](https://github.com/bc-zachary).
94
* [#000](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/000): Brief description here. - [@username](https://github.com/username).
105

6+
## 1.0.2
7+
8+
* [#173](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/173): Loosen Faraday dependency to ~> 1.1.0 - [@bc-johnhebron](https://github.com/bc-johnhebron).
9+
* [#159](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/159): Added new missing fields for an order - [@ranjeetkumarkanaily](https://github.com/ranjeetkumarkanaily).
10+
* [#171](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/171): Fix various Rubocop warnings and declare dotenv as a dev dependency - [@splittingred](https://github.com/splittingred).
11+
* [#170](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/170): Add frozen_string_literal magic comment to all files - [@splittingred](https://github.com/splittingred).
12+
* [#169](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/169): Move to CircleCI off of TravisCI - [@splittingred](https://github.com/splittingred).
13+
* [#168](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/168): Explicitly declare development dependencies in gemspec - [@splittingred](https://github.com/splittingred).
14+
* [#167](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/167): Changes handling of HTTP response headers to handle lowercased titles. - [@bc-zachary](https://github.com/bc-zachary).
15+
1116
## 1.0.1
1217

13-
* [#148](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/148): Loosen Faraday version dependency pin. Update license to explicit MIT. Fix Rubocop and Travis builds. - [@splittingred](https://github.com/splittingred)
14-
* [#142](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/142): Update Faraday gem version. Add support for OAuth SSL options. - [@pedelman](https://github.com/pedelman)
15-
* [#136](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/136): Added accept-encoding: gzip header. - [@adambilsing](https://github.com/adambilsing)
18+
* [#148](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/148): Loosen Faraday version dependency pin. Update license to explicit MIT. Fix Rubocop and Travis builds. - [@splittingred](https://github.com/splittingred).
19+
* [#142](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/142): Update Faraday gem version. Add support for OAuth SSL options. - [@pedelman](https://github.com/pedelman).
20+
* [#136](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/136): Added accept-encoding: gzip header. - [@adambilsing](https://github.com/adambilsing).
1621
* [#128](https://github.com/bigcommerce/bigcommerce-api-ruby/pull/128): Added support for token generation for storefront login. - [@mattolson](https://github.com/mattolson).
1722

1823
## 1.0.0

Diff for: RELEASING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ bundle install
1111
bundle exec rake
1212
```
1313

14-
This will ensure both style and that all the specs pass locally. Next, check that the last build succeeded in [Travis CI](https://travis-ci.org/bigcommerce/bigcommerce-api-ruby) for all supported platforms.
14+
This will ensure both style and that all the specs pass locally. Next, check that the last build succeeded in [CircleCI](https://app.circleci.com/pipelines/github/bigcommerce/bigcommerce-api-ruby) for all supported platforms.
1515

1616
Increment the version, modify [lib/bigcommerce/version.rb](lib/bigcommerce/version.rb).
1717

Diff for: bigcommerce.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Gem::Specification.new do |s|
3030
s.add_development_dependency 'rubocop-performance', '>= 1.5'
3131
s.add_development_dependency 'simplecov', '~> 0.15'
3232

33-
s.add_dependency 'faraday', '~> 0.11'
34-
s.add_dependency 'faraday_middleware', '~> 0.11'
33+
s.add_dependency 'faraday', '~> 1.1.0'
34+
s.add_dependency 'faraday_middleware', '~> 1.0'
3535
s.add_dependency 'hashie', '>= 3.4', '~> 4'
3636
s.add_dependency 'jwt', '>= 1.5.4', '~> 2'
3737
end

Diff for: lib/bigcommerce/config.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def api_url
2222
# @return [String]
2323
#
2424
def base_url
25-
ENV[BC_API_ENDPOINT_ENV_KEY].to_s.empty? ? DEFAULTS[:base_url] : ENV[BC_API_ENDPOINT_ENV_KEY]
25+
ENV[BC_API_ENDPOINT_ENV_KEY].to_s.empty? ? DEFAULTS[:base_url] : ENV.fetch(BC_API_ENDPOINT_ENV_KEY, nil)
2626
end
2727
end
2828
end

Diff for: lib/bigcommerce/resources/orders/order.rb

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ class Order < Resource
7777
property :store_default_currency_code
7878
property :store_default_to_transactional_exchange_rate
7979
property :tax_provider_id
80-
8180

8281
def self.count(params = {})
8382
get 'orders/count', params

Diff for: lib/bigcommerce/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module Bigcommerce
4-
VERSION = '1.0.2.pre'
4+
VERSION = '1.0.2'
55
end

0 commit comments

Comments
 (0)