http 0.8.12 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bb012bd8ce0fdf45a88171c20552f819279e316
-  data.tar.gz: 094be455227c7e42aba8157819b9336b9744b9d1
+  metadata.gz: c377300d1381925e494d179d86be2c8c58d6713a
+  data.tar.gz: eeed70bcd44a8c11b164da27f0de196a77a9a5db
 SHA512:
-  metadata.gz: 60ce4064cdafe70513e1749ace44afed30c9c08251d3d9ec0d0c1f205d243704403ca8643e96d7792fb23085e4ae755ab04db073c084142f7652f0ef5a594bdf
-  data.tar.gz: a7c7acda4cb5c67cb84ee300d42f5871a413066a78c44188fb8d51de96047124ba4b25ece259b0785c7a806f16e0d7bdc911572d7d6ab292cfd52b1afb4d612c
+  metadata.gz: b9b9287f6db01ead5a849cb7bfec0a75d9de5de808c8c7f86bcfdd0940d895639b6786f694d533b2d30ed50e2af943093c5fa8102cd4547a7f17e2912f030cbe
+  data.tar.gz: 2db3d208ee7f88366b9118473257574ae413576820fdef9b780566caeb77598512754e64960a58bb7e6533dad66018fe283c224cd1ed3b88cddb9f93b100cd89

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.8.13 (2015-08-14)
+
+* Backport params special-chars escaping fix from `v0.9.1`. (@ixti)
+
+
 ## 0.8.12 (2015-05-26)
 
 * Fix `HTTP.timeout` API (was loosing previously defined options). (@ixti)

data/Gemfile

@@ -25,9 +25,9 @@ group :test do
   gem "json",         ">= 1.8.1"
   gem "mime-types",   "~> 1.25",  :platforms => [:jruby]
   gem "rest-client",  "~> 1.6.0", :platforms => [:jruby]
-  gem "rspec",        "~> 3.0"
+  gem "rspec",        "~> 3.2.0"
   gem "rspec-its"
-  gem "rubocop"
+  gem "rubocop",      "~> 0.31.0"
   gem "yardstick"
   gem "certificate_authority"
 end

data/lib/http/client.rb

@@ -1,8 +1,5 @@
 require "forwardable"
 
-require "cgi"
-require "uri"
-
 require "http/form_data"
 require "http/options"
 require "http/headers"
@@ -115,7 +112,7 @@ module HTTP
     #
     # @param [#to_s] uri
     # @return [URI]
-    def make_request_uri(uri, options)
+    def make_request_uri(uri, opts)
       uri = uri.to_s
 
       if default_options.persistent? && uri !~ HTTP_OR_HTTPS_RE
@@ -124,9 +121,8 @@ module HTTP
 
       uri = HTTP::URI.parse uri
 
-      if options.params && !options.params.empty?
-        params    = CGI.parse(uri.query.to_s).merge(options.params || {})
-        uri.query = ::URI.encode_www_form params
+      if opts.params && !opts.params.empty?
+        uri.query = [uri.query, HTTP::URI.form_encode(opts.params)].compact.join("&")
       end
 
       # Some proxies (seen on WEBRick) fail if URL has

data/lib/http/version.rb

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

data/spec/lib/http/client_spec.rb

@@ -160,6 +160,14 @@ RSpec.describe HTTP::Client do
 
       client.get("http://example.com/?a[]=b&a[]=c", :params => {:d => "e"})
     end
+
+    it "properly encodes colons" do
+      expect(HTTP::Request).to receive(:new) do |_, uri|
+        expect(uri.query).to eq "t=1970-01-01T00%3A00%3A00Z"
+      end
+
+      client.get("http://example.com/", :params => {:t => "1970-01-01T00:00:00Z"})
+    end
   end
 
   describe "passing json" do

metadata

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