webmock 1.8.3 → 1.8.4

data/.gitignore

@@ -25,3 +25,4 @@ Gemfile.lock
 pkg/*
 tmp/*
 *.rbc
+*.rbx

data/.travis.yml

@@ -4,6 +4,8 @@ rvm:
   - 1.9.3
   - ree
   - jruby-19mode
+  - jruby-18mode
+  - rbx-18mode
+  - rbx-19mode
 
-
-script: "bundle exec rake && rake em_http_request_0_x_spec"
+script: "bundle exec rake && rake em_http_request_0_x_spec"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.8.4
+
+* Warning message is printed when an unsupported version of a http library is loaded.
+
+    Thanks to [Alexander Staubo](https://github.com/alexstaubo) for reporting the problem and to [Myron Marston](https://github.com/myronmarston) for a help with solution.
+
 ## 1.8.3
 
 * Fixed compatibility with latest em-http-request

data/Gemfile

@@ -17,5 +17,5 @@ group :test do
 end
 
 platforms :jruby do
-  gem 'jruby-openssl', '~> 0.7'
+  gem 'jruby-openssl', '~> 0.7.4.0'
 end

data/README.md

@@ -36,6 +36,7 @@ Supported Ruby Interpreters
 * MRI 1.9.3
 * REE 1.8.7
 * JRuby
+* Rubinius
 
 ##Installation
 

data/lib/webmock.rb

@@ -6,16 +6,6 @@ require 'crack'
 require 'webmock/deprecation'
 require 'webmock/version'
 
-require 'webmock/http_lib_adapters/http_lib_adapter_registry'
-require 'webmock/http_lib_adapters/http_lib_adapter'
-require 'webmock/http_lib_adapters/net_http'
-require 'webmock/http_lib_adapters/httpclient_adapter'
-require 'webmock/http_lib_adapters/patron_adapter'
-require 'webmock/http_lib_adapters/curb_adapter'
-require 'webmock/http_lib_adapters/em_http_request_adapter'
-require 'webmock/http_lib_adapters/typhoeus_hydra_adapter'
-require 'webmock/http_lib_adapters/excon_adapter'
-
 require 'webmock/errors'
 
 require 'webmock/util/uri'
@@ -23,6 +13,7 @@ require 'webmock/util/headers'
 require 'webmock/util/hash_counter'
 require 'webmock/util/hash_keys_stringifier'
 require 'webmock/util/json'
+require 'webmock/util/version_checker'
 
 require 'webmock/matchers/hash_including_matcher'
 
@@ -42,4 +33,17 @@ require 'webmock/callback_registry'
 require 'webmock/request_registry'
 require 'webmock/stub_registry'
 require 'webmock/api'
+
+require 'webmock/http_lib_adapters/http_lib_adapter_registry'
+require 'webmock/http_lib_adapters/http_lib_adapter'
+require 'webmock/http_lib_adapters/net_http'
+require 'webmock/http_lib_adapters/httpclient_adapter'
+require 'webmock/http_lib_adapters/patron_adapter'
+require 'webmock/http_lib_adapters/curb_adapter'
+require 'webmock/http_lib_adapters/em_http_request_adapter'
+require 'webmock/http_lib_adapters/typhoeus_hydra_adapter'
+require 'webmock/http_lib_adapters/excon_adapter'
+
 require 'webmock/webmock'
+
+

data/lib/webmock/http_lib_adapters/curb_adapter.rb

@@ -5,6 +5,8 @@ rescue LoadError
 end
 
 if defined?(Curl)
+  WebMock::VersionChecker.new('Curb', Gem.loaded_specs['curb'].version.to_s, '0.7.16').check_version!
+
   module WebMock
     module HttpLibAdapters
       class CurbAdapter < HttpLibAdapter

data/lib/webmock/http_lib_adapters/excon_adapter.rb

@@ -5,6 +5,7 @@ rescue LoadError
 end
 
 if defined?(Excon)
+  WebMock::VersionChecker.new('Excon', Excon::VERSION, '0.9.6').check_version!
 
   module WebMock
     module HttpLibAdapters

data/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb

@@ -5,6 +5,7 @@ rescue LoadError
 end
 
 if defined?(Typhoeus)
+  WebMock::VersionChecker.new('Typhoeus', Typhoeus::VERSION, '0.3.2').check_version!
 
   module WebMock
     module HttpLibAdapters

data/lib/webmock/request_pattern.rb

@@ -1,5 +1,11 @@
 module WebMock
 
+  module RSpecMatcherDetector
+    def rSpecHashIncludingMatcher?(matcher)
+      matcher.class.name =~ /R?Spec::Mocks::ArgumentMatchers::HashIncludingMatcher/
+    end
+  end
+
   class RequestPattern
 
     attr_reader :method_pattern, :uri_pattern, :body_pattern, :headers_pattern
@@ -73,6 +79,8 @@ module WebMock
 
 
   class URIPattern
+    include RSpecMatcherDetector
+
     def initialize(pattern)
       @pattern = pattern.is_a?(Addressable::URI) ? pattern : WebMock::Util::URI.normalize_uri(pattern)
     end
@@ -82,8 +90,7 @@ module WebMock
         query_params
       elsif query_params.is_a?(WebMock::Matchers::HashIncludingMatcher)
         query_params
-      elsif (defined?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher) && query_params.is_a?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher)) ||
-          (defined?(Spec::Mocks::ArgumentMatchers::HashIncludingMatcher) && query_params.is_a?(Spec::Mocks::ArgumentMatchers::HashIncludingMatcher))
+      elsif rSpecHashIncludingMatcher?(query_params)
         WebMock::Matchers::HashIncludingMatcher.from_rspec_matcher(query_params)
       else
         Addressable::URI.parse('?' + query_params).query_values
@@ -145,6 +152,7 @@ module WebMock
 
 
   class BodyPattern
+    include RSpecMatcherDetector
 
     BODY_FORMATS = {
       'text/xml'               => :xml,
@@ -162,8 +170,7 @@ module WebMock
     def initialize(pattern)
       @pattern = if pattern.is_a?(Hash)
         normalize_hash(pattern)
-      elsif (defined?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher) && pattern.is_a?(RSpec::Mocks::ArgumentMatchers::HashIncludingMatcher)) ||
-          (defined?(Spec::Mocks::ArgumentMatchers::HashIncludingMatcher) && pattern.is_a?(Spec::Mocks::ArgumentMatchers::HashIncludingMatcher))
+      elsif rSpecHashIncludingMatcher?(pattern)
         WebMock::Matchers::HashIncludingMatcher.from_rspec_matcher(pattern)
       else
         pattern

data/lib/webmock/util/version_checker.rb

@@ -0,0 +1,73 @@
+# This code was created based on https://github.com/myronmarston/vcr/blob/master/lib/vcr/util/version_checker.rb
+# Thanks to @myronmarston
+
+module WebMock
+  class VersionChecker
+    def initialize(library_name, library_version, min_patch_level, max_minor_version = nil)
+      @library_name, @library_version = library_name, library_version
+      @min_patch_level, @max_minor_version = min_patch_level, max_minor_version
+
+      @major,     @minor,     @patch     = parse_version(library_version)
+      @min_major, @min_minor, @min_patch = parse_version(min_patch_level)
+      @max_major, @max_minor             = parse_version(max_minor_version) if max_minor_version
+
+      @comparison_result = compare_version
+    end
+
+    def check_version!
+      warn_about_too_low if too_low?
+      warn_about_too_high if too_high?
+    end
+
+  private
+
+    def too_low?
+      @comparison_result == :too_low
+    end
+
+    def too_high?
+      @comparison_result == :too_high
+    end
+
+    def warn_about_too_low
+      warn_in_red "You are using #{@library_name} #{@library_version}. " +
+                  "WebMock supports version #{version_requirement}."
+    end
+
+    def warn_about_too_high
+      warn_in_red "You are using #{@library_name} #{@library_version}. " +
+                  "WebMock is known to work with #{@library_name} #{version_requirement}. " +
+                  "It may not work with this version."
+    end
+
+    def warn_in_red(text)
+      Kernel.warn colorize(text, "\e[31m")
+    end
+
+    def compare_version
+      case
+        when @major < @min_major then :too_low
+        when @max_major && @major > @max_major then :too_high
+        when @major > @min_major then :ok
+        when @minor < @min_minor then :too_low
+        when @max_minor && @minor > @max_minor then :too_high
+        when @minor > @min_minor then :ok
+        when @patch < @min_patch then :too_low
+      end
+    end
+
+    def version_requirement
+      req = ">= #{@min_patch_level}"
+      req += ", < #{@max_major}.#{@max_minor + 1}" if @max_minor
+      req
+    end
+
+    def parse_version(version)
+      version.split('.').map { |v| v.to_i }
+    end
+
+    def colorize(text, color_code)
+      "#{color_code}#{text}\e[0m"
+    end
+  end
+end

data/lib/webmock/version.rb

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

data/spec/acceptance/excon/excon_spec_helper.rb

@@ -3,6 +3,7 @@ require 'ostruct'
 module ExconSpecHelper
 
   def http_request(method, uri, options = {}, &block)
+    Excon.defaults[:ssl_verify_peer] = false
     uri      = Addressable::URI.heuristic_parse(uri)
     uri      = uri.omit(:userinfo).to_s.gsub(' ', '+')
 

data/spec/acceptance/net_http/net_http_spec_helper.rb

@@ -23,7 +23,7 @@ module NetHTTPSpecHelper
     if uri.scheme == "https"
       http.use_ssl = true
       #1.9.1 has a bug with ssl_timeout
-      http.ssl_timeout = 20 unless RUBY_VERSION == "1.9.1"
+      http.ssl_timeout = 20 unless RUBY_PLATFORM =~ /java/
       http.open_timeout = 60
       http.read_timeout = 60
     end

data/spec/acceptance/typhoeus/typhoeus_hydra_spec_helper.rb

@@ -1,20 +1,26 @@
 require 'ostruct'
 
 module TyphoeusHydraSpecHelper
-  class FakeTyphoeusHydraError < StandardError; end
+  class FakeTyphoeusHydraTimeoutError < StandardError; end
+  class FakeTyphoeusHydraConnectError < StandardError; end
 
 
   def http_request(method, uri, options = {}, &block)
     uri.gsub!(" ", "%20") #typhoeus doesn't like spaces in the uri
-    response = Typhoeus::Request.run(uri,
+    request = Typhoeus::Request.new(uri,
       {
         :method  => method,
         :body    => options[:body],
         :headers => options[:headers],
-        :timeout => 25000 # milliseconds
+        :timeout => 25000
       }
     )
-    raise FakeTyphoeusHydraError.new if response.code.to_s == "0"
+    hydra = Typhoeus::Hydra.new(:initial_pool_size => 0)
+    hydra.queue(request)
+    hydra.run
+    response = request.response
+    raise FakeTyphoeusHydraTimeoutError.new if response.timed_out?
+    raise FakeTyphoeusHydraConnectError.new if response.code == 0
     OpenStruct.new({
       :body => response.body,
       :headers => WebMock::Util::Headers.normalize_headers(join_array_values(response.headers_hash)),
@@ -36,11 +42,11 @@ module TyphoeusHydraSpecHelper
 
 
   def client_timeout_exception_class
-    FakeTyphoeusHydraError
+    FakeTyphoeusHydraTimeoutError
   end
 
   def connection_refused_exception_class
-    FakeTyphoeusHydraError
+    FakeTyphoeusHydraConnectError
   end
 
   def http_library

data/spec/unit/util/version_checker_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+module WebMock
+  describe VersionChecker do
+    it 'prints a warning if the major version is too low' do
+      checker = VersionChecker.new('foo', '0.7.3', '1.0.0', '1.1')
+      Kernel.should_receive(:warn).with("\e[31mYou are using foo 0.7.3. WebMock supports version >= 1.0.0, < 1.2.\e[0m")
+      checker.check_version!
+    end
+
+    it 'prints a warning if the minor version is too low' do
+      checker = VersionChecker.new('foo', '1.0.99', '1.1.3', '1.2')
+      Kernel.should_receive(:warn).with("\e[31mYou are using foo 1.0.99. WebMock supports version >= 1.1.3, < 1.3.\e[0m")
+      checker.check_version!
+    end
+
+    it 'prints a warning if the patch version is too low' do
+      checker = VersionChecker.new('foo', '1.0.8', '1.0.10', '1.2')
+      Kernel.should_receive(:warn).with("\e[31mYou are using foo 1.0.8. WebMock supports version >= 1.0.10, < 1.3.\e[0m")
+      checker.check_version!
+    end
+
+    it 'prints a warning if the patch version is too low and max version is not specified' do
+      checker = VersionChecker.new('foo', '1.0.8', '1.0.10')
+      Kernel.should_receive(:warn).with("\e[31mYou are using foo 1.0.8. WebMock supports version >= 1.0.10.\e[0m")
+      checker.check_version!
+    end
+
+    it 'prints a warning if the major version is too high' do
+      checker = VersionChecker.new('foo', '2.0.0', '1.0.0', '1.1')
+      Kernel.should_receive(:warn).with(/may not work with this version/)
+      checker.check_version!
+    end
+
+    it 'prints a warning if the minor version is too high' do
+      checker = VersionChecker.new('foo', '1.2.0', '1.0.0', '1.1')
+      Kernel.should_receive(:warn).with(/may not work with this version/)
+      checker.check_version!
+    end
+
+    it 'does not raise an error or print a warning when the major version is between the min and max' do
+      checker = VersionChecker.new('foo', '2.0.0', '1.0.0', '3.0')
+      Kernel.should_not_receive(:warn)
+      checker.check_version!
+    end
+
+    it 'does not raise an error or print a warning when the min_patch is 0.6.5, the max_minor is 0.7 and the version is 0.7.3' do
+      checker = VersionChecker.new('foo', '0.7.3', '0.6.5', '0.7')
+      Kernel.should_not_receive(:warn)
+      checker.check_version!
+    end
+
+    it 'does not raise an error or print a warning when the min_patch is 0.6.5, the max_minor is not specified and the version is 0.8.3' do
+      checker = VersionChecker.new('foo', '0.8.3', '0.6.5')
+      Kernel.should_not_receive(:warn)
+      checker.check_version!
+    end
+  end
+end

data/webmock.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rspec',           '~> 2.8'
   s.add_development_dependency 'httpclient',      '>= 2.2.4'
-  s.add_development_dependency 'patron',          '>= 0.4.17' unless RUBY_PLATFORM =~ /java/
-  s.add_development_dependency 'em-http-request', '>= 1.0.0'
+  s.add_development_dependency 'patron',          '>= 0.4.18' unless RUBY_PLATFORM =~ /java/
+  s.add_development_dependency 'em-http-request', '>= 1.0.2'
   s.add_development_dependency 'em-synchrony',    '>= 1.0.0' if RUBY_VERSION >= "1.9"
   s.add_development_dependency 'curb',            '>= 0.8.0' unless RUBY_PLATFORM =~ /java/
-  s.add_development_dependency 'typhoeus',        '>= 0.3.0' unless RUBY_PLATFORM =~ /java/
-  s.add_development_dependency 'excon',           '>= 0.9.5'
+  s.add_development_dependency 'typhoeus',        '>= 0.3.3' unless RUBY_PLATFORM =~ /java/
+  s.add_development_dependency 'excon',           '>= 0.11.0'
   s.add_development_dependency 'minitest',        '>= 2.2.2'
   s.add_development_dependency 'rdoc',            ((RUBY_VERSION == '1.8.6') ? '<= 3.5.0' : '>3.5.0')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 1
   - 8
-  - 3
-  version: 1.8.3
+  - 4
+  version: 1.8.4
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 Z
+date: 2012-03-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,11 +31,11 @@ dependencies:
         - 7
         version: 2.2.7
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: crack
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,11 +47,11 @@ dependencies:
         - 7
         version: 0.1.7
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +62,11 @@ dependencies:
         - 8
         version: "2.8"
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: httpclient
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,43 +78,43 @@ dependencies:
         - 4
         version: 2.2.4
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: patron
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 45
+        hash: 43
         segments: 
         - 0
         - 4
-        - 17
-        version: 0.4.17
+        - 18
+        version: 0.4.18
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: em-http-request
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: curb
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,43 +126,43 @@ dependencies:
         - 0
         version: 0.8.0
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: typhoeus
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 21
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 3
+        version: 0.3.3
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: excon
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 51
         segments: 
         - 0
-        - 9
-        - 5
-        version: 0.9.5
+        - 11
+        - 0
+        version: 0.11.0
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: minitest
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -175,11 +174,11 @@ dependencies:
         - 2
         version: 2.2.2
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -191,7 +190,8 @@ dependencies:
         - 0
         version: 3.5.0
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  requirement: *id011
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
 - bartosz.blimke@gmail.com
@@ -255,6 +255,7 @@ files:
 - lib/webmock/util/headers.rb
 - lib/webmock/util/json.rb
 - lib/webmock/util/uri.rb
+- lib/webmock/util/version_checker.rb
 - lib/webmock/version.rb
 - lib/webmock/webmock.rb
 - minitest/test_helper.rb
@@ -308,6 +309,7 @@ files:
 - spec/unit/util/headers_spec.rb
 - spec/unit/util/json_spec.rb
 - spec/unit/util/uri_spec.rb
+- spec/unit/util/version_checker_spec.rb
 - spec/unit/webmock_spec.rb
 - test/http_request.rb
 - test/shared_test.rb
@@ -343,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: webmock
-rubygems_version: 1.8.15
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.
@@ -396,6 +398,7 @@ test_files:
 - spec/unit/util/headers_spec.rb
 - spec/unit/util/json_spec.rb
 - spec/unit/util/uri_spec.rb
+- spec/unit/util/version_checker_spec.rb
 - spec/unit/webmock_spec.rb
 - test/http_request.rb
 - test/shared_test.rb