webmock 3.8.0 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7f69433e4cc2a3e16c2ba55df62db7f99585200c9bc9bc1d1e9f53df9fc8bb6
-  data.tar.gz: ffa4936d1432c8256bcd244db949cd75342170d60c9920707846ae6d12540434
+  metadata.gz: f4eb1f45308b980dfaa6f5e292efad872723d4f4d5d51a2edc07fac71f58ff79
+  data.tar.gz: b26aea6c4f2823a534274984ddf7a1d77bf69b0f9eb41e62dea9341c13efa028
 SHA512:
-  metadata.gz: 272c6a7bab37739d29fe8412264227325c4ceda06d17a6df13ba6ed317bda6770865063ef99b215c7880029f4a4dca1114e88fb5c0c017efeddee3a67f68cdf9
-  data.tar.gz: b86032f68e0e058d99c2ab61b1d360756d9bf4611cf383588feaad866a1d33964b4150a7819f5c1b0c64651539aed99499de7f8e1efbac476f99769f76abcfd4
+  metadata.gz: d914ab7d87674019a2f2ffe195a296ff488067b2971caf588f221ff6810fdbc7b646f529c680d7b0aefd09eb98a6db7b66fa1c8767f0fe6ee244df32e5ac583a
+  data.tar.gz: af18127a0082d5b74b400af4406909393de802ffc775ed5ecae25305ea0d06dbd571ed92d042d064c0aefad4e07b5ff32a660037fc63467143a4e0a71be3309b

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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

data/README.md

@@ -1118,6 +1118,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * 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/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

@@ -279,19 +279,22 @@ module Net  #:nodoc: all
     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.8.0' unless defined?(::WebMock::VERSION)
+  VERSION = '3.8.1' unless defined?(::WebMock::VERSION)
 end

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.8.0
+  version: 3.8.1
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 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.8.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/webmock/3.8.0
-  source_code_uri: https://github.com/bblimke/webmock/tree/v3.8.0
+  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.