webmock 3.4.2 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 91d9ae63bf5035f1d5ca0279cd0a8f4ec3ea80e9
-  data.tar.gz: b59813f02e62e3f5fa9b86e396d6da32f61f1a35
+SHA256:
+  metadata.gz: 2fcd3ec57f1f8be3dbf2685777853444680221a9c0230e6c068d3581bfb831a4
+  data.tar.gz: c14190f8962b927f5d1c5493db24a226c6cc56d54aff9d34589e7fa3adbf44b5
 SHA512:
-  metadata.gz: 576e5b246b09980d0a371a3b83468ef8d715917b29d1f6bc07fbb0c7398346c7effbcd3a9b8a6dcf9634f9531d49f8b85fe9f196f5afcaddbddc1cc6be5cb5c7
-  data.tar.gz: 19eb107133e2f8a12bf9859fd0cf444afe78d8d6da3057d93928344e2d67c8c99ccd2554d749dcae94f4cad3ebea915ba54b8f5296c42d7a8809023f10e242dc
+  metadata.gz: 7ed35459642359c3dc62cae4016b636110432e2bef6b6047acc5bb11d7ffa6dd180cb8938ad6e6dc522a4cb3429150ad7533e442df5fe8ab2fc3b9638126da7c
+  data.tar.gz: 2e7ebfc8da28d95acf8477b7166dba7e19657ba5d8fd7c4f44ae19985d216c639250c6c7ff47e2b65b007f58791f0116509a15f98b8babd75fd0acb66d00ca1d

data/.travis.yml

@@ -2,14 +2,14 @@ before_install:
   - gem update --system
   - gem update bundler
 rvm:
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
-  - 2.5.0
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
   - rbx-2
   - ruby-head
-  - jruby-9.0.5.0
-  - jruby-9.1.13.0
+  - jruby-9.1.17.0
+  - jruby-9.2.5.0
   - jruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 3.5.0
+
+  * Ruby 2.6.0 support
+
+    Thanks to [Arkadiy Tetelman](https://github.com/arkadiyt)
+
+  * Added `WebMock.reset_executed_requests!` method.
+
+        stub_get = stub_request(:get, "www.example.com")
+        Net::HTTP.get('www.example.com', '/')
+        WebMock::RequestRegistry.instance.times_executed(stub_get.request_pattern)  # => 1
+        reset_executed_requests!
+        WebMock::RequestRegistry.instance.times_executed(stub_get.request_pattern)  # => 0
+
+    Thanks to [Olia Kremmyda](https://github.com/oliakremmyda)
+
+  * Performance improvements
+
+    Thanks to [Pavel Rosický](https://github.com/ahorek)
+
 ## 3.4.2
 
   * Fixed `rbuf_fill` in Net::HTTP adapter to be thread-safe

data/README.md

@@ -705,6 +705,28 @@ Net::HTTP.get('www.example.com', '/')    # ===> Failure
 assert_not_requested :get, "www.example.com"    # ===> Success
 ```
 
+## Clearing request counters
+
+If you want to reset **only** the counters of the executed requests use `WebMock.reset_executed_requests!`
+
+```ruby
+stub  = stub_request(:get, "www.example.com")
+stub2 = stub_request(:get, "www.example2.com")
+
+Net::HTTP.get('www.example.com', '/')
+Net::HTTP.get('www.example.com', '/')
+
+Net::HTTP.get('www.example2.com', '/')
+
+expect(stub).to have_been_requested.times(2)
+expect(stub2).to have_been_requested.times(1)
+
+WebMock.reset_executed_requests!
+
+expect(stub).not_to have_been_requested
+expect(stub2).not_to have_been_requested
+```
+
 ## Disabling and enabling WebMock or only some http client adapters
 
 ```ruby
@@ -1058,6 +1080,9 @@ People who submitted patches and new features or suggested improvements. Many th
 * Lukas Pokorny
 * Arkadiy Tetelman
 * Kazato Sugimoto
+* Olle Jonsson
+* Pavel Rosický
+* Geremia Taglialatela
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock.rb

@@ -4,55 +4,55 @@ require 'addressable/uri'
 require 'addressable/template'
 require 'crack/xml'
 
-require 'webmock/deprecation'
-require 'webmock/version'
-
-require 'webmock/errors'
-
-require 'webmock/util/query_mapper'
-require 'webmock/util/uri'
-require 'webmock/util/headers'
-require 'webmock/util/hash_counter'
-require 'webmock/util/hash_keys_stringifier'
-require 'webmock/util/values_stringifier'
-require 'webmock/util/json'
-require 'webmock/util/version_checker'
-require 'webmock/util/hash_validator'
-
-require 'webmock/matchers/hash_argument_matcher'
-require 'webmock/matchers/hash_excluding_matcher'
-require 'webmock/matchers/hash_including_matcher'
-require 'webmock/matchers/any_arg_matcher'
-
-require 'webmock/request_pattern'
-require 'webmock/request_signature'
-require 'webmock/responses_sequence'
-require 'webmock/request_stub'
-require 'webmock/response'
-require 'webmock/rack_response'
-
-require 'webmock/stub_request_snippet'
-require 'webmock/request_signature_snippet'
-require 'webmock/request_body_diff'
-
-require 'webmock/assertion_failure'
-require 'webmock/request_execution_verifier'
-require 'webmock/config'
-require 'webmock/callback_registry'
-require 'webmock/request_registry'
-require 'webmock/stub_registry'
-require 'webmock/api'
-
-require 'webmock/http_lib_adapters/http_lib_adapter_registry'
-require 'webmock/http_lib_adapters/http_lib_adapter'
-require 'webmock/http_lib_adapters/net_http'
-require 'webmock/http_lib_adapters/http_rb_adapter'
-require 'webmock/http_lib_adapters/httpclient_adapter'
-require 'webmock/http_lib_adapters/patron_adapter'
-require 'webmock/http_lib_adapters/curb_adapter'
-require 'webmock/http_lib_adapters/em_http_request_adapter'
-require 'webmock/http_lib_adapters/typhoeus_hydra_adapter'
-require 'webmock/http_lib_adapters/excon_adapter'
-require 'webmock/http_lib_adapters/manticore_adapter'
-
-require 'webmock/webmock'
+require_relative 'webmock/deprecation'
+require_relative 'webmock/version'
+
+require_relative 'webmock/errors'
+
+require_relative 'webmock/util/query_mapper'
+require_relative 'webmock/util/uri'
+require_relative 'webmock/util/headers'
+require_relative 'webmock/util/hash_counter'
+require_relative 'webmock/util/hash_keys_stringifier'
+require_relative 'webmock/util/values_stringifier'
+require_relative 'webmock/util/json'
+require_relative 'webmock/util/version_checker'
+require_relative 'webmock/util/hash_validator'
+
+require_relative 'webmock/matchers/hash_argument_matcher'
+require_relative 'webmock/matchers/hash_excluding_matcher'
+require_relative 'webmock/matchers/hash_including_matcher'
+require_relative 'webmock/matchers/any_arg_matcher'
+
+require_relative 'webmock/request_pattern'
+require_relative 'webmock/request_signature'
+require_relative 'webmock/responses_sequence'
+require_relative 'webmock/request_stub'
+require_relative 'webmock/response'
+require_relative 'webmock/rack_response'
+
+require_relative 'webmock/stub_request_snippet'
+require_relative 'webmock/request_signature_snippet'
+require_relative 'webmock/request_body_diff'
+
+require_relative 'webmock/assertion_failure'
+require_relative 'webmock/request_execution_verifier'
+require_relative 'webmock/config'
+require_relative 'webmock/callback_registry'
+require_relative 'webmock/request_registry'
+require_relative 'webmock/stub_registry'
+require_relative 'webmock/api'
+
+require_relative 'webmock/http_lib_adapters/http_lib_adapter_registry'
+require_relative 'webmock/http_lib_adapters/http_lib_adapter'
+require_relative 'webmock/http_lib_adapters/net_http'
+require_relative 'webmock/http_lib_adapters/http_rb_adapter'
+require_relative 'webmock/http_lib_adapters/httpclient_adapter'
+require_relative 'webmock/http_lib_adapters/patron_adapter'
+require_relative 'webmock/http_lib_adapters/curb_adapter'
+require_relative 'webmock/http_lib_adapters/em_http_request_adapter'
+require_relative 'webmock/http_lib_adapters/typhoeus_hydra_adapter'
+require_relative 'webmock/http_lib_adapters/excon_adapter'
+require_relative 'webmock/http_lib_adapters/manticore_adapter'
+
+require_relative 'webmock/webmock'

data/lib/webmock/api.rb

@@ -66,6 +66,10 @@ module WebMock
       WebMock::StubRegistry.instance.remove_request_stub(stub)
     end
 
+    def reset_executed_requests!
+      WebMock::RequestRegistry.instance.reset!
+    end
+
     private
 
     def convert_uri_method_and_options_to_request_and_options(method, uri, options, &block)

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -256,8 +256,9 @@ end
 module Net  #:nodoc: all
 
   class WebMockNetBufferedIO < BufferedIO
-    def initialize(io, read_timeout: 60, continue_timeout: nil, debug_output: nil)
+    def initialize(io, read_timeout: 60, write_timeout: 60, continue_timeout: nil, debug_output: nil)
       @read_timeout = read_timeout
+      @write_timeout = write_timeout
       @rbuf = ''.dup
       @debug_output = debug_output
 

data/lib/webmock/stub_registry.rb

@@ -25,7 +25,7 @@ module WebMock
       responses = {}
 
       stub = ::WebMock::RequestStub.new(:any, /.*/).with { |request|
-        responses[request.object_id] = block.call(request)
+        responses[request.object_id] = yield(request)
       }.to_return(lambda { |request| responses.delete(request.object_id) })
 
       global_stubs.push stub

data/lib/webmock/util/hash_counter.rb

@@ -30,8 +30,8 @@ module WebMock
       end
 
       def each(&block)
-        @order.to_a.sort {|a, b| a[1] <=> b[1]}.each do |a|
-          block.call(a[0], hash[a[0]])
+        @order.to_a.sort_by { |a| a[1] }.each do |a|
+          yield(a[0], hash[a[0]])
         end
       end
     end

data/lib/webmock/util/query_mapper.rb

@@ -81,7 +81,7 @@ module WebMock::Util
           value = if value.nil?
                     nil
                   else
-                    ::Addressable::URI.unencode_component(value.gsub(/\+/, ' '))
+                    ::Addressable::URI.unencode_component(value.tr('+', ' '))
                   end
           key = Addressable::URI.unencode_component(key)
           key = key.dup.force_encoding(Encoding::ASCII_8BIT) if key.respond_to?(:force_encoding)

data/lib/webmock/version.rb

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

data/spec/acceptance/excon/excon_spec.rb

@@ -20,7 +20,8 @@ describe "Excon" do
     it "should support excon response_block for real requests", net_connect: true do
       a = []
       WebMock.allow_net_connect!
-      r = Excon.new('http://httpstat.us/200').get(response_block: lambda {|e, remaining, total| a << e}, chunk_size: 1)
+      r = Excon.new('http://httpstat.us/200', headers: { "Accept" => "*" }).
+        get(response_block: lambda {|e, remaining, total| a << e}, chunk_size: 1)
       expect(a).to eq(["2", "0", "0", " ", "O", "K"])
       expect(r.body).to eq("")
     end
@@ -40,7 +41,8 @@ describe "Excon" do
       WebMock.after_request { |_, res|
         response = res
       }
-      r = Excon.new('http://httpstat.us/200').get(response_block: lambda {|e, remaining, total| a << e}, chunk_size: 1)
+      r = Excon.new('http://httpstat.us/200', headers: { "Accept" => "*" }).
+        get(response_block: lambda {|e, remaining, total| a << e}, chunk_size: 1)
       expect(response.body).to eq("200 OK")
       expect(a).to eq(["2", "0", "0", " ", "O", "K"])
       expect(r.body).to eq("")

data/spec/acceptance/shared/callbacks.rb

@@ -102,7 +102,7 @@ shared_context "callbacks" do |*adapter_info|
           WebMock.after_request(except: [:other_lib])  do |_, response|
             @response = response
           end
-          http_request(:get, "http://httpstat.us/201")
+          http_request(:get, "http://httpstat.us/201", headers: { "Accept" => "*" })
         end
 
         it "should pass real response to callback with status and message" do

data/spec/unit/api_spec.rb

@@ -153,4 +153,23 @@ describe WebMock::API do
       end
     end
   end
+
+  describe '#reset_executed_requests!' do
+    subject {  WebMock::API.reset_executed_requests! }
+
+    let(:request_signature) { WebMock::RequestSignature.new(:get, "www.example.com") }
+    let(:request_pattern)   { WebMock::RequestPattern.new(:get, "www.example.com") }
+
+    before do
+      WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
+    end
+
+    it 'resets request registry counter' do
+      expect{
+        subject
+      }.to change{
+        WebMock::RequestRegistry.instance.times_executed(request_pattern)
+      }.from(1).to(0)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-03 00:00:00.000000000 Z
+date: 2018-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -399,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: webmock
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.