webmock 1.8.9 → 1.8.10

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 1.8.10
+
+* em-http-request fix. After request callbacks are correctly invoked for 3xx responses,
+  when :redirects option is set.
+
+    Thanks to [Myron Marston](https://github.com/myronmarston) for reporting that issue.
+
+* Fixed compatibility with Net::HTTP::DigestAuth
+
+    Thanks to [Jonathan Hyman](https://github.com/jonhyman) for reporting that issue.
+
+* Fixed problem in em-http-request 0.x appending the query to the client URI twice.
+
+    Thanks to [Paweł Pierzchała](https://github.com/wrozka)
+
 ## 1.8.9
 
 * Fixed problem with caching nil responses when the same HTTPClient instance is used.

data/README.md

@@ -713,6 +713,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Kevin Glowacz
 * Hans Hasselberg
 * Andrew France
+* Jonathan Hyman
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/Rakefile

@@ -27,7 +27,7 @@ end
 
 
 task :em_http_request_0_x_spec do
-  sh "EM_HTTP_REQUEST_0_X=true bundle install && bundle exec rspec spec/acceptance/em_http_request/em_http_request_spec.rb" if RUBY_VERSION <= "1.8.7"
+  sh "EM_HTTP_REQUEST_0_X=true bundle install && EM_HTTP_REQUEST_0_X=true bundle exec rspec spec/acceptance/em_http_request/em_http_request_spec.rb" if RUBY_VERSION <= "1.8.7"
 end
 
 require 'rake/testtask'

data/lib/webmock/http_lib_adapters/em_http_request/em_http_request_0_x.rb

@@ -90,11 +90,11 @@ if defined?(EventMachine::HttpRequest)
         if @req
           options = @req.options
           method = @req.method
-          uri = @req.uri
+          uri = @req.uri.dup
         else
           options = @options
           method = @method
-          uri = @uri
+          uri = @uri.dup
         end
 
         if options[:authorization] || options['authorization']

data/lib/webmock/http_lib_adapters/em_http_request/em_http_request_1_x.rb

@@ -108,14 +108,16 @@ if defined?(EventMachine::HttpClient)
         end
       end
 
-      def set_deferred_status(status, *args)
-        if status == :succeeded && !stubbed_webmock_response && WebMock::CallbackRegistry.any_callbacks?
+      def unbind(reason = nil)
+        if !stubbed_webmock_response && WebMock::CallbackRegistry.any_callbacks?
           webmock_response = build_webmock_response
           WebMock::CallbackRegistry.invoke_callbacks(
             {:lib => :em_http_request, :real_request => true},
             request_signature,
             webmock_response)
         end
+        @request_signature = nil
+        remove_instance_variable(:@stubbed_webmock_response)
 
         super
       end

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -28,6 +28,14 @@ module WebMock
         Net.send(:const_set, :HTTP, OriginalNetHTTP)
         Net.send(:const_set, :HTTPSession, OriginalNetHTTP)
         Net.send(:const_set, :BufferedIO, OriginalNetBufferedIO)
+
+        #copy all constants from @webMockNetHTTP to original Net::HTTP
+        #in case any constants were added to @webMockNetHTTP instead of Net::HTTP
+        #after WebMock was enabled.
+        #i.e Net::HTTP::DigestAuth
+        (@webMockNetHTTP.constants - OriginalNetHTTP.constants).each do |constant|
+          OriginalNetHTTP.send(:const_set, constant, @webMockNetHTTP.const_get(constant))
+        end
       end
 
       @webMockNetHTTP = Class.new(Net::HTTP) do

data/lib/webmock/version.rb

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

data/spec/acceptance/em_http_request/em_http_request_spec.rb

@@ -13,6 +13,39 @@ unless RUBY_PLATFORM =~ /java/
 
     #functionality only supported for em-http-request 1.x
     if defined?(EventMachine::HttpConnection)
+      context 'when a real request is made and redirects are followed' do
+        before { WebMock.allow_net_connect! }
+
+        # This url redirects to the https URL.
+        let(:http_url) { "http://raw.github.com:80/gist/fb555cb593f3349d53af/6921dd638337d3f6a51b0e02e7f30e3c414f70d6/vcr_gist" }
+        let(:https_url) { http_url.gsub('http', 'https').gsub('80', '443') }
+
+        def make_request
+          EM.run do
+            request = EM::HttpRequest.new(http_url).get(:redirects => 1)
+            request.callback { EM.stop }
+          end
+        end
+
+        it "invokes the globally_stub_request hook with both requests" do
+          urls = []
+          WebMock.globally_stub_request { |r| urls << r.uri.to_s; nil }
+
+          make_request
+
+          urls.should eq([http_url, https_url])
+        end
+
+        it 'invokes the after_request hook with both requests' do
+          urls = []
+          WebMock.after_request { |req, res| urls << req.uri.to_s }
+
+          make_request
+
+          urls.should eq([http_url, https_url])
+        end
+      end
+
       describe "with middleware" do
 
         it "should work with request middleware" do
@@ -38,19 +71,21 @@ unless RUBY_PLATFORM =~ /java/
           end
         end
 
-        it "should work with response middleware" do
-          stub_request(:get, "www.example.com").to_return(:body => 'foo')
-
-          middleware = Class.new do
+        let(:response_middleware) do
+          Class.new do
             def response(resp)
               resp.response = 'bar'
             end
           end
+        end
+
+        it "should work with response middleware" do
+          stub_request(:get, "www.example.com").to_return(:body => 'foo')
 
           EM.run do
             conn = EventMachine::HttpRequest.new('http://www.example.com/')
 
-            conn.use middleware
+            conn.use response_middleware
 
             http = conn.get
 
@@ -60,6 +95,36 @@ unless RUBY_PLATFORM =~ /java/
             end
           end
         end
+
+        let(:webmock_server_url) { "http://#{WebMockServer.instance.host_with_port}/" }
+
+        shared_examples_for "em-http-request middleware/after_request hook integration" do
+          it 'yields the original raw body to the after_request hook even if a response middleware modifies the body' do
+            yielded_response_body = nil
+            ::WebMock.after_request do |request, response|
+              yielded_response_body = response.body
+            end
+
+            EM::HttpRequest.use response_middleware
+
+            EM.run do
+              http = EventMachine::HttpRequest.new(webmock_server_url).get
+              http.callback { EM.stop }
+            end
+
+            yielded_response_body.should eq("hello world")
+          end
+        end
+
+        context 'making a real request' do
+          before { WebMock.allow_net_connect! }
+          include_examples "em-http-request middleware/after_request hook integration"
+        end
+
+        context 'when the request is stubbed' do
+          before { stub_request(:get, webmock_server_url).to_return(:body => 'hello world') }
+          include_examples "em-http-request middleware/after_request hook integration"
+        end
       end
 
       # not pretty, but it works
@@ -174,7 +239,8 @@ unless RUBY_PLATFORM =~ /java/
 
         it "#request_signature doesn't mutate the original uri" do
           subject.uri.should == Addressable::URI.parse("http://www.example.com/?a=1")
-          subject.request_signature.uri.should == Addressable::URI.parse(uri)
+          signature = WebMock::RequestRegistry.instance.requested_signatures.hash.keys.first
+          signature.uri.should == Addressable::URI.parse(uri)
         end
       end
     end

data/spec/acceptance/net_http/net_http_spec.rb

@@ -86,6 +86,19 @@ describe "Net:HTTP" do
         Object.const_get("Net").const_get("HTTP").constants(false).map(&:to_s).should include("Get")
       end
     end
+
+    describe "after WebMock is disabled" do
+      after(:each) do
+        WebMock.enable!
+      end
+      it "Net::HTTP should have the same constants" do
+        orig_consts_number = Net::HTTP.constants.size
+        Net::HTTP.send(:const_set, "TEST_CONST", 10)
+        Net::HTTP.constants.size.should == orig_consts_number + 1
+        WebMock.disable!
+        Net::HTTP.constants.size.should == orig_consts_number + 1
+      end
+    end
   end
 
   it "should work with block provided" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: 
   segments: 
   - 1
   - 8
-  - 9
-  version: 1.8.9
+  - 10
+  version: 1.8.10
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-15 00:00:00 Z
+date: 2012-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable