Fix normalization of URI in request.

Resolves #246. Again.

lib/http/request.rb

@@ -66,7 +66,7 @@ class UnsupportedSchemeError < RequestError; end
     # :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)
@@ -172,5 +172,18 @@ def port
     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

lib/http/uri.rb

@@ -2,10 +2,10 @@
 
 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