webmock 3.11.0 → 3.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee9c189319718f559e90e9e6d031d8dbdac98e9f0ae84c0c7e79d90bfc0dd493
-  data.tar.gz: cde291017ee8a2587c03e21d20317b96755ac15b94f1e4f287acc035c08ad904
+  metadata.gz: 6784322094783787fdf1a995a18c703ef70e0dccf59cbc8ad69cf086b11feb7b
+  data.tar.gz: e2e0fc45a8e44efdcfbfd777a733790b6d1762311f62762065e602c281daff09
 SHA512:
-  metadata.gz: 54838a253c586b32dfaf604b8f4c8efff34bb81a888bda860ca6e9b58ff0a5430376852e0d17a84d8ee4e56a088031d75d3ddb3d00d803789e6eb013e5493d9a
-  data.tar.gz: 9ddee20d1741ad835224254caaa8bbeda8807dc71c246c4ea8c3be18f31c089658f8c7a3b2fdf14da1f9cda32fe7c7cbf9cb594445ba92d47fa549754dd9b27e
+  metadata.gz: 277b355a34e07d6bf1c97692fe3c64c54518b16705fc9a6135b1b2000d0cd9e72256e88858e4b4c345cac9cda5d8edf2163f94e69ace05bbc6e75986eae0794d
+  data.tar.gz: ba7f43ee30745e58fa57d7030bce1bde7c334b719707642eadcce8963c0e52b88932913ed2a3115b59b6e3477830c87f9646961b7c5bdd95a95086ff733833c8

data/CHANGELOG.md

@@ -1,10 +1,22 @@
 # Changelog
 
+# 3.11.2
+
+  * Fix for Manticore streaming mode
+
+    Thanks to [Oleksiy Kovyrin](https://github.com/kovyrin)
+
+# 3.11.1
+
+  * Compatibility with async-http 0.54+
+
+    Thanks to [Jun Jiang](https://github.com/jasl)
+
 # 3.11.0
 
   * Added support for `features` in http.rb adapter.
 
-    Thanks to [Carl (ce07c3)](https://github.com/ce07c3) 
+    Thanks to [Carl (ce07c3)](https://github.com/ce07c3)
 
 # 3.10.0
 

data/README.md

@@ -1152,6 +1152,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Jesse Bowes
 * Marek Kasztelnik
 * ce07c3
+* Jun Jiang
+* Oleksiy Kovyrin
 
 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

@@ -40,8 +40,8 @@ if defined?(Async::HTTP)
         )
           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, **options)
+          @webmock_client = WebMockClient.new(webmock_endpoint, **options)
 
           @scheme = scheme
           @authority = authority

data/lib/webmock/http_lib_adapters/manticore_adapter.rb

@@ -127,8 +127,15 @@ if defined?(Manticore)
           def generate_webmock_response(manticore_response)
             webmock_response = WebMock::Response.new
             webmock_response.status = [manticore_response.code, manticore_response.message]
-            webmock_response.body = manticore_response.body
             webmock_response.headers = manticore_response.headers
+
+            # The attempt to read the body could fail if manticore is used in a streaming mode
+            webmock_response.body = begin
+              manticore_response.body
+            rescue ::Manticore::StreamClosedException
+              nil
+            end
+
             webmock_response
           end
         end

data/lib/webmock/version.rb

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

data/spec/acceptance/manticore/manticore_spec.rb

@@ -70,6 +70,38 @@ if RUBY_PLATFORM =~ /java/
           expect(failure_handler).to have_received(:call)
         end
       end
+
+      context 'when used in a streaming mode' do
+        let(:webmock_server_url) {"http://#{WebMockServer.instance.host_with_port}/"}
+        let(:result_chunks) { [] }
+
+        def manticore_streaming_get
+          Manticore.get(webmock_server_url).tap do |req|
+            req.on_success do |response|
+              response.body do |chunk|
+                result_chunks << chunk
+              end
+            end
+          end
+        end
+
+        context 'when connections are allowed' do
+          it 'works' do
+            WebMock.allow_net_connect!
+            expect { manticore_streaming_get.call }.to_not raise_error
+            expect(result_chunks).to_not be_empty
+          end
+        end
+
+        context 'when stubbed' do
+          it 'works' do
+            stub_body = 'hello!'
+            stub_request(:get, webmock_server_url).to_return(body: stub_body)
+            expect { manticore_streaming_get.call }.to_not raise_error
+            expect(result_chunks).to eq [stub_body]
+          end
+        end
+      end
     end
   end
 end

data/webmock.gemspec

@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest',        '>= 5.0.0'
   s.add_development_dependency 'test-unit',       '>= 3.0.0'
   s.add_development_dependency 'rdoc',            '>  3.5.0'
+  s.add_development_dependency 'webrick'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.11.2
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -254,6 +254,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP
   requests.
 email:
@@ -407,9 +421,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/bblimke/webmock/issues
-  changelog_uri: https://github.com/bblimke/webmock/blob/v3.11.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/webmock/3.11.0
-  source_code_uri: https://github.com/bblimke/webmock/tree/v3.11.0
+  changelog_uri: https://github.com/bblimke/webmock/blob/v3.11.2/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/webmock/3.11.2
+  source_code_uri: https://github.com/bblimke/webmock/tree/v3.11.2
   wiki_uri: https://github.com/bblimke/webmock/wiki
 post_install_message:
 rdoc_options: []