httpx 0.7.0 → 0.8.0

data/lib/httpx/response.rb

@@ -58,7 +58,7 @@ module HTTPX
       "HTTP/#{version} " \
       "@status=#{@status} " \
       "@headers=#{@headers} " \
-      "@body=#{@body}>"
+      "@body=#{@body.bytesize}>"
     end
     # :nocov:
 
@@ -150,6 +150,8 @@ module HTTPX
       def copy_to(dest)
         return unless @buffer
 
+        rewind
+
         if dest.respond_to?(:path) && @buffer.respond_to?(:path)
           FileUtils.mv(@buffer.path, dest.path)
         else
@@ -267,6 +269,18 @@ module HTTPX
       @error.message
     end
 
+    def reason
+      @error.class.name
+    end
+
+    def headers
+      {}
+    end
+
+    def body
+      @error.backtrace.join("\n")
+    end
+
     def raise_for_status
       raise @error
     end

data/lib/httpx/selector.rb

@@ -1,5 +1,26 @@
 # frozen_string_literal: true
 
+require "io/wait"
+
+module IOExtensions # :nodoc:
+  refine IO do
+    def wait(timeout = nil, mode = :read)
+      case mode
+      when :read
+        wait_readable(timeout)
+      when :write
+        wait_writable(timeout)
+      when :read_write
+        r, w = IO.select([self], [self], nil, timeout)
+
+        return unless r || w
+
+        self
+      end
+    end
+  end
+end
+
 class HTTPX::Selector
   READABLE = %i[rw r].freeze
   WRITABLE = %i[rw w].freeze
@@ -7,129 +28,109 @@ class HTTPX::Selector
   private_constant :READABLE
   private_constant :WRITABLE
 
-  #
-  # I/O monitor
-  #
-  class Monitor
-    attr_accessor :io, :interests, :readiness
-
-    def initialize(io, interests, reactor)
-      @io = io
-      @interests = interests
-      @reactor = reactor
-      @closed = false
-    end
-
-    def readable?
-      READABLE.include?(@interests)
-    end
-
-    def writable?
-      WRITABLE.include?(@interests)
-    end
-
-    # closes +@io+, deregisters from reactor (unless +deregister+ is false)
-    def close(deregister = true)
-      return if @closed
-
-      @closed = true
-      @reactor.deregister(@io) if deregister
-    end
-
-    def closed?
-      @closed
-    end
-
-    # :nocov:
-    def to_s
-      "#<#{self.class}: #{@io}(closed:#{@closed}) #{@interests} #{object_id.to_s(16)}>"
-    end
-    # :nocov:
-  end
+  using IOExtensions unless IO.method_defined?(:wait) && IO.instance_method(:wait).arity == 2
 
   def initialize
-    @selectables = {}
-    @__r__, @__w__ = IO.pipe
-    @closed = false
+    @selectables = []
   end
 
   # deregisters +io+ from selectables.
   def deregister(io)
-    monitor = @selectables.delete(io)
-    monitor.close(false) if monitor
+    @selectables.delete(io)
   end
 
-  # register +io+ for +interests+ events.
-  def register(io, interests)
-    monitor = @selectables[io]
-    if monitor
-      monitor.interests = interests
-    else
-      monitor = Monitor.new(io, interests, self)
-      @selectables[io] = monitor
-    end
-    monitor
-  end
+  # register +io+.
+  def register(io)
+    return if @selectables.include?(io)
 
-  # waits for read/write events for +interval+. Yields for monitors of
-  # selected IO objects.
-  #
-  def select(interval)
-    begin
-      r = [@__r__]
-      w = []
+    @selectables << io
+  end
 
-      @selectables.each do |io, monitor|
-        r << io if monitor.interests == :r || monitor.interests == :rw
-        w << io if monitor.interests == :w || monitor.interests == :rw
-        monitor.readiness = nil
+  private
+
+  READ_INTERESTS = %i[r rw].freeze
+  WRITE_INTERESTS = %i[w rw].freeze
+
+  def select_many(interval)
+    selectables, r, w = nil
+
+    # first, we group IOs based on interest type. On call to #interests however,
+    # things might already happen, and new IOs might be registered, so we might
+    # have to start all over again. We do this until we group all selectables
+    loop do
+      begin
+        r = nil
+        w = nil
+
+        selectables = @selectables
+        @selectables = []
+
+        selectables.each do |io|
+          interests = io.interests
+
+          (r ||= []) << io if READ_INTERESTS.include?(interests)
+          (w ||= []) << io if WRITE_INTERESTS.include?(interests)
+        end
+
+        if @selectables.empty?
+          @selectables = selectables
+          break
+        else
+          @selectables = [*selectables, @selectables]
+        end
+      rescue StandardError
+        @selectables = selectables if selectables
+        raise
       end
+    end
+
+    # TODO: what to do if there are no selectables?
 
+    begin
       readers, writers = IO.select(r, w, nil, interval)
 
       raise HTTPX::TimeoutError.new(interval, "timed out while waiting on select") if readers.nil? && writers.nil?
     rescue IOError, SystemCallError
-      @selectables.reject! { |io, _| io.closed? }
+      @selectables.reject!(&:closed?)
       retry
     end
 
     readers.each do |io|
-      if io == @__r__
-        # clean up wakeups
-        @__r__.read(@__r__.stat.size)
-      else
-        monitor = io.closed? ? @selectables.delete(io) : @selectables[io]
-        next unless monitor
-
-        monitor.readiness = writers.delete(io) ? :rw : :r
-        yield monitor
-      end
+      yield io
+
+      # so that we don't yield 2 times
+      writers.delete(io)
     end if readers
 
     writers.each do |io|
-      monitor = io.closed? ? @selectables.delete(io) : @selectables[io]
-      next unless monitor
-
-      # don't double run this, the last iteration might have run this task already
-      monitor.readiness = :w
-      yield monitor
+      yield io
     end if writers
   end
 
-  # Closes the selector.
-  #
-  def close
-    return if @closed
+  def select_one(interval)
+    io = @selectables.first
+
+    interests = io.interests
+
+    result = case interests
+             when :r then io.to_io.wait_readable(interval)
+             when :w then io.to_io.wait_writable(interval)
+             when :rw then io.to_io.wait(interval, :read_write)
+             when nil then return
+    end
+
+    raise HTTPX::TimeoutError.new(interval, "timed out while waiting on select") unless result
 
-    @__r__.close
-    @__w__.close
-  rescue IOError
-  ensure
-    @closed = true
+    yield io
+  rescue IOError, SystemCallError
+    @selectables.reject!(&:closed?)
   end
 
-  # interrupts the select call.
-  def wakeup
-    @__w__.write_nonblock("\0", exception: false)
+  def select(interval, &block)
+    return select_one(interval, &block) if @selectables.size == 1
+
+    select_many(interval, &block)
   end
+
+  public :select
 end

data/lib/httpx/session.rb

@@ -47,7 +47,7 @@ module HTTPX
     end
 
     def on_promise(_, stream)
-      log(level: 2, label: "#{stream.id}: ") { "refusing stream!" }
+      log(level: 2) { "#{stream.id}: refusing stream!" }
       stream.refuse
     end
 

data/lib/httpx/timeout.rb

@@ -6,6 +6,7 @@ module HTTPX
   class Timeout
     CONNECT_TIMEOUT = 60
     OPERATION_TIMEOUT = 60
+    KEEP_ALIVE_TIMEOUT = 20
 
     def self.new(opts = {})
       return opts if opts.is_a?(Timeout)
@@ -13,14 +14,16 @@ module HTTPX
       super(**opts)
     end
 
-    attr_reader :connect_timeout, :operation_timeout, :total_timeout
+    attr_reader :connect_timeout, :operation_timeout, :keep_alive_timeout, :total_timeout
 
     def initialize(connect_timeout: CONNECT_TIMEOUT,
                    operation_timeout: OPERATION_TIMEOUT,
+                   keep_alive_timeout: KEEP_ALIVE_TIMEOUT,
                    total_timeout: nil,
                    loop_timeout: nil)
       @connect_timeout = connect_timeout
       @operation_timeout = operation_timeout
+      @keep_alive_timeout = keep_alive_timeout
       @total_timeout = total_timeout
 
       return unless loop_timeout
@@ -35,6 +38,7 @@ module HTTPX
       if other.is_a?(Timeout)
         @connect_timeout == other.instance_variable_get(:@connect_timeout) &&
           @operation_timeout == other.instance_variable_get(:@operation_timeout) &&
+          @keep_alive_timeout == other.instance_variable_get(:@keep_alive_timeout) &&
           @total_timeout == other.instance_variable_get(:@total_timeout)
       else
         super
@@ -49,9 +53,11 @@ module HTTPX
       when Timeout
         connect_timeout = other.instance_variable_get(:@connect_timeout) || @connect_timeout
         operation_timeout = other.instance_variable_get(:@operation_timeout) || @operation_timeout
+        keep_alive_timeout = other.instance_variable_get(:@keep_alive_timeout) || @keep_alive_timeout
         total_timeout = other.instance_variable_get(:@total_timeout) || @total_timeout
         Timeout.new(connect_timeout: connect_timeout,
                     operation_timeout: operation_timeout,
+                    keep_alive_timeout: keep_alive_timeout,
                     total_timeout: total_timeout)
       else
         raise ArgumentError, "can't merge with #{other.class}"

data/lib/httpx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTPX
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2020-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: http-cookie
+  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: http-form_data
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +72,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: http-cookie
-  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: A client library for making HTTP requests from Ruby.
 email:
 - cardoso_tiago@hotmail.com