Skip to content

Commit c728ff5

Browse files
committed
Ecosystem Updates
- Add support for Ruby 3.2 and 3.3 - Require Faraday 2.0+
1 parent 6796c3f commit c728ff5

File tree

9 files changed

+18
-17
lines changed

9 files changed

+18
-17
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
ruby: [ '2.7', '3.0', '3.1' ]
12+
ruby: [ '3.1', '3.2', '3.3' ]
1313

1414
steps:
1515
- name: repo checkout
@@ -22,7 +22,7 @@ jobs:
2222
ruby-version: ${{ matrix.ruby }}
2323

2424
- name: Set up Bundler
25-
run: gem install bundler -v 2.1.4
25+
run: gem install bundler
2626

2727

2828
- name: bundle install
@@ -48,7 +48,7 @@ jobs:
4848
- name: Set up Ruby
4949
uses: ruby/setup-ruby@v1
5050
with:
51-
ruby-version: '2.7'
51+
ruby-version: '3.3'
5252

5353
- name: bundle install
5454
run: |

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.2
1+
3.2.3

CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
v1.7.0
2+
- Drop support for ruby 2.7
3+
- Add support for ruby 3.2+
4+
- Require minimum version of faraday 2.0
5+
16
v1.6.3
27
- Add support for sending end user ip address in request headers
38

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.3
1+
1.7.0

lib/spark_api/authentication/oauth2_impl/faraday_middleware.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module OAuth2Impl
66

77
#==OAuth2 Faraday response middleware
88
# HTTP Response after filter to package oauth2 responses and bubble up basic api errors.
9-
class FaradayMiddleware < Faraday::Response::Middleware
9+
class FaradayMiddleware < Faraday::Middleware
1010

1111
def initialize(app)
1212
super(app)
@@ -42,7 +42,7 @@ def on_complete(env)
4242

4343
#==OAuth2 Faraday response middleware
4444
# HTTP Response after filter to package oauth2 responses and bubble up basic api errors.
45-
class SparkbarFaradayMiddleware < Faraday::Response::Middleware
45+
class SparkbarFaradayMiddleware < Faraday::Middleware
4646

4747
def initialize(app)
4848
super(app)

lib/spark_api/configuration/yaml.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def self.config_keys()
6060
end
6161

6262
def self.exists?(name)
63-
File.exists? "#{config_path}/#{name}.yml"
63+
File.exist? "#{config_path}/#{name}.yml"
6464
end
6565

6666
def self.build(name)

lib/spark_api/faraday_middleware.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
module SparkApi
66
#=Spark API Faraday middleware
77
# HTTP Response after filter to package api responses and bubble up basic api errors.
8-
class FaradayMiddleware < Faraday::Response::Middleware
8+
class FaradayMiddleware < Faraday::Middleware
99
include SparkApi::PaginateHelper
1010

1111
def initialize(app)

spark_api.gemspec

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ Gem::Specification.new do |s|
3131
s.require_paths = ["lib"]
3232

3333
s.add_dependency 'addressable'
34-
s.add_dependency 'faraday', '>= 0.17.3', '< 2.0'
35-
s.add_dependency 'multi_json', '~> 1.0'
34+
s.add_dependency 'faraday', '>= 2.0.0'
35+
s.add_dependency 'multi_json', '> 1.0'
3636
s.add_dependency 'json', '>= 1.7'
37-
s.add_dependency 'builder', '>= 2.1.2', '< 4.0.0'
3837
s.add_dependency 'will_paginate', '>= 3.0.pre2', '< 4.0.0'
3938
s.add_dependency 'highline', '>= 1.0'
4039

@@ -45,10 +44,7 @@ Gem::Specification.new do |s|
4544
s.add_development_dependency 'rexml' #needed for ruby 3
4645
s.add_development_dependency 'typhoeus'
4746
s.add_development_dependency 'ci_reporter_rspec'
48-
# s.add_development_dependency 'rb-readline'
49-
# s.add_development_dependency 'rb-fsevent'
50-
# s.add_development_dependency 'simplecov'
47+
s.add_development_dependency 'builder', '>= 2.1.2', '< 4.0.0'
5148
s.add_development_dependency 'simplecov-rcov'
52-
# s.add_development_dependency 'guard-rspec'
5349
end
5450

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
require 'spark_api'
2525

26-
FileUtils.mkdir 'log' unless File.exists? 'log'
26+
FileUtils.mkdir 'log' unless File.exist? 'log'
2727

2828
module SparkApi
2929
def self.logger

0 commit comments

Comments
 (0)