httpx 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79f53c62644d9e645ab5aeb91d897e0537c3160c
-  data.tar.gz: 7a9cb5c745c6b02ada9d0d76930372201150dba3
+  metadata.gz: 6dac1e1e43e2c1935f8fd0c1807d1d29bf782f27
+  data.tar.gz: e5786862d65ee9807f31e9ca847d8ca9125dce29
 SHA512:
-  metadata.gz: c623d4faf4e590b757f5e883a62c337364d76da0d01dfb170f47580331edd915abddee82b867a92f86b59d0ea7eefb5c7405554ee7269cc01e12e144a47ec849
-  data.tar.gz: 40ce7074c72b32de7255e5af941e6a8e38c2f026aa3d1e367fb09ca0d63186a5d71c9b5011ced31ff7e28b446a41508f68ea578ab339872baa0ac5de6b82be53
+  metadata.gz: 5a5f4106511049f7dc22c6a44aee01cf560827b553b05aede40e5ff11fb20d52213d754488cec4419a895c9a7eef9c77517242f4553ee0d1b797cfe1cbc4726c
+  data.tar.gz: a2390e810c8d6738a9d13fce36bc0cbfcd9e4a7eeb88e5d7a9919a8311dc61404cb3328569836eff86cbabe33b63daef9107d9fe3938136af06b6c78b57f953d

data/README.md

@@ -92,14 +92,15 @@ It also means that it ships with the minimum amount of dependencies.
 
 ## Easy to test
 
-The test suite runs against [httpbin proxied over nghttp2](https://nghttp2.org/httpbin/), so there is no mocking/stubbing going on. The test suite uses [minitest](https://github.com/seattlerb/minitest), but its matchers usage is limit to assert (assert is all you need).
+The test suite runs against [httpbin proxied over nghttp2](https://nghttp2.org/httpbin/), so there are no mocking/stubbing false positives. The test suite uses [minitest](https://github.com/seattlerb/minitest), but its matchers usage is (almost) limited to `#assert` (`assert` is all you need).
 
 ## Supported Rubies
 
 All Rubies greater or equal to 2.1, and always latest JRuby.
 
 ## Resources
-
+|               |                                                     |
+| ------------- | --------------------------------------------------- |
 | Website       | https://honeyryderchuck.gitlab.io/httpx/            |
 | Documentation | https://honeyryderchuck.gitlab.io/httpx/rdoc/       |
 | Wiki          | https://gitlab.com/honeyryderchuck/httpx/wikis/home |

data/lib/httpx/channel.rb

@@ -196,6 +196,14 @@ module HTTPX
       parser.on(:close) do
         transition(:closing)
       end
+      parser.on(:reset) do
+        transition(:closing)
+        unless parser.empty?
+          transition(:closed)
+          transition(:idle)
+          transition(:open)
+        end
+      end
       parser
     end
 
@@ -218,7 +226,10 @@ module HTTPX
       end
       @state = nextstate
     rescue Errno::ECONNREFUSED,
-           Errno::EADDRNOTAVAIL => e
+           Errno::ENETUNREACH,
+           Errno::EADDRNOTAVAIL,
+           OpenSSL::SSL::SSLError => e
+      # connect errors, exit gracefully
       emit_error(e)
       @state = :closed
       emit(:close)
@@ -226,7 +237,7 @@ module HTTPX
 
     def emit_error(e)
       response = ErrorResponse.new(e, 0, @options)
-      @pending.each do |request, _| # rubocop:disable Performance/HashEachMethods
+      @pending.each do |request, _|
         emit(:response, request, response)
       end
     end

data/lib/httpx/channel/http1.rb

@@ -71,7 +71,7 @@ module HTTPX
     # must be public methods, or else they won't be reachable
 
     def on_message_begin
-      log(2) { "parsing begins" }
+      log(level: 2) { "parsing begins" }
     end
 
     def on_headers_complete(h)
@@ -81,14 +81,14 @@ module HTTPX
       request = @requests.first
       return if request.response
 
-      log(2) { "headers received" }
+      log(level: 2) { "headers received" }
       headers = @options.headers_class.new(h)
       response = @options.response_class.new(@requests.last,
                                              @parser.status_code,
                                              @parser.http_version.join("."),
                                              headers, @options)
-      log { "-> HEADLINE: #{response.status} HTTP/#{@parser.http_version.join(".")}" }
-      log { response.headers.each.map { |f, v| "-> HEADER: #{f}: #{v}" }.join("\n") }
+      log(color: :yellow) { "-> HEADLINE: #{response.status} HTTP/#{@parser.http_version.join(".")}" }
+      log(color: :yellow) { response.headers.each.map { |f, v| "-> HEADER: #{f}: #{v}" }.join("\n") }
 
       request.response = response
 
@@ -96,8 +96,8 @@ module HTTPX
     end
 
     def on_body(chunk)
-      log { "-> DATA: #{chunk.bytesize} bytes..." }
-      log(2) { "-> #{chunk.inspect}" }
+      log(color: :green) { "-> DATA: #{chunk.bytesize} bytes..." }
+      log(level: 2, color: :green) { "-> #{chunk.inspect}" }
       response = @requests.first.response
 
       response << chunk
@@ -106,7 +106,7 @@ module HTTPX
     end
 
     def on_message_complete
-      log(2) { "parsing complete" }
+      log(level: 2) { "parsing complete" }
       request = @requests.first
       response = request.response
 
@@ -144,18 +144,21 @@ module HTTPX
       close
       send(@pending.shift) unless @pending.empty?
       return unless response.headers["connection"] == "close"
-      unless @requests.empty?
-        @requests.map { |r| r.transition(:idle) }
-        # server doesn't handle pipelining, and probably
-        # doesn't support keep-alive. Fallback to send only
-        # 1 keep alive request.
-        @max_concurrent_requests = 1
-      end
-      emit(:close)
+      disable_concurrency
+      emit(:reset)
     end
 
     private
 
+    def disable_concurrency
+      return if @requests.empty?
+      @requests.each { |r| r.transition(:idle) }
+      # server doesn't handle pipelining, and probably
+      # doesn't support keep-alive. Fallback to send only
+      # 1 keep alive request.
+      @max_concurrent_requests = 1
+    end
+
     def set_request_headers(request)
       request.headers["host"] ||= request.authority
       request.headers["connection"] ||= "keep-alive"
@@ -184,12 +187,12 @@ module HTTPX
     def join_headers(request)
       buffer = +""
       buffer << "#{request.verb.to_s.upcase} #{headline_uri(request)} HTTP/#{@version.join(".")}" << CRLF
-      log { "<- HEADLINE: #{buffer.chomp.inspect}" }
+      log(color: :yellow) { "<- HEADLINE: #{buffer.chomp.inspect}" }
       @buffer << buffer
       buffer.clear
       request.headers.each do |field, value|
         buffer << "#{capitalized(field)}: #{value}" << CRLF
-        log { "<- HEADER: #{buffer.chomp}" }
+        log(color: :yellow) { "<- HEADER: #{buffer.chomp}" }
         @buffer << buffer
         buffer.clear
       end
@@ -200,8 +203,8 @@ module HTTPX
     def join_body(request)
       return if request.empty?
       while (chunk = request.drain_body)
-        log { "<- DATA: #{chunk.bytesize} bytes..." }
-        log(2) { "<- #{chunk.inspect}" }
+        log(color: :green) { "<- DATA: #{chunk.bytesize} bytes..." }
+        log(level: 2, color: :green) { "<- #{chunk.inspect}" }
         @buffer << chunk
         throw(:buffer_full, request) if @buffer.full?
       end

data/lib/httpx/channel/http2.rb

@@ -92,7 +92,7 @@ module HTTPX
     def handle_stream(stream, request)
       stream.on(:close, &method(:on_stream_close).curry[stream, request])
       stream.on(:half_close) do
-        log(2, "#{stream.id}: ") { "waiting for response..." }
+        log(level: 2, label: "#{stream.id}: ") { "waiting for response..." }
       end
       # stream.on(:altsvc)
       stream.on(:headers, &method(:on_stream_headers).curry[stream, request])
@@ -107,7 +107,7 @@ module HTTPX
       headers[":path"]      = headline_uri(request)
       headers[":authority"] = request.authority
       headers = headers.merge(request.headers)
-      log(1, "#{stream.id}: ") do
+      log(level: 1, label: "#{stream.id}: ", color: :yellow) do
         headers.map { |k, v| "-> HEADER: #{k}: #{v}" }.join("\n")
       end
       stream.headers(headers, end_stream: request.empty?)
@@ -117,8 +117,8 @@ module HTTPX
       chunk = @drains.delete(request) || request.drain_body
       while chunk
         next_chunk = request.drain_body
-        log(1, "#{stream.id}: ") { "-> DATA: #{chunk.bytesize} bytes..." }
-        log(2, "#{stream.id}: ") { "-> #{chunk.inspect}" }
+        log(level: 1, label: "#{stream.id}: ", color: :green) { "-> DATA: #{chunk.bytesize} bytes..." }
+        log(level: 2, label: "#{stream.id}: ", color: :green) { "-> #{chunk.inspect}" }
         stream.data(chunk, end_stream: !next_chunk)
         if next_chunk && @buffer.full?
           @drains[request] = next_chunk
@@ -133,7 +133,7 @@ module HTTPX
     ######
 
     def on_stream_headers(stream, request, h)
-      log(stream.id) do
+      log(label: "#{stream.id}:", color: :yellow) do
         h.map { |k, v| "<- HEADER: #{k}: #{v}" }.join("\n")
       end
       _, status = h.shift
@@ -144,8 +144,8 @@ module HTTPX
     end
 
     def on_stream_data(stream, request, data)
-      log(1, "#{stream.id}: ") { "<- DATA: #{data.bytesize} bytes..." }
-      log(2, "#{stream.id}: ") { "<- #{data.inspect}" }
+      log(level: 1, label: "#{stream.id}: ", color: :green) { "<- DATA: #{data.bytesize} bytes..." }
+      log(level: 2, label: "#{stream.id}: ", color: :green) { "<- #{data.inspect}" }
       request.response << data
     end
 
@@ -153,7 +153,7 @@ module HTTPX
       return handle(request, stream) if request.expects?
       response = request.response || ErrorResponse.new(Error.new(error), @retries, @options)
       emit(:response, request, response)
-      log(2, "#{stream.id}: ") { "closing stream" }
+      log(level: 2, label: "#{stream.id}: ") { "closing stream" }
 
       @streams.delete(request)
       send(@pending.shift) unless @pending.empty?
@@ -174,13 +174,11 @@ module HTTPX
     end
 
     def on_frame_sent(frame)
-      log(2, "#{frame[:stream]}: ") { "frame was sent!" }
-      log(2, "#{frame[:stream]}: ") do
+      log(level: 2, label: "#{frame[:stream]}: ") { "frame was sent!" }
+      log(level: 2, label: "#{frame[:stream]}: ", color: :blue) do
         case frame[:type]
         when :data
           frame.merge(payload: frame[:payload].bytesize).inspect
-        when :headers
-          "\e[33m#{frame.inspect}\e[0m"
         else
           frame.inspect
         end
@@ -188,8 +186,8 @@ module HTTPX
     end
 
     def on_frame_received(frame)
-      log(2, "#{frame[:stream]}: ") { "frame was received!" }
-      log(2, "#{frame[:stream]}: ") do
+      log(level: 2, label: "#{frame[:stream]}: ") { "frame was received!" }
+      log(level: 2, label: "#{frame[:stream]}: ", color: :magenta) do
         case frame[:type]
         when :data
           frame.merge(payload: frame[:payload].bytesize).inspect
@@ -200,8 +198,8 @@ module HTTPX
     end
 
     def on_altsvc(frame)
-      log(2, "#{frame[:stream]}: ") { "altsvc frame was received" }
-      log(2, "#{frame[:stream]}: ") { frame.inspect }
+      log(level: 2, label: "#{frame[:stream]}: ") { "altsvc frame was received" }
+      log(level: 2, label: "#{frame[:stream]}: ") { frame.inspect }
     end
 
     def on_promise(stream)

data/lib/httpx/client.rb

@@ -9,16 +9,18 @@ module HTTPX
       @options = self.class.default_options.merge(options)
       @connection = Connection.new(@options)
       @responses = {}
+      @keep_open = false
       wrap(&blk) if block_given?
     end
 
     def wrap
       return unless block_given?
       begin
+        prev_keep_open = @keep_open
         @keep_open = true
         yield self
       ensure
-        @keep_open = false
+        @keep_open = prev_keep_open
         close
       end
     end
@@ -43,7 +45,7 @@ module HTTPX
     end
 
     def on_promise(_, stream)
-      log(2, "#{stream.id}: ") { "refusing stream!" }
+      log(level: 2, label: "#{stream.id}: ") { "refusing stream!" }
       stream.refuse
       # TODO: policy for handling promises
     end

data/lib/httpx/errors.rb

@@ -6,11 +6,15 @@ module HTTPX
   TimeoutError = Class.new(Error)
 
   HTTPError = Class.new(Error) do
-    attr_reader :status
+    attr_reader :response
 
-    def initialize(status)
-      @status = status
-      super("HTTP Error: #{status}")
+    def initialize(response)
+      @response = response
+      super("HTTP Error: #{@response.status}")
+    end
+
+    def status
+      @response.status
     end
   end
 end

data/lib/httpx/headers.rb

@@ -5,16 +5,16 @@ module HTTPX
     EMPTY = [].freeze # :nodoc:
 
     class << self
-      def new(h = nil)
-        return h if h.is_a?(self)
+      def new(headers = nil)
+        return headers if headers.is_a?(self)
         super
       end
     end
 
-    def initialize(h = nil)
+    def initialize(headers = nil)
       @headers = {}
-      return unless h
-      h.each do |field, value|
+      return unless headers
+      headers.each do |field, value|
         array_value(value).each do |v|
           add(downcased(field), v)
         end

data/lib/httpx/io.rb

@@ -137,7 +137,7 @@ module HTTPX
       when :closed
         return unless @state == :connected
       end
-      log(1, "#{inspect}: ") { nextstate.to_s }
+      log(level: 1, label: "#{inspect}: ") { nextstate.to_s }
       @state = nextstate
     end
   end

data/lib/httpx/loggable.rb

@@ -2,10 +2,23 @@
 
 module HTTPX
   module Loggable
-    def log(level = @options.debug_level, label = "", &msg)
+    COLORS = {
+      black:   30,
+      red:     31,
+      green:   32,
+      yellow:  33,
+      blue:    34,
+      magenta: 35,
+      cyan:    36,
+      white:   37,
+    }.freeze
+
+    def log(level: @options.debug_level, label: "", color: nil, &msg)
       return unless @options.debug
       return unless @options.debug_level >= level
-      @options.debug << (+label << msg.call << "\n")
+      message = (+label << msg.call << "\n")
+      message = "\e[#{COLORS[color]}m#{message}\e[0m" if color && @options.debug.isatty
+      @options.debug << message
     end
   end
 end

data/lib/httpx/plugins/cookies.rb

@@ -37,9 +37,9 @@ module HTTPX
 
       module ResponseMethods
         def cookie_jar
-          return @cookies if defined?(@cookies)
+          return @cookie_jar if defined?(@cookie_jar)
           return nil unless headers.key?("set-cookie")
-          @cookies ||= begin
+          @cookie_jar ||= begin
             jar = HTTP::CookieJar.new
             jar.parse(headers["set-cookie"], @request.uri)
             jar

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

@@ -53,7 +53,7 @@ module HTTPX
               return unless @state == :connecting
               @parser = nil
             end
-            log(1, "SOCKS4: ") { "#{nextstate}: #{@write_buffer.to_s.inspect}" }
+            log(level: 1, label: "SOCKS4: ") { "#{nextstate}: #{@write_buffer.to_s.inspect}" }
             super
           end
         end

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

@@ -86,7 +86,7 @@ module HTTPX
               return unless @state == :negotiating
               @parser = nil
             end
-            log(1, "SOCKS5: ") { "#{nextstate}: #{@write_buffer.to_s.inspect}" }
+            log(level: 1, label: "SOCKS5: ") { "#{nextstate}: #{@write_buffer.to_s.inspect}" }
             super
           end
 

data/lib/httpx/plugins/push_promise.rb

@@ -34,7 +34,7 @@ module HTTPX
         end
 
         def __on_promise_request(parser, stream, h)
-          log(1, "#{stream.id}: ") do
+          log(level: 1, label: "#{stream.id}: ") do
             h.map { |k, v| "-> PROMISE HEADER: #{k}: #{v}" }.join("\n")
           end
           headers = @options.headers_class.new(h)

data/lib/httpx/response.rb

@@ -62,7 +62,7 @@ module HTTPX
 
     def raise_for_status
       return if @status < 400
-      raise HTTPError, @status
+      raise HTTPError, self
     end
 
     class Body

data/lib/httpx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2