webmock 1.2.1 → 1.2.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 #Changelog
 
+## 1.2.2
+
+* Fixed problem where ArgumentError was raised if query params were made up of an array e.g. data[]=a&data[]=b. Thanks to Steve Tooke
+
 ## 1.2.1
 
 * Changed license from GPL to MIT

data/README.md

@@ -438,6 +438,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Sam Phillips
 * Jose Angel Cortinas
 * Razic
+* Steve Tooke
 
 ## Background
 

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/webmock/util/uri.rb

@@ -16,7 +16,7 @@ module WebMock
         return uri if uri.is_a?(Regexp)
         uri = 'http://' + uri unless uri.match('^https?://') if uri.is_a?(String)
         normalized_uri = Addressable::URI.heuristic_parse(uri)
-        normalized_uri.query_values = Hash[*normalized_uri.query_values.sort.flatten] if normalized_uri.query_values
+        normalized_uri.query_values = sort_query_values(normalized_uri.query_values) if normalized_uri.query_values
         normalized_uri = normalized_uri.normalize #normalize! is slower 
         normalized_uri.port = normalized_uri.inferred_port unless normalized_uri.port
         normalized_uri
@@ -57,6 +57,10 @@ module WebMock
 
       private
 
+      def self.sort_query_values(query_values)
+        Hash[*query_values.sort.inject([]) { |values, pair| values + pair}] 
+      end
+
       def self.uris_with_inferred_port_and_without(uris)
         uris.map { |uri| [ uri, uri.gsub(%r{(:80)|(:443)}, "").freeze ] }.flatten
       end

data/spec/util/uri_spec.rb

@@ -167,6 +167,11 @@ describe WebMock::Util::URI do
       end
     end
 
+    it "should successfully handle array parameters" do
+      uri = 'http://www.example.com:80/path?a[]=b&a[]=c'
+      lambda { WebMock::Util::URI.normalize_uri(uri) }.should_not raise_error(ArgumentError)
+    end
+    
   end
 
   describe "stripping default port" do

data/webmock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webmock}
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bartosz Blimke"]
-  s.date = %q{2010-05-24}
+  s.date = %q{2010-05-26}
   s.description = %q{WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.}
   s.email = %q{bartosz.blimke@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 +01:00
+date: 2010-05-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency