webmock 1.18.0 → 1.19.0

data/spec/unit/util/uri_spec.rb

@@ -197,6 +197,35 @@ describe WebMock::Util::URI do
       uri = WebMock::Util::URI.normalize_uri(uri_string)
       WebMock::Util::QueryMapper.query_to_values(uri.query).should == {"load"=>{"include"=>[{"staff"=>"email"},"business_name"]}}
     end
+
+    context "when query notation is set to :flat_array" do
+      before :all do
+        WebMock::Config.instance.query_values_notation = :flat_array
+      end
+
+      it "should successfully handle repeated paramters" do
+        uri_string = "http://www.example.com:80/path?target=host1&target=host2"
+        uri = WebMock::Util::URI.normalize_uri(uri_string)
+        WebMock::Util::QueryMapper.query_to_values(uri.query, :notation => WebMock::Config.instance.query_values_notation).should == [['target', 'host1'], ['target', 'host2']]
+      end
+    end
+  end
+
+  describe "sorting query values" do
+
+    context "when query values is a Hash" do
+      it "returns an alphabetically sorted hash" do
+        sorted_query = WebMock::Util::URI.sort_query_values({"b"=>"one", "a"=>"two"})
+        sorted_query.should == {"a"=>"two", "b"=>"one"}
+      end
+    end
+
+    context "when query values is an Array" do
+      it "returns an alphabetically sorted array" do
+        sorted_query = WebMock::Util::URI.sort_query_values([["b","two"],["a","one_b"],["a","one_a"]])
+        sorted_query.should == [["a","one_a"],["a","one_b"],["b","two"]]
+      end
+    end
   end
 
   describe "stripping default port" do

data/webmock.gemspec

@@ -19,14 +19,14 @@ Gem::Specification.new do |s|
   s.add_dependency 'crack', '>=0.3.2'
 
   s.add_development_dependency 'rspec',           '~> 2.10'
-  s.add_development_dependency 'http',            '>= 0.5.0'
+  s.add_development_dependency 'http',            '>= 0.6.0'
   s.add_development_dependency 'httpclient',      '>= 2.2.4'
   s.add_development_dependency 'patron',          '>= 0.4.18' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'em-http-request', '>= 1.0.2'
   s.add_development_dependency 'em-synchrony',    '>= 1.0.0' if RUBY_VERSION >= "1.9"
   s.add_development_dependency 'curb',            '>= 0.8.0' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'typhoeus',        '>= 0.5.0' unless RUBY_PLATFORM =~ /java/
-  s.add_development_dependency 'excon',           '>= 0.27.5', '< 0.30.0'
+  s.add_development_dependency 'excon',           '>= 0.27.5'
   s.add_development_dependency 'minitest',        '~> 5.0.0'
   s.add_development_dependency 'rdoc',            ((RUBY_VERSION == '1.8.6') ? '<= 3.5.0' : '>3.5.0')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 91
   prerelease: 
   segments: 
   - 1
-  - 18
+  - 19
   - 0
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-05-13 00:00:00 +02:00
+date: 2014-09-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,12 +72,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 0
-        - 5
+        - 6
         - 0
-        version: 0.5.0
+        version: 0.6.0
   prerelease: false
   requirement: *id004
   name: http
@@ -174,14 +174,6 @@ dependencies:
         - 27
         - 5
         version: 0.27.5
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 103
-        segments: 
-        - 0
-        - 30
-        - 0
-        version: 0.30.0
   prerelease: false
   requirement: *id010
   name: excon