Merge pull request #40 from Flagsmith/chore/remove_faraday_middleware

chore: Remove faraday middleware

Author: zachaysan

.github/workflows/pull_request.yaml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3']
 
     steps:
     - uses: actions/checkout@v3

.rubocop.yml

@@ -4,7 +4,7 @@ Layout/HashAlignment:
   AllowMultipleStyles: true
   EnforcedColonStyle: key
 AllCops:
-  TargetRubyVersion: 2.4  # Pin to flagsmith.gemspec required_ruby_version
+  TargetRubyVersion: 3.0  # Pin to flagsmith.gemspec required_ruby_version
   NewCops: enable
   SuggestExtensions: false
   Exclude:

Gemfile.lock

@@ -2,9 +2,8 @@ PATH
   remote: .
   specs:
     flagsmith (3.2.0)
-      faraday (>= 1.0.0)
+      faraday (>= 2.0.1)
       faraday-retry
-      faraday_middleware
       semantic
 
 GEM
@@ -13,82 +12,64 @@ GEM
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    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)
-    gem-release (2.2.0)
-    json (2.6.3)
+    diff-lcs (1.5.0)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
+    faraday-retry (2.2.0)
+      faraday (~> 2.0)
+    gem-release (2.2.2)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    multipart-post (2.3.0)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    net-http (0.4.1)
+      uri
+    parallel (1.24.0)
+    parser (3.3.0.4)
       ast (~> 2.4.1)
       racc
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    racc (1.7.1)
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.3)
-    regexp_parser (2.8.1)
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
-    rubocop (1.54.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.60.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     semantic (1.6.1)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
+    uri (0.13.0)
 
 PLATFORMS
   ruby

flagsmith.gemspec

@@ -3,7 +3,7 @@
 require File.expand_path('lib/flagsmith/version', __dir__)
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 3.0.0'
   spec.name = 'flagsmith'
   spec.version = Flagsmith::VERSION
   spec.authors = ['Tom Stuart', 'Brian Moelk', 'Zach Aysan']
@@ -32,8 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
 
-  spec.add_dependency 'faraday', '>= 1.0.0'
-  spec.add_dependency 'faraday_middleware'
+  spec.add_dependency 'faraday', '>= 2.0.1'
   spec.add_dependency 'faraday-retry'
   spec.add_dependency 'semantic'
   spec.metadata['rubygems_mfa_required'] = 'true'

lib/flagsmith.rb

@@ -5,7 +5,6 @@
 
 require 'faraday'
 require 'faraday/retry'
-require 'faraday_middleware'
 
 # Hash#slice was added in ruby version 2.5
 # This is the patch to use slice in earler versions