typhoeus 1.6.0 → 1.7.0

data/lib/typhoeus/response/informations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Typhoeus
   class Response
 
@@ -27,6 +29,17 @@ module Typhoeus
         Ethon::Curl.easy_strerror(return_code) if return_code
       end
 
+      # Returns the detailed error message from libcurl's error buffer,
+      # only available when the request was made with errorbuffer: true.
+      #
+      # @example Get error_message.
+      #   response.error_message
+      #
+      # @return [ String, nil ] The error_message.
+      def error_message
+        options[:error_message]
+      end
+
       # Return the http response body.
       #
       # @example Get response_body.
@@ -34,7 +47,8 @@ module Typhoeus
       #
       # @return [ String ] The response_body.
       def response_body
-        options[:response_body] || options[:body]
+        body = options[:response_body] || options[:body]
+        apply_content_type_charset(body)
       end
       alias :body :response_body
 
@@ -47,13 +61,13 @@ module Typhoeus
       def response_headers
         return options[:response_headers] if options[:response_headers]
         if mock? && h = options[:headers]
-            status_code = return_code || "200"
-            reason_phrase = status_code == "200" ? "OK" : "Mock Reason Phrase"
-            status_line = "HTTP/1.1 #{status_code} #{reason_phrase}"
-            actual_headers = h.map{ |k,v| [k, v.respond_to?(:join) ? v.join(',') : v] }.
-              map{ |e| "#{e.first}: #{e.last}" }
+          status_code = options[:response_code] || options[:code] || 200
+          reason_phrase = status_code.to_i == 200 ? "OK" : "Mock Reason Phrase"
+          status_line = "HTTP/1.1 #{status_code} #{reason_phrase}"
+          actual_headers = h.map{ |k,v| [k, v.respond_to?(:join) ? v.join(',') : v] }.
+            map{ |e| "#{e.first}: #{e.last}" }
 
-            [status_line, *actual_headers].join("\r\n")
+          [status_line, *actual_headers].join("\r\n")
         end
       end
 
@@ -67,7 +81,14 @@ module Typhoeus
       #
       # @return [ Integer ] The response_code.
       def response_code
-        (options[:response_code] || options[:code]).to_i
+        code = options[:response_code] || options[:code]
+        return code.to_i unless code.nil?
+
+        # A response built from raw headers, such as one returned by
+        # #redirections, has no option describing the status.
+        line = first_header_line
+        status = line && line[/\AHTTP\/\S+\s+(\d{3})/, 1]
+        status ? status.to_i : 0
       end
       alias :code :response_code
 
@@ -282,9 +303,9 @@ module Typhoeus
       #
       # @return [ Typhoeus::Header ] The response header.
       def headers
-        return Header.new(options[:headers]) if mock? && options[:headers]
-        return nil if response_headers.nil? && !defined?(@headers)
-        @headers ||= Header.new(response_headers.split("\r\n\r\n").last)
+        return @headers if defined?(@headers) && @headers
+        return nil if response_headers.nil?
+        @headers = Header.new(last_response_block)
       end
       alias :headers_hash :headers
 
@@ -297,7 +318,49 @@ module Typhoeus
       # @return [ Array<Typhoeus::Response> ] The redirections
       def redirections
         return [] unless response_headers
-        response_headers.split("\r\n\r\n")[0..-2].map{ |h| Response.new(:response_headers => h) }
+
+        http_blocks = response_blocks.select { |block| block.start_with?("HTTP/") }
+        blocks = http_blocks.empty? ? response_blocks[0..-2] : http_blocks[0..-2]
+        blocks.map { |header| Response.new(:response_headers => header) }
+      end
+
+      private
+
+      # Split the raw response headers into their header blocks.
+      #
+      # @return [ Array<String> ] The blocks.
+      def response_blocks
+        response_headers.to_s.split("\r\n\r\n")
+      end
+
+      # Return the last block that starts a new response. HTTP/1.1 trailers
+      # add a block without a status line after the response headers.
+      #
+      # @return [ String ] The response block.
+      def last_response_block
+        http_blocks = response_blocks.select { |block| block.start_with?("HTTP/") }
+        (http_blocks.empty? ? response_blocks.last : http_blocks.last).to_s
+      end
+
+      # Force the body to the charset advertised by the Content-Type
+      # header, but leave binary and already encoded bodies alone.
+      #
+      # @param [ String, nil ] body The response body.
+      #
+      # @return [ String, nil ] The response body.
+      def apply_content_type_charset(body)
+        return body unless body.is_a?(String) && !body.frozen?
+        return body unless body.encoding == Encoding::BINARY
+
+        content_type = headers && headers["Content-Type"]
+        return body unless content_type
+
+        charset = content_type.to_s[/;\s*charset\s*=\s*["']?([^"';,\s]+)/i, 1]
+        return body unless charset
+
+        body.force_encoding(Encoding.find(charset))
+      rescue ArgumentError
+        body
       end
     end
   end

data/lib/typhoeus/response/status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Typhoeus
   class Response
 
@@ -56,7 +58,7 @@ module Typhoeus
       #
       # @return [ Boolean ] Return true if failure, false else.
       def failure?
-        (mock || return_code == :internal_server_error) && response_code && has_bad_response_code?
+        (mock || !return_code.nil?) && !success?
       end
 
       # Return wether the response is modified.
@@ -83,24 +85,13 @@ module Typhoeus
 
       # :nodoc:
       def first_header_line
-        @first_header_line ||= begin
-          if response_headers.to_s.include?("\r\n\r\n")
-            response_headers.to_s.split("\r\n\r\n").last.split("\r\n").first
-          else
-            response_headers.to_s.split("\r\n").first
-          end
-        end
+        @first_header_line ||= last_response_block.split("\r\n").first
       end
 
       # :nodoc:
       def has_good_response_code?
         response_code >= 200 && response_code < 300
       end
-
-      # :nodoc:
-      def has_bad_response_code?
-        !has_good_response_code?
-      end
     end
   end
 end

data/lib/typhoeus/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'typhoeus/response/header'
 require 'typhoeus/response/informations'
 require 'typhoeus/response/status'
@@ -47,6 +49,20 @@ module Typhoeus
       @headers = Header.new(options[:headers]) if options[:headers]
     end
 
+    # Keep duplicated responses independent. Memoization hands a copy of the
+    # leader's response to every follower, so shared options, headers, bodies,
+    # or callback results would let one request change another one's response.
+    def initialize_copy(other)
+      super
+      @options = duplicate_value(other.options)
+      @handled_response = nil
+      if other.instance_variable_defined?(:@headers)
+        headers = other.instance_variable_get(:@headers)
+        @headers = headers.dup if headers
+      end
+    end
+    private :initialize_copy
+
     # Returns whether this request is mocked
     # or not.
     #
@@ -64,5 +80,24 @@ module Typhoeus
     def handled_response
       @handled_response || self
     end
+
+    private
+
+    # Duplicate the mutable containers a response may share with its copy.
+    # Other option values are opaque and are left alone.
+    def duplicate_value(value)
+      case value
+      when Hash
+        value.each_with_object({}) do |(key, nested), copy|
+          copy[duplicate_value(key)] = duplicate_value(nested)
+        end
+      when Array
+        value.map { |nested| duplicate_value(nested) }
+      when String
+        value.dup
+      else
+        value
+      end
+    end
   end
 end

data/lib/typhoeus/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Typhoeus
 
   # The current Typhoeus version.
-  VERSION = '1.6.0'
+  VERSION = '1.7.0'
 end

data/lib/typhoeus.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest/sha2'
 require 'ethon'
 
@@ -11,26 +13,19 @@ require 'typhoeus/request'
 require 'typhoeus/response'
 require 'typhoeus/version'
 
-# If we are using any Rack-based application, then we need the Typhoeus rack
-# middleware to ensure our app is running properly.
-if defined?(Rack)
+# Load the optional integrations when their dependency is installed, not when
+# the dependency happens to be loaded before Typhoeus. Requiring the adapter
+# files is safe because they only reference the dependency at call time.
+begin
+  require "rack"
   require "rack/typhoeus"
+rescue LoadError
+  # Rack is optional.
 end
 
-# If the Redis gem is available, load the redis cache adapter
-if defined?(Redis)
-  require "typhoeus/cache/redis"
-end
-
-# If the Dalli gem is available, load the Dalli cache adapter
-if defined?(Dalli)
-  require "typhoeus/cache/dalli"
-end
-
-# If we are using Rails, load the Rails cache adapter
-if defined?(Rails)
-  require "typhoeus/cache/rails"
-end
+require "typhoeus/cache/redis"
+require "typhoeus/cache/dalli"
+require "typhoeus/cache/rails"
 
 # If we are using Rails, then we will include the Typhoeus railtie.
 # if defined?(Rails)
@@ -114,8 +109,29 @@ module Typhoeus
     @before
   end
 
+  # Returns the callbacks that run before a request. Returns nil when before
+  # callbacks are skipped or when there are none, so the common path does not
+  # allocate a callback array.
+  #
+  # @param [ Typhoeus::Request ] request The request that is about to run.
+  #
+  # @return [ Array<Proc>, nil ] The callbacks or nil.
+  #
+  # @api private
+  def self.before_callbacks_for(request)
+    return unless Config.feature_enabled?(:before)
+
+    global = before
+    local = request.before
+    return if global.empty? && local.empty?
+
+    global + local
+  end
+
   # Execute given block as if block connection is turned off.
-  # The old block connection state is restored afterwards.
+  # The old block connection state is restored afterwards. Stubs are bypassed
+  # inside the block, so a stub can forward to the real service without
+  # recursing into itself.
   #
   # @example Make a real request, no matter if it's blocked.
   #   Typhoeus::Config.block_connection = true
@@ -127,17 +143,64 @@ module Typhoeus
   #     #=> :ok
   #   end
   #
-  # @yield Yields control to the block after disabling block_connection.
-  #        Afterwards, the block_connection is set to its original
-  #        value.
+  # @example Let one stubbed URL reach the real service.
+  #   Typhoeus.stub("http://elastic:9200") do |request|
+  #     Typhoeus.with_connection { request.run }
+  #   end
+  #
+  # @yield Yields control to the block after disabling block_connection for
+  #        the current thread. Other threads keep their block_connection
+  #        setting.
   # @return [ Object ] Returns the return value of the block.
   #
   # @see Typhoeus::Config.block_connection
   def self.with_connection
-    old = Config.block_connection
-    Config.block_connection = false
-    result = yield if block_given?
-    Config.block_connection = old
-    result
+    # Fibers on the same thread share the override. Save the previous values
+    # when the outermost call enters and restore them only when the last call
+    # leaves, so a fiber that finishes while another is still inside the block
+    # does not clear it.
+    depth = Thread.current.thread_variable_get(:typhoeus_connection_depth).to_i
+    if depth.zero?
+      Thread.current.thread_variable_set(
+        :typhoeus_previous_connection,
+        [Thread.current.thread_variable_get(:typhoeus_block_connection),
+         Thread.current.thread_variable_get(:typhoeus_stubs_disabled)]
+      )
+    end
+    Thread.current.thread_variable_set(:typhoeus_connection_depth, depth + 1)
+    Thread.current.thread_variable_set(:typhoeus_block_connection, false)
+    Thread.current.thread_variable_set(:typhoeus_stubs_disabled, true)
+    yield if block_given?
+  ensure
+    depth = Thread.current.thread_variable_get(:typhoeus_connection_depth).to_i - 1
+    Thread.current.thread_variable_set(:typhoeus_connection_depth, depth)
+    if depth.zero?
+      old_block_connection, old_stubs_disabled =
+        Thread.current.thread_variable_get(:typhoeus_previous_connection)
+      Thread.current.thread_variable_set(:typhoeus_block_connection, old_block_connection)
+      Thread.current.thread_variable_set(:typhoeus_stubs_disabled, old_stubs_disabled)
+      Thread.current.thread_variable_set(:typhoeus_previous_connection, nil)
+    end
+  end
+
+  # Whether connections are blocked for the current thread. The override is
+  # thread-local so {with_connection} cannot unblock another thread.
+  #
+  # @api private
+  #
+  # @return [ Boolean, nil ] The configured value, or the thread override.
+  def self.connection_blocked?
+    override = Thread.current.thread_variable_get(:typhoeus_block_connection)
+    override.nil? ? Config.block_connection : override
+  end
+
+  # Whether the current thread is inside {with_connection} and therefore
+  # bypasses stubs.
+  #
+  # @api private
+  #
+  # @return [ Boolean ] True when stubs should be skipped.
+  def self.stubs_disabled?
+    Thread.current.thread_variable_get(:typhoeus_stubs_disabled)
   end
 end

data/typhoeus.gemspec

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
@@ -24,10 +25,21 @@ Gem::Specification.new do |s|
     'source_code_uri'       => "https://github.com/typhoeus/typhoeus/tree/v#{s.version}"
   }
 
-  s.add_dependency('ethon', [">= 0.18.0"])
+  s.add_dependency('ethon', [">= 0.19.0", "< 0.20.0"])
 
   s.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |file|
+    files = begin
+      IO.popen(["git", "ls-files", "-z"], :err => File::NULL, &:read).split("\x0")
+    rescue SystemCallError
+      []
+    end
+    # Building from a source tarball or a container without git must still
+    # produce a working gem.
+    if files.empty?
+      files = Dir["lib/**/*", "*.md", "LICENSE", "typhoeus.gemspec"].
+        select { |file| File.file?(file) }
+    end
+    files.reject do |file|
       file.start_with?(*%w[. Gemfile Guardfile Rakefile perf spec])
     end
   end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - David Balatero
 - Paul Dix
 - Hans Hasselberg
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
@@ -17,14 +18,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.20.0
 description: Like a modern code version of the mythical beast with 100 serpent heads,
   Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.
 email:
@@ -49,32 +56,20 @@ files:
 - lib/typhoeus/config.rb
 - lib/typhoeus/easy_factory.rb
 - lib/typhoeus/errors.rb
+- lib/typhoeus/errors/invalid_option.rb
+- lib/typhoeus/errors/no_response.rb
 - lib/typhoeus/errors/no_stub.rb
 - lib/typhoeus/errors/typhoeus_error.rb
 - lib/typhoeus/expectation.rb
 - lib/typhoeus/hydra.rb
-- lib/typhoeus/hydra/addable.rb
-- lib/typhoeus/hydra/before.rb
-- lib/typhoeus/hydra/block_connection.rb
-- lib/typhoeus/hydra/cacheable.rb
-- lib/typhoeus/hydra/memoizable.rb
 - lib/typhoeus/hydra/queueable.rb
-- lib/typhoeus/hydra/runnable.rb
-- lib/typhoeus/hydra/stubbable.rb
 - lib/typhoeus/pool.rb
 - lib/typhoeus/railtie.rb
 - lib/typhoeus/request.rb
 - lib/typhoeus/request/actions.rb
-- lib/typhoeus/request/before.rb
-- lib/typhoeus/request/block_connection.rb
-- lib/typhoeus/request/cacheable.rb
 - lib/typhoeus/request/callbacks.rb
 - lib/typhoeus/request/marshal.rb
-- lib/typhoeus/request/memoizable.rb
-- lib/typhoeus/request/operations.rb
-- lib/typhoeus/request/responseable.rb
 - lib/typhoeus/request/streamable.rb
-- lib/typhoeus/request/stubbable.rb
 - lib/typhoeus/response.rb
 - lib/typhoeus/response/cacheable.rb
 - lib/typhoeus/response/header.rb
@@ -87,10 +82,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/typhoeus/typhoeus/issues
-  changelog_uri: https://github.com/typhoeus/typhoeus/blob/v1.6.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/typhoeus/1.6.0
+  changelog_uri: https://github.com/typhoeus/typhoeus/blob/v1.7.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/typhoeus/1.7.0
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/typhoeus/typhoeus/tree/v1.6.0
+  source_code_uri: https://github.com/typhoeus/typhoeus/tree/v1.7.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,7 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Parallel HTTP library on top of libcurl multi.
 test_files: []

data/lib/typhoeus/hydra/addable.rb

@@ -1,23 +0,0 @@
-module Typhoeus
-  class Hydra
-
-    # This module handles the request adding on
-    # hydra.
-    #
-    # @api private
-    module Addable
-
-      # Adds request to multi.
-      #
-      # @example Add request.
-      #   hydra.add(request)
-      #
-      # @param [ Typhoeus::Request ] request to add.
-      #
-      # @return [ void ]
-      def add(request)
-        multi.add(EasyFactory.new(request, self).get)
-      end
-    end
-  end
-end

data/lib/typhoeus/hydra/before.rb

@@ -1,31 +0,0 @@
-module Typhoeus
-  class Hydra
-
-    # This module provides a way to hook into before
-    # a request gets queued in hydra. This is very powerful
-    # and you should be careful because when you accidently
-    # return a falsy value the request won't be executed.
-    #
-    # @api private
-    module Before
-
-      # Overrride add in order to execute callbacks in
-      # Typhoeus.before. Will break and return when a
-      # callback returns nil, false or a response. Calls super
-      # otherwise.
-      #
-      # @example Add the request.
-      #   hydra.add(request)
-      def add(request)
-        Typhoeus.before.each do |callback|
-          value = callback.call(request)
-          if value.nil? || value == false || value.is_a?(Response)
-            dequeue
-            return value
-          end
-        end
-        super
-      end
-    end
-  end
-end

data/lib/typhoeus/hydra/block_connection.rb

@@ -1,35 +0,0 @@
-module Typhoeus
-  class Hydra
-
-    # This module handles the blocked connection request mode on
-    # the hydra side, where only stubbed requests
-    # are allowed.
-    # Connection blocking needs to be turned on:
-    #   Typhoeus.configure do |config|
-    #     config.block_connection = true
-    #   end
-    #
-    # When trying to do real requests a NoStub error
-    # is raised.
-    #
-    # @api private
-    module BlockConnection
-
-      # Overrides add in order to check before if block connection
-      # is turned on. If thats the case a NoStub error is
-      # raised.
-      #
-      # @example Add the request.
-      #   hydra.add(request)
-      #
-      # @param [ Request ] request The request to enqueue.
-      def add(request)
-        if request.blocked?
-          raise Typhoeus::Errors::NoStub.new(request)
-        else
-          super
-        end
-      end
-    end
-  end
-end

data/lib/typhoeus/hydra/cacheable.rb

@@ -1,15 +0,0 @@
-module Typhoeus
-  class Hydra
-    module Cacheable
-      def add(request)
-        if request.cacheable? && response = request.cached_response
-          response.cached = true
-          request.finish(response)
-          dequeue
-        else
-          super
-        end
-      end
-    end
-  end
-end

data/lib/typhoeus/hydra/memoizable.rb

@@ -1,56 +0,0 @@
-module Typhoeus
-  class Hydra
-
-    # This module handles the GET request memoization
-    # on the hydra side. Memoization needs to be turned
-    # on:
-    #   Typhoeus.configure do |config|
-    #     config.memoize = true
-    #   end
-    #
-    # @api private
-    module Memoizable
-
-      # Return the memory.
-      #
-      # @example Return the memory.
-      #   hydra.memory
-      #
-      # @return [ Hash ] The memory.
-      def memory
-        @memory ||= {}
-      end
-
-      # Overrides add in order to check before if request
-      # is memoizable and already in memory. If thats the case,
-      # super is not called, instead the response is set and
-      # the on_complete callback called.
-      #
-      # @example Add the request.
-      #   hydra.add(request)
-      #
-      # @param [ Request ] request The request to add.
-      #
-      # @return [ Request ] The added request.
-      def add(request)
-        if request.memoizable? && memory.has_key?(request)
-          response = memory[request]
-          request.finish(response, true)
-          dequeue
-        else
-          super
-        end
-      end
-
-      # Overrides run to make sure the memory is cleared after
-      # each run.
-      #
-      # @example Run hydra.
-      #   hydra.run
-      def run
-        super
-        memory.clear
-      end
-    end
-  end
-end