webmock 0.7.0 → 0.7.1

data/README.md

@@ -10,7 +10,7 @@ Features
 * Matching requests based on method, url, headers and body
 * Support for Test::Unit and RSpec (and can be easily extended to other frameworks)
 * Support for Net::Http and other http libraries based on Net::Http
-* Architecture allows adding other http library adapters easily
+* Adding other http library adapters is easy
 
 
 Installation
@@ -32,7 +32,7 @@ Now you are ready to write your tests/specs with stubbed HTTP calls.
 
 	 stub_request(:any, "www.google.com")
 
-	 Net::HTTP.get('www.google.com', '/')
+	 Net::HTTP.get('www.google.com', '/')    # ===> Success
 	
 ### Stubbing requests based on method, url, body and headers
 
@@ -43,49 +43,68 @@ Now you are ready to write your tests/specs with stubbed HTTP calls.
 	req['Content-Length'] = 3
     res = Net::HTTP.start(url.host, url.port) {|http|
       http.request(req, 'abc')
-    }
+    }    # ===> Success
+
+### Matching custom request headers
+
+    stub_request(:any, "www.google.com").with(:headers=>{'Header-Name'=>"Header-Value"}).to_return(:body => "abc", :status => 200)
+
+	url = URI.parse('http://www.google.com/')
+    req = Net::HTTP::Post.new(url.path)
+	req['Header-Name'] = "Header-Value"
+    res = Net::HTTP.start(url.host, url.port) {|http|
+      http.request(req, 'abc')
+    }    # ===> Success
 
 ### Custom response
 
 	stub_request(:any, "www.google.com").to_return(:body => "abc", :status => 200,  :headers => { 'Content-Length' => 3 })
 	
-	Net::HTTP.get('www.google.com', '/').body ===> "abc"
+	Net::HTTP.get('www.google.com', '/')    # ===> "abc"
+	
+### Custom response with body as file path
+
+	File.open('/tmp/response_body.txt', 'w') { |f| f.puts 'abc' }
+
+	stub_request(:any, "www.google.com").to_return(:body => "/tmp/response_body.txt", :status => 200)
+
+	Net::HTTP.get('www.google.com', '/')    # ===> "abc\n"
 	
 ### Request with basic authentication
 
 	stub_request(:any, "john:smith@www.google.com")
 	
-	Net::HTTP.get(URI.parse('http://john:smith@www.google.com'))
+	Net::HTTP.get(URI.parse('http://john:smith@www.google.com'))    # ===> Success
 	
 ### Matching urls using regular expressions
 
 	 stub_request(:any, /.*google.*/)
 
-	 Net::HTTP.get('www.google.com', '/')
+	 Net::HTTP.get('www.google.com', '/') # ===> Success
 
-### Real requests to network can be allowed or disables
+### Real requests to network can be allowed or disabled
 
 	WebMock.allow_net_connect!
 
 	stub_request(:any, "www.google.com").to_return(:body => "abc")
 
-	Net::HTTP.get('www.google.com', '/').should == "abc"
+	Net::HTTP.get('www.google.com', '/')    # ===> "abc"
 	
-	Net::HTTP.get('www.something.com', '/').should =~ "Something."	
+	Net::HTTP.get('www.something.com', '/') # ===> /.+Something.+/
 	
 	WebMock.disable_net_connect!
 	
-	Net::HTTP.get('www.something.com', '/') ===> Failure
+	Net::HTTP.get('www.something.com', '/')    # ===> Failure
 
 ### Clearing stubs
 
 	stub_request(:any, "www.google.com")
 
-	Net::HTTP.get('www.google.com', '/') ===> Success
+	Net::HTTP.get('www.google.com', '/')    # ===> Success
 	
 	reset_webmock
 	
-	Net::HTTP.get('www.google.com', '/') ===> Failure
+	Net::HTTP.get('www.google.com', '/')    # ===> Failure
 
 
 ### Test/Unit style assertions (they actually work everywhere, in RSpec too)
@@ -99,9 +118,17 @@ Now you are ready to write your tests/specs with stubbed HTTP calls.
       http.request(req, 'abc')
     }
 
-	assert_requested :post, "http://www.google.com", :headers => {'Content-Length' => 3}, :body => "abc"
+	assert_requested :post, "http://www.google.com", :headers => {'Content-Length' => 3}, :body => "abc", :times => 1    # ===> Success
+	
+	assert_not_requested :get, "http://www.something.com"    # ===> Success
+
+### Expecting real (not stubbed) requests
+
+	WebMock.allow_net_connect!
 	
-	assert_not_requested :get, "http://www.something.com"
+	Net::HTTP.get('www.google.com', '/')    # ===> Success
+
+	assert_requested :get, "http://www.google.com"    # ===> Success
 
 ### RSpec matchers 1
 
@@ -109,13 +136,13 @@ Now you are ready to write your tests/specs with stubbed HTTP calls.
 	
 	request(:post, "www.something.com").should have_been_made.times(3)
 	
-	request(:any, "www.example.com").should have_not_been_made
+	request(:any, "www.example.com").should_not have_been_made
 
 ### RSpec matchers 2 ([fakeweb-matcher](http://github.com/freelancing-god/fakeweb-matcher) style)
 
 	WebMock.should have_requested(:get, "www.google.com").with(:body => "abc", :headers => {'Content-Length' => 3}).twice
 	
-	WebMock.should have_not_requested(:get, "www.something.com")
+	WebMock.should_not have_requested(:get, "www.something.com")
 
 Notes
 -----
@@ -137,7 +164,7 @@ i.e
 	stub_request(:get, "www.google.com").to_return(:body => "abc")
 	stub_request(:get, "www.google.com").to_return(:body => "def")
 
-	Net::HTTP.get('www.google.com', '/').body ====> "def"
+	Net::HTTP.get('www.google.com', '/')   # ====> "def"
 
 Bugs and Issues
 ---------------
@@ -147,7 +174,7 @@ Please submit them here [http://github.com/bblimke/webmock/issues](http://github
 Suggestions
 ------------
 
-If you have any suggestions on how to improve WebMock please send an email to the mailing list [groups.google.com/group/fakeweb-users](http://groups.google.com/group/fakeweb-users)
+If you have any suggestions on how to improve WebMock please send an email to the mailing list [groups.google.com/group/webmock-users](http://groups.google.com/group/webmock-users)
 
 I'm particularly interested in how the DSL could be improved.
 

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/webmock/adapters/rspec/request_profile_matcher.rb

@@ -1,37 +1,42 @@
 module WebMock
   class RequestProfileMatcher
-    
+
     def initialize
       @request_execution_verifier = RequestExecutionVerifier.new
     end
-    
+
     def once
       @request_execution_verifier.expected_times_executed = 1
       self
     end
-    
+
     def twice
       @request_execution_verifier.expected_times_executed = 2
       self
     end
-    
+
     def times(times)
       @request_execution_verifier.expected_times_executed = times.to_i
       self
     end
-    
+
     def matches?(request_profile)
       @request_execution_verifier.request_profile = request_profile
-      @request_execution_verifier.verify
+      @request_execution_verifier.matches?
     end
-    
+
+    def does_not_match?(request_profile)
+      @request_execution_verifier.request_profile = request_profile
+      @request_execution_verifier.does_not_match?
+    end
+
     def failure_message
       @request_execution_verifier.failure_message
     end
-    
+
 
     def negative_failure_message
       @request_execution_verifier.negative_failure_message
     end
   end
-end
+end

data/lib/webmock/adapters/rspec/webmock_matcher.rb

@@ -30,7 +30,11 @@ module WebMock
     end
 
     def matches?(webmock)
-      @request_execution_verifier.verify
+      @request_execution_verifier.matches?
+    end
+    
+    def does_not_match?(webmock)
+      @request_execution_verifier.does_not_match?
     end
 
     def failure_message

data/lib/webmock/request_execution_verifier.rb

@@ -1,22 +1,42 @@
 module WebMock
   class RequestExecutionVerifier
-    
+
     attr_accessor :request_profile, :expected_times_executed, :times_executed
 
     def initialize(request_profile = nil, expected_times_executed = nil)
       @request_profile = request_profile
-      @expected_times_executed = expected_times_executed || 1
+      @expected_times_executed = expected_times_executed
+    end
+
+    def matches?
+      @times_executed =
+      RequestRegistry.instance.times_executed(@request_profile)
+      @times_executed == (@expected_times_executed || 1)
     end
 
-    def verify
-      @times_executed = 
+    def does_not_match?
+      @times_executed =
       RequestRegistry.instance.times_executed(@request_profile)
-      @times_executed == @expected_times_executed
+      if @expected_times_executed
+        @times_executed != @expected_times_executed
+      else
+        @times_executed == 0
+      end
     end
 
+
     def failure_message
+      expected_times_executed = @expected_times_executed || 1
       %Q(The request #{request_profile.to_s} was expected to execute #{expected_times_executed} time#{ (expected_times_executed == 1) ? '' : 's'} but it executed #{times_executed} time#{ (times_executed == 1) ? '' : 's'})
     end
 
+    def negative_failure_message
+      if @expected_times_executed
+        %Q(The request #{request_profile.to_s} was not expected to execute #{expected_times_executed} time#{ (expected_times_executed == 1) ? '' : 's'} but it executed #{times_executed} time#{ (times_executed == 1) ? '' : 's'})
+      else
+        %Q(The request #{request_profile.to_s} was expected to execute 0 times but it executed #{times_executed} time#{ (times_executed == 1) ? '' : 's'})
+      end
+    end
+
   end
 end

data/lib/webmock/webmock.rb

@@ -18,11 +18,13 @@ module WebMock
     expected_times_executed = options.delete(:times) || 1
     request = RequestProfile.new(method, url, options[:body], options[:headers])
     verifier = RequestExecutionVerifier.new(request, expected_times_executed)
-    assertion_failure(verifier.failure_message) unless verifier.verify
+    assertion_failure(verifier.failure_message) unless verifier.matches?
   end
 
   def assert_not_requested(method, url, options = {})
-    assert_requested(method, url, options.update(:times => 0))
+    request = RequestProfile.new(method, url, options[:body], options[:headers])
+    verifier = RequestExecutionVerifier.new(request, options.delete(:times))
+    assertion_failure(verifier.negative_failure_message) unless verifier.does_not_match?
   end
 
   def self.allow_net_connect!

data/spec/request_execution_verifier_spec.rb

@@ -23,29 +23,68 @@ describe RequestExecutionVerifier do
     end
 
   end
+  
+  describe "negative failure message" do
 
-  describe "verify" do
+    it "should report failure message if it executed number of times specified" do
+      @verifier.times_executed = 2
+      @verifier.expected_times_executed = 2
+      @verifier.negative_failure_message.should == "The request www.google.com was not expected to execute 2 times but it executed 2 times"
+    end
+
+    it "should report failure message when not expected request but it executed" do
+      @verifier.times_executed = 1
+      @verifier.negative_failure_message.should == "The request www.google.com was expected to execute 0 times but it executed 1 time"
+    end
+
+  end
+
+  describe "matches?" do
 
     it "should succeed if request was executed expected number of times" do
       RequestRegistry.instance.
         should_receive(:times_executed).with(@request_profile).and_return(10)
       @verifier.expected_times_executed = 10
-      @verifier.verify.should be_true
+      @verifier.matches?.should be_true
     end
 
     it "should fail if request was not executed expected number of times" do
       RequestRegistry.instance.
         should_receive(:times_executed).with(@request_profile).and_return(10)
       @verifier.expected_times_executed = 5
-      @verifier.verify.should be_false
+      @verifier.matches?.should be_false
     end
 
   end
+  
+  describe "does_not_match?" do
+
+    it "should fail if request executed expected number of times" do
+      RequestRegistry.instance.
+        should_receive(:times_executed).with(@request_profile).and_return(10)
+      @verifier.expected_times_executed = 10
+      @verifier.does_not_match?.should be_false     
+    end
+    
+    it "should succeed if request was not executed at all and expected number of times was not set" do
+      RequestRegistry.instance.
+        should_receive(:times_executed).with(@request_profile).and_return(0)
+      @verifier.does_not_match?.should be_true      
+    end
+    
+    it "should fail if request was executed and expected number of times was not set" do
+      RequestRegistry.instance.
+        should_receive(:times_executed).with(@request_profile).and_return(1)
+      @verifier.does_not_match?.should be_false     
+    end
+
+    it "should succeed if request was not executed expected number of times" do
+      RequestRegistry.instance.
+        should_receive(:times_executed).with(@request_profile).and_return(10)
+      @verifier.expected_times_executed = 5
+      @verifier.does_not_match?.should be_true
+    end
 
-  def verify
-    @times_executed =
-    RequestRegistry.instance.times_executed(@request_profile)
-    @times_executed == @expected_times_executed
   end
 
 end

data/spec/response_spec.rb

@@ -55,5 +55,5 @@ describe Response do
     end
     
   end
-
+  
 end

data/spec/webmock_spec.rb

@@ -230,14 +230,14 @@ describe "WebMock", :shared => true do
 
         it "should pass if request was not expected and not executed" do
           lambda {
-            request(:get, "http://www.google.com").should have_not_been_made
+            request(:get, "http://www.google.com").should_not have_been_made
           }.should_not raise_error
         end
 
         it "should fail if request was not expected but executed" do
           lambda {
             http_request(:get, "http://www.google.com/")
-            request(:get, "http://www.google.com").should have_not_been_made
+            request(:get, "http://www.google.com").should_not have_been_made
           }.should fail_with("The request GET http://www.google.com/ was expected to execute 0 times but it executed 1 time")
         end
 
@@ -434,10 +434,12 @@ describe "WebMock", :shared => true do
           it "should verify that non expected requests didn't occur" do
             lambda {
               http_request(:get, "http://www.google.com/")
-              WebMock.should have_not_requested(:get, "http://www.google.com")
+              WebMock.should_not have_requested(:get, "http://www.google.com")
             }.should fail_with("The request GET http://www.google.com/ was expected to execute 0 times but it executed 1 time")
           end
         end
+        
+
 
         describe "using assert_requested" do
 
@@ -482,7 +484,7 @@ describe "WebMock", :shared => true do
         it "should verify that non expected requests didn't occur" do
           lambda {
             http_request(:get, "http://www.google.com/")
-            request(:get, "http://www.google.com").should have_not_been_made
+            request(:get, "http://www.google.com").should_not have_been_made
           }.should fail_with("The request GET http://www.google.com/ was expected to execute 0 times but it executed 1 time")
         end
       end

data/webmock.gemspec

@@ -0,0 +1,124 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{webmock}
+  s.version = "0.7.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bartosz Blimke"]
+  s.date = %q{2009-11-20}
+  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 = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "lib/webmock.rb",
+     "lib/webmock/adapters/rspec.rb",
+     "lib/webmock/adapters/rspec/matchers.rb",
+     "lib/webmock/adapters/rspec/request_profile_matcher.rb",
+     "lib/webmock/adapters/rspec/webmock_matcher.rb",
+     "lib/webmock/adapters/test_unit.rb",
+     "lib/webmock/config.rb",
+     "lib/webmock/errors.rb",
+     "lib/webmock/http_lib_adapters/net_http.rb",
+     "lib/webmock/request_execution_verifier.rb",
+     "lib/webmock/request_profile.rb",
+     "lib/webmock/request_registry.rb",
+     "lib/webmock/request_stub.rb",
+     "lib/webmock/response.rb",
+     "lib/webmock/url.rb",
+     "lib/webmock/util/hash_counter.rb",
+     "lib/webmock/utility.rb",
+     "lib/webmock/webmock.rb",
+     "spec/net_http_spec.rb",
+     "spec/other_net_http_libs_spec.rb",
+     "spec/request_execution_verifier_spec.rb",
+     "spec/request_profile_spec.rb",
+     "spec/request_registry_spec.rb",
+     "spec/request_stub_spec.rb",
+     "spec/response_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/util/hash_counter_spec.rb",
+     "spec/utility_spec.rb",
+     "spec/vendor/right_http_connection-1.2.4/History.txt",
+     "spec/vendor/right_http_connection-1.2.4/Manifest.txt",
+     "spec/vendor/right_http_connection-1.2.4/README.txt",
+     "spec/vendor/right_http_connection-1.2.4/Rakefile",
+     "spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb",
+     "spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb",
+     "spec/vendor/right_http_connection-1.2.4/setup.rb",
+     "spec/vendor/samuel-0.2.1/.document",
+     "spec/vendor/samuel-0.2.1/.gitignore",
+     "spec/vendor/samuel-0.2.1/LICENSE",
+     "spec/vendor/samuel-0.2.1/README.rdoc",
+     "spec/vendor/samuel-0.2.1/Rakefile",
+     "spec/vendor/samuel-0.2.1/VERSION",
+     "spec/vendor/samuel-0.2.1/lib/samuel.rb",
+     "spec/vendor/samuel-0.2.1/lib/samuel/net_http.rb",
+     "spec/vendor/samuel-0.2.1/lib/samuel/request.rb",
+     "spec/vendor/samuel-0.2.1/samuel.gemspec",
+     "spec/vendor/samuel-0.2.1/test/request_test.rb",
+     "spec/vendor/samuel-0.2.1/test/samuel_test.rb",
+     "spec/vendor/samuel-0.2.1/test/test_helper.rb",
+     "spec/vendor/samuel-0.2.1/test/thread_test.rb",
+     "spec/webmock_spec.rb",
+     "test/test_helper.rb",
+     "test/test_webmock.rb",
+     "webmock.gemspec"
+  ]
+  s.homepage = %q{http://github.com/bblimke/webmock}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Library for stubbing HTTP requests in Ruby.}
+  s.test_files = [
+    "spec/net_http_spec.rb",
+     "spec/other_net_http_libs_spec.rb",
+     "spec/request_execution_verifier_spec.rb",
+     "spec/request_profile_spec.rb",
+     "spec/request_registry_spec.rb",
+     "spec/request_stub_spec.rb",
+     "spec/response_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/util/hash_counter_spec.rb",
+     "spec/utility_spec.rb",
+     "spec/vendor/right_http_connection-1.2.4/lib/net_fix.rb",
+     "spec/vendor/right_http_connection-1.2.4/lib/right_http_connection.rb",
+     "spec/vendor/right_http_connection-1.2.4/setup.rb",
+     "spec/vendor/samuel-0.2.1/lib/samuel/net_http.rb",
+     "spec/vendor/samuel-0.2.1/lib/samuel/request.rb",
+     "spec/vendor/samuel-0.2.1/lib/samuel.rb",
+     "spec/vendor/samuel-0.2.1/test/request_test.rb",
+     "spec/vendor/samuel-0.2.1/test/samuel_test.rb",
+     "spec/vendor/samuel-0.2.1/test/test_helper.rb",
+     "spec/vendor/samuel-0.2.1/test/thread_test.rb",
+     "spec/webmock_spec.rb",
+     "test/test_helper.rb",
+     "test/test_webmock.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -90,6 +90,7 @@ files:
 - spec/webmock_spec.rb
 - test/test_helper.rb
 - test/test_webmock.rb
+- webmock.gemspec
 has_rdoc: true
 homepage: http://github.com/bblimke/webmock
 licenses: []