http 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab9b540a68db221ff6f7fd5f82ba2b518c80bade
-  data.tar.gz: 17062a814f863f5fc9c89b5dc3a9f13f785913f6
+  metadata.gz: 6d0fc648f6ef248aefe945523640200d4f0f77d2
+  data.tar.gz: e84a46fc898596c653dada5f8d8bcf82c5cc0eba
 SHA512:
-  metadata.gz: 3894d6b7eb652f73d842492fe11efb2b15070cb9a6aa64759dcbd9bf3249e76c5e154bc453c123601922afcbcab02a8da9858daa0d55b37e9a9fef9ec20ec43e
-  data.tar.gz: 54245ef8c606aec07ea913e33af03b0356e12fd573c6dff9b5bc952768c37985e44939634d5f81189b8964d117db9e24395ea1803b1f4d1fbfe82f4089c590b8
+  metadata.gz: cc8fa5eee19489bfcaa40a046e5699a8f7a99c439223041025348c30bc1e23ba1524692a17dc4d25ba6c1632a0df8923fb0e3f31908c4bdf226660a134ff67d1
+  data.tar.gz: 225d15b4e50168746f890d08be499a19ecdf39dc41e111e7471e720f8494d2f3eb305d50dcf1a5fe0f735a165168a53e927402ef4176ebe757780452c8fda334

data/CHANGES.md

@@ -1,6 +1,15 @@
+## 0.9.3 (2015-08-19)
+
+* Fixed request URI normalization. See #246. (@ixti)
+  - Avoids query component normalization
+  - Omits fragment component in headline
+
+
 ## 0.9.2 (2015-08-18)
+
 * Fixed exceptionless NIO EOF handling. (@zanker)
 
+
 ## 0.9.1 (2015-08-14)
 
 * Fix params special-chars escaping. See #246. (@ixti)
@@ -12,6 +21,11 @@
 * JRuby 9000 compatibility
 
 
+## 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

@@ -66,7 +66,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)
@@ -123,7 +123,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
@@ -172,5 +172,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.9.2".freeze
+  VERSION = "0.9.3".freeze
 end

data/spec/lib/http/request_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe HTTP::Request do
   let(:proxy)       { {} }
   let(:headers)     { {:accept => "text/html"} }
-  let(:request_uri) { "http://example.com/foo?bar=baz#moo" }
+  let(:request_uri) { "http://example.com/foo?bar=baz" }
 
   subject(:request) { HTTP::Request.new(:get, request_uri, headers, proxy) }
 
@@ -134,13 +134,38 @@ RSpec.describe HTTP::Request do
   end
 
   describe "#headline" do
-    subject { request.headline }
+    subject(:headline) { 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 "when URI contains encoded query" do
+      let(:encoded_query) { "t=1970-01-01T01%3A00%3A00%2B01%3A00" }
+      let(:request_uri) { "http://example.com/foo/?#{encoded_query}" }
+
+      it "does not unencodes query part" do
+        expect(headline).to eq "GET /foo/?#{encoded_query} HTTP/1.1"
+      end
+    end
+
+    context "when URI contains non-ASCII path" do
+      let(:request_uri) { "http://example.com/キョ" }
+
+      it "encodes non-ASCII path part" do
+        expect(headline).to eq "GET /%E3%82%AD%E3%83%A7 HTTP/1.1"
+      end
+    end
+
+    context "when URI contains fragment" do
+      let(:request_uri) { "http://example.com/foo#bar" }
+
+      it "omits fragment part" do
+        expect(headline).to eq "GET /foo HTTP/1.1"
+      end
+    end
 
     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.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -183,39 +183,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
-test_files:
-- spec/lib/http/client_spec.rb
-- spec/lib/http/content_type_spec.rb
-- spec/lib/http/headers/mixin_spec.rb
-- spec/lib/http/headers_spec.rb
-- spec/lib/http/options/body_spec.rb
-- spec/lib/http/options/form_spec.rb
-- spec/lib/http/options/headers_spec.rb
-- spec/lib/http/options/json_spec.rb
-- spec/lib/http/options/merge_spec.rb
-- spec/lib/http/options/new_spec.rb
-- spec/lib/http/options/proxy_spec.rb
-- spec/lib/http/options_spec.rb
-- spec/lib/http/redirector_spec.rb
-- spec/lib/http/request/writer_spec.rb
-- spec/lib/http/request_spec.rb
-- spec/lib/http/response/body_spec.rb
-- spec/lib/http/response/status_spec.rb
-- spec/lib/http/response_spec.rb
-- spec/lib/http_spec.rb
-- spec/spec_helper.rb
-- spec/support/black_hole.rb
-- spec/support/capture_warning.rb
-- spec/support/connection_reuse_shared.rb
-- spec/support/dummy_server.rb
-- spec/support/dummy_server/servlet.rb
-- spec/support/http_handling_shared.rb
-- spec/support/proxy_server.rb
-- spec/support/servers/config.rb
-- spec/support/servers/runner.rb
-- spec/support/ssl_helper.rb
+test_files: []
 has_rdoc: