webmock 1.8.11 → 1.9.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.9.0
+
+* Added support for Typhoeus >= 0.5.0 and removed support for Typhoeus < 0.5.0.
+
+  Thanks to [Hans Hasselberg](https://github.com/i0rek)
+
 ## 1.8.11
 
 * Fix excon adapter to handle `:body => some_file_object`

data/lib/webmock/http_lib_adapters/typhoeus_hydra_adapter.rb

@@ -14,53 +14,56 @@ if defined?(Typhoeus)
 
         def self.enable!
           @disabled = false
+          add_before_callback
           add_after_request_callback
-          ::Typhoeus::Hydra.allow_net_connect = true
+          ::Typhoeus::Config.block_connection = true
         end
 
         def self.disable!
           @disabled = true
           remove_after_request_callback
-          ::Typhoeus::Hydra.allow_net_connect = true
+          remove_before_callback
+          ::Typhoeus::Config.block_connection = false
         end
 
         def self.disabled?
           !!@disabled
         end
 
+        def self.add_before_callback
+          unless Typhoeus.before.include?(BEFORE_CALLBACK)
+            Typhoeus.before << BEFORE_CALLBACK
+          end
+        end
+
+        def self.remove_before_callback
+          Typhoeus.before.delete_if {|v| v == BEFORE_CALLBACK }
+        end
+
         def self.add_after_request_callback
-          unless Typhoeus::Hydra.
-            global_hooks[:after_request_before_on_complete].
-              include?(AFTER_REQUEST_CALLBACK)
-            Typhoeus::Hydra.
-              global_hooks[:after_request_before_on_complete] << AFTER_REQUEST_CALLBACK
+          unless Typhoeus.on_complete.include?(AFTER_REQUEST_CALLBACK)
+            Typhoeus.on_complete << AFTER_REQUEST_CALLBACK
           end
         end
 
         def self.remove_after_request_callback
-          Typhoeus::Hydra.global_hooks[:after_request_before_on_complete].
-            delete_if {|v| v == AFTER_REQUEST_CALLBACK }
+          Typhoeus.on_complete.delete_if {|v| v == AFTER_REQUEST_CALLBACK }
         end
 
         def self.build_request_signature(req)
           uri = WebMock::Util::URI.heuristic_parse(req.url)
           uri.path = uri.normalized_path.gsub("[^:]//","/")
-          if req.username
-            uri.user = req.username
-            uri.password = req.password
+          if req.options[:userpwd]
+            uri.user, uri.password = req.options[:userpwd].split(':')
           end
 
-          body = req.body
-
-          if req.params && req.method == :post
-            body = request_body_for_post_request_with_params(req)
-          end
+          body = req.options[:body]
 
           request_signature = WebMock::RequestSignature.new(
-            req.method,
+            req.options[:method],
             uri.to_s,
             :body => body,
-            :headers => req.headers
+            :headers => req.options[:headers]
           )
 
           req.instance_variable_set(:@__webmock_request_signature, request_signature)
@@ -68,45 +71,33 @@ if defined?(Typhoeus)
           request_signature
         end
 
-        def self.request_body_for_post_request_with_params(req)
-          params = req.params
-          form = Typhoeus::Form.new(params)
-          form.process!
-          form.to_s
-        end
-
         def self.build_webmock_response(typhoeus_response)
           webmock_response = WebMock::Response.new
           webmock_response.status = [typhoeus_response.code, typhoeus_response.status_message]
           webmock_response.body = typhoeus_response.body
-          webmock_response.headers = typhoeus_response.headers_hash
+          webmock_response.headers = typhoeus_response.headers
           webmock_response
         end
 
-        def self.stub_typhoeus(request_signature, webmock_response, typhoeus)
+        def self.generate_typhoeus_response(request_signature, webmock_response)
           response = if webmock_response.should_timeout
             ::Typhoeus::Response.new(
               :code         => 0,
               :status_message => "",
               :body         => "",
-              :headers_hash => {},
-              :curl_return_code => 28
+              :headers => {},
+              :return_code => :operation_timedout
             )
           else
             ::Typhoeus::Response.new(
               :code         => webmock_response.status[0],
               :status_message => webmock_response.status[1],
               :body         => webmock_response.body,
-              :headers_hash => webmock_response.headers
+              :headers => webmock_response.headers
             )
           end
-
-
-          typhoeus.stub(
-            request_signature.method || :any,
-            /.*/,
-            :webmock_stub => true
-          ).and_return(response)
+          response.mock = :webmock
+          response
         end
 
         def self.request_hash(request_signature)
@@ -118,12 +109,13 @@ if defined?(Typhoeus)
           hash
         end
 
-        AFTER_REQUEST_CALLBACK = Proc.new do |request|
+        AFTER_REQUEST_CALLBACK = Proc.new do |response|
+          request = response.request
           request_signature = request.instance_variable_get(:@__webmock_request_signature)
           webmock_response =
             ::WebMock::HttpLibAdapters::TyphoeusAdapter.
-              build_webmock_response(request.response)
-          if request.response.mock?
+              build_webmock_response(response)
+          if response.mock
             WebMock::CallbackRegistry.invoke_callbacks(
               {:lib => :typhoeus},
               request_signature,
@@ -137,43 +129,29 @@ if defined?(Typhoeus)
             )
           end
         end
-      end
-    end
-  end
-
-
-  module Typhoeus
-    class Hydra
-      def queue_with_webmock(request)
-        self.clear_webmock_stubs
-
-        if WebMock::HttpLibAdapters::TyphoeusAdapter.disabled?
-          return queue_without_webmock(request)
-        end
 
-        request_signature =
-         ::WebMock::HttpLibAdapters::TyphoeusAdapter.build_request_signature(request)
-
-        ::WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
-
-        if webmock_response = ::WebMock::StubRegistry.instance.response_for_request(request_signature)
-          ::WebMock::HttpLibAdapters::TyphoeusAdapter.
-            stub_typhoeus(request_signature, webmock_response, self)
-          webmock_response.raise_error_if_any
-        elsif !WebMock.net_connect_allowed?(request_signature.uri)
-          raise WebMock::NetConnectNotAllowedError.new(request_signature)
+        BEFORE_CALLBACK = Proc.new do |request|
+          Typhoeus::Expectation.all.delete_if {|e| e.from == :webmock }
+          res = true
+
+          unless WebMock::HttpLibAdapters::TyphoeusAdapter.disabled?
+            request_signature = ::WebMock::HttpLibAdapters::TyphoeusAdapter.build_request_signature(request)
+            request.block_connection = false;
+
+            ::WebMock::RequestRegistry.instance.requested_signatures.put(request_signature)
+
+            if webmock_response = ::WebMock::StubRegistry.instance.response_for_request(request_signature)
+              # ::WebMock::HttpLibAdapters::TyphoeusAdapter.stub_typhoeus(request_signature, webmock_response, self)
+              response = ::WebMock::HttpLibAdapters::TyphoeusAdapter.generate_typhoeus_response(request_signature, webmock_response)
+              request.finish(response)
+              webmock_response.raise_error_if_any
+              res = false
+            elsif !WebMock.net_connect_allowed?(request_signature.uri)
+              raise WebMock::NetConnectNotAllowedError.new(request_signature)
+            end
+          end
+          res
         end
-        queue_without_webmock(request)
-      end
-
-      alias_method :queue_without_webmock, :queue
-      alias_method :queue, :queue_with_webmock
-
-      def clear_webmock_stubs
-        self.stubs = [] unless self.stubs
-        self.stubs.delete_if {|s|
-          s.instance_variable_get(:@options)[:webmock_stub]
-        }
       end
     end
   end

data/lib/webmock/version.rb

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

data/spec/acceptance/typhoeus/typhoeus_hydra_spec.rb

@@ -6,6 +6,11 @@ unless RUBY_PLATFORM =~ /java/
 
   describe "Typhoeus::Hydra" do
     include TyphoeusHydraSpecHelper
+    let(:hydra) { Typhoeus::Hydra.new }
+
+    before do
+      Typhoeus::Expectation.clear
+    end
 
     include_context "with WebMock"
 
@@ -17,13 +22,17 @@ unless RUBY_PLATFORM =~ /java/
 
       describe "when params are used" do
         it "should take into account params for POST request" do
-          stub_request(:post, "www.example.com").with(:body => {:hello => 'world'})
-          Typhoeus::Request.post("www.example.com", :params => {:hello => 'world'})
+          stub_request(:post, "www.example.com").with(:params => {:hello => 'world'})
+          request = Typhoeus::Request.new("http://www.example.com", :method => :post, :params => {:hello => 'world'})
+          hydra.queue(request)
+          hydra.run
         end
 
         it "should take into account params for GET request" do
-          stub_request(:get, "http://www.example.com/?hello=world")
-          Typhoeus::Request.get("www.example.com", :params => {:hello => 'world'})
+          stub_request(:get, "http://www.example.com/?hello=world").to_return({})
+          request = Typhoeus::Request.new("http://www.example.com/?hello=world", :method => :get)
+          hydra.queue(request)
+          hydra.run
         end
       end
 
@@ -31,15 +40,16 @@ unless RUBY_PLATFORM =~ /java/
         it "should support native typhoeus timeouts" do
           stub_request(:any, "example.com").to_timeout
 
-          response = Typhoeus::Request.get("http://example.com")
+          request = Typhoeus::Request.new("http://example.com", :method => :get)
+          hydra.queue(request)
+          hydra.run
 
-          response.should be_timed_out
+          request.response.should be_timed_out
         end
       end
 
       describe "callbacks" do
         before(:each) do
-          @hydra = Typhoeus::Hydra.new
           @request = Typhoeus::Request.new("http://example.com")
         end
 
@@ -48,11 +58,11 @@ unless RUBY_PLATFORM =~ /java/
           stub_request(:any, "example.com").to_return(:body => body)
 
           test = nil
-          @hydra.on_complete do |c|
+          Typhoeus.on_complete do |c|
             test = c.body
           end
-          @hydra.queue @request
-          @hydra.run
+          hydra.queue @request
+          hydra.run
           test.should == body
         end
 
@@ -61,11 +71,11 @@ unless RUBY_PLATFORM =~ /java/
           stub_request(:any, "example.com").to_return(:status => [response_code, "Server On Fire"])
 
           test = nil
-          @hydra.on_complete do |c|
+          Typhoeus.on_complete do |c|
             test = c.code
           end
-          @hydra.queue @request
-          @hydra.run
+          hydra.queue @request
+          hydra.run
           test.should == response_code
         end
       end

data/spec/acceptance/typhoeus/typhoeus_hydra_spec_helper.rb

@@ -15,15 +15,16 @@ module TyphoeusHydraSpecHelper
         :timeout => 25000
       }
     )
-    hydra = Typhoeus::Hydra.new(:initial_pool_size => 0)
+    hydra = Typhoeus::Hydra.new
     hydra.queue(request)
     hydra.run
+
     response = request.response
+    raise FakeTyphoeusHydraConnectError.new if response.return_code == :couldnt_connect
     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)),
+      :headers => WebMock::Util::Headers.normalize_headers(join_array_values(response.headers)),
       :status => response.code.to_s,
       :message => response.status_message
     })

data/webmock.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   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.3' unless RUBY_PLATFORM =~ /java/
+  s.add_development_dependency 'typhoeus',        '>= 0.5.0' 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,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webmock
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 51
+  prerelease: 
   segments: 
   - 1
-  - 8
-  - 11
-  version: 1.8.11
+  - 9
+  - 0
+  version: 1.9.0
 platform: ruby
 authors: 
 - Bartosz Blimke
@@ -14,162 +15,183 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-29 00:00:00 +02:00
-default_executable: 
+date: 2012-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: addressable
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 2
         - 7
         version: 2.2.7
-  name: addressable
-  requirement: *id001
+  type: :runtime
   prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: crack
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 0
         - 1
         - 7
         version: 0.1.7
-  name: crack
-  requirement: *id002
+  type: :runtime
   prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rspec
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 10
         version: "2.10"
-  name: rspec
-  requirement: *id003
+  type: :development
   prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: httpclient
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 2
         - 4
         version: 2.2.4
-  name: httpclient
-  requirement: *id004
+  type: :development
   prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: patron
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 4
         - 18
         version: 0.4.18
-  name: patron
-  requirement: *id005
+  type: :development
   prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: em-http-request
   version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 0
         - 2
         version: 1.0.2
-  name: em-http-request
-  requirement: *id006
+  type: :development
   prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: curb
   version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 8
         - 0
         version: 0.8.0
-  name: curb
-  requirement: *id007
+  type: :development
   prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: typhoeus
   version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        - 3
-        - 3
-        version: 0.3.3
-  name: typhoeus
-  requirement: *id008
+        - 5
+        - 0
+        version: 0.5.0
+  type: :development
   prerelease: false
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: excon
   version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 11
         - 0
         version: 0.11.0
-  name: excon
-  requirement: *id009
+  type: :development
   prerelease: false
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: minitest
   version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 2
         - 2
         version: 2.2.2
-  name: minitest
-  requirement: *id010
+  type: :development
   prerelease: false
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: rdoc
   version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 3
         - 5
         - 0
         version: 3.5.0
-  name: rdoc
-  requirement: *id011
+  type: :development
   prerelease: false
+  requirement: *id011
 description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
 email: 
 - bartosz.blimke@gmail.com
@@ -295,7 +317,6 @@ files:
 - test/test_helper.rb
 - test/test_webmock.rb
 - webmock.gemspec
-has_rdoc: true
 homepage: http://github.com/bblimke/webmock
 licenses: []
 
@@ -305,23 +326,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: webmock
-rubygems_version: 1.3.6
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.