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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e961bbdeefeaa1bc3a8faa0433fde49e9c3f2ee0eb4e27523abcbd0e7dcedde
-  data.tar.gz: 2380be8e9ad3d94c14c03c929922cb6827d12e6d392ae445707a98c84a383290
+  metadata.gz: 50f1e65c56e527b724b107dbf1f4580f4de9e7d102d4617ed3c5bceecd4a1b07
+  data.tar.gz: f6ad202b18f54eaa665b3407bc0297c41e6ba41259220b21e186493c45019c16
 SHA512:
-  metadata.gz: 6deb98d5ba3ae81d9748fda3a0cc342f5a41b25490fca35fb3f33ffbde10783eca848b26c950ae41091c891d0f1316f87fb90452c49c37f359491b18442cdcff
-  data.tar.gz: 3bafd4c7fc07d5205e161a68d832f832e66c84ab04f1611863124b987c14ecec260be91db143de705c8c56c029a066063ee937494a73f505b3a3c05813703195
+  metadata.gz: 00e25dfdbdafe00431648975d8a31ba2ea53e4c74d688e937a0a4e87524a6987370fd99a81a22eb2548e587d138822e0984f698315c223a4baeb5f0aed8b0815
+  data.tar.gz: f470b1b56a0a40a590cf492c85f53e089c64ec95ff55f52a1c579b18fa304ba3c80dbf01c0e2d403a341f416cf7eb5dba953cf37c07f33a3db58a0d66d9bf088

data/lib/faraday/adapter/net_http.rb

@@ -48,30 +48,29 @@ module Faraday
       end
 
       def net_http_connection(env)
-        klass = if (proxy = env[:request][:proxy])
-                  Net::HTTP::Proxy(proxy[:uri].hostname, proxy[:uri].port,
-                                   proxy[:user], proxy[:password])
-                else
-                  Net::HTTP
-                end
+        proxy = env[:request][:proxy]
         port = env[:url].port || (env[:url].scheme == 'https' ? 443 : 80)
-        klass.new(env[:url].hostname, port)
+        if proxy
+          Net::HTTP.new(env[:url].hostname, port,
+                        proxy[:uri].hostname, proxy[:uri].port,
+                        proxy[:user], proxy[:password])
+        else
+          Net::HTTP.new(env[:url].hostname, port, nil)
+        end
       end
 
       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
@@ -207,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 = '0.0.6'
+    VERSION = '2.0.0.alpha-2'
   end
 end

data/lib/faraday/net_http.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 require 'faraday'
-require 'faraday/adapter'
-
-require_relative 'adapter/net_http'
-require_relative 'net_http/version'
+require 'faraday/adapter/net_http'
+require 'faraday/net_http/version'
 
 module Faraday
   module NetHttp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-net_http
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 2.0.0.alpha.pre.2
 platform: ruby
 authors:
 - Jan van der Pas
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,140 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
+        version: 2.0.0.alpha.pre.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !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'
+        version: 2.0.0.alpha.pre.2
 description: Faraday adapter for Net::HTTP
 email:
 - janvanderpas@gmail.com
@@ -168,8 +42,8 @@ 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
-post_install_message:
+  changelog_uri: https://github.com/lostisland/faraday-net_http/releases/tag/v2.0.0.alpha.pre.2
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -180,12 +54,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Faraday adapter for Net::HTTP
 test_files: []