webmock 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: '086af9d48e21a095a9447cee1e20b2630a9fcbe299a5212a9f13e8daa5209f71'
-  data.tar.gz: 7afbd414ac88a4da8180934c81adea158230a8bac7eaa0c24f7cefceab056101
+SHA1:
+  metadata.gz: 91d9ae63bf5035f1d5ca0279cd0a8f4ec3ea80e9
+  data.tar.gz: b59813f02e62e3f5fa9b86e396d6da32f61f1a35
 SHA512:
-  metadata.gz: 995f6f1be116147e3b832a0070b6cf780bfcaf45b2aae80c0a61f990c20c199955418cc809ba6489cbce7cef0c568571e811bb93a42633e0fb512f48c3b003c5
-  data.tar.gz: 5d2f3395dedcc227e1e492e5e7d6938cb9224e0084a09b6d157e204cc7205835c87816cb62068cbcbbf6290a0fb4f4a5f41465345da0fd30e065f74b3d36b8e0
+  metadata.gz: 576e5b246b09980d0a371a3b83468ef8d715917b29d1f6bc07fbb0c7398346c7effbcd3a9b8a6dcf9634f9531d49f8b85fe9f196f5afcaddbddc1cc6be5cb5c7
+  data.tar.gz: 19eb107133e2f8a12bf9859fd0cf444afe78d8d6da3057d93928344e2d67c8c99ccd2554d749dcae94f4cad3ebea915ba54b8f5296c42d7a8809023f10e242dc

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 3.4.2
+
+  * Fixed `rbuf_fill` in Net::HTTP adapter to be thread-safe
+
+    Thanks to [Arkadiy Tetelman](https://github.com/arkadiyt)
+
+  * Fix invalid scheme error with Addressable::Template
+
+    Thanks to [Kazato Sugimoto](https://github.com/uiureo)
+
 ## 3.4.1
 
  * When comparing url encoded body to a body from request stub, which was declared as hash, only String, Numeric and boolean hash values are stringified before the comparison.

data/README.md

@@ -1056,6 +1056,8 @@ People who submitted patches and new features or suggested improvements. Many th
 * Kenny Ortmann
 * redbar0n
 * Lukas Pokorny
+* Arkadiy Tetelman
+* Kazato Sugimoto
 
 For a full list of contributors you can visit the
 [contributors](https://github.com/bblimke/webmock/contributors) page.

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -274,7 +274,10 @@ module Net  #:nodoc: all
 
     if RUBY_VERSION >= '2.6.0'
       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

data/lib/webmock/request_pattern.rb

@@ -155,10 +155,10 @@ module WebMock
     def matches?(uri)
       if @query_params.nil?
         # Let Addressable check the whole URI
-        WebMock::Util::URI.variations_of_uri_as_strings(uri).any? { |u| @pattern.match(u) }
+        matches_with_variations?(uri)
       else
         # WebMock checks the query, Addressable checks everything else
-        WebMock::Util::URI.variations_of_uri_as_strings(uri.omit(:query)).any? { |u| @pattern.match(u) } &&
+        matches_with_variations?(uri.omit(:query)) &&
           @query_params == WebMock::Util::QueryMapper.query_to_values(uri.query)
       end
     end
@@ -177,6 +177,15 @@ module WebMock
       str += " with variables #{@pattern.variables.inspect}" if @pattern.variables
       str
     end
+
+    private
+
+    def matches_with_variations?(uri)
+      normalized_template = Addressable::Template.new(WebMock::Util::URI.heuristic_parse(@pattern.pattern))
+
+      WebMock::Util::URI.variations_of_uri_as_strings(uri, only_with_scheme: true)
+        .any? { |u| normalized_template.match(u) }
+    end
   end
 
   class URIStringPattern < URIPattern

data/lib/webmock/util/uri.rb

@@ -33,7 +33,7 @@ module WebMock
         NORMALIZED_URIS[uri].dup
       end
 
-      def self.variations_of_uri_as_strings(uri_object)
+      def self.variations_of_uri_as_strings(uri_object, only_with_scheme: false)
         normalized_uri = normalize_uri(uri_object.dup).freeze
         uris = [ normalized_uri ]
 
@@ -47,7 +47,7 @@ module WebMock
           uris = uris_with_inferred_port_and_without(uris)
         end
 
-        if normalized_uri.scheme == "http"
+        if normalized_uri.scheme == "http" && !only_with_scheme
           uris = uris_with_scheme_and_without(uris)
         end
 

data/lib/webmock/version.rb

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

data/spec/unit/request_pattern_spec.rb

@@ -121,6 +121,12 @@ describe WebMock::RequestPattern do
         to match(WebMock::RequestSignature.new(:get, "www.example.com"))
     end
 
+    it "should match if Addressable::Template pattern that has ip address host matches request uri" do
+      signature = WebMock::RequestSignature.new(:get, "127.0.0.1:3000/1234")
+      uri = Addressable::Template.new("127.0.0.1:3000/{id}")
+      expect(WebMock::RequestPattern.new(:get, uri)).to match(signature)
+    end
+
     it "should match for uris with same parameters as pattern" do
       expect(WebMock::RequestPattern.new(:get, "www.example.com?a=1&b=2")).
         to match(WebMock::RequestSignature.new(:get, "www.example.com?a=1&b=2"))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-06-03 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.7.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.