webmock 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2360898f731c7559973a74945b09dec9b49d4e8
-  data.tar.gz: 544e6b9f40279e95d88a79d6b3fa80b2ed875862
+  metadata.gz: c1069c0a60e8b12e1b55267f15e1e4fb3d57835b
+  data.tar.gz: 2cc2741c7f3a459e1f861d2975a71b5faa2a97a8
 SHA512:
-  metadata.gz: 026d14aa0f2605e6ee7f229fa9bf5b47efabd51b8b17dc939b0202c65c922c5a11952ba5b025eb0d4f6b9c38c0c5e8a03b77f03afea4997013e54ef7d6c1d89e
-  data.tar.gz: 5634533246d042db493ae69993f4bb59f13aae9510a888008f50d98bcac85d8561380229098eaa3dab86bfe22160d50f523feace61e64e48464791885eb2f332
+  metadata.gz: ed37a77fc5f8f16a5d672439a576a977d01dc930455cbe8e3acd65ad571c368597cbcfb21b98c8cb6f6173e877a8a955e4879ba62d73592e36f723594f45e00e
+  data.tar.gz: 6c9d14043a5f3fd8f359a6b4750c045c65b80c32fd8028c004f10b78fa80c586a2d81c21f1ac4ed6d6d1fba318c8c5ef071f54f5c665d3064c35157eda9dcb8a

data/.travis.yml

@@ -1,17 +1,21 @@
 rvm:
+  - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.2.1
   - 2.2.3
   - 2.3.0
-  - ruby-2.4.0-preview3
+  - 2.4.0
   - rbx-2
   - ruby-head
-  - jruby-9.0.5.0
-  - jruby-9.1.5.0
+  - jruby-9.0.0.0
+  - jruby-9.0.1.0
+  - jruby-19mode
+  - jruby
   - 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,11 @@
 # Changelog
 
+## 2.3.2
+
+  * Restored support for Ruby 1.9.3 to comply with semantic versioning.
+
+    Thanks to [Jordan Harband](https://github.com/ljharb) for reporting the problem.
+
 ## 2.3.1
 
   * Added support for Ruby 2.4

data/README.md

@@ -32,7 +32,8 @@ Supported HTTP libraries
 Supported Ruby Interpreters
 ---------------------------
 
-* MRI 2.0
+* MRI 1.9.3
+* MRI 2.0.0
 * MRI 2.1
 * MRI 2.2
 * MRI 2.3
@@ -1027,6 +1028,7 @@ People who submitted patches and new features or suggested improvements. Many th
 * Aleksei Maridashvili
 * Ville Lautanala
 * Koichi ITO
+* Jordan Harband
 
 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,6 +183,9 @@ 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
@@ -256,7 +259,21 @@ end
 module Net  #:nodoc: all
 
   class WebMockNetBufferedIO < BufferedIO
-    def initialize(io, read_timeout: 60, continue_timeout: nil, debug_output: nil)
+    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
       @rbuf = ''
       @debug_output = debug_output

data/lib/webmock/test_unit.rb

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

data/lib/webmock/util/json.rb

@@ -48,11 +48,21 @@ module WebMock
           right_pos = marks << json.bytesize
           output    = []
 
-          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]]
+          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")
             end
           end
 

data/lib/webmock/version.rb

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

data/spec/acceptance/httpclient/httpclient_spec_helper.rb

@@ -7,6 +7,7 @@ module HTTPClientSpecHelper
     uri = Addressable::URI.heuristic_parse(uri)
     c = options.fetch(:client) { HTTPClient.new }
     c.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    c.reset_all
     if options[:basic_auth]
       c.force_basic_auth = true
       c.set_basic_auth(nil, options[:basic_auth][0], options[:basic_auth][1])

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" do
+      it "should return stubbed response for url with non utf query params", "ruby>1.9" => true 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 = '>= 2.0'
+  s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency 'addressable', '>= 2.3.6'
+  s.add_dependency 'addressable', '>= 2.3.6', ('<= 2.4.0' if RUBY_VERSION <= '1.9.3')
   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',            '>= 0.8.0'
+  s.add_development_dependency 'http',            ((RUBY_VERSION <= '1.9.3') ? '0.7.3' : '>= 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.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-01 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.0
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
 - !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: '2.0'
+      version: 1.9.3
 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.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Library for stubbing HTTP requests in Ruby.