webmock 1.12.3 → 1.13.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.13.0
+
+* Net::HTTP::Persistent compatibility.
+  WebMock doesn't disconnect previously started connections upon a request anymore.
+
+
 ## 1.12.3
 
 * Fixed issue with handling Addressable::URI with query params passed to `Net::HTTP.get_response`

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -93,15 +93,22 @@ module WebMock
               block.call response if block
               response
             end
-            response = if (started? && !WebMock::Config.instance.net_http_connect_on_start) || !started?
-              @started = false #otherwise start_with_connect wouldn't execute and connect
-              start_with_connect {
-                response = super(request, nil, &nil)
-                after_request.call(response)
-              }
-            else
+            super_with_after_request = lambda {
               response = super(request, nil, &nil)
               after_request.call(response)
+            }
+            response = if started?
+              if WebMock::Config.instance.net_http_connect_on_start
+                super_with_after_request.call
+              else
+                start_with_connect_without_finish {
+                  super_with_after_request.call
+                }
+              end
+            else
+              start_with_connect {
+                super_with_after_request.call
+              }
             end
           else
             raise WebMock::NetConnectNotAllowedError.new(request_signature)
@@ -122,6 +129,18 @@ module WebMock
           self
         end
 
+
+        def start_with_connect_without_finish  # :yield: http
+          if block_given?
+            begin
+              do_start
+              return yield(self)
+            end
+          end
+          do_start
+          self
+        end
+
         alias_method :start_with_connect, :start
 
         def start(&block)

data/lib/webmock/version.rb

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

data/spec/acceptance/httpclient/httpclient_spec.rb

@@ -61,7 +61,7 @@ describe "HTTPClient" do
       }
     ]}
 
-    let(:make_request) {HTTPClient.new.post("http://www.example.com", body: body, header: header)}
+    let(:make_request) {HTTPClient.new.post("http://www.example.com", :body => body, :header => header)}
 
     before do
       stub_request(:post, "www.example.com")

data/spec/acceptance/net_http/net_http_shared.rb

@@ -32,8 +32,15 @@ shared_examples_for "Net::HTTP" do
         conn.request(Net::HTTP::Get.new("/"))
         socket_id_after_request = conn.instance_variable_get(:@socket).object_id
       }
-      socket_id_after_request.should_not be_nil
-      socket_id_after_request.should == socket_id_before_request
+
+      if !defined?(WebMock::Config) || WebMock::Config.instance.net_http_connect_on_start
+        socket_id_before_request.should_not == nil.object_id
+        socket_id_after_request.should_not == nil.object_id
+        socket_id_after_request.should == socket_id_before_request
+      else
+        socket_id_before_request.should == nil.object_id
+        socket_id_after_request.should_not == nil.object_id
+      end
     end
 
     describe "without start" do
@@ -121,5 +128,15 @@ shared_examples_for "Net::HTTP" do
         @http.started?.should == false
       end
     end
+
+    describe "with start without a block and finish" do
+      it "should gracefully start and close connection" do
+        @http.start
+        @http.get("/")
+        @http.should be_started
+        @http.finish
+        @http.should_not be_started
+      end
+    end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 35
   prerelease: 
   segments: 
   - 1
-  - 12
-  - 3
-  version: 1.12.3
+  - 13
+  - 0
+  version: 1.13.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-28 00:00:00 Z
+date: 2013-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable