httpx 0.15.4 → 0.16.0

data/lib/httpx/plugins/grpc/call.rb

@@ -10,6 +10,7 @@ module HTTPX
         def initialize(response)
           @response = response
           @decoder = ->(z) { z }
+          @consumed = false
         end
 
         def inspect
@@ -25,7 +26,7 @@ module HTTPX
         end
 
         def trailing_metadata
-          return unless @response.body.closed?
+          return unless @consumed
 
           @response.trailing_metadata
         end
@@ -40,8 +41,10 @@ module HTTPX
               Message.stream(@response).each do |message|
                 y << @decoder.call(message)
               end
+              @consumed = true
             end
           else
+            @consumed = true
             @decoder.call(Message.unary(@response))
           end
         end

data/lib/httpx/plugins/ntlm_authentication.rb

@@ -15,13 +15,15 @@ module HTTPX
         end
 
         def extra_options(options)
-          Class.new(options.class) do
-            def_option(:ntlm, <<-OUT)
-              raise Error, ":ntlm must be a #{NTLMParams}" unless value.is_a?(#{NTLMParams})
+          options.merge(max_concurrent_requests: 1)
+        end
+      end
+
+      module OptionsMethods
+        def option_ntlm(value)
+          raise TypeError, ":ntlm must be a #{NTLMParams}" unless value.is_a?(NTLMParams)
 
-              value
-            OUT
-          end.new(options).merge(max_concurrent_requests: 1)
+          value
         end
       end
 

data/lib/httpx/plugins/proxy.rb

@@ -64,13 +64,11 @@ module HTTPX
           klass.plugin(:"proxy/socks4")
           klass.plugin(:"proxy/socks5")
         end
+      end
 
-        def extra_options(options)
-          Class.new(options.class) do
-            def_option(:proxy, <<-OUT)
-              value.is_a?(#{Parameters}) ? value : Hash[value]
-            OUT
-          end.new(options)
+      module OptionsMethods
+        def option_proxy(value)
+          value.is_a?(Parameters) ? value : Hash[value]
         end
       end
 

data/lib/httpx/plugins/proxy/socks4.rb

@@ -4,7 +4,8 @@ require "resolv"
 require "ipaddr"
 
 module HTTPX
-  Socks4Error = Class.new(Error)
+  class Socks4Error < Error; end
+
   module Plugins
     module Proxy
       module Socks4

data/lib/httpx/plugins/proxy/socks5.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module HTTPX
-  Socks5Error = Class.new(Error)
+  class Socks5Error < Error; end
+
   module Plugins
     module Proxy
       module Socks5

data/lib/httpx/plugins/proxy/ssh.rb

@@ -6,16 +6,16 @@ module HTTPX
   module Plugins
     module Proxy
       module SSH
-        def self.load_dependencies(*)
-          require "net/ssh/gateway"
+        class << self
+          def load_dependencies(*)
+            require "net/ssh/gateway"
+          end
         end
 
-        def self.extra_options(options)
-          Class.new(options.class) do
-            def_option(:proxy, <<-OUT)
-              Hash[value]
-            OUT
-          end.new(options)
+        module OptionsMethods
+          def option_proxy(value)
+            Hash[value]
+          end
         end
 
         module InstanceMethods
@@ -65,7 +65,7 @@ module HTTPX
             when "http"
               TCPSocket.open("localhost", port)
             else
-              raise Error, "unexpected scheme: #{request_uri.scheme}"
+              raise TypeError, "unexpected scheme: #{request_uri.scheme}"
             end
           end
         end

data/lib/httpx/plugins/retries.rb

@@ -17,39 +17,43 @@ module HTTPX
                           Errno::ECONNRESET,
                           Errno::ECONNABORTED,
                           Errno::EPIPE,
-                          (TLSError if defined?(TLSError)),
+                          TLSError,
                           TimeoutError,
                           Parser::Error,
                           Errno::EINVAL,
                           Errno::ETIMEDOUT].freeze
 
       def self.extra_options(options)
-        Class.new(options.class) do
-          def_option(:retry_after, <<-OUT)
-            # return early if callable
-            unless value.respond_to?(:call)
-              value = Integer(value)
-              raise Error, ":retry_after must be positive" unless value.positive?
-            end
+        options.merge(max_retries: MAX_RETRIES)
+      end
+
+      module OptionsMethods
+        def option_retry_after(value)
+          # return early if callable
+          unless value.respond_to?(:call)
+            value = Integer(value)
+            raise TypeError, ":retry_after must be positive" unless value.positive?
+          end
 
-            value
-          OUT
+          value
+        end
 
-          def_option(:max_retries, <<-OUT)
-            num = Integer(value)
-            raise Error, ":max_retries must be positive" unless num.positive?
+        def option_max_retries(value)
+          num = Integer(value)
+          raise TypeError, ":max_retries must be positive" unless num.positive?
 
-            num
-          OUT
+          num
+        end
 
-          def_option(:retry_change_requests)
+        def option_retry_change_requests(v)
+          v
+        end
 
-          def_option(:retry_on, <<-OUT)
-            raise ":retry_on must be called with the response" unless value.respond_to?(:call)
+        def option_retry_on(value)
+          raise ":retry_on must be called with the response" unless value.respond_to?(:call)
 
-            value
-          OUT
-        end.new(options).merge(max_retries: MAX_RETRIES)
+          value
+        end
       end
 
       module InstanceMethods

data/lib/httpx/plugins/upgrade.rb

@@ -18,14 +18,15 @@ module HTTPX
           upgrade_handlers = Module.new do
             extend Registry
           end
+          options.merge(upgrade_handlers: upgrade_handlers)
+        end
+      end
 
-          Class.new(options.class) do
-            def_option(:upgrade_handlers, <<-OUT)
-              raise Error, ":upgrade_handlers must be a registry" unless value.respond_to?(:registry)
+      module OptionsMethods
+        def option_upgrade_handlers(value)
+          raise TypeError, ":upgrade_handlers must be a registry" unless value.respond_to?(:registry)
 
-              value
-            OUT
-          end.new(options).merge(upgrade_handlers: upgrade_handlers)
+          value
         end
       end
 

data/lib/httpx/registry.rb

@@ -31,7 +31,7 @@ module HTTPX
   #
   module Registry
     # Base Registry Error
-    Error = Class.new(Error)
+    class Error < Error; end
 
     def self.extended(klass)
       super

data/lib/httpx/request.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "delegate"
 require "forwardable"
 
 module HTTPX
@@ -155,7 +156,7 @@ module HTTPX
     end
     # :nocov:
 
-    class Body
+    class Body < SimpleDelegator
       class << self
         def new(*, options)
           return options.body if options.body.is_a?(self)
@@ -177,6 +178,7 @@ module HTTPX
 
         @headers["content-type"] ||= @body.content_type
         @headers["content-length"] = @body.bytesize unless unbounded_body?
+        super(@body)
       end
 
       def each(&block)
@@ -214,7 +216,7 @@ module HTTPX
 
       def stream(body)
         encoded = body
-        encoded = Transcoder.registry("chunker").encode(body) if chunked?
+        encoded = Transcoder.registry("chunker").encode(body.enum_for(:each)) if chunked?
         encoded
       end
 
@@ -238,16 +240,6 @@ module HTTPX
         "#{unbounded_body? ? "stream" : "@bytesize=#{bytesize}"}>"
       end
       # :nocov:
-
-      def respond_to_missing?(meth, *args)
-        @body.respond_to?(meth, *args) || super
-      end
-
-      def method_missing(meth, *args, &block)
-        return super unless @body.respond_to?(meth)
-
-        @body.__send__(meth, *args, &block)
-      end
     end
 
     def transition(nextstate)

data/lib/httpx/resolver/https.rb

@@ -24,8 +24,6 @@ module HTTPX
       record_types: RECORD_TYPES.keys,
     }.freeze
 
-    def_delegator :@connections, :empty?
-
     def_delegators :@resolver_connection, :connecting?, :to_io, :call, :close
 
     def initialize(options)

data/lib/httpx/response.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "objspace"
 require "stringio"
 require "tempfile"
 require "fileutils"
@@ -92,6 +93,16 @@ module HTTPX
         @length = 0
         @buffer = nil
         @state = :idle
+        ObjectSpace.define_finalizer(self, self.class.finalize(@buffer))
+      end
+
+      def self.finalize(buffer)
+        proc {
+          return unless buffer
+
+          @buffer.close
+          @buffer.unlink if @buffer.respond_to?(:unlink)
+        }
       end
 
       def closed?
@@ -134,18 +145,26 @@ module HTTPX
       end
 
       def to_s
-        rewind
-        if @buffer
-          content = @buffer.read
+        case @buffer
+        when StringIO
+          begin
+            @buffer.string.force_encoding(@encoding)
+          rescue ArgumentError
+            @buffer.string
+          end
+        when Tempfile, File
+          rewind
+          content = _with_same_buffer_pos { @buffer.read }
           begin
-            return content.force_encoding(@encoding)
+            content.force_encoding(@encoding)
           rescue ArgumentError # ex: unknown encoding name - utf
-            return content
+            content
           end
+        when nil
+          "".b
+        else
+          @buffer
         end
-        "".b
-      ensure
-        close
       end
       alias_method :to_str, :to_s
 
@@ -177,7 +196,11 @@ module HTTPX
       end
 
       def ==(other)
-        to_s == other.to_s
+        if other.respond_to?(:read)
+          _with_same_buffer_pos { FileUtils.compare_stream(@buffer, other) }
+        else
+          to_s == other.to_s
+        end
       end
 
       # :nocov:
@@ -204,7 +227,7 @@ module HTTPX
             @buffer = Tempfile.new("httpx", encoding: Encoding::BINARY, mode: File::RDWR)
           else
             @state = :memory
-            @buffer = StringIO.new("".b, File::RDWR)
+            @buffer = StringIO.new("".b)
           end
         when :memory
           if @length > @threshold_size
@@ -222,6 +245,18 @@ module HTTPX
 
         return unless %i[memory buffer].include?(@state)
       end
+
+      def _with_same_buffer_pos
+        return yield unless @buffer && @buffer.respond_to?(:pos)
+
+        current_pos = @buffer.pos
+        @buffer.rewind
+        begin
+          yield
+        rescue StandardError
+          @buffer.pos = current_pos
+        end
+      end
     end
   end
 
@@ -286,14 +321,6 @@ module HTTPX
     def raise_for_status
       raise @error
     end
-
-    # rubocop:disable Style/MissingRespondToMissing
-    def method_missing(meth, *, &block)
-      raise NoMethodError, "undefined response method `#{meth}' for error response" if @options.response_class.public_method_defined?(meth)
-
-      super
-    end
-    # rubocop:enable Style/MissingRespondToMissing
   end
 end
 

data/lib/httpx/selector.rb

@@ -43,9 +43,6 @@ class HTTPX::Selector
 
   private
 
-  READ_INTERESTS = %i[r rw].freeze
-  WRITE_INTERESTS = %i[w rw].freeze
-
   def select_many(interval, &block)
     selectables, r, w = nil
 
@@ -64,8 +61,8 @@ class HTTPX::Selector
           selectables.each do |io|
             interests = io.interests
 
-            (r ||= []) << io if READ_INTERESTS.include?(interests)
-            (w ||= []) << io if WRITE_INTERESTS.include?(interests)
+            (r ||= []) << io if READABLE.include?(interests)
+            (w ||= []) << io if WRITABLE.include?(interests)
           end
 
           if @selectables.empty?

data/lib/httpx/session.rb

@@ -15,8 +15,6 @@ module HTTPX
     end
 
     def wrap
-      return unless block_given?
-
       begin
         prev_persistent = @persistent
         @persistent = true
@@ -31,6 +29,8 @@ module HTTPX
     end
 
     def request(*args, **options)
+      raise ArgumentError, "must perform at least one request" if args.empty?
+
       requests = args.first.is_a?(Request) ? args : build_requests(*args, options)
       responses = send_requests(*requests, options)
       return responses.first if responses.size == 1
@@ -247,9 +247,8 @@ module HTTPX
         if !@plugins.include?(pl)
           @plugins << pl
           pl.load_dependencies(self, &block) if pl.respond_to?(:load_dependencies)
+
           @default_options = @default_options.dup
-          @default_options = pl.extra_options(@default_options, &block) if pl.respond_to?(:extra_options)
-          @default_options = @default_options.merge(options) if options
 
           include(pl::InstanceMethods) if defined?(pl::InstanceMethods)
           extend(pl::ClassMethods) if defined?(pl::ClassMethods)
@@ -266,14 +265,26 @@ module HTTPX
           opts.response_body_class.__send__(:include, pl::ResponseBodyMethods) if defined?(pl::ResponseBodyMethods)
           opts.response_body_class.extend(pl::ResponseBodyClassMethods) if defined?(pl::ResponseBodyClassMethods)
           opts.connection_class.__send__(:include, pl::ConnectionMethods) if defined?(pl::ConnectionMethods)
+          if defined?(pl::OptionsMethods)
+            opts.options_class.__send__(:include, pl::OptionsMethods)
+
+            (pl::OptionsMethods.instance_methods - Object.instance_methods).each do |meth|
+              opts.options_class.method_added(meth)
+            end
+            @default_options = opts.options_class.new(opts)
+          end
+
+          @default_options = pl.extra_options(@default_options) if pl.respond_to?(:extra_options)
+          @default_options = @default_options.merge(options) if options
+
           pl.configure(self, &block) if pl.respond_to?(:configure)
 
           @default_options.freeze
         elsif options
           # this can happen when two plugins are loaded, an one of them calls the other under the hood,
           # albeit changing some default.
-          @default_options = @default_options.dup
-          @default_options = @default_options.merge(options)
+          @default_options = pl.extra_options(@default_options) if pl.respond_to?(:extra_options)
+          @default_options = @default_options.merge(options) if options
 
           @default_options.freeze
         end
@@ -283,8 +294,8 @@ module HTTPX
       # :nocov:
       def plugins(pls)
         warn ":#{__method__} is deprecated, use :plugin instead"
-        pls.each do |pl, *args|
-          plugin(pl, *args)
+        pls.each do |pl|
+          plugin(pl)
         end
         self
       end