faraday-net_http 2.0.0.alpha.pre.1 → 2.0.0.alpha.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f906e027c9d891ccc21f9a1b750e1cb917d56315d8661d7a1a4278eb18ff1084
-  data.tar.gz: 4cd64aad7008c122cbcaae48bfcb4b61c6387557552c5a5405981cd0b70389be
+  metadata.gz: 50f1e65c56e527b724b107dbf1f4580f4de9e7d102d4617ed3c5bceecd4a1b07
+  data.tar.gz: f6ad202b18f54eaa665b3407bc0297c41e6ba41259220b21e186493c45019c16
 SHA512:
-  metadata.gz: '0793967f3175c622bc15b797124a857f6ddc56eb8284e37dae9fe8bb643061bc160793a1f925e2654b309e87fd8badae5a557bcf2a1260a4fa4c1ed0c9f50367'
-  data.tar.gz: 8d44d2ca498d7f0f1cd3903b56f673f8c8d13648871c5b298d0cfca8ab99d191fbb2dbb904803450b48724c4c77a533791e835247f8cca8c880a4b0f903d4a40
+  metadata.gz: 00e25dfdbdafe00431648975d8a31ba2ea53e4c74d688e937a0a4e87524a6987370fd99a81a22eb2548e587d138822e0984f698315c223a4baeb5f0aed8b0815
+  data.tar.gz: f470b1b56a0a40a590cf492c85f53e089c64ec95ff55f52a1c579b18fa304ba3c80dbf01c0e2d403a341f416cf7eb5dba953cf37c07f33a3db58a0d66d9bf088

data/lib/faraday/adapter/net_http.rb

@@ -62,17 +62,15 @@ module Faraday
       def call(env)
         super
         http_response = connection(env) do |http|
-          begin
-            perform_request(http, env)
-          rescue *NET_HTTP_EXCEPTIONS => e
-            raise Faraday::SSLError, e if defined?(OpenSSL) && e.is_a?(OpenSSL::SSL::SSLError)
+          perform_request(http, env)
+        rescue *NET_HTTP_EXCEPTIONS => e
+          raise Faraday::SSLError, e if defined?(OpenSSL) && e.is_a?(OpenSSL::SSL::SSLError)
 
-            raise Faraday::ConnectionFailed, e
-          end
+          raise Faraday::ConnectionFailed, e
         end
 
         save_response(env, http_response.code.to_i,
-                      http_response.body || +'', nil,
+                      encoded_body(http_response), nil,
                       http_response.message) do |response_headers|
           http_response.each_header do |key, value|
             response_headers[key] = value
@@ -208,6 +206,18 @@ module Faraday
                                end
                              end
       end
+
+      def encoded_body(http_response)
+        body = http_response.body || +''
+        /\bcharset=\s*(.+?)\s*(;|$)/.match(http_response['Content-Type']) do |match|
+          content_charset = Encoding.find(match.captures.first)
+          body = body.dup if body.frozen?
+          body.force_encoding(content_charset)
+        rescue ArgumentError
+          nil
+        end
+        body
+      end
     end
   end
 end

data/lib/faraday/net_http/version.rb

@@ -2,6 +2,6 @@
 
 module Faraday
   module NetHttp
-    VERSION = '2.0.0.alpha-1'
+    VERSION = '2.0.0.alpha-2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-net_http
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.pre.1
+  version: 2.0.0.alpha.pre.2
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,132 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0.alpha.pre.2
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.19.0
-- !ruby/object:Gem::Dependency
-  name: multipart-parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.91.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.91.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-packaging
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Faraday adapter for Net::HTTP
 email:
 - janvanderpas@gmail.com
@@ -168,7 +42,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/lostisland/faraday-net_http
   source_code_uri: https://github.com/lostisland/faraday-net_http
-  changelog_uri: https://github.com/lostisland/faraday-net_http
+  changelog_uri: https://github.com/lostisland/faraday-net_http/releases/tag/v2.0.0.alpha.pre.2
 post_install_message: 
 rdoc_options: []
 require_paths: