webmock 2.3.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1069c0a60e8b12e1b55267f15e1e4fb3d57835b
-  data.tar.gz: 2cc2741c7f3a459e1f861d2975a71b5faa2a97a8
+  metadata.gz: fa6515a5f5cc32fb13178203cd7005737dae9ed2
+  data.tar.gz: 351a2ceeac166e491aa4cff1d7c9db5b052cb96e
 SHA512:
-  metadata.gz: ed37a77fc5f8f16a5d672439a576a977d01dc930455cbe8e3acd65ad571c368597cbcfb21b98c8cb6f6173e877a8a955e4879ba62d73592e36f723594f45e00e
-  data.tar.gz: 6c9d14043a5f3fd8f359a6b4750c045c65b80c32fd8028c004f10b78fa80c586a2d81c21f1ac4ed6d6d1fba318c8c5ef071f54f5c665d3064c35157eda9dcb8a
+  metadata.gz: 55209329e78df950a0cc9f0dfaaf53e1e0029f64b158962f301d77cad5557f6d4e26c94523f5e0cb99afc0f09eacc0560d99d01928d0f604b45bc87d1c82272a
+  data.tar.gz: 200bcf41066c34527ff772e2f89105e6603810abb51724461444436b60484ff33630247f8642a1f3865723e717e9624bf14c7bae414c074cfc22289b04f61e1b

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.2.1
@@ -8,14 +7,11 @@ rvm:
   - 2.4.0
   - rbx-2
   - ruby-head
-  - jruby-9.0.0.0
-  - jruby-9.0.1.0
-  - jruby-19mode
-  - jruby
+  - jruby-9.0.5.0
+  - jruby-9.1.5.0
   - jruby-head
 matrix:
   allow_failures:
-    - rvm: jruby-9.0.0.0
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: rbx-2

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 3.0.0
+
+  * Dropped support for Ruby 1.9.3
+
+  * Using Ruby >= 1.9 hash key syntax in stub suggestions
+
+    Thanks to [Tarmo Tänav](https://github.com/tarmo)
+
+  * Add at_least matchers for fakeweb-style expectations
+
+    Thanks to [Joe Marty](https://github.com/mltsy)
+
+  * Fix against "can't modify frozen String' error when Ruby option `frozen_string_literal` is enabled.
+
+    Thanks to [Chris Thomson](https://github.com/christhomson)
+
+  * Handling `read_timeout` option in Net::HTTP in Ruby >= 2.4
+
+    Thanks to [Christof Koenig](https://github.com/ckoenig)
+
+  * `RequestRegistry` fix for `RuntimeError - can't add a new key into hash during iteration`
+
+    Thanks to [Chung-Yi Chi](https://github.com/starsirius)
+
 ## 2.3.2
 
   * Restored support for Ruby 1.9.3 to comply with semantic versioning.

data/README.md

@@ -32,8 +32,7 @@ Supported HTTP libraries
 Supported Ruby Interpreters
 ---------------------------
 
-* MRI 1.9.3
-* MRI 2.0.0
+* MRI 2.0
 * MRI 2.1
 * MRI 2.2
 * MRI 2.3
@@ -132,7 +131,7 @@ end    # ===> Success
 
 ```ruby
 stub_request(:post, "www.example.com").
-  with(body: /^.*world$/, headers: {"Content-Type" => /image\/.+/}).
+  with(body: /world$/, headers: {"Content-Type" => /image\/.+/}).
   to_return(body: "abc")
 
 uri = URI.parse('http://www.example.com/')
@@ -232,7 +231,7 @@ RestClient.get('user:pass@www.example.com')    # ===> Success
 ### Matching uris using regular expressions
 
 ```ruby
-stub_request(:any, /.*example.*/)
+stub_request(:any, /example/)
 
 Net::HTTP.get('www.example.com', '/')    # ===> Success
 ```
@@ -787,7 +786,7 @@ or these
 
 If you provide Regexp to match URI, WebMock will try to match it against every valid form of the same url.
 
-I.e `/.*my path.*/` will match `www.example.com/my%20path` because it is equivalent of `www.example.com/my path`
+I.e `/my path/` will match `www.example.com/my%20path` because it is equivalent of `www.example.com/my path`
 
 ## Matching with URI Templates
 
@@ -1029,6 +1028,13 @@ People who submitted patches and new features or suggested improvements. Many th
 * Ville Lautanala
 * Koichi ITO
 * Jordan Harband
+* Tarmo Tänav
+* Joe Marty
+* Chris Thomson
+* Vít Ondruch
+* George Ulmer
+* Christof Koenig
+* Chung-Yi Chi
 
 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

@@ -183,9 +183,6 @@ module WebMock
           if defined?(Net::OpenTimeout)
             # Ruby 2.x
             Net::OpenTimeout
-          elsif defined?(Net::HTTP::OpenTimeout)
-            # Ruby 1.9
-            Net::HTTP::OpenTimeout
           else
             # Fallback, if things change
             Timeout::Error
@@ -259,22 +256,8 @@ end
 module Net  #:nodoc: all
 
   class WebMockNetBufferedIO < BufferedIO
-    if RUBY_VERSION <= '1.9.3'
-      class_eval <<-DEFINE_METHOD
-        def initialize(io, debug_output = nil)
-          common_initialize(io, debug_output)
-        end
-      DEFINE_METHOD
-    else
-      class_eval <<-DEFINE_METHOD
-        def initialize(io, read_timeout: 60, continue_timeout: nil, debug_output: nil)
-          common_initialize(io, debug_output)
-        end
-      DEFINE_METHOD
-    end
-
-    def common_initialize(io, debug_output = nil)
-      @read_timeout = 60
+    def initialize(io, read_timeout: 60, continue_timeout: nil, debug_output: nil)
+      @read_timeout = read_timeout
       @rbuf = ''
       @debug_output = debug_output
 

data/lib/webmock/request_registry.rb

@@ -14,9 +14,9 @@ module WebMock
     end
 
     def times_executed(request_pattern)
-      self.requested_signatures.hash.select { |request_signature, times_executed|
+      self.requested_signatures.select do |request_signature|
         request_pattern.matches?(request_signature)
-      }.inject(0) {|sum, (_, times_executed)| sum + times_executed }
+      end.inject(0) { |sum, (_, times_executed)| sum + times_executed }
     end
 
     def to_s

data/lib/webmock/rspec/matchers/webmock_matcher.rb

@@ -16,6 +16,21 @@ module WebMock
       self
     end
 
+    def at_least_once
+      @request_execution_verifier.at_least_times_executed = 1
+      self
+    end
+
+    def at_least_twice
+      @request_execution_verifier.at_least_times_executed = 2
+      self
+    end
+
+    def at_least_times(times)
+      @request_execution_verifier.at_least_times_executed = times
+      self
+    end
+
     def with(options = {}, &block)
       @request_execution_verifier.request_pattern.with(options, &block)
       self

data/lib/webmock/stub_request_snippet.rb

@@ -16,17 +16,17 @@ module WebMock
       with = ""
 
       if (request_pattern.body_pattern)
-        with << ":body => #{request_pattern.body_pattern.to_s}"
+        with << "body: #{request_pattern.body_pattern.to_s}"
       end
 
       if (request_pattern.headers_pattern)
         with << ",\n       " unless with.empty?
 
-        with << ":headers => #{request_pattern.headers_pattern.to_s}"
+        with << "headers: #{request_pattern.headers_pattern.to_s}"
       end
       string << ".\n  with(#{with})" unless with.empty?
       if with_response
-        string << ".\n  to_return(:status => 200, :body => \"\", :headers => {})"
+        string << ".\n  to_return(status: 200, body: \"\", headers: {})"
       end
       string
     end

data/lib/webmock/test_unit.rb

@@ -19,4 +19,4 @@ module Test
   end
 end
 
-WebMock::AssertionFailure.error_class = Test::Unit::AssertionFailedError rescue MiniTest::Assertion # ruby1.9 compat
+WebMock::AssertionFailure.error_class = Test::Unit::AssertionFailedError

data/lib/webmock/util/hash_counter.rb

@@ -22,6 +22,13 @@ module WebMock
         end
       end
 
+      def select(&block)
+        return unless block_given?
+        @lock.synchronize do
+          hash.select &block
+        end
+      end
+
       def each(&block)
         @order.to_a.sort {|a, b| a[1] <=> b[1]}.each do |a|
           block.call(a[0], hash[a[0]])

data/lib/webmock/util/json.rb

@@ -48,21 +48,11 @@ module WebMock
           right_pos = marks << json.bytesize
           output    = []
 
-          if RUBY_VERSION != "1.9.2"
-            left_pos.each_with_index do |left, i|
-              if json.respond_to?(:byteslice)
-                output << json.byteslice(left.succ..right_pos[i])
-              else
-                output << json[left.succ..right_pos[i]]
-              end
-            end
-          else
-            json_as_binary = json.force_encoding("binary")
-            left_pos.each_with_index do |left, i|
-              output << json_as_binary[left.succ..right_pos[i]]
-            end
-            output.map! do |binary_str|
-              binary_str.force_encoding("UTF-8")
+          left_pos.each_with_index do |left, i|
+            if json.respond_to?(:byteslice)
+              output << json.byteslice(left.succ..right_pos[i])
+            else
+              output << json[left.succ..right_pos[i]]
             end
           end
 

data/lib/webmock/util/query_mapper.rb

@@ -39,7 +39,7 @@ module WebMock::Util
       #   #=> [['one', 'two'], ['one', 'three']]
       def query_to_values(query, options={})
         return nil if query.nil?
-        query.force_encoding('utf-8') if query.respond_to?(:force_encoding)
+        query = query.dup.force_encoding('utf-8') if query.respond_to?(:force_encoding)
 
         options[:notation] ||= :subscript
 

data/lib/webmock/version.rb

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

data/spec/acceptance/httpclient/httpclient_spec.rb

@@ -182,7 +182,7 @@ describe "HTTPClient" do
     end
   end
 
-  context 'httpclient streams response' do
+  context 'httpclient streams response', net_connect: true do
     before do
       WebMock.allow_net_connect!
       WebMock.after_request(except: [:other_lib])  do |_, response|
@@ -201,7 +201,8 @@ describe "HTTPClient" do
 
   context 'credentials' do
     it 'are detected when manually specifying Authorization header' do
-      stub_request(:get, 'username:password@www.example.com').to_return(status: 200)
+      stub_request(:get, "http://www.example.com/").with(basic_auth: ['username', 'password']).to_return(status: 200)
+
       headers = {'Authorization' => 'Basic dXNlcm5hbWU6cGFzc3dvcmQ='}
       expect(http_request(:get, 'http://www.example.com/', {headers: headers}).status).to eql('200')
     end

data/spec/acceptance/net_http/net_http_shared.rb

@@ -43,6 +43,17 @@ shared_examples_for "Net::HTTP" do
       end
     end
 
+    it "should pass the read_timeout value on", net_connect: true do
+      @http = Net::HTTP.new('localhost', port)
+      read_timeout = @http.read_timeout + 1
+      @http.read_timeout = read_timeout
+      @http.start {|conn|
+        conn.request(Net::HTTP::Get.new("/"))
+        socket = conn.instance_variable_get(:@socket)
+        expect(socket.read_timeout).to eq(read_timeout)
+      }
+    end
+
     describe "without start" do
       it "should close connection after a real request" do
         @http.get('/') { }

data/spec/acceptance/shared/stubbing_requests.rb

@@ -18,7 +18,7 @@ shared_examples_for "stubbing requests" do |*adapter_info|
         expect(http_request(:get, "http://www.example.com/hello+/?#{NOT_ESCAPED_PARAMS}").body).to eq("abc")
       end
 
-      it "should return stubbed response for url with non utf query params", "ruby>1.9" => true do
+      it "should return stubbed response for url with non utf query params" do
         param = 'aäoöuü'.encode('iso-8859-1')
         param = CGI.escape(param)
         stub_request(:get, "www.example.com/?#{param}").to_return(body: "abc")

data/spec/unit/request_registry_spec.rb

@@ -43,6 +43,25 @@ describe WebMock::RequestRegistry do
     it "should report number of times all matching pattern were requested" do
       expect(WebMock::RequestRegistry.instance.times_executed(WebMock::RequestPattern.new(:get, /.*example.*/))).to eq(3)
     end
+
+    describe "multithreading" do
+      let(:request_pattern) { WebMock::RequestPattern.new(:get, "www.example.com") }
+
+      # Reproduce a multithreading issue that causes a RuntimeError:
+      #   can't add a new key into hash during iteration.
+      it "works normally iterating on the requested signature hash while another thread is setting it" do
+        thread_injected = false
+        allow(request_pattern).to receive(:matches?).and_wrap_original do |m, *args|
+          unless thread_injected
+            thread_injected = true
+            Thread.new { WebMock::RequestRegistry.instance.requested_signatures.put(:abc) }.join(0.1)
+          end
+          m.call(*args)
+        end
+        expect(WebMock::RequestRegistry.instance.times_executed(request_pattern)).to eq(2)
+        sleep 0.1 while !WebMock::RequestRegistry.instance.requested_signatures.hash.key?(:abc)
+      end
+    end
   end
 
   describe "request_signatures" do

data/spec/unit/request_signature_snippet_spec.rb

@@ -60,7 +60,7 @@ RSpec.describe WebMock::RequestSignatureSnippet do
         result = subject.request_stubs
         result.sub!("registered request stubs:\n\n", "")
         expect(result).to eq(
-          "stub_request(:get, \"https://www.example.com/\").\n  with(:body => {\"a\"=>\"b\"})"
+          "stub_request(:get, \"https://www.example.com/\").\n  with(body: {\"a\"=>\"b\"})"
         )
       end
 
@@ -74,7 +74,7 @@ RSpec.describe WebMock::RequestSignatureSnippet do
         result = subject.request_stubs
         result.sub!("registered request stubs:\n\n", "")
         expect(result).to eq(
-          "stub_request(:get, \"https://www.example.com/\").\n  with(:body => {\"a\"=>\"b\"})\n\nBody diff:\n [[\"-\", \"key\", \"different value\"], [\"+\", \"a\", \"b\"]]\n"
+          "stub_request(:get, \"https://www.example.com/\").\n  with(body: {\"a\"=>\"b\"})\n\nBody diff:\n [[\"-\", \"key\", \"different value\"], [\"+\", \"a\", \"b\"]]\n"
         )
       end
     end

data/spec/unit/stub_request_snippet_spec.rb

@@ -8,7 +8,7 @@ describe WebMock::StubRequestSnippet do
       end
 
       it "should print stub request snippet with url with params and method and empty successful response" do
-        expected = %Q(stub_request(:get, "http://www.example.com/?a=b&c=d").\n  to_return(:status => 200, :body => "", :headers => {}))
+        expected = %Q(stub_request(:get, "http://www.example.com/?a=b&c=d").\n  to_return(status: 200, body: "", headers: {}))
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
       end
@@ -16,8 +16,8 @@ describe WebMock::StubRequestSnippet do
       it "should print stub request snippet with body if available" do
         @request_signature.body = "abcdef"
         expected = %Q(stub_request(:get, "http://www.example.com/?a=b&c=d").)+
-        "\n  with(:body => \"abcdef\")." +
-        "\n  to_return(:status => 200, :body => \"\", :headers => {})"
+        "\n  with(body: \"abcdef\")." +
+        "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
       end
@@ -25,8 +25,8 @@ describe WebMock::StubRequestSnippet do
       it "should print stub request snippet with multiline body" do
         @request_signature.body = "abc\ndef"
         expected = %Q(stub_request(:get, "http://www.example.com/?a=b&c=d").)+
-        "\n  with(:body => \"abc\\ndef\")." +
-        "\n  to_return(:status => 200, :body => \"\", :headers => {})"
+        "\n  with(body: \"abc\\ndef\")." +
+        "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
       end
@@ -34,8 +34,8 @@ describe WebMock::StubRequestSnippet do
       it "should print stub request snippet with headers if any" do
         @request_signature.headers = {'B' => 'b', 'A' => 'a'}
         expected = 'stub_request(:get, "http://www.example.com/?a=b&c=d").'+
-        "\n  with(:headers => {\'A\'=>\'a\', \'B\'=>\'b\'})." +
-        "\n  to_return(:status => 200, :body => \"\", :headers => {})"
+        "\n  with(headers: {\'A\'=>\'a\', \'B\'=>\'b\'})." +
+        "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
       end
@@ -44,15 +44,15 @@ describe WebMock::StubRequestSnippet do
         @request_signature.body = "abcdef"
         @request_signature.headers = {'B' => 'b', 'A' => 'a'}
         expected = 'stub_request(:get, "http://www.example.com/?a=b&c=d").'+
-        "\n  with(:body => \"abcdef\",\n       :headers => {\'A\'=>\'a\', \'B\'=>\'b\'})." +
-        "\n  to_return(:status => 200, :body => \"\", :headers => {})"
+        "\n  with(body: \"abcdef\",\n       headers: {\'A\'=>\'a\', \'B\'=>\'b\'})." +
+        "\n  to_return(status: 200, body: \"\", headers: {})"
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected)
       end
 
       it "should not print to_return part if not wanted" do
         expected = 'stub_request(:get, "http://www.example.com/").'+
-        "\n  with(:body => \"abcdef\")"
+        "\n  with(body: \"abcdef\")"
         stub = WebMock::RequestStub.new(:get, "www.example.com").with(body: "abcdef").to_return(body: "hello")
         expect(WebMock::StubRequestSnippet.new(stub).to_s(false)).to eq(expected)
       end
@@ -68,9 +68,9 @@ describe WebMock::StubRequestSnippet do
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expected = <<-STUB
 stub_request(:post, "http://www.example.com/").
-  with(:body => {"user"=>{"first_name"=>"Bartosz"}},
-       :headers => {'Content-Type'=>'application/x-www-form-urlencoded'}).
-  to_return(:status => 200, :body => \"\", :headers => {})
+  with(body: {"user"=>{"first_name"=>"Bartosz"}},
+       headers: {'Content-Type'=>'application/x-www-form-urlencoded'}).
+  to_return(status: 200, body: \"\", headers: {})
         STUB
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected.strip)
       end
@@ -82,9 +82,9 @@ stub_request(:post, "http://www.example.com/").
         @request_stub = WebMock::RequestStub.from_request_signature(@request_signature)
         expected = <<-STUB
 stub_request(:post, "http://www.example.com/").
-  with(:body => "#{multipart_form_body}",
-       :headers => {'Content-Type'=>'multipart/form-data; boundary=ABC123'}).
-  to_return(:status => 200, :body => \"\", :headers => {})
+  with(body: "#{multipart_form_body}",
+       headers: {'Content-Type'=>'multipart/form-data; boundary=ABC123'}).
+  to_return(status: 200, body: \"\", headers: {})
         STUB
         expect(WebMock::StubRequestSnippet.new(@request_stub).to_s).to eq(expected.strip)
       end

data/spec/unit/util/query_mapper_spec.rb

@@ -64,6 +64,12 @@ describe WebMock::Util::QueryMapper do
       expect(hsh['a'][0]['b']).to eq(['one'])
       expect(hsh['a'][0]['c']).to eq(['two'])
     end
+
+    it 'should not attempt to mutate its query argument' do
+      query = "a=foo".freeze
+      hsh = subject.query_to_values(query)
+      expect(hsh['a']).to eq('foo')
+    end
   end
 
   context '#to_query' do

data/webmock.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'webmock'
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0'
 
-  s.add_dependency 'addressable', '>= 2.3.6', ('<= 2.4.0' if RUBY_VERSION <= '1.9.3')
+  s.add_dependency 'addressable', '>= 2.3.6'
   s.add_dependency 'crack', '>= 0.3.2'
   s.add_dependency 'hashdiff'
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency 'typhoeus', '>= 0.5.0'
   end
 
-  s.add_development_dependency 'http',            ((RUBY_VERSION <= '1.9.3') ? '0.7.3' : '>= 0.8.0')
+  s.add_development_dependency 'http',            '>= 0.8.0'
   s.add_development_dependency 'manticore',       '>= 0.5.1' if RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'rack',            ((RUBY_VERSION < '2.2.2') ? '1.6.0' : '> 1.6')
   s.add_development_dependency 'rspec',           '>= 3.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-01 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -112,16 +112,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -386,7 +386,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -394,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: webmock
-rubygems_version: 2.6.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.