httpx 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd100aaeeeb3425820db41745f3dbc9ff8f4932308a4396139025818054d8a9
-  data.tar.gz: a946a80e2e0060106799228bca3ff6b6c4a7317297758a90e65bd3599eb5cac0
+  metadata.gz: 8d46b9e4e151ec41d27edd3c5890081bd08f8d1106e12ed7be49432fba952e2e
+  data.tar.gz: b4db1fe32bf9e97171c08f8e2477adfd84b56c50d1d76f34144d7b6bc281473c
 SHA512:
-  metadata.gz: 95d038b06bad0457f34cb39a373691b64d4c8c2b323c84005166eb22e3240133c7e4f0975e5522c5846cf6dc1959bdec798534026e550e68bc930b0a6d68aad2
-  data.tar.gz: 5d1980dfab340b60851140f6d4976fd374ee74650f6b6e731ca4d6c16288dbcb2cf5acc956db09610e62eda33186afac0cc0b853218852074306644fd2acde7c
+  metadata.gz: dfa30d6432aa328391d19e4a236c962232a216d049d8b5aa5a41ae5d35f0a796b88603de96225ed88d23ed8408af355e8edaed5f07c183b50978b4f6d8570a60
+  data.tar.gz: e3186c27ab01a92653bb72fbd628f8b5d2738e90050d0873cac0e94767a374ba1f6bb0735a0b7391ff2343f5f53c0b1642ec8b55b77cc3c9936548065723be2a

data/lib/httpx/buffer.rb

@@ -16,8 +16,6 @@ module HTTPX
 
     def_delegator :@buffer, :bytesize
 
-    def_delegator :@buffer, :slice!
-
     def_delegator :@buffer, :clear
 
     def_delegator :@buffer, :replace
@@ -32,5 +30,9 @@ module HTTPX
     def full?
       @buffer.bytesize >= @limit
     end
+
+    def shift!(fin)
+      @buffer = @buffer.byteslice(fin..-1)
+    end
   end
 end

data/lib/httpx/connection/http2.rb

@@ -198,7 +198,7 @@ module HTTPX
     def on_stream_close(stream, request, error)
       return handle(request, stream) if request.expects?
 
-      if error
+      if error && error != :no_error
         ex = Error.new(stream.id, error)
         ex.set_backtrace(caller)
         emit(:error, request, ex)
@@ -230,7 +230,7 @@ module HTTPX
     end
 
     def on_close(_last_frame, error, _payload)
-      if error
+      if error && error != :no_error
         ex = Error.new(0, error)
         ex.set_backtrace(caller)
         @streams.each_key do |request|

data/lib/httpx/headers.rb

@@ -41,6 +41,15 @@ module HTTPX
       super
     end
 
+    def same_headers?(headers)
+      @headers.empty? || begin
+        headers.each do |k, v|
+          return false unless v == self[k]
+        end
+        true
+      end
+    end
+
     # merges headers with another header-quack.
     # the merge rule is, if the header already exists,
     # ignore what the +other+ headers has. Otherwise, set

data/lib/httpx/io/tcp.rb

@@ -87,7 +87,7 @@ module HTTPX
 
       def write(buffer)
         siz = @io.write_nonblock(buffer)
-        buffer.slice!(0, siz)
+        buffer.shift!(siz)
         siz
       rescue ::IO::WaitWritable
         0
@@ -108,7 +108,7 @@ module HTTPX
         return 0 if siz == :wait_writable
         return if siz.nil?
 
-        buffer.slice!(0, siz)
+        buffer.shift!(siz)
         siz
       end
     end

data/lib/httpx/io/udp.rb

@@ -30,7 +30,7 @@ module HTTPX
 
     def write(buffer)
       siz = @io.send(buffer, 0, @host, @port)
-      buffer.slice!(0, siz)
+      buffer.shift!(siz)
       siz
     end
 

data/lib/httpx/options.rb

@@ -108,10 +108,20 @@ module HTTPX
       def_option(method_name)
     end
 
+    REQUEST_IVARS = %i[@params @form @json @body].freeze
+
     def ==(other)
       ivars = instance_variables | other.instance_variables
       ivars.all? do |ivar|
-        instance_variable_get(ivar) == other.instance_variable_get(ivar)
+        case ivar
+        when :@headers
+          headers = instance_variable_get(ivar)
+          headers.same_headers?(other.instance_variable_get(ivar))
+        when *REQUEST_IVARS
+          true
+        else
+          instance_variable_get(ivar) == other.instance_variable_get(ivar)
+        end
       end
     end
 

data/lib/httpx/parser/http1.rb

@@ -67,7 +67,8 @@ module HTTPX
         @status_code = code.to_i
         raise(Error, "wrong status code (#{@status_code})") unless (100..599).cover?(@status_code)
 
-        @buffer.slice!(0, idx + 1)
+        # @buffer.slice!(0, idx + 1)
+        @buffer = @buffer.byteslice((idx + 1)..-1)
         nextstate(:headers)
       end
 
@@ -116,7 +117,8 @@ module HTTPX
             @observer.on_data(chunk)
           end
         elsif @content_length
-          data = @buffer.slice!(0, @content_length)
+          data = @buffer.byteslice(0, @content_length)
+          @buffer = @buffer.byteslice(@content_length..-1) || "".b
           @content_length -= data.bytesize
           @observer.on_data(data)
           data.clear

data/lib/httpx/plugins/compression.rb

@@ -23,6 +23,14 @@ module HTTPX
         options.merge(headers: { "accept-encoding" => Compression.registry.keys })
       end
 
+      module RequestMethods
+        def initialize(*)
+          super
+          # forego compression in the Range cases
+          @headers.delete("accept-encoding") if @headers.key?("range")
+        end
+      end
+
       module RequestBodyMethods
         def initialize(*)
           super
@@ -36,14 +44,28 @@ module HTTPX
       end
 
       module ResponseBodyMethods
+        attr_reader :encodings
+
         def initialize(*)
+          @encodings = []
+
           super
 
           return unless @headers.key?("content-encoding")
 
           @_decoders = @headers.get("content-encoding").map do |encoding|
-            Compression.registry(encoding).decoder
+            decoder = Compression.registry(encoding).decoder
+            # do not uncompress if there is no decoder available. In fact, we can't reliably
+            # continue decompressing beyond that, so ignore.
+            break unless decoder
+
+            @encodings << encoding
+            decoder
           end
+
+          # remove encodings that we are able to decode
+          @headers["content-encoding"] = @headers.get("content-encoding") - @encodings
+
           @_compressed_length = if @headers.key?("content-length")
             @headers["content-length"].to_i
           else

data/lib/httpx/plugins/cookies.rb

@@ -55,6 +55,10 @@ module HTTPX
           end if @default_cookies
           store
         end
+
+        def ==(other)
+          @store == other.instance_variable_get(:@store)
+        end
       end
 
       def self.load_dependencies(*)

data/lib/httpx/transcoder/chunker.rb

@@ -60,7 +60,8 @@ module HTTPX::Transcoder
             return unless index && index.positive?
 
             # Read hex-length
-            hexlen = @buffer.slice!(0, index)
+            hexlen = @buffer.byteslice(0, index)
+            @buffer = @buffer.byteslice(index..-1) || "".b
             hexlen[/\h/] || raise(Error, "wrong chunk size line: #{hexlen}")
             @chunk_length = hexlen.hex
             # check if is last chunk
@@ -72,7 +73,7 @@ module HTTPX::Transcoder
             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)
+            @buffer = @buffer.byteslice(crlf_size..-1)
             if @chunk_length.nil?
               nextstate(:length)
             else
@@ -81,8 +82,10 @@ module HTTPX::Transcoder
               nextstate(:data)
             end
           when :data
-            @chunk_buffer << (slice = @buffer.slice!(0, @chunk_length))
-            @chunk_length -= slice.bytesize
+            chunk = @buffer.byteslice(0, @chunk_length)
+            @buffer = @buffer.byteslice(@chunk_length..-1) || "".b
+            @chunk_buffer << chunk
+            @chunk_length -= chunk.bytesize
             if @chunk_length.zero?
               yield @chunk_buffer unless @chunk_buffer.empty?
               @chunk_buffer.clear

data/lib/httpx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2019-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2