Make sure that Faraday::Request::Json and Faraday::Response::Json…

… are correctly autoloaded (#1595)
lostisland · Sep 20, 2024 · 435888d · 435888d
1 parent 8208693
commit 435888d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - name: Set up Ruby 2.7
       uses: ruby/setup-ruby@v1
@@ -24,7 +24,7 @@ jobs:
 
     - name: Rubocop
       run: |
-        gem install bundler
+        gem install bundler -v 2.4.22
         bundle config set without 'development test'
         bundle config set with 'lint'
         bundle install
@@ -42,10 +42,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2']
+        ruby: ['3.0', '3.1', '3.2']
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
@@ -57,7 +57,7 @@ jobs:
 
     - name: Build
       run: |
-        gem install bundler -v '<2'
+        gem install bundler -v 2.4.22
         bundle install --jobs 4 --retry 3
 
     - name: Test

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby 2.7
         uses: ruby/setup-ruby@v1

diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ tmp
 .rvmrc
 .ruby-version
 .yardoc
+.DS_Store
 
 ## BUNDLER
 *.gem
@@ -17,6 +18,7 @@ vendor/bundle
 
 ## PROJECT::SPECIFIC
 .rbx
+node_modules
 
 ## IDEs
 .idea/

diff --git a/lib/faraday/autoload.rb b/lib/faraday/autoload.rb
@@ -67,21 +67,23 @@ class Adapter
   class Request
     extend AutoloadHelper
     autoload_all 'faraday/request',
-                 UrlEncoded: 'url_encoded',
-                 Multipart: 'multipart',
-                 Retry: 'retry',
                  Authorization: 'authorization',
                  BasicAuthentication: 'basic_authentication',
+                 Instrumentation: 'instrumentation',
+                 Json: 'json',
+                 Multipart: 'multipart',
+                 Retry: 'retry',
                  TokenAuthentication: 'token_authentication',
-                 Instrumentation: 'instrumentation'
+                 UrlEncoded: 'url_encoded'
   end
 
   # Response represents the returned value of a sent Faraday request.
   # @see lib/faraday/response.rb Original class location
   class Response
     extend AutoloadHelper
     autoload_all 'faraday/response',
-                 RaiseError: 'raise_error',
-                 Logger: 'logger'
+                 Json: 'json',
+                 Logger: 'logger',
+                 RaiseError: 'raise_error'
   end
 end