http 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2545bd2a47ff01e9815c106d0327832fc72362781959a70af0e10b59583b5c25
-  data.tar.gz: 93128cbefb8094cd7338ca7147490a1815e9eea5e1ce36675e3f74b08973e184
+  metadata.gz: 11cd466b5be40e3caba90c9df54f90c3b927d4a3eae307b41f6c4e97fa0e453b
+  data.tar.gz: 33b04d19cdb16ff4ef7ac4e09b79266ccb9474f2bed845b70a25c1ae7382ee5f
 SHA512:
-  metadata.gz: 83062a87b859c3b0dfef82e080dc14d75d462c3d591d8aa151ffdfb458bdda25717262c4aa86b4823271fc00d5c57d771f5a87f5ff5e229057f1d2dd2ea750b2
-  data.tar.gz: 6a7c8ec90698228e156de30ffe02e68ad0105f290582f86e3e7c0664d527f34901ddad7f361a884a9181b6f11694b263f35680c3862231f81c8aaac366f0e517
+  metadata.gz: 40c8b29c85f85f64c0e6205df50cf96df6c60959ff770de9813119d1cc70a8e4fd7b70e5013980c5449b0076ef7dd0f906180d44b6037a930068997acbac2d45
+  data.tar.gz: aacd288d0353724d3c353ffebacbd4e34ea73f32102ced92e7b1c30e76ee12e1a7ae7ee48cc203239176ffac0bcb861c0ad5e990c3dfbd20c5197b45ca6472f0

data/CHANGES.md

@@ -1,3 +1,12 @@
+## 4.0.3 (2019-01-18)
+
+* Fix missing URL in response wrapped by auto inflate.
+  ([@ixti])
+
+* Provide `HTTP::Request#inspect` method for debugging purposes.
+  ([@ixti])
+
+
 ## 4.0.2 (2019-01-15)
 
 * [#506](https://github.com/httprb/http/pull/506)

data/lib/http/features/auto_inflate.rb

@@ -1,24 +1,41 @@
 # frozen_string_literal: true
 
+require "set"
+
 module HTTP
   module Features
     class AutoInflate < Feature
+      SUPPORTED_ENCODING = Set.new(%w[deflate gzip x-gzip]).freeze
+      private_constant :SUPPORTED_ENCODING
+
       def wrap_response(response)
-        return response unless %w[deflate gzip x-gzip].include?(response.headers[:content_encoding])
-        Response.new(
+        return response unless supported_encoding?(response)
+
+        options = {
           :status => response.status,
           :version => response.version,
           :headers => response.headers,
           :proxy_headers => response.proxy_headers,
           :connection => response.connection,
           :body => stream_for(response.connection)
-        )
+        }
+
+        options[:uri] = response.uri if response.uri
+
+        Response.new(options)
       end
 
       def stream_for(connection)
         Response::Body.new(Response::Inflater.new(connection))
       end
 
+      private
+
+      def supported_encoding?(response)
+        content_encoding = response.headers.get(Headers::CONTENT_ENCODING).first
+        content_encoding && SUPPORTED_ENCODING.include?(content_encoding)
+      end
+
       HTTP::Options.register_feature(:auto_inflate, self)
     end
   end

data/lib/http/request.rb

@@ -184,6 +184,18 @@ module HTTP
       using_proxy? ? proxy[:proxy_port] : port
     end
 
+    # Human-readable representation of base request info.
+    #
+    # @example
+    #
+    #     req.inspect
+    #     # => #<HTTP::Request/1.1 GET https://example.com>
+    #
+    # @return [String]
+    def inspect
+      "#<#{self.class}/#{@version} #{verb.to_s.upcase} #{uri}>"
+    end
+
     private
 
     # @!attribute [r] host

data/lib/http/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP
-  VERSION = "4.0.2"
+  VERSION = "4.0.3"
 end

data/spec/lib/http/features/auto_inflate_spec.rb

@@ -2,8 +2,10 @@
 
 RSpec.describe HTTP::Features::AutoInflate do
   subject(:feature) { HTTP::Features::AutoInflate.new }
+
   let(:connection) { double }
-  let(:headers) { {} }
+  let(:headers)    { {} }
+
   let(:response) do
     HTTP::Response.new(
       :version    => "1.1",
@@ -13,7 +15,7 @@ RSpec.describe HTTP::Features::AutoInflate do
     )
   end
 
-  describe "wrap_response" do
+  describe "#wrap_response" do
     subject(:result) { feature.wrap_response(response) }
 
     context "when there is no Content-Encoding header" do
@@ -61,5 +63,23 @@ RSpec.describe HTTP::Features::AutoInflate do
         expect(result.body).to be_instance_of HTTP::Response::Body
       end
     end
+
+    # TODO(ixti): We should refactor API to either make uri non-optional,
+    #   or add reference to request into response object (better).
+    context "when response has uri" do
+      let(:response) do
+        HTTP::Response.new(
+          :version    => "1.1",
+          :status     => 200,
+          :headers    => {:content_encoding => "gzip"},
+          :connection => connection,
+          :uri        => "https://example.com"
+        )
+      end
+
+      it "preserves uri in wrapped response" do
+        expect(result.uri).to eq HTTP::URI.parse("https://example.com")
+      end
+    end
   end
 end

data/spec/lib/http/request_spec.rb

@@ -225,4 +225,10 @@ RSpec.describe HTTP::Request do
       end
     end
   end
+
+  describe "#inspect" do
+    subject { request.inspect }
+
+    it { is_expected.to eq "#<HTTP::Request/1.1 GET #{request_uri}>" }
+  end
 end

data/spec/lib/http/response_spec.rb

@@ -129,13 +129,12 @@ RSpec.describe HTTP::Response do
   end
 
   describe "#inspect" do
+    subject { response.inspect }
+
     let(:headers) { {:content_type => "text/plain"} }
     let(:body)    { double :to_s => "foobar" }
 
-    it "returns human-friendly response representation" do
-      expect(response.inspect).
-        to eq '#<HTTP::Response/1.1 200 OK {"Content-Type"=>"text/plain"}>'
-    end
+    it { is_expected.to eq '#<HTTP::Response/1.1 200 OK {"Content-Type"=>"text/plain"}>' }
   end
 
   describe "#cookies" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb