webmock 3.7.3 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6023ac450eb0fc7d307ffd764f811e9d409e28fdfabdb215bec15d4e4ea7a363
-  data.tar.gz: 2417fb3aecf50a9b48dc84ee1eb55da9493cff52c68c8a292e0d9215f1c52379
+  metadata.gz: f4eb1f45308b980dfaa6f5e292efad872723d4f4d5d51a2edc07fac71f58ff79
+  data.tar.gz: b26aea6c4f2823a534274984ddf7a1d77bf69b0f9eb41e62dea9341c13efa028
 SHA512:
-  metadata.gz: a83cdbc53a9c75e6d4db3f01e727cc2cb27fb8097dfbad2cd36b39e263bfdc570f60b1c2b924845f81bff2c89dbd91758061c830293c86d0f3a2ba2bb01d619a
-  data.tar.gz: 07cc56e80c126f76ecd53a00b218e80c0a07760d478b1d8354d85f7057828256f4dcc2e857312c83a2bfadbdbcfda0bb20c82510949cabdb24fd3f50657fffbb
+  metadata.gz: d914ab7d87674019a2f2ffe195a296ff488067b2971caf588f221ff6810fdbc7b646f529c680d7b0aefd09eb98a6db7b66fa1c8767f0fe6ee244df32e5ac583a
+  data.tar.gz: af18127a0082d5b74b400af4406909393de802ffc775ed5ecae25305ea0d06dbd571ed92d042d064c0aefad4e07b5ff32a660037fc63467143a4e0a71be3309b

data/.travis.yml

@@ -1,11 +1,11 @@
 before_install:
-  - gem update --system
-  - gem update bundler
+  - gem update --system -N
 rvm:
   - 2.3.8
   - 2.4.6
   - 2.5.5
   - 2.6.3
+  - 2.7.0
   - rbx-2
   - ruby-head
   - jruby-9.1.17.0

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## 3.8.1
+
+  * Added support for mocking non-ASCII bodies when making requests with HTTP.rb
+
+    Thanks to [Patrik Ragnarsson](https://github.com/dentarg)
+
+## 3.8.0
+
+  * Fixed options handling when initialising Async::HTTP::Client
+
+    Thanks to [Samuel Williams](https://github.com/ioquatix)
+
+  * Ruby 2.7 support.
+
+    Thanks to [Ryan Davis](https://github.com/zenspider) and [Brandur](https://github.com/brandur)
+
+## 3.7.6
+
+  * Suppressed keyword argument warnings in Ruby 2.7 in async-http adapter.
+
+    Thanks to [Koichi ITO](https://github.com/koic)
+
+## 3.7.5
+
+  * Suppress Excon warning generated by extra key
+
+    Thanks to [Marco Costa](https://github.com/marcotc)
+
+## 3.7.4
+
+  * Resetting memoized response fields in Curb adapter.
+
+    Thanks to [Andrei Sidorov](https://github.com/heretge)
+
 ## 3.7.3
 
   * Fix for http.rb. Allow passing an output buffer to HTTP::Response::Body#readpartial

data/README.md

@@ -43,6 +43,7 @@ Supported Ruby Interpreters
 * MRI 2.4
 * MRI 2.5
 * MRI 2.6
+* MRI 2.7
 * JRuby
 * Rubinius
 
@@ -1112,8 +1113,12 @@ People who submitted patches and new features or suggested improvements. Many th
 * George Claghorn
 * Alex Junger
 * Orien Madgwick
-
-
+* Andrei Sidorov
+* Marco Costa
+* Ryan Davis
+* Brandur
+* Samuel Williams
+* Patrik Ragnarsson
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/async_http_client_adapter.rb

@@ -36,12 +36,12 @@ if defined?(Async::HTTP)
           protocol = endpoint.protocol,
           scheme = endpoint.scheme,
           authority = endpoint.authority,
-          options = {}
+          **options
         )
           webmock_endpoint = WebMockEndpoint.new(scheme, authority, protocol)
 
-          @network_client = WebMockClient.new(endpoint, protocol, scheme, authority, options)
-          @webmock_client = WebMockClient.new(webmock_endpoint, protocol, scheme, authority, options)
+          @network_client = WebMockClient.new(endpoint, protocol, scheme, authority, **options)
+          @webmock_client = WebMockClient.new(webmock_endpoint, protocol, scheme, authority, **options)
 
           @scheme = scheme
           @authority = authority

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -340,6 +340,10 @@ if defined?(Curl)
 
       def reset
         instance_variable_set(:@body_str, nil)
+        instance_variable_set(:@content_type, nil)
+        instance_variable_set(:@header_str, nil)
+        instance_variable_set(:@last_effective_url, nil)
+        instance_variable_set(:@response_code, nil)
         super
       end
     end

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -159,4 +159,7 @@ if defined?(Excon)
       end
     end
   end
+
+  # Suppresses Excon connection argument validation warning
+  Excon::VALID_CONNECTION_KEYS << :__construction_args
 end

data/lib/webmock/http_lib_adapters/http_rb/response.rb

@@ -14,7 +14,7 @@ module HTTP
       def from_webmock(webmock_response, request_signature = nil)
         status  = Status.new(webmock_response.status.first)
         headers = webmock_response.headers || {}
-        body    = Body.new Streamer.new webmock_response.body
+        body    = Body.new(Streamer.new(webmock_response.body), encoding: webmock_response.body.encoding)
         uri     = normalize_uri(request_signature && request_signature.uri)
 
         return new(status, "1.1", headers, body, uri) if HTTP::VERSION < "1.0.0"

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -228,9 +228,9 @@ class PatchedStringIO < StringIO #:nodoc:
 
   alias_method :orig_read_nonblock, :read_nonblock
 
-  def read_nonblock(size, *args)
+  def read_nonblock(size, *args, **kwargs)
     args.reject! {|arg| !arg.is_a?(Hash)}
-    orig_read_nonblock(size, *args)
+    orig_read_nonblock(size, *args, **kwargs)
   end
 
 end
@@ -257,7 +257,7 @@ end
 module Net  #:nodoc: all
 
   class WebMockNetBufferedIO < BufferedIO
-    def initialize(io, *args)
+    def initialize(io, *args, **kwargs)
       io = case io
       when Socket, OpenSSL::SSL::SSLSocket, IO
         io
@@ -268,23 +268,33 @@ module Net  #:nodoc: all
       end
       raise "Unable to create local socket" unless io
 
-      super
+      # Prior to 2.4.0 `BufferedIO` only takes a single argument (`io`) with no
+      # options. Here we pass through our full set of arguments only if we're
+      # on 2.4.0 or later, and use a simplified invocation otherwise.
+      if RUBY_VERSION >= '2.4.0'
+        super
+      else
+        super(io)
+      end
     end
 
     if RUBY_VERSION >= '2.6.0'
+      # https://github.com/ruby/ruby/blob/7d02441f0d6e5c9d0a73a024519eba4f69e36dce/lib/net/protocol.rb#L208
+      # Modified version of method from ruby, so that nil is always passed into orig_read_nonblock to avoid timeout
       def rbuf_fill
-        current_thread_id = Thread.current.object_id
-
-        trace = TracePoint.trace(:line) do |tp|
-          next unless Thread.current.object_id == current_thread_id
-          if tp.binding.local_variable_defined?(:tmp)
-            tp.binding.local_variable_set(:tmp, nil)
-          end
-        end
-
-        super
-      ensure
-        trace.disable
+        case rv = @io.read_nonblock(BUFSIZE, nil, exception: false)
+        when String
+          return if rv.nil?
+          @rbuf << rv
+          rv.clear
+          return
+        when :wait_readable
+          @io.to_io.wait_readable(@read_timeout) or raise Net::ReadTimeout
+        when :wait_writable
+          @io.to_io.wait_writable(@read_timeout) or raise Net::ReadTimeout
+        when nil
+          raise EOFError, 'end of file reached'
+        end while true
       end
     end
   end

data/lib/webmock/version.rb

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

data/spec/acceptance/curb/curb_spec.rb

@@ -474,18 +474,25 @@ unless RUBY_PLATFORM =~ /java/
       include CurbSpecHelper::ClassPerform
     end
 
-    describe "using .reset" do
+    describe "using #reset" do
       before do
         @curl = Curl::Easy.new
         @curl.url = "http://example.com"
-        body = "on_success fired"
-        stub_request(:any, "example.com").to_return(body: body)
+        stub_request(:any, "example.com").
+          to_return(body: "abc",
+                    headers: { "Content-Type" => "application/json" })
         @curl.http_get
       end
 
-      it "should clear the body_str" do
+      it "should clear all memoized response fields" do
         @curl.reset
-        expect(@curl.body_str).to eq(nil)
+        expect(@curl).to have_attributes(
+          body_str: nil,
+          content_type: nil,
+          header_str: nil,
+          last_effective_url: nil,
+          response_code: 0,
+        )
       end
     end
   end

data/spec/acceptance/excon/excon_spec_helper.rb

@@ -28,6 +28,8 @@ module ExconSpecHelper
       res
     end
 
+    Excon.set_raise_on_warnings!(true)
+
     OpenStruct.new \
       body: response.body,
       headers: headers,

data/spec/acceptance/http_rb/http_rb_spec.rb

@@ -74,13 +74,13 @@ describe "HTTP.rb" do
   context "streamer" do
     it "can be read to a provided buffer" do
       stub_request(:get, "example.com/foo")
-        .to_return(status: 200, body: "Hello world!")
+        .to_return(status: 200, body: "Hello world! ")
       response = HTTP.get "http://example.com/foo"
 
       buffer = ""
       response.body.readpartial(1024, buffer)
 
-      expect(buffer).to eq "Hello world!"
+      expect(buffer).to eq "Hello world! "
     end
 
     it "can be closed" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: 3.8.1
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-13 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -407,9 +407,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/bblimke/webmock/issues
-  changelog_uri: https://github.com/bblimke/webmock/blob/v3.7.3/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/webmock/3.7.3
-  source_code_uri: https://github.com/bblimke/webmock/tree/v3.7.3
+  changelog_uri: https://github.com/bblimke/webmock/blob/v3.8.1/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/webmock/3.8.1
+  source_code_uri: https://github.com/bblimke/webmock/tree/v3.8.1
   wiki_uri: https://github.com/bblimke/webmock/wiki
 post_install_message: 
 rdoc_options: []
@@ -426,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.