http 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4daefc1ab609a814049d1dbb15c8b4dd1dcbc4af
-  data.tar.gz: 8e997cb150a1b40c3f93713a8c0a8e0c3c347e37
+  metadata.gz: 9ce75d295d182290642aa569b754914f89ed797f
+  data.tar.gz: 353078321cc4c0e9134a5b10d655186474288770
 SHA512:
-  metadata.gz: 14aa2d7853ca5d3b0c4a60f3d85ea79ce29f942cae40d60c83cfa9de10845806b521cece91aabff8954f2bfd33ccd78577f39676133d5dee45f7055b0083e599
-  data.tar.gz: 9473c747c14dc40eb7ee6a9822bf45b674a8892c8cc92db6cfa9d88fa9bc3d6f03429e72609d6e902fdaed836c38e80fc6ba0d5d58c53a2a688a98fb365deaf1
+  metadata.gz: d4717d7e9b0a3d841fa31e533e69e35728943218c68455550ccacb845712c1a24e657385c7c4d228c6d3af5a5c68105a674647bef64fba1af33439041153db6a
+  data.tar.gz: 6dd93161b0a552b4f7484ee2e935e54f57de0f0f6f3f1415250f35073ea90be854baa00322cc59a078a2f3f0a84732289de5ad44e63f782874df44a347770bb8

data/CHANGES.md

@@ -1,3 +1,18 @@
+## 2.1.0 (2016-11-08)
+
+* [#370](https://github.com/httprb/http/issues/370)
+  Add Headers#include?
+  ([@ixti])
+
+* [#364](https://github.com/httprb/http/issues/364)
+  Add HTTP::Response#connection
+  ([@janko-m])
+
+* [#362](https://github.com/httprb/http/issues/362)
+  connect_ssl uses connect_timeout (Closes #359)
+  ([@TiagoCardoso1983])
+
+
 ## 2.0.3 (2016-08-03)
 
 * [#365](https://github.com/httprb/http/issues/365)

data/lib/http/headers.rb

@@ -75,6 +75,14 @@ module HTTP
       end
     end
 
+    # Tells whenever header with given `name` is set or not.
+    #
+    # @return [Boolean]
+    def include?(name)
+      name = normalize_header name.to_s
+      @pile.any? { |k, _| k == name }
+    end
+
     # Returns Rack-compatible headers Hash
     #
     # @return [Hash]

data/lib/http/response.rb

@@ -71,6 +71,10 @@ module HTTP
     #   (see HTTP::Response::Body#readpartial)
     def_delegator :body, :readpartial
 
+    # @!method connection
+    #   (see HTTP::Response::Body#connection)
+    def_delegator :body, :connection
+
     # Returns an Array ala Rack: `[status, headers, body]`
     #
     # @return [Array(Fixnum, Hash, String)]

data/lib/http/response/body.rb

@@ -10,17 +10,22 @@ module HTTP
       include Enumerable
       def_delegator :to_s, :empty?
 
-      def initialize(client, encoding = Encoding::BINARY)
-        @client    = client
-        @streaming = nil
-        @contents  = nil
-        @encoding  = encoding
+      # The connection object used to make the corresponding request.
+      #
+      # @return [HTTP::Connection]
+      attr_reader :connection
+
+      def initialize(connection, encoding = Encoding::BINARY)
+        @connection = connection
+        @streaming  = nil
+        @contents   = nil
+        @encoding   = encoding
       end
 
       # (see HTTP::Client#readpartial)
       def readpartial(*args)
         stream!
-        @client.readpartial(*args)
+        @connection.readpartial(*args)
       end
 
       # Iterate over the body, allowing it to be enumerable
@@ -47,7 +52,7 @@ module HTTP
           @streaming  = false
           @contents   = String.new("").force_encoding(encoding)
 
-          while (chunk = @client.readpartial)
+          while (chunk = @connection.readpartial)
             @contents << chunk.force_encoding(encoding)
           end
         rescue

data/lib/http/timeout/null.rb

@@ -55,19 +55,19 @@ module HTTP
       private
 
       # Retry reading
-      def rescue_readable
+      def rescue_readable(timeout = read_timeout)
         yield
       rescue IO::WaitReadable
-        retry if @socket.to_io.wait_readable(read_timeout)
-        raise TimeoutError, "Read timed out after #{read_timeout} seconds"
+        retry if @socket.to_io.wait_readable(timeout)
+        raise TimeoutError, "Read timed out after #{timeout} seconds"
       end
 
       # Retry writing
-      def rescue_writable
+      def rescue_writable(timeout = write_timeout)
         yield
       rescue IO::WaitWritable
-        retry if @socket.to_io.wait_writable(write_timeout)
-        raise TimeoutError, "Write timed out after #{write_timeout} seconds"
+        retry if @socket.to_io.wait_writable(timeout)
+        raise TimeoutError, "Write timed out after #{timeout} seconds"
       end
     end
   end

data/lib/http/timeout/per_operation.rb

@@ -28,8 +28,8 @@ module HTTP
       end
 
       def connect_ssl
-        rescue_readable do
-          rescue_writable do
+        rescue_readable(@connect_timeout) do
+          rescue_writable(@connect_timeout) do
             @socket.connect_nonblock
           end
         end

data/lib/http/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP
-  VERSION = "2.0.3".freeze
+  VERSION = "2.1.0".freeze
 end

data/spec/lib/http/headers_spec.rb

@@ -185,6 +185,26 @@ RSpec.describe HTTP::Headers do
     end
   end
 
+  describe "#include?" do
+    before do
+      headers.add :content_type, "application/json"
+      headers.add :set_cookie,   "hoo=ray"
+      headers.add :set_cookie,   "woo=hoo"
+    end
+
+    it "tells whenever given headers is set or not" do
+      expect(headers.include?("Content-Type")).to be true
+      expect(headers.include?("Set-Cookie")).to be true
+      expect(headers.include?("Accept")).to be false
+    end
+
+    it "normalizes given header name" do
+      expect(headers.include?(:content_type)).to be true
+      expect(headers.include?(:set_cookie)).to be true
+      expect(headers.include?(:accept)).to be false
+    end
+  end
+
   describe "#to_h" do
     before do
       headers.add :content_type, "application/json"

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 RSpec.describe HTTP::Response::Body do
-  let(:client)   { double(:sequence_id => 0) }
-  let(:chunks)   { [String.new("Hello, "), String.new("World!")] }
+  let(:connection) { double(:sequence_id => 0) }
+  let(:chunks)     { [String.new("Hello, "), String.new("World!")] }
 
-  before         { allow(client).to receive(:readpartial) { chunks.shift } }
+  before           { allow(connection).to receive(:readpartial) { chunks.shift } }
 
-  subject(:body) { described_class.new(client, Encoding::UTF_8) }
+  subject(:body)   { described_class.new(connection, Encoding::UTF_8) }
 
   it "streams bodies from responses" do
     expect(subject.to_s).to eq("Hello, World!")
@@ -21,8 +21,8 @@ RSpec.describe HTTP::Response::Body do
 
   describe "#readpartial" do
     context "with size given" do
-      it "passes value to underlying client" do
-        expect(client).to receive(:readpartial).with(42)
+      it "passes value to underlying connection" do
+        expect(connection).to receive(:readpartial).with(42)
         body.readpartial 42
       end
     end
@@ -32,8 +32,8 @@ RSpec.describe HTTP::Response::Body do
         expect { body.readpartial }.to_not raise_error
       end
 
-      it "calls underlying client readpartial without specific size" do
-        expect(client).to receive(:readpartial).with no_args
+      it "calls underlying connection readpartial without specific size" do
+        expect(connection).to receive(:readpartial).with no_args
         body.readpartial
       end
     end

data/spec/lib/http/response_spec.rb

@@ -157,4 +157,20 @@ RSpec.describe HTTP::Response do
       expect(jar.count { |c| "c" == c.name }).to eq 0
     end
   end
+
+  describe "#connection" do
+    let(:connection) { double }
+
+    subject(:response) do
+      HTTP::Response.new(
+        :version    => "1.1",
+        :status     => 200,
+        :connection => connection
+      )
+    end
+
+    it "returns the connection object used to instantiate the response" do
+      expect(response.connection).to eq connection
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -219,4 +219,3 @@ test_files:
 - spec/support/servers/config.rb
 - spec/support/servers/runner.rb
 - spec/support/ssl_helper.rb
-has_rdoc: