http 2.0.0.pre → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 528cd808cd0cf04d196ac3459063496777a46736
-  data.tar.gz: a3a4cf179068d8f5c48bc803118075e5e71331d5
+  metadata.gz: 8ae83a6df13ab671375cfdd322ba65d1a15b8a43
+  data.tar.gz: 4e107db57baa353e23fb25d805a3a0a6f17d1310
 SHA512:
-  metadata.gz: 1774996540d80f6f08866f5bee7d632baa72a33bd31122485f15fdb97d695de7645c0f9131a5e52188ef4706005c96c74bcc175ee3b5182a9a7b7b4597f07274
-  data.tar.gz: 9cc27b2c73fee256c61409ce41069588e780c41df32d27662eea5c1d7de116e820c8843b3e08b670a84cfbb695b64d126c1f1b6e7b43de599cb84cad91f09d73
+  metadata.gz: fdc5e4ea2f1e56a213246c34b40320584a1e092d07fcb03f99dd9f11d260b81e40be26483640a997c57d601b4882c753ca367152bd7cca9ad5b0498cb1b6681b
+  data.tar.gz: e421f13bb1522ec92bd2eca7efd73a713036daba084416cdc86d69d681d72d8f050738fe9b664d101a186afb028dd0d46eea475c029587a17d3dc3dfa619ac21

data/.travis.yml

@@ -1,8 +1,12 @@
+language: ruby
+sudo: false
+
 bundler_args: --without development doc
+
 env:
   global:
     - JRUBY_OPTS="$JRUBY_OPTS --debug"
-language: ruby
+
 rvm:
   - 2.0.0
   - 2.1
@@ -12,10 +16,14 @@ rvm:
   - jruby-head
   - ruby-head
   - rbx-2
+
 matrix:
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: rbx-2
   fast_finish: true
-sudo: false
+
+branches:
+  only:
+    - master

data/CHANGES.md

@@ -1,4 +1,17 @@
-## master (unreleased)
+## 2.0.0 (2016-04-23)
+
+* [#333](https://github.com/httprb/http/pull/333)
+  Fix HTTPS request headline when sent via proxy.
+  ([@Connorhd])
+
+* [#331](https://github.com/httprb/http/pull/331)
+  Add `#informational?`, `#success?`, `#redirect?`, `#client_error?` and
+  `#server_error?` helpers to `Response::Status`.
+  ([@mwitek])
+
+* [#330](https://github.com/httprb/http/pull/330)
+  Support custom CONNECT headers (request/response) during HTTPS proxy requests.
+  ([@smudge])
 
 * [#319](https://github.com/httprb/http/pull/319)
   Drop Ruby 1.9.x support.
@@ -501,3 +514,5 @@ end
 [@jwinter]: https://github.com/jwinter
 [@nerdrew]: https://github.com/nerdrew
 [@kylekyle]: https://github.com/kylekyle
+[@smudge]: https://github.com/smudge
+[@mwitek]: https://github.com/mwitek

data/Gemfile

@@ -20,11 +20,11 @@ group :test do
   gem "coveralls"
   gem "simplecov", ">= 0.9"
   gem "json",      ">= 1.8.1"
-  gem "rubocop",   "=  0.36.0"
+  gem "rubocop",   "=  0.39.0"
   gem "rspec",     "~> 3.0"
   gem "rspec-its"
   gem "yardstick"
-  gem "certificate_authority"
+  gem "certificate_authority", :require => false
 end
 
 group :doc do

data/lib/http/chainable.rb

@@ -93,7 +93,7 @@ module HTTP
               when :null          then HTTP::Timeout::Null
               when :global        then HTTP::Timeout::Global
               when :per_operation then HTTP::Timeout::PerOperation
-              else fail ArgumentError, "Unsupported Timeout class: #{klass}"
+              else raise ArgumentError, "Unsupported Timeout class: #{klass}"
               end
 
       [:read, :write, :connect].each do |k|
@@ -153,8 +153,10 @@ module HTTP
       proxy_hash[:proxy_port]     = proxy[1] if proxy[1].is_a?(Integer)
       proxy_hash[:proxy_username] = proxy[2] if proxy[2].is_a?(String)
       proxy_hash[:proxy_password] = proxy[3] if proxy[3].is_a?(String)
+      proxy_hash[:proxy_headers]  = proxy[2] if proxy[2].is_a?(Hash)
+      proxy_hash[:proxy_headers]  = proxy[4] if proxy[4].is_a?(Hash)
 
-      fail(RequestError, "invalid HTTP proxy: #{proxy_hash}") unless [2, 4].include?(proxy_hash.keys.size)
+      raise(RequestError, "invalid HTTP proxy: #{proxy_hash}") unless (2..5).cover?(proxy_hash.keys.size)
 
       branch default_options.with_proxy(proxy_hash)
     end

data/lib/http/client.rb

@@ -68,12 +68,13 @@ module HTTP
       end
 
       res = Response.new(
-        :status     => @connection.status_code,
-        :version    => @connection.http_version,
-        :headers    => @connection.headers,
-        :connection => @connection,
-        :encoding   => options.encoding,
-        :uri        => req.uri
+        :status        => @connection.status_code,
+        :version       => @connection.http_version,
+        :headers       => @connection.headers,
+        :proxy_headers => @connection.proxy_response_headers,
+        :connection    => @connection,
+        :encoding      => options.encoding,
+        :uri           => req.uri
       )
 
       @connection.finish_response if req.verb == :head
@@ -96,7 +97,7 @@ module HTTP
     # Verify our request isn't going to be made against another URI
     def verify_connection!(uri)
       if default_options.persistent? && uri.origin != default_options.persistent
-        fail StateError, "Persistence is enabled for #{default_options.persistent}, but we got #{uri.origin}"
+        raise StateError, "Persistence is enabled for #{default_options.persistent}, but we got #{uri.origin}"
       # We re-create the connection object because we want to let prior requests
       # lazily load the body as long as possible, and this mimics prior functionality.
       elsif @connection && (!@connection.keep_alive? || @connection.expired?)

data/lib/http/connection.rb

@@ -19,6 +19,9 @@ module HTTP
     # HTTP/1.1
     HTTP_1_1 = "1.1".freeze
 
+    # Returned after HTTP CONNECT (via proxy)
+    attr_reader :proxy_response_headers
+
     # @param [HTTP::Request] req
     # @param [HTTP::Options] options
     # @raise [HTTP::ConnectionError] when failed to connect
@@ -60,11 +63,8 @@ module HTTP
     # @param [Request] req Request to send to the server
     # @return [nil]
     def send_request(req)
-      if @pending_response
-        fail StateError, "Tried to send a request while one is pending already. Make sure you read off the body."
-      elsif @pending_request
-        fail StateError, "Tried to send a request while a response is pending. Make sure you've fully read the body from the request."
-      end
+      raise StateError, "Tried to send a request while one is pending already. Make sure you read off the body." if @pending_response
+      raise StateError, "Tried to send a request while a response is pending. Make sure you read off the body."  if @pending_request
 
       @pending_request = true
 
@@ -94,7 +94,7 @@ module HTTP
     def read_headers!
       loop do
         if read_more(BUFFER_SIZE) == :eof
-          fail ConnectionError, "couldn't read response headers" unless @parser.headers?
+          raise ConnectionError, "couldn't read response headers" unless @parser.headers?
           break
         elsif @parser.headers?
           break
@@ -167,6 +167,7 @@ module HTTP
       @pending_response = true
 
       read_headers!
+      @proxy_response_headers = @parser.headers
 
       if @parser.status_code != 200
         @failed_proxy_connect = true

data/lib/http/headers.rb

@@ -171,7 +171,7 @@ module HTTP
                    when object.respond_to?(:to_hash) then object.to_hash
                    when object.respond_to?(:to_h)    then object.to_h
                    when object.respond_to?(:to_a)    then object.to_a
-                   else fail Error, "Can't coerce #{object.inspect} to Headers"
+                   else raise Error, "Can't coerce #{object.inspect} to Headers"
                    end
         end
 
@@ -197,7 +197,7 @@ module HTTP
 
       return normalized if normalized =~ COMPLIANT_NAME_RE
 
-      fail InvalidHeaderNameError, "Invalid HTTP header field name: #{name.inspect}"
+      raise InvalidHeaderNameError, "Invalid HTTP header field name: #{name.inspect}"
     end
   end
 end

data/lib/http/mime_type.rb

@@ -33,7 +33,7 @@ module HTTP
       # @raise [Error] if no adapter found
       # @return [Class]
       def [](type)
-        adapters[normalize type] || fail(Error, "Unknown MIME type: #{type}")
+        adapters[normalize type] || raise(Error, "Unknown MIME type: #{type}")
       end
 
       # Register a shortcut for MIME type

data/lib/http/options.rb

@@ -135,7 +135,7 @@ module HTTP
     private
 
     def argument_error!(message)
-      fail(Error, message, caller[1..-1])
+      raise(Error, message, caller[1..-1])
     end
   end
 end

data/lib/http/redirector.rb

@@ -51,8 +51,8 @@ module HTTP
       while REDIRECT_CODES.include? @response.status.code
         @visited << "#{@request.verb} #{@request.uri}"
 
-        fail TooManyRedirectsError if too_many_hops?
-        fail EndlessRedirectError  if endless_loop?
+        raise TooManyRedirectsError if too_many_hops?
+        raise EndlessRedirectError  if endless_loop?
 
         @response.flush
 
@@ -80,13 +80,13 @@ module HTTP
     # Redirect policy for follow
     # @return [Request]
     def redirect_to(uri)
-      fail StateError, "no Location header in redirect" unless uri
+      raise StateError, "no Location header in redirect" unless uri
 
       verb = @request.verb
       code = @response.status.code
 
       if UNSAFE_VERBS.include?(verb) && STRICT_SENSITIVE_CODES.include?(code)
-        fail StateError, "can't follow #{@response.status} redirect" if @strict
+        raise StateError, "can't follow #{@response.status} redirect" if @strict
         verb = :get
       end
 

data/lib/http/request.rb

@@ -77,8 +77,8 @@ module HTTP
       @uri    = normalize_uri(opts.fetch(:uri))
       @scheme = @uri.scheme.to_s.downcase.to_sym if @uri.scheme
 
-      fail(UnsupportedMethodError, "unknown method: #{verb}") unless METHODS.include?(@verb)
-      fail(UnsupportedSchemeError, "unknown scheme: #{scheme}") unless SCHEMES.include?(@scheme)
+      raise(UnsupportedMethodError, "unknown method: #{verb}") unless METHODS.include?(@verb)
+      raise(UnsupportedSchemeError, "unknown scheme: #{scheme}") unless SCHEMES.include?(@scheme)
 
       @proxy   = opts[:proxy] || {}
       @body    = opts[:body]
@@ -106,7 +106,7 @@ module HTTP
 
     # Stream the request to a socket
     def stream(socket)
-      include_proxy_authorization_header if using_authenticated_proxy? && !@uri.https?
+      include_proxy_headers if using_proxy? && !@uri.https?
       Request::Writer.new(socket, body, headers, headline).stream
     end
 
@@ -117,7 +117,12 @@ module HTTP
 
     # Is this request using an authenticated proxy?
     def using_authenticated_proxy?
-      proxy && proxy.keys.size == 4
+      proxy && proxy.keys.size >= 4
+    end
+
+    def include_proxy_headers
+      headers.merge!(proxy[:proxy_headers]) if proxy.key?(:proxy_headers)
+      include_proxy_authorization_header if using_authenticated_proxy?
     end
 
     # Compute and add the Proxy-Authorization header
@@ -137,7 +142,7 @@ module HTTP
 
     # Compute HTTP request header for direct or proxy request
     def headline
-      request_uri = using_proxy? ? uri : uri.omit(:scheme, :authority)
+      request_uri = (using_proxy? && !uri.https?) ? uri : uri.omit(:scheme, :authority)
       "#{verb.to_s.upcase} #{request_uri.omit :fragment} HTTP/#{version}"
     end
 
@@ -154,7 +159,7 @@ module HTTP
       )
 
       connect_headers[Headers::PROXY_AUTHORIZATION] = proxy_authorization_header if using_authenticated_proxy?
-
+      connect_headers.merge!(proxy[:proxy_headers]) if proxy.key?(:proxy_headers)
       connect_headers
     end
 

data/lib/http/request/writer.rb

@@ -54,7 +54,7 @@ module HTTP
         if @body.is_a?(String) && !@headers[Headers::CONTENT_LENGTH]
           @request_header << "#{Headers::CONTENT_LENGTH}: #{@body.bytesize}"
         elsif @body.is_a?(Enumerable) && CHUNKED != @headers[Headers::TRANSFER_ENCODING]
-          fail(RequestError, "invalid transfer encoding")
+          raise(RequestError, "invalid transfer encoding")
         end
       end
 
@@ -86,7 +86,7 @@ module HTTP
           end
 
           write(CHUNKED_END)
-        else fail TypeError, "invalid body type: #{@body.class}"
+        else raise TypeError, "invalid body type: #{@body.class}"
         end
       end
 
@@ -102,7 +102,7 @@ module HTTP
 
       def validate_body_type!
         return if VALID_BODY_TYPES.any? { |type| @body.is_a? type }
-        fail RequestError, "body of wrong type: #{@body.class}"
+        raise RequestError, "body of wrong type: #{@body.class}"
       end
     end
   end

data/lib/http/response.rb

@@ -23,20 +23,25 @@ module HTTP
     # @return [URI, nil]
     attr_reader :uri
 
+    # @return [Hash]
+    attr_reader :proxy_headers
+
     # Inits a new instance
     #
     # @option opts [Integer] :status Status code
     # @option opts [String] :version HTTP version
     # @option opts [Hash] :headers
+    # @option opts [Hash] :proxy_headers
     # @option opts [HTTP::Connection] :connection
     # @option opts [String] :encoding Encoding to use when reading body
     # @option opts [String] :body
     # @option opts [String] :uri
     def initialize(opts)
-      @version  = opts.fetch(:version)
-      @uri      = HTTP::URI.parse(opts.fetch(:uri)) if opts.include? :uri
-      @status   = HTTP::Response::Status.new(opts.fetch(:status))
-      @headers  = HTTP::Headers.coerce(opts[:headers] || {})
+      @version       = opts.fetch(:version)
+      @uri           = HTTP::URI.parse(opts.fetch(:uri)) if opts.include? :uri
+      @status        = HTTP::Response::Status.new(opts.fetch(:status))
+      @headers       = HTTP::Headers.coerce(opts[:headers] || {})
+      @proxy_headers = HTTP::Headers.coerce(opts[:proxy_headers] || {})
 
       if opts.include?(:connection)
         connection = opts.fetch(:connection)

data/lib/http/response/body.rb

@@ -33,7 +33,7 @@ module HTTP
       def to_s
         return @contents if @contents
 
-        fail StateError, "body is being streamed" unless @streaming.nil?
+        raise StateError, "body is being streamed" unless @streaming.nil?
 
         # see issue 312
         begin
@@ -59,7 +59,7 @@ module HTTP
 
       # Assert that the body is actively being streamed
       def stream!
-        fail StateError, "body has already been consumed" if @streaming == false
+        raise StateError, "body has already been consumed" if @streaming == false
         @streaming = true
       end
 

data/lib/http/response/status.rb

@@ -26,7 +26,7 @@ module HTTP
 
           return new code if code
 
-          fail Error, "Can't coerce #{object.class}(#{object}) to #{self}"
+          raise Error, "Can't coerce #{object.class}(#{object}) to #{self}"
         end
         alias [] coerce
 
@@ -83,6 +83,36 @@ module HTTP
         "#{code} #{reason}".strip
       end
 
+      # Check if status code is informational (1XX)
+      # @return [Boolean]
+      def informational?
+        100 <= code && code < 200
+      end
+
+      # Check if status code is successful (2XX)
+      # @return [Boolean]
+      def success?
+        200 <= code && code < 300
+      end
+
+      # Check if status code is redirection (3XX)
+      # @return [Boolean]
+      def redirect?
+        300 <= code && code < 400
+      end
+
+      # Check if status code is client error (4XX)
+      # @return [Boolean]
+      def client_error?
+        400 <= code && code < 500
+      end
+
+      # Check if status code is server error (5XX)
+      # @return [Boolean]
+      def server_error?
+        500 <= code && code < 600
+      end
+
       # Symbolized {#reason}
       #
       # @return [nil] unless code is well-known (see REASONS)
@@ -108,7 +138,7 @@ module HTTP
       end
 
       def __setobj__(obj)
-        fail TypeError, "Expected #{obj.inspect} to respond to #to_i" unless obj.respond_to? :to_i
+        raise TypeError, "Expected #{obj.inspect} to respond to #to_i" unless obj.respond_to? :to_i
         @code = obj.to_i
       end
 

data/lib/http/timeout/global.rb

@@ -122,7 +122,7 @@ module HTTP
       def log_time
         @time_left -= (Time.now - @started)
         if time_left <= 0
-          fail TimeoutError, "Timed out after using the allocated #{total_timeout} seconds"
+          raise TimeoutError, "Timed out after using the allocated #{total_timeout} seconds"
         end
 
         reset_timer

data/lib/http/timeout/per_operation.rb

@@ -60,14 +60,12 @@ module HTTP
         def readpartial(size)
           loop do
             result = @socket.read_nonblock(size, :exception => false)
-            if result.nil?
-              return :eof
-            elsif result != :wait_readable
-              return result
-            end
+
+            return :eof   if result.nil?
+            return result if result != :wait_readable
 
             unless IO.select([@socket], nil, nil, read_timeout)
-              fail TimeoutError, "Read timed out after #{read_timeout} seconds"
+              raise TimeoutError, "Read timed out after #{read_timeout} seconds"
             end
           end
         end
@@ -79,7 +77,7 @@ module HTTP
             return result unless result == :wait_writable
 
             unless IO.select(nil, [@socket], nil, write_timeout)
-              fail TimeoutError, "Write timed out after #{write_timeout} seconds"
+              raise TimeoutError, "Write timed out after #{write_timeout} seconds"
             end
           end
         end

data/lib/http/uri.rb

@@ -63,7 +63,7 @@ module HTTP
         @uri = Addressable::URI.new(options_or_uri)
       when Addressable::URI
         @uri = options_or_uri
-      else fail TypeError, "expected Hash for options, got #{options_or_uri.class}"
+      else raise TypeError, "expected Hash for options, got #{options_or_uri.class}"
       end
     end
 

data/lib/http/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module HTTP
-  VERSION = "2.0.0.pre".freeze
+  VERSION = "2.0.0".freeze
 end

data/spec/lib/http/request_spec.rb

@@ -202,6 +202,12 @@ RSpec.describe HTTP::Request do
     context "with proxy" do
       let(:proxy) { {:user => "user", :pass => "pass"} }
       it { is_expected.to eq "GET http://example.com/foo?bar=baz HTTP/1.1" }
+
+      context "and HTTPS uri" do
+        let(:request_uri) { "https://example.com/foo?bar=baz" }
+
+        it { is_expected.to eq "GET /foo?bar=baz HTTP/1.1" }
+      end
     end
   end
 end

data/spec/lib/http/response/status_spec.rb

@@ -34,6 +34,126 @@ RSpec.describe HTTP::Response::Status do
     end
   end
 
+  context "with 1xx codes" do
+    subject { (100...200).map { |code| described_class.new code } }
+
+    it "is #informational?" do
+      expect(subject).to all satisfy(&:informational?)
+    end
+
+    it "is not #success?" do
+      expect(subject).to all satisfy { |status| !status.success? }
+    end
+
+    it "is not #redirect?" do
+      expect(subject).to all satisfy { |status| !status.redirect? }
+    end
+
+    it "is not #client_error?" do
+      expect(subject).to all satisfy { |status| !status.client_error? }
+    end
+
+    it "is not #server_error?" do
+      expect(subject).to all satisfy { |status| !status.server_error? }
+    end
+  end
+
+  context "with 2xx codes" do
+    subject { (200...300).map { |code| described_class.new code } }
+
+    it "is not #informational?" do
+      expect(subject).to all satisfy { |status| !status.informational? }
+    end
+
+    it "is #success?" do
+      expect(subject).to all satisfy(&:success?)
+    end
+
+    it "is not #redirect?" do
+      expect(subject).to all satisfy { |status| !status.redirect? }
+    end
+
+    it "is not #client_error?" do
+      expect(subject).to all satisfy { |status| !status.client_error? }
+    end
+
+    it "is not #server_error?" do
+      expect(subject).to all satisfy { |status| !status.server_error? }
+    end
+  end
+
+  context "with 3xx codes" do
+    subject { (300...400).map { |code| described_class.new code } }
+
+    it "is not #informational?" do
+      expect(subject).to all satisfy { |status| !status.informational? }
+    end
+
+    it "is not #success?" do
+      expect(subject).to all satisfy { |status| !status.success? }
+    end
+
+    it "is #redirect?" do
+      expect(subject).to all satisfy(&:redirect?)
+    end
+
+    it "is not #client_error?" do
+      expect(subject).to all satisfy { |status| !status.client_error? }
+    end
+
+    it "is not #server_error?" do
+      expect(subject).to all satisfy { |status| !status.server_error? }
+    end
+  end
+
+  context "with 4xx codes" do
+    subject { (400...500).map { |code| described_class.new code } }
+
+    it "is not #informational?" do
+      expect(subject).to all satisfy { |status| !status.informational? }
+    end
+
+    it "is not #success?" do
+      expect(subject).to all satisfy { |status| !status.success? }
+    end
+
+    it "is not #redirect?" do
+      expect(subject).to all satisfy { |status| !status.redirect? }
+    end
+
+    it "is #client_error?" do
+      expect(subject).to all satisfy(&:client_error?)
+    end
+
+    it "is not #server_error?" do
+      expect(subject).to all satisfy { |status| !status.server_error? }
+    end
+  end
+
+  context "with 5xx codes" do
+    subject { (500...600).map { |code| described_class.new code } }
+
+    it "is not #informational?" do
+      expect(subject).to all satisfy { |status| !status.informational? }
+    end
+
+    it "is not #success?" do
+      expect(subject).to all satisfy { |status| !status.success? }
+    end
+
+    it "is not #redirect?" do
+      expect(subject).to all satisfy { |status| !status.redirect? }
+    end
+
+    it "is not #client_error?" do
+      expect(subject).to all satisfy { |status| !status.client_error? }
+    end
+
+    it "is #server_error?" do
+      expect(subject).to all satisfy(&:server_error?)
+    end
+  end
+
   describe "#to_sym" do
     subject { described_class.new(code).to_sym }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.0.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -178,9 +178,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1