faraday-net_http 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6e5d7596613c3f2bcfde1d254ab83f9a01e23b8180d852bb08c4311a183f92f
-  data.tar.gz: e4fa72a0f4b435d2d4d7a8594c235593c5d4797bbb33e27c47fd9c58d3e3b095
+  metadata.gz: 7365d1f9a008eb354cbbcce1b0e3240650af808e0bbf560cf2899ccf7f2e563e
+  data.tar.gz: b76c90f94af3cbb6c805c8f52a40b52493c870e47d301d49c85d62ade92c292f
 SHA512:
-  metadata.gz: 0de17541184794c11df1c0cd37c220a1b36dbfcfc7fdfec88dcd860f354dd7916b146c8a0b18e3bc4ae770bd4ca78e3d5ff1ef623d30c2e2e2af68c118c3d496
-  data.tar.gz: 7403a56c1f396f290f76302d1ea665c371fab0c298bd4324ff779dc55567b10953bbf9a9c5872fbe51a15b3f7cd9fc9095447bf20d2f1b9068ef4ec5baefcf6e
+  metadata.gz: bee9f6377442d7415517b240862fe120ef5dd9b372113d2205ac19b0c22b8ea0bf3fec4af2ba1466c9fcfe4168851bfd9078829c0076c6de842e24ade6fdafd9
+  data.tar.gz: 6070ef641164d592931e43ffb2f83d9fa83e1f30b41f0950c0439d90eecaad25ae0ee2ea7f7440faf7a440e9eb742e5e74d969681255050ea889fa8658def52e

data/README.md

@@ -20,16 +20,18 @@ Or install it yourself as:
 
 ## Usage
 
-Configure your Faraday connection to use this adapter like this:
-
 ```ruby
-connection = Faraday.new(url, conn_options) do |conn|
-  conn.adapter(:net_http)
+conn = Faraday.new(...) do |f|
+  f.adapter :net_http do |http|
+    # yields Net::HTTP
+    http.idle_timeout = 100
+    http.verify_callback = lambda do |preverify, cert_store|
+      # do something here...
+    end
+  end
 end
 ```
 
-For more information on how to setup your Faraday connection and adapters usage, please refer to the [Faraday Website][faraday-website].
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -49,9 +51,8 @@ The gem is available as open source under the terms of the [license][license].
 Everyone interacting in the Faraday Net::HTTP adapter project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct][code-of-conduct].
 
 [faraday]: https://github.com/lostisland/faraday
-[faraday-website]: https://lostisland.github.io/faraday
 [net-http]: https://ruby-doc.org/stdlib-2.7.0/libdoc/net/http/rdoc/Net/HTTP.html
 [rubygems]: https://rubygems.org
 [repo]: https://github.com/lostisland/faraday-net_http
 [license]: https://github.com/lostisland/faraday-net_http/blob/main/LICENSE.md
-[code-of-conduct]: https://github.com/lostisland/faraday-net_http/blob/main/CODE_OF_CONDUCT.md
+[code-of-conduct]: https://github.com/lostisland/faraday-net_http/blob/main/CODE_OF_CONDUCT.md

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 = '1.0.0'
+    VERSION = '2.0.0'
   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,155 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: faraday-net_http
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  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'
-- !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
+  type: :runtime
   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
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -184,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Faraday adapter for Net::HTTP