fakeweb-matcher 1.0.1 → 1.1.0

data/README.textile

@@ -19,12 +19,17 @@ h2. Usage
 
 <pre><code>FakeWeb.should have_requested(:get, 'http://example.com')
 FakeWeb.should have_requested(:any, 'http://example.com')
+FakeWeb.should have_requested(:post, /http:\/\/example.com\/)
 FakeWeb.should_not have_requested(:put, 'http://example.com')</code></pre>
 
 h2. Contribution
 
 Unsurprisingly, this library is tested using RSpec, and relies upon FakeWeb. It also uses "YARD":http://yard.soen.ca/ for documentation, so if you're submitting patches (which are most definitely welcome!) please use YARD syntax and have valid specs.
 
+h2. Contributors
+
+* "Thilo Utke":http://github.com/thilo (Regex URL matching)
+
 h2. Copyright
 
 Copyright (c) 2009 Pat Allan, released under an MIT Licence

data/VERSION.yml

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

data/lib/fake_web_matcher/request_matcher.rb

@@ -8,7 +8,7 @@ module FakeWebMatcher
     # Create a new matcher.
     # 
     # @param [Symbol] method The HTTP method. Defaults to :any if not supplied.
-    # @param [String] uri The URI to check for
+    # @param [String, Regexp] uri The URI to check for
     # 
     def initialize(*args)
       @method, @url = args_split(*args)
@@ -23,7 +23,7 @@ module FakeWebMatcher
     def matches?(fakeweb)
       !FakeWeb::Registry.instance.requests.detect { |req|
         method, url = args_split(*req)
-        match_method(method) && url == @url
+        match_method(method) && match_url(url)
       }.nil?
     end
     
@@ -32,11 +32,7 @@ module FakeWebMatcher
     # @return [String] failure message
     # 
     def failure_message
-      if @method == :any
-        "The URL #{@url} was not requested."
-      else
-        "The URL #{@url} was not requested using #{formatted_method}."
-      end
+      regex?(@url) ? regex_failure_message : url_failure_message
     end
     
     # Failure message if the URI should not have been requested.
@@ -44,15 +40,31 @@ module FakeWebMatcher
     # @return [String] failure message
     #
     def negative_failure_message
-      if @method == :any
-        "The URL #{@url} was requested and should not have been."
-      else
-        "The URL #{@url} was requested using #{formatted_method} and should not have been."
-      end
+      regex?(@url) ? regex_negative_failure_message : url_negative_failure_message
     end
     
     private
     
+    def regex_negative_failure_message
+      "A URL that matches #{@url.inspect} was requested#{failure_message_method} and should not have been."
+    end
+    
+    def url_negative_failure_message
+      "The URL #{@url} was requested#{failure_message_method} and should not have been."
+    end
+    
+    def regex_failure_message
+        "A URL that matches #{@url.inspect} was not requested#{failure_message_method}."
+    end
+    
+    def url_failure_message
+        "The URL #{@url} was not requested#{failure_message_method}."
+    end
+    
+    def failure_message_method
+      " using #{formatted_method}" unless @method == :any
+    end
+    
     # Compares methods, or ignores if either side of the comparison is :any.
     # 
     # @param [Symbol] method HTTP method
@@ -62,6 +74,17 @@ module FakeWebMatcher
       @method == :any || method == :any || method == @method
     end
     
+    # Compares the url either by match it agains a regular expression or 
+    # by simple comparison
+    # 
+    # @param [String] url the called URI
+    # @return [Boolean] true if exprexted URI and called URI match.
+    # 
+    def match_url(url)
+      regex?(@url) ? @url.match(url.to_s) : @url == url
+    end
+    
+    
     # Expected method formatted to be an uppercase string. Example: :get becomes
     # "GET".
     # 
@@ -75,20 +98,24 @@ module FakeWebMatcher
     # string, is required, but the method is not (will default to :any).
     # 
     # @param [Array] args
-    # @return [Array] Two items: method and URI instance
+    # @return [Array] Two items: method and URI instance or regular expression
     # 
     def args_split(*args)
       method  = :any
       uri     = nil
       
       case args.length
-      when 1 then uri         = URI.parse(args[0])
-      when 2 then method, uri = args[0], URI.parse(args[1])
+      when 1 then uri         = args[0]
+      when 2 then method, uri = args[0], args[1]
       else
         raise ArgumentError.new("wrong number of arguments")
       end
-      
+      uri = URI.parse(uri) unless regex?(uri)
       return method, uri
     end
+    
+    def regex?(object)
+      object.is_a?(Regexp)
+    end
   end
 end

data/spec/lib/fake_web_matcher/request_matcher_spec.rb

@@ -53,6 +53,19 @@ describe FakeWebMatcher::RequestMatcher do
       matcher = FakeWebMatcher::RequestMatcher.new(:post, 'http://domain.com')
       matcher.matches?(FakeWeb).should be_false
     end
+    
+    describe "matching url is regular expression" do
+      it "should return true if expression matches" do
+        matcher = FakeWebMatcher::RequestMatcher.new(:get, /example/)
+        matcher.matches?(FakeWeb).should be_true
+      end
+      
+      it "should return false if don't match" do
+        matcher = FakeWebMatcher::RequestMatcher.new(:get, /domain/)
+        matcher.matches?(FakeWeb).should be_false
+      end
+      
+    end
   end
   
   describe '#failure_message' do
@@ -67,6 +80,18 @@ describe FakeWebMatcher::RequestMatcher do
       matcher.failure_message.
         should == 'The URL http://example.com was not requested.'
     end
+    
+    it "should mention failing match" do
+      matcher = FakeWebMatcher::RequestMatcher.new(/example.com/)
+      matcher.failure_message.
+          should == 'A URL that matches /example.com/ was not requested.'
+    end
+    
+    it "should mention failing match with method if set" do
+      matcher = FakeWebMatcher::RequestMatcher.new(:get, /example.com/)
+      matcher.failure_message.
+         should == 'A URL that matches /example.com/ was not requested using GET.'
+    end
   end
   
   describe '#negative_failure_message' do
@@ -81,5 +106,18 @@ describe FakeWebMatcher::RequestMatcher do
       matcher.negative_failure_message.
         should == 'The URL http://example.com was requested and should not have been.'
     end
+    
+    it "should mention unexpected match" do
+      matcher = FakeWebMatcher::RequestMatcher.new(/example.com/)
+      matcher.negative_failure_message.
+          should == 'A URL that matches /example.com/ was requested and should not have been.'
+    end
+    
+    it "should mention unexpected match with method if set" do
+      matcher = FakeWebMatcher::RequestMatcher.new(:get, /example.com/)
+      matcher.negative_failure_message.
+         should == 'A URL that matches /example.com/ was requested using GET and should not have been.'
+    end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fakeweb-matcher
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 +02:00
+date: 2009-12-06 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,7 +77,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: RSpec matcher for the FakeWeb library
 test_files: 
 - spec/lib/fake_web_matcher/extension_spec.rb