From d3045714a255c243e70e6b67380fb43515aec792 Mon Sep 17 00:00:00 2001 From: Ian Dias Date: Thu, 18 Sep 2025 13:55:03 -0300 Subject: [PATCH 1/2] Update faraday to v2.13.4 --- Gemfile.lock | 41 ++++++++++---------------------- fixtures/vcr_cassettes/token.yml | 4 ++-- incognia_api.gemspec | 3 +-- lib/incognia_api/api.rb | 1 - lib/incognia_api/client.rb | 9 +++---- 5 files changed, 18 insertions(+), 40 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d620a1c..0d03156 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,8 +2,7 @@ PATH remote: . specs: incognia_api (2.2.0) - faraday (~> 1.10) - faraday_middleware (~> 1.2) + faraday (~> 2.13) GEM remote: https://rubygems.org/ @@ -14,34 +13,18 @@ GEM crack (0.4.5) rexml diff-lcs (1.4.4) - faraday (1.10.3) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - faraday_middleware (1.2.0) - faraday (~> 1.0) + faraday (2.13.4) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.1) + net-http (>= 0.5.0) hashdiff (1.0.1) + json (2.14.0) + logger (1.7.0) method_source (1.0.0) - multipart-post (2.3.0) + net-http (0.6.0) + uri pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -61,8 +44,8 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.2) - ruby2_keywords (0.0.5) timecop (0.9.4) + uri (1.0.3) webmock (3.14.0) addressable (>= 2.8.0) crack (>= 0.3.2) diff --git a/fixtures/vcr_cassettes/token.yml b/fixtures/vcr_cassettes/token.yml index b211854..05470e9 100644 --- a/fixtures/vcr_cassettes/token.yml +++ b/fixtures/vcr_cassettes/token.yml @@ -8,7 +8,7 @@ http_interactions: string: '' headers: User-Agent: - - Faraday v1.4.2 + - Faraday v2.13.4 Authorization: - Basic R1BXSzFMQ1paSW8xRkxPQ0NuTExNcU44UWkxSHYzazQ6RUxHOV8yazU5T0hkMUdiVXhIaGRTdGtqZUI3TXlQZ21vRjhlR2YxM0xBMU1scmZRZ1Q1bkhFMmFIaVNobVc0WA== Content-Type: @@ -58,7 +58,7 @@ http_interactions: string: '{"installation_id":"xyz"}' headers: User-Agent: - - Faraday v1.4.2 + - Faraday v2.13.4 Authorization: - Bearer access_token Content-Type: diff --git a/incognia_api.gemspec b/incognia_api.gemspec index ec8305c..c10f849 100644 --- a/incognia_api.gemspec +++ b/incognia_api.gemspec @@ -28,8 +28,7 @@ Gem::Specification.new do |spec| # Uncomment to register a new dependency of your gem # spec.add_dependency "example-gem", "~> 1.0" - spec.add_dependency('faraday', '~> 1.10') - spec.add_dependency('faraday_middleware', '~> 1.2') + spec.add_dependency('faraday', '~> 2.13') # For more information and examples about making a new gem, checkout our # guide at: https://bundler.io/guides/creating_gem.html diff --git a/lib/incognia_api/api.rb b/lib/incognia_api/api.rb index c536cef..89f0ead 100644 --- a/lib/incognia_api/api.rb +++ b/lib/incognia_api/api.rb @@ -1,7 +1,6 @@ require "faraday" require "json" require "logger" -require 'faraday_middleware' module Incognia class Api diff --git a/lib/incognia_api/client.rb b/lib/incognia_api/client.rb index a5b8ae1..a87a472 100644 --- a/lib/incognia_api/client.rb +++ b/lib/incognia_api/client.rb @@ -14,9 +14,7 @@ def request(method, endpoint = nil, data = nil, headers = {}) json_data = JSON.generate(data) if data connection.send(method, endpoint, json_data, headers) do |r| - r.headers[Faraday::Request::Authorization::KEY] ||= Faraday::Request - .lookup_middleware(:authorization) - .header(:Bearer, credentials.access_token) + r.headers[Faraday::Request::Authorization::KEY] ||= "Bearer #{credentials.access_token}" end rescue Faraday::ClientError, Faraday::ServerError => e raise APIError.new(e.to_s, e.response) @@ -50,9 +48,8 @@ def connection protected def request_credentials - basic_auth = Faraday::Request - .lookup_middleware(:basic_auth) - .header(Incognia.config.client_id, Incognia.config.client_secret) + basic_auth = Faraday::Utils + .basic_header_from(Incognia.config.client_id, Incognia.config.client_secret) response = connection.send(:post, 'v2/token') do |r| r.headers[Faraday::Request::Authorization::KEY] = basic_auth From abde1d3fb7e2b4a8806e351cf8f3fc682e2f19bb Mon Sep 17 00:00:00 2001 From: Ian Dias Date: Mon, 22 Sep 2025 10:18:01 -0300 Subject: [PATCH 2/2] Update version to 3.0.0 --- CHANGELOG.md | 4 ++++ Gemfile.lock | 2 +- incognia_api.gemspec | 2 +- lib/incognia_api/version.rb | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed28fcb..7f0a849 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [Unreleased] +## [3.0.0] - 2025-09-22 +- Update `faraday` dependency to version 2.13.4 +- Remove `faraday_middleware` dependency + ## [2.2.0] - 2025-09-16 - Add support for passing an optional person_id parameter to HTTP request helpers diff --git a/Gemfile.lock b/Gemfile.lock index 0d03156..23effcb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - incognia_api (2.2.0) + incognia_api (3.0.0) faraday (~> 2.13) GEM diff --git a/incognia_api.gemspec b/incognia_api.gemspec index c10f849..8e47698 100644 --- a/incognia_api.gemspec +++ b/incognia_api.gemspec @@ -11,7 +11,7 @@ Gem::Specification.new do |spec| spec.summary = "Official Ruby lib for communicating with Incognia API" spec.description = "Official Ruby lib for communicating with Incognia API" spec.homepage = "https://github.com/inloco/incognia-ruby" - spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0") + spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0") spec.metadata["homepage_uri"] = spec.homepage spec.metadata["source_code_uri"] = "https://github.com/inloco/incognia-ruby" diff --git a/lib/incognia_api/version.rb b/lib/incognia_api/version.rb index 847efbd..9c182c7 100644 --- a/lib/incognia_api/version.rb +++ b/lib/incognia_api/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Incognia - VERSION = "2.2.0" + VERSION = "3.0.0" end