faraday-typhoeus 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93cb5577c71cc18d04be6150ccf60886529527a21b06ce229a49da67f047df98
-  data.tar.gz: 2210f5945cb6873e7a3e0f751355a4da96b4d2b60ced5d3e40fc1aa0a3f085d0
+  metadata.gz: 3406a70221d241d3ccb2342afbc7fb08b553a773ac905347c4d564ad5f00c5c0
+  data.tar.gz: debb8619126869d93830f5032f5a96c59654cd2e5067dd6b675bf0f32c4fb3ce
 SHA512:
-  metadata.gz: 3a1bb851c5f5bbf84176fe4f63e57480bfc35af59a90961aa1b4b2084a0adeb06f8453340c19aeb21b77690a0a255083eb82f3b23874248a03d8be6232667e2a
-  data.tar.gz: 688e444af7f0222bf5d4e1bdf04133884a565b9a507d1f600fe936915921accb9da563eb836b214b8ddf228de609405aa7094c8a47418a7fe67b3464fff3e117
+  metadata.gz: c9d8adf166c150c68ec34dc6eb65fd08cd70e0659b7b01a8c7df0a5602fa76cbf4bb505ab5dfaf8a0cbc279aa359902b99bfc213be4febcbac675e1b5ef2dcc2
+  data.tar.gz: 45049261f119410adecc2fcee9c1f30151928ee80859bb56bcedfe9073b2e21dc9fd418cfe892f7db7b9b9fda0947e50c8a1f066f2363c8541ae4edc4b916ca3

data/README.md

@@ -1,6 +1,6 @@
 # Faraday Typhoeus Adapter
 
-This is a [Faraday][faraday] adapter for the [Typhoeus][typhoeus] parallel HTTP client. It supports parallel HTTP requests and streaming.
+This is a [Faraday 2][faraday] adapter for the [Typhoeus][typhoeus] parallel HTTP client. It supports parallel HTTP requests and streaming.
 
 ## Installation
 
@@ -125,8 +125,8 @@ To release a new version, update the version number in `version.rb`, and then ru
 - [ ] Better tests for parallel functionality (can port them over from Typhoeus)
 - [ ] Support block-based configuration like other adapters
 - [ ] Refactor the adapter a bit to look more like other Faraday 2 adapters (use `connection` etc.)
-- [ ] Compression support
-- [ ] Reason-phrase parsing support
+- [x] Compression support
+- [x] Reason-phrase parsing support
 
 ## Contributing
 

data/lib/faraday/adapter/typhoeus.rb

@@ -4,25 +4,9 @@ require 'typhoeus'
 
 module Faraday
   class Adapter
-    # This class provides the main implementation for your adapter.
-    # There are some key responsibilities that your adapter should satisfy:
-    # * Initialize and store internally the client you chose (e.g. Net::HTTP)
-    # * Process requests and save the response (see `#call`)
     class Typhoeus < Faraday::Adapter
       self.supports_parallel = true
 
-      # The initialize method is lazy-called ONCE when the connection stack is
-      # built. See https://github.com/lostisland/faraday/blob/master/lib/faraday/rack_builder.rb
-      #
-      # @param app [#call] the "rack app" wrapped in middleware. See
-      #   https://github.com/lostisland/faraday/blob/master/lib/faraday/rack_builder.rb#L157
-      # @param opts [Hash] the options hash with all the options necessary for
-      #   the adapter to correctly configure itself. These are automatically
-      #   stored into `@connection_options` when you call `super`.
-      def initialize(app = nil, opts = {}, &block)
-        super(app, opts, &block)
-      end
-
       # Setup Hydra with provided options.
       #
       # @example Setup Hydra.
@@ -43,14 +27,6 @@ module Faraday
         perform_request env
         @app.call(env)
 
-        # NOTE: An adapter `call` MUST return the `env.response`. If
-        # `save_response` is the last line in your `call` method implementation,
-        # it will automatically return the response for you. Otherwise, you'll
-        # need to manually do so. You can do this with any (not both) of the
-        # following lines:
-        # * @app.call(env)
-        # * env.response
-        #
         # Finally, it's good practice to rescue client-specific exceptions (e.g.
         # Timeout, ConnectionFailed, etc...) and re-raise them as Faraday
         # Errors. Check `Faraday::Error` for a list of all errors.
@@ -103,8 +79,9 @@ module Faraday
         req.on_complete do |resp|
           if resp.timed_out?
             env[:typhoeus_timed_out] = true
+            env[:typhoeus_return_message] = resp.return_message
             unless parallel?(env)
-              raise Faraday::TimeoutError, 'request timed out'
+              raise Faraday::TimeoutError, resp.return_message
             end
           elsif resp.response_code.zero? || ((resp.return_code != :ok) && !resp.mock?)
             env[:typhoeus_connection_failed] = true
@@ -114,7 +91,7 @@ module Faraday
             end
           end
 
-          save_response(env, resp.code, resp.body) do |response_headers|
+          save_response(env, resp.code, resp.body, nil, resp.status_message) do |response_headers|
             response_headers.parse resp.response_headers
           end
           # in async mode, :response is initialized at this point
@@ -128,7 +105,9 @@ module Faraday
         opts = {
           method: env[:method],
           body: env[:body],
-          headers: env[:request_headers]
+          headers: env[:request_headers],
+          # https://curl.se/libcurl/c/CURLOPT_ACCEPT_ENCODING.html
+          accept_encoding: ''
         }.merge(@connection_options)
 
         ::Typhoeus::Request.new(env[:url].to_s, opts)

data/lib/faraday/typhoeus/version.rb

@@ -2,6 +2,6 @@
 
 module Faraday
   module Typhoeus
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Leavitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday