webmock 1.7.5 → 1.7.6

data/.rspec-tm

@@ -0,0 +1,2 @@
+--rspec-version 2.0.0
+--bundler

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.7.6
+
+* Support for the HTTPClient's request_filter feature
+
+   Thanks to [Roman Shterenzon](https://github.com/romanbsd)
+
 ## 1.7.5
 
 * Added support for Patron 0.4.15. This change is not backward compatible so please upgrade Patron to version >= 0.4.15 if you want to use it with WebMock.

data/Gemfile

@@ -2,8 +2,8 @@ source 'http://rubygems.org/'
 
 gemspec
 if ENV["EM_HTTP_REQUEST_1_X"]
-  gem 'em-http-request', '>= 1.0.0.beta.4'
-  gem 'em-synchrony', '>= 0.3.0.beta.1'
+  gem 'em-http-request', '>= 1.0.0'
+  gem 'em-synchrony', '>= 1.0.0'
 end
 
 

data/README.md

@@ -648,6 +648,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Lin Jen-Shin
 * David Yeu
 * Andreas Garnæs
+* Roman Shterenzon
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/Rakefile

@@ -21,13 +21,13 @@ RSpec::Core::RakeTask.new(:spec) do |t|
 end
 
 RSpec::Core::RakeTask.new(:spec_http_without_webmock) do |t|
-  t.rspec_opts = ["-c", "-f progress", "-r ./spec/real_net_http_spec.rb"]
-  t.pattern = 'spec/real_net_http_spec.rb'
+  t.rspec_opts = ["-c", "-f progress", "-r ./spec/acceptance/net_http/real_net_http_spec.rb"]
+  t.pattern = 'spec/acceptance/net_http/real_net_http_spec.rb'
 end
 
 
 task :em_http_request_1_x_spec do
-  sh "EM_HTTP_REQUEST_1_X=true bundle install && bundle exec rspec spec/em_http_request_spec.rb" if RUBY_VERSION >= "1.9.2"
+  sh "EM_HTTP_REQUEST_1_X=true bundle install && bundle exec rspec spec/acceptance/em_http_request/em_http_request_spec.rb" if RUBY_VERSION >= "1.9.2"
 end
 
 require 'rake/testtask'

data/lib/webmock/http_lib_adapters/httpclient_adapter.rb

@@ -45,6 +45,9 @@ if defined?(::HTTPClient)
       if WebMock::StubRegistry.instance.registered_request?(request_signature)
         webmock_response = WebMock::StubRegistry.instance.response_for_request(request_signature)
         response = build_httpclient_response(webmock_response, stream, &block)
+        @request_filter.each do |filter|
+          filter.filter_response(req, response)
+        end
         res = conn.push(response)
         WebMock::CallbackRegistry.invoke_callbacks(
           {:lib => :httpclient}, request_signature, webmock_response)
@@ -130,10 +133,14 @@ if defined?(::HTTPClient)
     auth = www_auth.basic_auth
     auth.challenge(req.header.request_uri, nil)
 
-    headers = req.header.all.inject({}) do |headers, header|
-      headers[header[0]] ||= [];
-      headers[header[0]] << header[1]
-      headers
+    @request_filter.each do |filter|
+      filter.filter_request(req)
+    end
+
+    headers = req.header.all.inject({}) do |hdrs, header|
+      hdrs[header[0]] ||= []
+      hdrs[header[0]] << header[1]
+      hdrs
     end
 
     if (auth_cred = auth.get(req)) && auth.scheme == 'Basic'

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.7.5' unless defined?(::WebMock::VERSION)
+  VERSION = '1.7.6' unless defined?(::WebMock::VERSION)
 end

data/spec/{curb_spec.rb → acceptance/curb/curb_spec.rb}

@@ -1,17 +1,17 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_shared'
+require 'spec_helper'
+require 'acceptance/webmock_shared'
 
 unless RUBY_PLATFORM =~ /java/
-  require 'curb_spec_helper'
+  require 'acceptance/curb/curb_spec_helper'
 
   shared_examples_for "Curb" do
     include CurbSpecHelper
 
-    it_should_behave_like "WebMock"
+    include_examples "with WebMock"
 
     describe "when doing PUTs" do
       it "should stub them" do
-        stub_http_request(:put, "www.example.com").with(:body => "01234")
+        stub_request(:put, "www.example.com").with(:body => "01234")
         http_request(:put, "http://www.example.com", :body => "01234").
           status.should == "200"
       end
@@ -273,7 +273,7 @@ unless RUBY_PLATFORM =~ /java/
       include CurbSpecHelper::NamedHttp
 
       it "should work with blank arguments for post" do
-        stub_http_request(:post, "www.example.com").with(:body => "01234")
+        stub_request(:post, "www.example.com").with(:body => "01234")
         c = Curl::Easy.new
         c.url = "http://www.example.com"
         c.post_body = "01234"
@@ -282,13 +282,13 @@ unless RUBY_PLATFORM =~ /java/
       end
 
       it "should work with several body arguments for post using the class method" do
-        stub_http_request(:post, "www.example.com").with(:user => {:first_name=>'Bartosz', :last_name=>'Blimke'})
+        stub_request(:post, "www.example.com").with(:user => {:first_name=>'Bartosz', :last_name=>'Blimke'})
         c = Curl::Easy.http_post "http://www.example.com", 'user[first_name]=Bartosz', 'user[last_name]=Blimke'
         c.response_code.should == 200
       end
 
       it "should work with blank arguments for put" do
-        stub_http_request(:put, "www.example.com").with(:body => "01234")
+        stub_request(:put, "www.example.com").with(:body => "01234")
         c = Curl::Easy.new
         c.url = "http://www.example.com"
         c.put_data = "01234"
@@ -299,7 +299,7 @@ unless RUBY_PLATFORM =~ /java/
       it "should work with multiple arguments for post" do
         data = { :name => "john", :address => "111 example ave" }
 
-        stub_http_request(:post, "www.example.com").with(:body => data)
+        stub_request(:post, "www.example.com").with(:body => data)
         c = Curl::Easy.new
         c.url = "http://www.example.com"
         c.http_post Curl::PostField.content('name', data[:name]),  Curl::PostField.content('address', data[:address])

data/spec/{em_http_request_spec.rb → acceptance/em_http_request/em_http_request_spec.rb}

@@ -1,21 +1,21 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_shared'
+require 'spec_helper'
+require 'acceptance/webmock_shared'
 require 'ostruct'
 
 unless RUBY_PLATFORM =~ /java/
-  require 'em_http_request_spec_helper'
+  require 'acceptance/em_http_request/em_http_request_spec_helper'
 
-  describe "Webmock with EM::HttpRequest" do
+  describe "EM::HttpRequest" do
     include EMHttpRequestSpecHelper
 
-    it_should_behave_like "WebMock"
+    include_examples "with WebMock"
 
     #functionality only supported for em-http-request 1.x
     if defined?(EventMachine::HttpConnection)
       describe "with middleware" do
 
         it "should work with request middleware" do
-          stub_http_request(:get, "www.example.com").with(:body => 'bar')
+          stub_request(:get, "www.example.com").with(:body => 'bar')
 
           middleware = Class.new do
             def request(client, head, body)
@@ -38,7 +38,7 @@ unless RUBY_PLATFORM =~ /java/
         end
 
         it "should work with response middleware" do
-          stub_http_request(:get, "www.example.com").to_return(:body => 'foo')
+          stub_request(:get, "www.example.com").to_return(:body => 'foo')
 
           middleware = Class.new do
             def response(resp)
@@ -102,7 +102,7 @@ unless RUBY_PLATFORM =~ /java/
     end
 
     it "should work with streaming" do
-      stub_http_request(:get, "www.example.com").to_return(:body => "abc")
+      stub_request(:get, "www.example.com").to_return(:body => "abc")
       response = ""
       EM.run {
         http = EventMachine::HttpRequest.new('http://www.example.com/').get
@@ -112,28 +112,28 @@ unless RUBY_PLATFORM =~ /java/
     end
 
     it "should work with responses that use chunked transfer encoding" do
-      stub_http_request(:get, "www.example.com").to_return(:body => "abc", :headers => { 'Transfer-Encoding' => 'chunked' })
+      stub_request(:get, "www.example.com").to_return(:body => "abc", :headers => { 'Transfer-Encoding' => 'chunked' })
       http_request(:get, "http://www.example.com").body.should == "abc"
     end
 
     it "should work with optional query params" do
-      stub_http_request(:get, "www.example.com/?x=3&a[]=b&a[]=c").to_return(:body => "abc")
+      stub_request(:get, "www.example.com/?x=3&a[]=b&a[]=c").to_return(:body => "abc")
       http_request(:get, "http://www.example.com/?x=3", :query => {"a" => ["b", "c"]}).body.should == "abc"
     end
 
     it "should work with optional query params declared as string" do
-      stub_http_request(:get, "www.example.com/?x=3&a[]=b&a[]=c").to_return(:body => "abc")
+      stub_request(:get, "www.example.com/?x=3&a[]=b&a[]=c").to_return(:body => "abc")
       http_request(:get, "http://www.example.com/?x=3", :query => "a[]=b&a[]=c").body.should == "abc"
     end
 
     it "should work when the body is passed as a Hash" do
-      stub_http_request(:post, "www.example.com").with(:body => {:a => "1", :b => "2"}).to_return(:body => "ok")
+      stub_request(:post, "www.example.com").with(:body => {:a => "1", :b => "2"}).to_return(:body => "ok")
       http_request(:post, "http://www.example.com", :body => {:a => "1", :b => "2"}).body.should == "ok"
     end
 
     describe "mocking EM::HttpClient API" do
       before do
-        stub_http_request(:get, "www.example.com/")
+        stub_request(:get, "www.example.com/")
         WebMock::HttpLibAdapters::EmHttpRequestAdapter.enable!
       end
       subject do

data/spec/acceptance/httpclient/httpclient_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+require 'acceptance/webmock_shared'
+require 'ostruct'
+
+require 'acceptance/httpclient/httpclient_spec_helper'
+
+describe "HTTPClient" do
+  include HTTPClientSpecHelper
+
+  before(:each) do
+    HTTPClientSpecHelper.async_mode = false
+  end
+
+  include_examples "with WebMock"
+
+  it "should yield block on response if block provided" do
+    stub_request(:get, "www.example.com").to_return(:body => "abc")
+    response_body = ""
+    http_request(:get, "http://www.example.com/") do |body|
+      response_body = body
+    end
+    response_body.should == "abc"
+  end
+
+  it "should match requests if headers are the same  but in different order" do
+    stub_request(:get, "www.example.com").with(:headers => {"a" => ["b", "c"]} )
+    http_request(
+      :get, "http://www.example.com/",
+    :headers => {"a" => ["c", "b"]}).status.should == "200"
+  end
+
+  describe "when using async requests" do
+    before(:each) do
+      HTTPClientSpecHelper.async_mode = true
+    end
+
+    include_examples "with WebMock"
+  end
+
+  context "Filters" do
+    class Filter
+      def filter_request(request)
+        request.header["Authorization"] = "Bearer 0123456789"
+      end
+
+      def filter_response(request, response)
+        response.header.set('X-Powered-By', 'webmock')
+      end
+    end
+
+    before do
+      @client = HTTPClient.new
+      @client.request_filter << Filter.new
+      stub_request(:get, 'www.example.com').with(:headers => {'Authorization' => 'Bearer 0123456789'})
+    end
+
+    it "supports request filters" do
+      @client.request(:get, 'http://www.example.com/').status.should == 200
+    end
+
+    it "supports response filters" do
+      res = @client.request(:get, 'http://www.example.com/')
+      res.header['X-Powered-By'].first.should == 'webmock'
+    end
+  end
+
+end

data/spec/{net_http_spec.rb → acceptance/net_http/net_http_spec.rb}

@@ -1,13 +1,13 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_shared'
+require 'spec_helper'
 require 'ostruct'
-require 'net_http_spec_helper'
-require 'net_http_shared'
+require 'acceptance/webmock_shared'
+require 'acceptance/net_http/net_http_spec_helper'
+require 'acceptance/net_http/net_http_shared'
 
 include NetHTTPSpecHelper
 
-describe "Webmock with Net:HTTP" do
-  it_should_behave_like "WebMock"
+describe "Net:HTTP" do
+  include_examples "with WebMock"
 
   let(:port){ WebMockServer.instance.port }
 

data/spec/{real_net_http_spec.rb → acceptance/net_http/real_net_http_spec.rb}

@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'rspec'
 require 'net/http'
-require 'net_http_shared'
 require 'net/https'
 require 'stringio'
+require 'acceptance/net_http/net_http_shared'
 require 'support/webmock_server'
 
 describe "Real Net:HTTP without webmock", :without_webmock => true do

data/spec/{patron_spec.rb → acceptance/patron/patron_spec.rb}

@@ -1,17 +1,17 @@
 # encoding: utf-8
 
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'webmock_shared'
+require 'spec_helper'
+require 'acceptance/webmock_shared'
 
 unless RUBY_PLATFORM =~ /java/
-  require 'patron_spec_helper'
+  require 'acceptance/patron/patron_spec_helper'
   require 'tmpdir'
   require 'fileutils'
 
-  describe "Webmock with Patron" do
+  describe "Patron" do
     include PatronSpecHelper
 
-    it_should_behave_like "WebMock"
+    include_examples "with WebMock"
 
     describe "when custom functionality is used" do
       before(:each) do
@@ -33,13 +33,13 @@ unless RUBY_PLATFORM =~ /java/
 
 
         it "should work with get_file" do
-          stub_http_request(:get, "www.example.com").to_return(:body => "abc")
+          stub_request(:get, "www.example.com").to_return(:body => "abc")
           @sess.get_file("/", @file_path)
           File.read(@file_path).should == "abc"
         end
 
         it "should raise same error as Patron if file is not readable for get request" do
-          stub_http_request(:get, "www.example.com")
+          stub_request(:get, "www.example.com")
           File.open("/tmp/read_only_file", "w") do |tmpfile|
             tmpfile.chmod(0400)
           end
@@ -54,18 +54,18 @@ unless RUBY_PLATFORM =~ /java/
 
         it "should work with put_file" do
           File.open(@file_path, "w") {|f| f.write "abc"}
-          stub_http_request(:put, "www.example.com").with(:body => "abc")
+          stub_request(:put, "www.example.com").with(:body => "abc")
           @sess.put_file("/", @file_path)
         end
 
         it "should work with post_file" do
           File.open(@file_path, "w") {|f| f.write "abc"}
-          stub_http_request(:post, "www.example.com").with(:body => "abc")
+          stub_request(:post, "www.example.com").with(:body => "abc")
           @sess.post_file("/", @file_path)
         end
 
         it "should raise same error as Patron if file is not readable for post request" do
-          stub_http_request(:post, "www.example.com").with(:body => "abc")
+          stub_request(:post, "www.example.com").with(:body => "abc")
           lambda {
             @sess.post_file("/", "/path/to/non/existing/file")
           }.should raise_error(ArgumentError, "Unable to open specified file.")
@@ -75,7 +75,7 @@ unless RUBY_PLATFORM =~ /java/
 
       describe "handling errors same way as patron" do
         it "should raise error if put request has neither upload_data nor file_name" do
-          stub_http_request(:post, "www.example.com")
+          stub_request(:post, "www.example.com")
           lambda {
             @sess.post("/", nil)
           }.should raise_error(ArgumentError, "Must provide either data or a filename when doing a PUT or POST")
@@ -83,7 +83,7 @@ unless RUBY_PLATFORM =~ /java/
       end
 
       it "should work with WebDAV copy request" do
-        stub_http_request(:copy, "www.example.com/abc").with(:headers => {'Destination' => "/def"})
+        stub_request(:copy, "www.example.com/abc").with(:headers => {'Destination' => "/def"})
         @sess.copy("/abc", "/def")
       end
 

data/spec/acceptance/shared/allowing_and_disabling_net_connect.rb

@@ -0,0 +1,142 @@
+shared_context "allowing and disabling net connect" do
+  describe "when net connect" do
+    describe "is allowed", :net_connect => true do
+      before(:each) do
+        WebMock.allow_net_connect!
+      end
+
+      it "should make a real web request if request is not stubbed" do
+        http_request(:get, webmock_server_url).status.should == "200"
+      end
+
+      it "should make a real https request if request is not stubbed" do
+        unless http_library == :httpclient
+          http_request(:get, "https://www.paypal.com/uk/cgi-bin/webscr").
+            body.should =~ /.*paypal.*/
+        end
+      end
+
+      it "should return stubbed response if request was stubbed" do
+        stub_request(:get, "www.example.com").to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/").body.should == "abc"
+      end
+    end
+
+    describe "is not allowed" do
+      before(:each) do
+        WebMock.disable_net_connect!
+      end
+
+      it "should return stubbed response if request was stubbed" do
+        stub_request(:get, "www.example.com").to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/").body.should == "abc"
+      end
+
+      it "should return stubbed response if request with path was stubbed" do
+        stub_request(:get, "www.example.com/hello_world").to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/hello_world").body.should == "abc"
+      end
+
+      it "should raise exception if request was not stubbed" do
+        lambda {
+          http_request(:get, "http://www.example.com/")
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
+      end
+    end
+
+    describe "is not allowed with exception for localhost" do
+      before(:each) do
+        WebMock.disable_net_connect!(:allow_localhost => true)
+      end
+
+      it "should return stubbed response if request was stubbed" do
+        stub_request(:get, "www.example.com").to_return(:body => "abc")
+        http_request(:get, "http://www.example.com/").body.should == "abc"
+      end
+
+      it "should raise exception if request was not stubbed" do
+        lambda {
+          http_request(:get, "http://www.example.com/")
+        }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
+      end
+
+      it "should make a real request to localhost" do
+        lambda {
+          http_request(:get, "http://localhost:12345/")
+        }.should raise_error(connection_refused_exception_class)
+      end
+
+      it "should make a real request to 127.0.0.1" do
+        lambda {
+          http_request(:get, "http://127.0.0.1:12345/")
+        }.should raise_error(connection_refused_exception_class)
+      end
+
+      it "should make a real request to 0.0.0.0" do
+        lambda {
+          http_request(:get, "http://0.0.0.0:12345/")
+        }.should raise_error(connection_refused_exception_class)
+      end
+    end
+
+    describe "is not allowed with exception for allowed domains" do
+      let(:host_with_port){ WebMockServer.instance.host_with_port }
+
+      before(:each) do
+        WebMock.disable_net_connect!(:allow => ["www.example.org", host_with_port])
+      end
+
+      context "when the host is not allowed" do
+        it "should return stubbed response if request was stubbed" do
+          stub_request(:get, "www.example.com").to_return(:body => "abc")
+          http_request(:get, "http://www.example.com/").body.should == "abc"
+        end
+
+        it "should raise exception if request was not stubbed" do
+          lambda {
+            http_request(:get, "http://www.example.com/")
+          }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
+        end
+      end
+
+      context "when the host with port is not allowed" do
+        it "should return stubbed response if request was stubbed" do
+          stub_request(:get, "http://localhost:2345").to_return(:body => "abc")
+          http_request(:get, "http://localhost:2345/").body.should == "abc"
+        end
+
+        it "should raise exception if request was not stubbed" do
+          lambda {
+            http_request(:get, "http://localhost:2345/")
+          }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://localhost:2345/))
+        end
+      end
+
+      context "when the host is allowed" do
+        it "should raise exception if request was not stubbed" do
+          lambda {
+            http_request(:get, "http://www.example.com/")
+          }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://www.example.com/))
+        end
+
+        it "should make a real request to allowed host", :net_connect => true do
+          http_request(:get, "http://www.example.org/").status.should == "302"
+        end
+      end
+
+      context "when the host with port is allowed" do
+        it "should make a real request to allowed host", :net_connect => true do
+          http_request(:get, "http://#{host_with_port}/").status.should == "200"
+        end
+      end
+
+      context "when the host is allowed but not port" do
+        it "should make a real request to allowed host", :net_connect => true do
+          lambda {
+            http_request(:get, "http://localhost:123/")
+          }.should raise_error(WebMock::NetConnectNotAllowedError, %r(Real HTTP connections are disabled. Unregistered request: GET http://localhost:123/))
+        end
+      end
+    end
+  end
+end