fakeweb-matcher 1.1.0 → 1.2.0

data/README.textile

@@ -29,6 +29,7 @@ Unsurprisingly, this library is tested using RSpec, and relies upon FakeWeb. It
 h2. Contributors
 
 * "Thilo Utke":http://github.com/thilo (Regex URL matching)
+* "Wes Morgan":http://nerdyadventuresofwes.blogspot.com/ (Normalise query params)
 
 h2. Copyright
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
-:minor: 1
+:minor: 2
 :patch: 0

data/lib/fake_web_matcher/request_matcher.rb

@@ -2,6 +2,24 @@ module FakeWebMatcher
   # Matcher class, following RSpec's expectations. Used to confirm whether a
   # request has been made on a given method and URI.
   # 
+  
+  # Monkey patch to add a normalize! method to the URI::HTTP class.
+  # It doesn't currently sort the query params which means two URLs
+  # that are equivalent except for a different order of query params
+  # will be !=. This isn't how FakeWeb works, so we patch it here.
+  class ::URI::HTTP
+
+    # Normalize an HTTP URI so that query param order differences don't
+    # affect equality.
+    def normalize!
+      if query
+        query_array = self.query.split('&')
+        set_query(query_array.sort.join('&'))
+      end
+      super
+    end
+  end
+
   class RequestMatcher
     attr_reader :url, :method
     
@@ -81,10 +99,10 @@ module FakeWebMatcher
     # @return [Boolean] true if exprexted URI and called URI match.
     # 
     def match_url(url)
-      regex?(@url) ? @url.match(url.to_s) : @url == url
+      return @url.match(url.to_s) if regex?(@url)
+      @url == url
     end
     
-    
     # Expected method formatted to be an uppercase string. Example: :get becomes
     # "GET".
     # 

data/spec/lib/fake_web_matcher/matchers_spec.rb

@@ -32,4 +32,11 @@ describe FakeWebMatcher::Matchers do
     
     FakeWeb.should_not have_requested(:get, 'http://example.com')
   end
+
+  it "should not care about the order of the query parameters" do
+    FakeWeb.register_uri(:get, URI.parse('http://example.com/page?foo=bar&baz=qux'), :body => 'foo')
+    open('http://example.com/page?baz=qux&foo=bar')
+
+    FakeWeb.should have_requested(:get, 'http://example.com/page?foo=bar&baz=qux')
+  end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fakeweb-matcher
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  hash: 31
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-06 00:00:00 +11:00
+date: 2010-10-25 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fakeweb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 2
+        - 5
         version: 1.2.5
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: pat@freelancing-gods.com
 executables: []
@@ -51,31 +69,42 @@ files:
 - lib/fake_web_matcher/matchers.rb
 - lib/fake_web_matcher/request_matcher.rb
 - lib/fakeweb_matcher.rb
+- spec/lib/fake_web_matcher/extension_spec.rb
+- spec/lib/fake_web_matcher/matchers_spec.rb
+- spec/lib/fake_web_matcher/request_matcher_spec.rb
+- spec/lib/fake_web_matcher_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/freelancing-god/fakeweb-matcher
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: RSpec matcher for the FakeWeb library