Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@ jobs:
gemfile:
- Gemfile
include:
# See https://github.com/dblock/strava-ruby-client/issues/113: json
# 2.x is the version this gem currently supports. json_3 is
# commented out until Faraday's :json middleware supports json >=
# 3.0, since it currently fails (Faraday::ParsingError).
# See https://github.com/dblock/strava-ruby-client/issues/113.
- ruby-version: "3.4"
gemfile: gemfiles/json_2.gemfile
# - ruby-version: "3.4"
# gemfile: gemfiles/json_3.gemfile
- ruby-version: "3.4"
gemfile: gemfiles/json_3.gemfile
env:
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
steps:
Expand Down
7 changes: 2 additions & 5 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
# frozen_string_literal: true

# Tests the gem against the two major json releases that are relevant to
# https://github.com/dblock/strava-ruby-client/issues/113: json < 3.0, where
# JSON.parse accepts a positional options hash (the form Faraday's :json
# response middleware uses), and json >= 3.0, where JSON.parse only accepts
# keyword arguments and Faraday's call raises an ArgumentError.
# Tests the gem against the two major json releases relevant to
# https://github.com/dblock/strava-ruby-client/issues/113.
appraise 'json-2' do
gem 'json', '~> 2.3'
end
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
### 3.1.1 (Next)

* [#113](https://github.com/dblock/strava-ruby-client/issues/113): Adds Appraisals (`json-2`, `json-3`) - [@dblock](https://github.com/dblock).
* [#113](https://github.com/dblock/strava-ruby-client/issues/113): Supports `json` gem >= 3.0 by requiring Faraday >= 2.14.4 - [@dblock](https://github.com/dblock).
* Your contribution here.

### 3.1.0 (2026/08/29)
Expand Down
6 changes: 0 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@ source 'http://rubygems.org'

gemspec

# Faraday's :json response middleware is incompatible with json >= 3.0 (see
# https://github.com/dblock/strava-ruby-client/issues/113), so pin json here
# rather than relying on rubocop's own transitive constraint. The `json-3`
# appraisal (see Appraisals) is used to track when this can be removed.
gem 'json', '~> 2.3'

group :development, :test do
gem 'appraisal'
gem 'csv'
Expand Down
2 changes: 1 addition & 1 deletion strava-ruby-client.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |s|
s.licenses = ['MIT']
s.summary = 'Strava API Ruby client.'
s.add_dependency 'activesupport'
s.add_dependency 'faraday', '>= 2.0'
s.add_dependency 'faraday', '>= 2.14.4'
s.add_dependency 'faraday-multipart', '>= 1.0'
s.add_dependency 'hashie'
s.metadata['rubygems_mfa_required'] = 'true'
Expand Down
Loading