http 0.8.13 → 0.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c377300d1381925e494d179d86be2c8c58d6713a
-  data.tar.gz: eeed70bcd44a8c11b164da27f0de196a77a9a5db
+  metadata.gz: bde805c006e8d041591f271243d2e889e2134bc1
+  data.tar.gz: ec416925025cf7c7686f3e21b525bafeaa773ce6
 SHA512:
-  metadata.gz: b9b9287f6db01ead5a849cb7bfec0a75d9de5de808c8c7f86bcfdd0940d895639b6786f694d533b2d30ed50e2af943093c5fa8102cd4547a7f17e2912f030cbe
-  data.tar.gz: 2db3d208ee7f88366b9118473257574ae413576820fdef9b780566caeb77598512754e64960a58bb7e6533dad66018fe283c224cd1ed3b88cddb9f93b100cd89
+  metadata.gz: 66f67e4665d52a746081b25fbf331884eaadcd45c2716cde98de3eccbc33262cce3fea3e581ea3b46699e89e51623f9afe27794f8a2d43c3d6cf7aed4752bd22
+  data.tar.gz: 97bcbc0ec6607e3a34dfcc9d0a6d1e2730501a67f0d3133e9c2141f2967a17af2e4ea9d00f88b70b04a5ffcde954d9db99c7085bd3ebdb737c4dc42e644c78c8

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.8.14 (2015-08-19)
+
+* Backport request URI normalization fixes from master. (@ixti)
+
+
 ## 0.8.13 (2015-08-14)
 
 * Backport params special-chars escaping fix from `v0.9.1`. (@ixti)

data/lib/http/request.rb

@@ -67,7 +67,7 @@ module HTTP
     # :nodoc:
     def initialize(verb, uri, headers = {}, proxy = {}, body = nil, version = "1.1") # rubocop:disable ParameterLists
       @verb   = verb.to_s.downcase.to_sym
-      @uri    = HTTP::URI.parse(uri).normalize
+      @uri    = normalize_uri uri
       @scheme = @uri.scheme && @uri.scheme.to_s.downcase.to_sym
 
       fail(UnsupportedMethodError, "unknown method: #{verb}") unless METHODS.include?(@verb)
@@ -124,7 +124,7 @@ module HTTP
     # Compute HTTP request header for direct or proxy request
     def headline
       request_uri = using_proxy? ? uri : uri.omit(:scheme, :authority)
-      "#{verb.to_s.upcase} #{request_uri} HTTP/#{version}"
+      "#{verb.to_s.upcase} #{request_uri.omit :fragment} HTTP/#{version}"
     end
 
     # @deprecated Will be removed in 1.0.0
@@ -178,5 +178,18 @@ module HTTP
     def default_host_header_value
       PORTS[@scheme] != port ? "#{host}:#{port}" : host
     end
+
+    # @return [HTTP::URI] URI with all componentes but query being normalized.
+    def normalize_uri(uri)
+      uri = HTTP::URI.parse uri
+
+      HTTP::URI.new(
+        :scheme     => uri.normalized_scheme,
+        :authority  => uri.normalized_authority,
+        :path       => uri.normalized_path,
+        :query      => uri.query,
+        :fragment   => uri.normalized_fragment
+      )
+    end
   end
 end

data/lib/http/uri.rb

@@ -2,10 +2,10 @@ require "addressable/uri"
 
 module HTTP
   class URI < Addressable::URI
-    # HTTP scheme
+    # @private
     HTTP_SCHEME = "http".freeze
 
-    # HTTPS scheme
+    # @private
     HTTPS_SCHEME = "https".freeze
 
     # @return [True] if URI is HTTP
@@ -19,5 +19,10 @@ module HTTP
     def https?
       HTTPS_SCHEME == scheme
     end
+
+    # @return [String] human-readable representation of URI
+    def inspect
+      format("#<%s:%#0x URI:%s>", self.class, object_id, to_s)
+    end
   end
 end

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.8.13".freeze
+  VERSION = "0.8.14".freeze
 end

data/spec/lib/http/request_spec.rb

@@ -141,11 +141,11 @@ RSpec.describe HTTP::Request do
   describe "#headline" do
     subject { request.headline }
 
-    it { is_expected.to eq "GET /foo?bar=baz#moo HTTP/1.1" }
+    it { is_expected.to eq "GET /foo?bar=baz HTTP/1.1" }
 
     context "with proxy" do
       let(:proxy) { {:user => "user", :pass => "pass"} }
-      it { is_expected.to eq "GET http://example.com/foo?bar=baz#moo HTTP/1.1" }
+      it { is_expected.to eq "GET http://example.com/foo?bar=baz HTTP/1.1" }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.8.14
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb