httpx 0.2.1 → 0.3.0

data/lib/httpx/plugins/multipart.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module HTTPX
+  module Plugins
+    module Multipart
+      module FormTranscoder
+        module_function
+
+        class Encoder
+          extend Forwardable
+
+          def_delegator :@raw, :content_type
+
+          def_delegator :@raw, :to_s
+
+          def_delegator :@raw, :read
+
+          def initialize(form)
+            @raw = HTTP::FormData.create(form)
+          end
+
+          def bytesize
+            @raw.content_length
+          end
+
+          def force_encoding(*args)
+            @raw.to_s.force_encoding(*args)
+          end
+
+          def to_str
+            @raw.to_s
+          end
+        end
+
+        def encode(form)
+          Encoder.new(form)
+        end
+      end
+
+      def self.load_dependencies(*)
+        require "http/form_data"
+      end
+
+      def self.configure(*)
+        Transcoder.register("form", FormTranscoder)
+      end
+    end
+    register_plugin :multipart, Multipart
+  end
+end

data/lib/httpx/plugins/proxy.rb

@@ -50,11 +50,12 @@ module HTTPX
         def find_channel(request, **options)
           uri = URI(request.uri)
           proxy = proxy_params(uri)
-          return super unless proxy
+          raise Error, "Failed to connect to proxy" unless proxy
           @connection.find_channel(proxy) || build_channel(proxy, options)
         end
 
         def build_channel(proxy, options)
+          return super if proxy.is_a?(URI::Generic)
           channel = build_proxy_channel(proxy, **options)
           set_channel_callbacks(channel, options)
           channel
@@ -118,6 +119,10 @@ module HTTPX
       @pending << [request, args]
     end
 
+    def connecting?
+      super || @state == :connecting || @state == :connected
+    end
+
     def to_io
       case @state
       when :idle

data/lib/httpx/request.rb

@@ -5,6 +5,7 @@ require "forwardable"
 module HTTPX
   class Request
     extend Forwardable
+    using URIExtensions
 
     METHODS = [
       # RFC 2616: Hypertext Transfer Protocol -- HTTP/1.1
@@ -71,10 +72,14 @@ module HTTPX
       path
     end
 
+    # https://bugs.ruby-lang.org/issues/15278
     def authority
-      host = @uri.host
-      port_string = @uri.port == @uri.default_port ? nil : ":#{@uri.port}"
-      "#{host}#{port_string}"
+      @uri.authority
+    end
+
+    # https://bugs.ruby-lang.org/issues/15278
+    def origin
+      @uri.origin
     end
 
     def query

data/lib/httpx/response.rb

@@ -41,11 +41,7 @@ module HTTPX
 
     def bodyless?
       @request.verb == :head ||
-        @status < 200 ||
-        @status == 201 ||
-        @status == 204 ||
-        @status == 205 ||
-        @status == 304
+        no_data?
     end
 
     def content_type
@@ -65,6 +61,19 @@ module HTTPX
       raise HTTPError, self
     end
 
+    private
+
+    def no_data?
+      @status < 200 ||
+        @status == 204 ||
+        @status == 205 ||
+        @status == 304 || begin
+        content_length = @headers["content-length"]
+        return false if content_length.nil?
+        content_length == "0"
+      end
+    end
+
     class Body
       def initialize(response, threshold_size:, window_size: 1 << 14)
         @response = response
@@ -170,7 +179,7 @@ module HTTPX
         when :memory
           if @length > @threshold_size
             aux = @buffer
-            @buffer = Tempfile.new("palanca", encoding: @encoding, mode: File::RDWR)
+            @buffer = Tempfile.new("httpx", encoding: @encoding, mode: File::RDWR)
             aux.rewind
             ::IO.copy_stream(aux, @buffer)
             # TODO: remove this if/when minor ruby is 2.3

data/lib/httpx/selector.rb

@@ -109,7 +109,7 @@ class HTTPX::Selector
 
       readers, writers = IO.select(r, w, nil, interval)
 
-      raise HTTPX::TimeoutError, "timed out while waiting on select" if readers.nil? && writers.nil?
+      raise HTTPX::TimeoutError.new(interval, "timed out while waiting on select") if readers.nil? && writers.nil?
     rescue IOError, SystemCallError
       @lock.synchronize do
         @readers.reject! { |io, _| io.closed? }

data/lib/httpx/timeout.rb

@@ -4,28 +4,42 @@ require "timeout"
 
 module HTTPX
   class Timeout
-    LOOP_TIMEOUT = 5
+    CONNECT_TIMEOUT = 60
+    OPERATION_TIMEOUT = 60
 
     def self.new(opts = {})
       return opts if opts.is_a?(Timeout)
       super
     end
 
-    def initialize(loop_timeout: LOOP_TIMEOUT, total_timeout: nil)
-      @loop_timeout = loop_timeout
+    attr_reader :connect_timeout, :operation_timeout
+
+    def initialize(connect_timeout: CONNECT_TIMEOUT,
+                   operation_timeout: OPERATION_TIMEOUT,
+                   total_timeout: nil,
+                   loop_timeout: nil)
+      @connect_timeout = connect_timeout
+      @operation_timeout = operation_timeout
       @total_timeout = total_timeout
+      if loop_timeout
+        warn ":loop_timeout is deprecated, use :operation_timeout instead"
+        @operation_timeout = loop_timeout
+      end
       reset_counter
+      @state = :idle # this is here not to trigger the log
+      transition(:idle)
     end
 
     def timeout
-      @loop_timeout || @total_timeout
+      @timeout || @total_timeout
     ensure
       log_time
     end
 
     def ==(other)
       if other.is_a?(Timeout)
-        @loop_timeout == other.instance_variable_get(:@loop_timeout) &&
+        @connect_timeout == other.instance_variable_get(:@connect_timeout) &&
+          @operation_timeout == other.instance_variable_get(:@operation_timeout) &&
           @total_timeout == other.instance_variable_get(:@total_timeout)
       else
         super
@@ -38,14 +52,29 @@ module HTTPX
         timeout = Timeout.new(other)
         merge(timeout)
       when Timeout
-        loop_timeout = other.instance_variable_get(:@loop_timeout) || @loop_timeout
+        connect_timeout = other.instance_variable_get(:@connect_timeout) || @connect_timeout
+        operation_timeout = other.instance_variable_get(:@operation_timeout) || @operation_timeout
         total_timeout = other.instance_variable_get(:@total_timeout) || @total_timeout
-        Timeout.new(loop_timeout: loop_timeout, total_timeout: total_timeout)
+        Timeout.new(connect_timeout: connect_timeout,
+                    operation_timeout: operation_timeout,
+                    total_timeout: total_timeout)
       else
         raise ArgumentError, "can't merge with #{other.class}"
       end
     end
 
+    def transition(nextstate)
+      return if @state == nextstate
+      case nextstate
+      # when :idle
+      when :idle
+        @timeout = @connect_timeout
+      when :open
+        @timeout = @operation_timeout
+      end
+      @state = nextstate
+    end
+
     private
 
     def reset_counter
@@ -60,7 +89,7 @@ module HTTPX
       return unless @time_left
       return reset_timer unless @started
       @time_left -= (Process.clock_gettime(Process::CLOCK_MONOTONIC) - @started)
-      raise TimeoutError, "Timed out after #{@total_timeout} seconds" if @time_left <= 0
+      raise TimeoutError.new(@total_timeout, "Timed out after #{@total_timeout} seconds") if @time_left <= 0
 
       reset_timer
     end

data/lib/httpx/transcoder/chunker.rb

@@ -4,15 +4,14 @@ require "forwardable"
 
 module HTTPX::Transcoder
   module Chunker
-    module_function
+    Error = Class.new(HTTPX::Error)
+    CRLF = "\r\n".b
 
     class Encoder
       extend Forwardable
 
       def_delegator :@raw, :readpartial
 
-      CRLF = "\r\n"
-
       def initialize(body)
         @raw = body
       end
@@ -30,6 +29,80 @@ module HTTPX::Transcoder
       end
     end
 
+    class Decoder
+      extend Forwardable
+
+      def_delegator :@buffer, :empty?
+
+      def_delegator :@buffer, :<<
+
+      def_delegator :@buffer, :clear
+
+      def initialize(buffer, trailers = false)
+        @buffer = buffer
+        @chunk_length = nil
+        @chunk_buffer = "".b
+        @finished = false
+        @state = :length
+        @trailers = trailers
+      end
+
+      def to_s
+        @buffer
+      end
+
+      def each
+        loop do
+          case @state
+          when :length
+            index = @buffer.index(CRLF)
+            return unless index && index.positive?
+            # Read hex-length
+            hexlen = @buffer.slice!(0, index)
+            hexlen[/\h/] || raise(Error, "wrong chunk size line: #{hexlen}")
+            @chunk_length = hexlen.hex
+            # check if is last chunk
+            @finished = @chunk_length.zero?
+            nextstate(:crlf)
+          when :crlf
+            crlf_size = @finished && !@trailers ? 4 : 2
+            # consume CRLF
+            return if @buffer.bytesize < crlf_size
+            raise Error, "wrong chunked encoding format" unless @buffer.start_with?(CRLF * (crlf_size / 2))
+            @buffer.slice!(0, crlf_size)
+            if @chunk_length.nil?
+              nextstate(:length)
+            else
+              return if @finished
+              nextstate(:data)
+            end
+          when :data
+            @chunk_buffer << (slice = @buffer.slice!(0, @chunk_length))
+            @chunk_length -= slice.bytesize
+            if @chunk_length.zero?
+              yield @chunk_buffer unless @chunk_buffer.empty?
+              @chunk_buffer.clear
+              @chunk_length = nil
+              nextstate(:crlf)
+            end
+          end
+          break if @buffer.empty?
+        end
+      end
+
+      def finished?
+        @finished
+      end
+
+      private
+
+      def nextstate(state)
+        @state = state
+      end
+    end
+
+    module_function
+
     def encode(chunks)
       Encoder.new(chunks)
     end

data/lib/httpx/transcoder/form.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "forwardable"
-require "http/form_data"
+require "uri"
 
 module HTTPX::Transcoder
   module Form
@@ -10,22 +10,18 @@ module HTTPX::Transcoder
     class Encoder
       extend Forwardable
 
-      def_delegator :@raw, :content_type
-
       def_delegator :@raw, :to_s
 
-      def_delegator :@raw, :read
+      def_delegator :@raw, :bytesize
 
-      def initialize(form)
-        @raw = HTTP::FormData.create(form)
-      end
+      def_delegator :@raw, :force_encoding
 
-      def bytesize
-        @raw.content_length
+      def initialize(form)
+        @raw = URI.encode_www_form(form)
       end
 
-      def force_encoding(*args)
-        @raw.to_s.force_encoding(*args)
+      def content_type
+        "application/x-www-form-urlencoded"
       end
 
       def to_str

data/lib/httpx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
@@ -34,7 +34,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -44,20 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: http_parser.rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: http-cookie
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +68,7 @@ files:
 - LICENSE.txt
 - README.md
 - lib/httpx.rb
+- lib/httpx/altsvc.rb
 - lib/httpx/buffer.rb
 - lib/httpx/callbacks.rb
 - lib/httpx/chainable.rb
@@ -100,6 +87,7 @@ files:
 - lib/httpx/io/unix.rb
 - lib/httpx/loggable.rb
 - lib/httpx/options.rb
+- lib/httpx/parser/http1.rb
 - lib/httpx/plugins/authentication.rb
 - lib/httpx/plugins/basic_authentication.rb
 - lib/httpx/plugins/compression.rb
@@ -110,6 +98,7 @@ files:
 - lib/httpx/plugins/digest_authentication.rb
 - lib/httpx/plugins/follow_redirects.rb
 - lib/httpx/plugins/h2c.rb
+- lib/httpx/plugins/multipart.rb
 - lib/httpx/plugins/proxy.rb
 - lib/httpx/plugins/proxy/http.rb
 - lib/httpx/plugins/proxy/socks4.rb
@@ -154,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: HTTPX, to the future, and beyond