webmock 1.20.0 → 1.20.1

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.20.1
+
+  * `assert_requested` and `assert_not_requested` accept `at_least_times` and `at_most_times` options
+
+      Thanks to [Dan Buettner](https://github.com/Capncavedan)
+
+  * Silenced `instance variable undefined` warnings in Curb adapted.
+
+      Thanks to [Sven Riedel](https://github.com/sriedel)
+
 ## 1.20.0
 
   * Add support for on_missing callback of Curb::Easy

data/README.md

@@ -930,6 +930,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * tjsousa
 * Tasos Stathopoulos
 * Dan Buettner
+* Sven Riedel
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/api.rb

@@ -65,12 +65,19 @@ module WebMock
     end
 
     def assert_request_requested(request, options = {})
-      verifier = WebMock::RequestExecutionVerifier.new(request, options.delete(:times) || 1)
+      times = options.delete(:times)
+      at_least_times = options.delete(:at_least_times)
+      at_most_times  = options.delete(:at_most_times)
+      times = 1 if times.nil? && at_least_times.nil? && at_most_times.nil?
+      verifier = WebMock::RequestExecutionVerifier.new(request, times, at_least_times, at_most_times)
       WebMock::AssertionFailure.failure(verifier.failure_message) unless verifier.matches?
     end
 
     def assert_request_not_requested(request, options = {})
-      verifier = WebMock::RequestExecutionVerifier.new(request, options.delete(:times))
+      times = options.delete(:times)
+      at_least_times = options.delete(:at_least_times)
+      at_most_times  = options.delete(:at_most_times)
+      verifier = WebMock::RequestExecutionVerifier.new(request, times, at_least_times, at_most_times)
       WebMock::AssertionFailure.failure(verifier.failure_message_when_negated) unless verifier.does_not_match?
     end
 

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -143,9 +143,9 @@ if defined?(Curl)
       end
 
       def invoke_curb_callbacks
-        @on_progress.call(0.0,1.0,0.0,1.0) if @on_progress
-        self.header_str.lines.each { |header_line| @on_header.call header_line } if @on_header
-        if @on_body
+        @on_progress.call(0.0,1.0,0.0,1.0) if defined?( @on_progress )
+        self.header_str.lines.each { |header_line| @on_header.call header_line } if defined?( @on_header )
+        if defined?( @on_body )
           if chunked_response?
             self.body_str.each do |chunk|
               @on_body.call(chunk)
@@ -154,20 +154,20 @@ if defined?(Curl)
             @on_body.call(self.body_str)
           end
         end
-        @on_complete.call(self) if @on_complete
+        @on_complete.call(self) if defined?( @on_complete )
 
         case response_code
         when 200..299
-          @on_success.call(self) if @on_success
+          @on_success.call(self) if defined?( @on_success )
         when 400..499
-          @on_missing.call(self, self.response_code) if @on_missing
+          @on_missing.call(self, self.response_code) if defined?( @on_missing )
         when 500..599
-          @on_failure.call(self, self.response_code) if @on_failure
+          @on_failure.call(self, self.response_code) if defined?( @on_failure )
         end
       end
 
       def chunked_response?
-        @transfer_encoding == 'chunked' && self.body_str.respond_to?(:each)
+        defined?( @transfer_encoding ) && @transfer_encoding == 'chunked' && self.body_str.respond_to?(:each)
       end
 
       def build_webmock_response

data/lib/webmock/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: 
   segments: 
   - 1
   - 20
-  - 0
-  version: 1.20.0
+  - 1
+  version: 1.20.1
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-22 00:00:00 +02:00
+date: 2014-11-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency