http 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 516d371c9aa3a19abeaabeefea99bd16be506f36
-  data.tar.gz: 030d18563e33fc3aad5832cb98508013cba1a956
+  metadata.gz: d9dcdebfa768fef6850eb95f309e613e7dabff6e
+  data.tar.gz: ef6556edd618dc48d214b6e4dd0b3eae123a2640
 SHA512:
-  metadata.gz: 33f746cb66e0493bb3ca2a272bbf7364a6a949e804dc7f581738a05b373367b08baf0798e838e3a7865d7ef782f0e74dd823204a63bb97b7f334964673e9ed0f
-  data.tar.gz: c426e9ff531bbc8268b7bfd3d49276c0fb890e063a69fc3fd6000c8580631dfb62fd83d04088c1a77ed246078fe77c30364c42cdaa527a1f2cedcb1e55499c77
+  metadata.gz: 1c5b7284269683e79dc40f00784745498483ba98a9931ff1fcdd9141fdfeb77bddd96e29ee086c8611536ef6498456deb390afe64a138816f84eb347aaacd5a1
+  data.tar.gz: 4d6fd7a909cffcbd7618fae1cebf984de0d3a85753725ac79997febfa46f67526f9d0e0eb2dd9e605d6809ad686acc00fba98f9ada46fb2f8b67d125c6b233bc

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 2.2.1 (2017-02-06)
+
+* [#395](https://github.com/httprb/http/issues/395)
+  Fix regression of API, that broke webmock integration.
+  ([@ixti])
+
+
 ## 2.2.0 (2017-02-03)
 
 * [#375](https://github.com/httprb/http/pull/375)

data/lib/http/response.rb

@@ -48,10 +48,9 @@ module HTTP
       if opts.include?(:connection)
         connection = opts.fetch(:connection)
         encoding   = opts[:encoding] || charset || Encoding::BINARY
+        stream     = body_stream_for(connection, opts)
 
-        stream = body_stream_for(connection, opts)
-
-        @body = Response::Body.new(connection, stream, encoding)
+        @body = Response::Body.new(stream, encoding)
       else
         @body = opts.fetch(:body)
       end

data/lib/http/response/body.rb

@@ -15,11 +15,11 @@ module HTTP
       # @return [HTTP::Connection]
       attr_reader :connection
 
-      def initialize(connection, stream, encoding = Encoding::BINARY)
-        @connection = connection
+      def initialize(stream, encoding = Encoding::BINARY)
+        @stream     = stream
+        @connection = stream.is_a?(Inflater) ? stream.connection : stream
         @streaming  = nil
         @contents   = nil
-        @stream     = stream
         @encoding   = encoding
       end
 

data/lib/http/response/inflater.rb

@@ -5,6 +5,8 @@ require "zlib"
 module HTTP
   class Response
     class Inflater
+      attr_reader :connection
+
       def initialize(connection)
         @connection = connection
       end

data/lib/http/version.rb

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

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

@@ -5,7 +5,7 @@ RSpec.describe HTTP::Response::Body do
 
   before           { allow(connection).to receive(:readpartial) { chunks.shift } }
 
-  subject(:body)   { described_class.new(connection, connection, 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!")
@@ -47,7 +47,7 @@ RSpec.describe HTTP::Response::Body do
     end
     subject(:body) do
       inflater = HTTP::Response::Inflater.new(connection)
-      described_class.new(connection, inflater, Encoding::UTF_8)
+      described_class.new(inflater, Encoding::UTF_8)
     end
 
     it "decodes body" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb