webmock 2.2.0 → 2.3.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDA0NGYxYjJmZGI0OTNjMjhlNDhjMWRkNTMwZWZlNTQ4ZjhkZDljOQ==
-  data.tar.gz: !binary |-
-    MjgyODBlOWY3ODE1MmM0OTk4NDE5NzU1NjhkYzRiN2QwN2Q5MzZiNA==
+SHA1:
+  metadata.gz: e2360898f731c7559973a74945b09dec9b49d4e8
+  data.tar.gz: 544e6b9f40279e95d88a79d6b3fa80b2ed875862
 SHA512:
-  metadata.gz: !binary |-
-    ZjZiYWFmOTJjMDc3Yzk3Y2M1M2UxNzMyYWVkOWNiNTYyMWQzZTJhZDNmMjA3
-    ZjcxMjI5N2QzNTBhNTVlYzI4OTFlNjMyYTZlNjNiNjNkNmUxYThlYjQ1MzNm
-    YjlhMWI5YTE5OTZmYThiYTJhNTllOGRjNTkzYWEwY2U1M2M5ZmE=
-  data.tar.gz: !binary |-
-    NjI2YzNjODk0ZDBmNTM4N2NkMmU1NGZkNDVlOWFiZTUwYmQ3NGE0ZDJmYWRj
-    OTNjYmE3MWQxMTdmMzMwYTY5NmI1MWE5ODQ4YWY5MGQ2YWIzYTQ0NWVjMmJk
-    NGFiZjYzZTc4MzM4MWNlYWFjOGMzMTIwODY1M2NlZjFmYmRmNzU=
+  metadata.gz: 026d14aa0f2605e6ee7f229fa9bf5b47efabd51b8b17dc939b0202c65c922c5a11952ba5b025eb0d4f6b9c38c0c5e8a03b77f03afea4997013e54ef7d6c1d89e
+  data.tar.gz: 5634533246d042db493ae69993f4bb59f13aae9510a888008f50d98bcac85d8561380229098eaa3dab86bfe22160d50f523feace61e64e48464791885eb2f332

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:
   - ruby-2.4.0-preview3
   - 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,13 @@
 # Changelog
 
+## 2.3.1
+
+  * Added support for Ruby 2.4
+
+    Thanks to [Koichi ITO](https://github.com/koic)
+
+  * Dropped support for Ruby 1.9.3
+
 ## 2.2.0
 
   * Added `refute_requested` as an alias for `assert_not_requested`

data/README.md

@@ -32,11 +32,11 @@ 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
+* MRI 2.4
 * JRuby
 * Rubinius
 
@@ -1026,6 +1026,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Michael Grosser
 * Aleksei Maridashvili
 * Ville Lautanala
+* Koichi ITO
 
 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
@@ -248,6 +245,9 @@ class StubSocket #:nodoc:
     @closed ||= true
   end
 
+  def close
+  end
+
   def readuntil(*args)
   end
 
@@ -256,7 +256,7 @@ end
 module Net  #:nodoc: all
 
   class WebMockNetBufferedIO < BufferedIO
-    def initialize(io, debug_output = nil)
+    def initialize(io, read_timeout: 60, continue_timeout: nil, debug_output: nil)
       @read_timeout = 60
       @rbuf = ''
       @debug_output = debug_output

data/lib/webmock/request_stub.rb

@@ -62,7 +62,7 @@ module WebMock
     end
 
     def times(number)
-      raise "times(N) accepts integers >= 1 only" if !number.is_a?(Fixnum) || number < 1
+      raise "times(N) accepts integers >= 1 only" if !number.is_a?(Integer) || number < 1
       if @responses_sequences.empty?
         raise "Invalid WebMock stub declaration." +
           " times(N) can be declared only after response declaration."

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/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/version.rb

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

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/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,119 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: webmock
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-04 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.6
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.6
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: patron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.18
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.16
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -132,112 +126,112 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.27.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.27.5
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 3.5.0
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP
@@ -248,10 +242,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gemtest
-- .gitignore
-- .rspec-tm
-- .travis.yml
+- ".gemtest"
+- ".gitignore"
+- ".rspec-tm"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -390,17 +384,17 @@ require_paths:
 - lib
 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:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       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.