typhoeus 0.5.0.alpha → 0.5.0.pre

data/CHANGELOG.md

@@ -20,7 +20,6 @@ Major Changes:
     for a description.
   * The following classes were deleted because they do not seemed to be uesed at all. If that
     turns out to be wrong, they will be restored: `Typhoeus::Filter`, `Typhoeus::Remote`, `Typhoeus::RemoteMethod`, `Typhoeus::RemoteProxyObject`
-  * `Typhoeus::Easy` and `Typhoeus::Multi` are now `Ethon::Easy` and `Ethon::Multi`
 
 * Request shortcuts: `Typhoeus.get("www.google.de")`
 * Global configuration:
@@ -33,17 +32,6 @@ end
 * No more Response#headers_hash, instead response#header returning the last
   header and response#redirections returning the responses with headers
   generated through redirections
-* Instead of defining the same callbacks on every request, you can define global callbacks:
-
-```ruby
-Typhoeus.on_complete { p "yay" }
-```
-
-* The stubbing interface changed slightly. You now have the same syntax as for requests:
-
-```ruby
-Typhoeus.stub(url, options).and_return(response)
-```
 
 Enhancements:
 

data/Gemfile

@@ -1,19 +1,3 @@
 source :rubygems
-gemspec
-
-gem "rake"
-
-group :development, :test do
-  gem "rspec", "~> 2.11"
 
-  gem "sinatra", "~> 1.3"
-  gem "json"
-
-  if RUBY_PLATFORM == "java"
-    gem "spoon"
-  end
-
-  unless ENV["CI"]
-    gem "guard-rspec", "~> 0.7"
-  end
-end
+gemspec

data/lib/typhoeus.rb

@@ -2,11 +2,9 @@ require 'digest/sha2'
 require 'ethon'
 
 require 'typhoeus/config'
-require 'typhoeus/errors'
-require 'typhoeus/expectation'
-require 'typhoeus/hydra'
 require 'typhoeus/request'
 require 'typhoeus/response'
+require 'typhoeus/hydra'
 require 'typhoeus/version'
 
 # Typhoeus is a http client library based on Ethon which
@@ -26,7 +24,6 @@ module Typhoeus
   extend self
   extend Hydras::EasyPool
   extend Requests::Actions
-  extend Requests::Callbacks::Types
 
   # The default typhoeus user agent.
   USER_AGENT = "Typhoeus - https://github.com/typhoeus/typhoeus"
@@ -42,32 +39,4 @@ module Typhoeus
   def configure
     yield Config
   end
-
-  # Stub out specific request.
-  #
-  # @example Stub.
-  #   Typhoeus.stub("www.example.com").and_return(Typhoeus::Response.new)
-  #
-  # @param [ String ] url The url to stub out.
-  # @param [ Hash ] options The options to stub out.
-  #
-  # @return [ Expection ] The expection.
-  def stub(url, options = {})
-    expectation = Expectation.all.find{ |e| e.url == url && e.options == options }
-    return expectation if expectation
-
-    Expectation.new(url, options).tap do |new_expectation|
-      Expectation.all << new_expectation
-    end
-  end
-
-  # Execute given block as if block connection is turned off.
-  #
-  # @param [ Block ] block The block to execute.
-  def with_connection
-    old = Config.block_connection
-    Config.block_connection = false
-    yield if block_given?
-    Config.block_connection = old
-  end
 end

data/lib/typhoeus/config.rb

@@ -2,13 +2,10 @@ module Typhoeus
 
   # The Typhoeus configuration used to set global
   # options. Available options:
-  # * block_connection: only stubbed requests are
-  #   allowed, raises NoStub error when trying to
-  #   do a real request.
-  # * verbose: show curls debug out
-  # * memoize: memoize GET requests.
+  # * verbose
+  # * memoize.
   module Config
     extend self
-    attr_accessor :block_connection, :memoize, :verbose
+    attr_accessor :verbose, :memoize
   end
 end

data/lib/typhoeus/hydra.rb

@@ -1,25 +1,20 @@
-require 'typhoeus/hydras/block_connection'
 require 'typhoeus/hydras/easy_factory'
 require 'typhoeus/hydras/easy_pool'
 require 'typhoeus/hydras/memoizable'
 require 'typhoeus/hydras/queueable'
 require 'typhoeus/hydras/runnable'
-require 'typhoeus/hydras/stubbable'
 
 module Typhoeus
 
   # Hydra manages making parallel HTTP requests. This
-  # is achieved by using libcurls multi interface:
-  # http://curl.haxx.se/libcurl/c/libcurl-multi.html
-  # The benefits are that you don't have to worry running
+  # is archived by using libcurls multi interface. The
+  # benefits are that you don't have to worry running
   # the requests by yourself.
   class Hydra
     include Hydras::EasyPool
     include Hydras::Queueable
     include Hydras::Runnable
     include Hydras::Memoizable
-    include Hydras::BlockConnection
-    include Hydras::Stubbable
 
     attr_reader :max_concurrency, :multi
 

data/lib/typhoeus/hydras/easy_factory.rb

@@ -59,7 +59,7 @@ module Typhoeus
           request.response = Response.new(easy.to_hash)
           hydra.release_easy(easy)
           hydra.queue(hydra.queued_requests.shift) unless hydra.queued_requests.empty?
-          request.execute_callbacks
+          request.complete
         end
       end
     end

data/lib/typhoeus/hydras/memoizable.rb

@@ -4,7 +4,7 @@ module Typhoeus
     # This module handles the GET request memoization
     # on the hydra side. Memoization needs to be turned
     # on:
-    #   Typhoeus.configure do |config|
+    #   Typhoeus.configre do |config|
     #     config.memoize = true
     #   end
     module Memoizable
@@ -33,13 +33,13 @@ module Typhoeus
       def queue(request)
         if request.memoizable? && memory.has_key?(request)
           request.instance_variable_set(:@response, memory[request])
-          request.execute_callbacks
+          request.complete
         else
           super
         end
       end
 
-      # Overrides run to make sure the memory is cleared after
+      # Overrides run to clear the memory is cleared after
       # each run.
       #
       # @example Run hydra.

data/lib/typhoeus/request.rb

@@ -1,27 +1,22 @@
-require 'typhoeus/requests/actions'
-require 'typhoeus/requests/block_connection'
 require 'typhoeus/requests/callbacks'
-require 'typhoeus/requests/marshal'
-require 'typhoeus/requests/memoizable'
+require 'typhoeus/requests/actions'
 require 'typhoeus/requests/operations'
+require 'typhoeus/requests/marshal'
 require 'typhoeus/requests/responseable'
-require 'typhoeus/requests/stubbable'
+require 'typhoeus/requests/memoizable'
 
 module Typhoeus
 
   # This class represents a request.
   class Request
-    extend  Requests::Actions
-    include Requests::Callbacks::Types
     include Requests::Callbacks
     include Requests::Marshal
     include Requests::Operations
+    extend  Requests::Actions
     include Requests::Responseable
     include Requests::Memoizable
-    include Requests::BlockConnection
-    include Requests::Stubbable
 
-    attr_accessor :options, :url, :hydra, :original_options
+    attr_accessor :options, :url, :hydra
 
     # Create a new request.
     #
@@ -34,10 +29,14 @@ module Typhoeus
     # #return [ Request ] The new request.
     def initialize(url, options = {})
       @url = url
-      @original_options = options
       @options = options.dup
 
-      set_defaults
+      if @options[:headers]
+        @options[:headers] = {'User-Agent' => Typhoeus::USER_AGENT}.merge(options[:headers])
+      else
+        @options[:headers] = {'User-Agent' => Typhoeus::USER_AGENT}
+      end
+      @options[:verbose] = Typhoeus::Config.verbose unless @options[:verbose]
     end
 
     # Returns wether other is equal to self.
@@ -65,8 +64,8 @@ module Typhoeus
 
     # Checks if two hashes are equal or not, discarding first-level hash order
     #
-    # @param [ Hash ] left
-    # @param [ Hash ] right hash to check for equality
+    # @param [ Hash ] hash
+    # @param [ Hash ] other hash to check for equality
     #
     # @return [ Boolean ] Returns true if hashes have same values for same keys and same length,
     #     even if the keys are given in a different order.
@@ -78,14 +77,5 @@ module Typhoeus
       end
     end
 
-    # Sets default header and verbose when turned on.
-    def set_defaults
-      if @options[:headers]
-        @options[:headers] = {'User-Agent' => Typhoeus::USER_AGENT}.merge(options[:headers])
-      else
-        @options[:headers] = {'User-Agent' => Typhoeus::USER_AGENT}
-      end
-      @options[:verbose] = Typhoeus::Config.verbose if @options[:verbose].nil? && !Typhoeus::Config.verbose.nil?
-    end
   end
 end

data/lib/typhoeus/requests/actions.rb

@@ -5,96 +5,12 @@ module Typhoeus
     # http methods. Like
     #   Typhoeus.get("www.example.com")
     module Actions
-
-      # Make a get request.
-      #
-      # @example Make get request.
-      #   Typhoeus.get("www.example.com")
-      #
-      # @param [ String ] url The url to request.
-      # @param [ options ] options The options.
-      #
-      # @return [ Response ] The response.
-      def get(url, options = {})
-        Request.run(url, options.merge(:method => :get))
-      end
-
-      # Make a post request.
-      #
-      # @example Make post request.
-      #   Typhoeus.post("www.example.com")
-      #
-      # @param [ String ] url The url to request.
-      # @param [ options ] options The options.
-      #
-      # @return [ Response ] The response.
-      def post(url, options = {})
-        Request.run(url, options.merge(:method => :post))
-      end
-
-      # Make a put request.
-      #
-      # @example Make put request.
-      #   Typhoeus.put("www.example.com")
-      #
-      # @param [ String ] url The url to request.
-      # @param [ options ] options The options.
-      #
-      # @return [ Response ] The response.
-      def put(url, options = {})
-        Request.run(url, options.merge(:method => :put))
-      end
-
-      # Make a delete request.
-      #
-      # @example Make delete request.
-      #   Typhoeus.delete("www.example.com")
-      #
-      # @param [ String ] url The url to request.
-      # @param [ options ] options The options.
-      #
-      # @return [ Response ] The response.
-      def delete(url, options = {})
-        Request.run(url, options.merge(:method => :delete))
-      end
-
-      # Make a head request.
-      #
-      # @example Make head request.
-      #   Typhoeus.head("www.example.com")
-      #
-      # @param [ String ] url The url to request.
-      # @param [ options ] options The options.
-      #
-      # @return [ Response ] The response.
-      def head(url, options = {})
-        Request.run(url, options.merge(:method => :head))
-      end
-
-      # Make a patch request.
-      #
-      # @example Make patch request.
-      #   Typhoeus.patch("www.example.com")
-      #
-      # @param [ String ] url The url to request.
-      # @param [ options ] options The options.
-      #
-      # @return [ Response ] The response.
-      def patch(url, options = {})
-        Request.run(url, options.merge(:method => :patch))
-      end
-
-      # Make a options request.
-      #
-      # @example Make options request.
-      #   Typhoeus.options("www.example.com")
-      #
-      # @param [ String ] url The url to request.
-      # @param [ options ] options The options.
-      #
-      # @return [ Response ] The response.
-      def options(url, options = {})
-        Request.run(url, options.merge(:method => :options))
+      [:get, :post, :put, :delete, :head, :patch, :options].each do |name|
+        define_method(name) do |*args|
+          url = args[0]
+          options = args.fetch(1, {})
+          Request.run(url, options.merge(:method => name))
+        end
       end
     end
   end

data/lib/typhoeus/requests/callbacks.rb

@@ -9,7 +9,7 @@ module Typhoeus
     #
     #   request.on_complete { p 1 }
     #   request.on_complete { p 2 }
-    #   request.execute_callbacks
+    #   request.complete
     #   #=> 1
     #   #=> 2
     #
@@ -18,64 +18,30 @@ module Typhoeus
     #   request.on_complete { p 1 }
     #   request.on_complete { p 2 }
     #   request.on_complete.clear
-    #   request.execute_callbacks
+    #   request.on_complete
     #   #=> []
     module Callbacks
 
-      module Types
-        # Set on_complete callback.
-        #
-        # @example Set on_complete.
-        #   request.on_complete { p "yay" }
-        #
-        # @param [ Block ] block The block to execute.
-        def on_complete(&block)
-          @on_complete ||= []
-          @on_complete << block if block_given?
-          @on_complete
-        end
-
-        # Set on_success callback.
-        #
-        # @example Set on_success.
-        #   request.on_success { p "yay" }
-        #
-        # @param [ Block ] block The block to execute.
-        def on_success(&block)
-          @on_success ||= []
-          @on_success << block if block_given?
-          @on_success
-        end
-
-        # Set on_failure callback.
-        #
-        # @example Set on_failure.
-        #   request.on_failure { p "yay" }
-        #
-        # @param [ Block ] block The block to execute.
-        def on_failure(&block)
-          @on_failure ||= []
-          @on_failure << block if block_given?
-          @on_failure
-        end
+      # Set on_complete callback.
+      #
+      # @example Set on_complete.
+      #   request.on_complete { p "yay" }
+      #
+      # @param [ Block ] block The block to execute.
+      def on_complete(&block)
+        @on_complete ||= []
+        @on_complete << block if block_given?
+        @on_complete
       end
 
-      # Execute nessecary callback and yields response. This
-      # include in every case on_complete, on_success if
-      # successful and on_failure if not.
+      # Execute on_complete callbacks.
       #
-      # @example Execute callbacks.
-      #   request.execute_callbacks
-      def execute_callbacks
-        callbacks = Typhoeus.on_complete + on_complete
-
-        if response && response.success?
-          callbacks += Typhoeus.on_success + on_success
-        elsif response
-          callbacks += Typhoeus.on_failure + on_failure
+      # @example Execute on_completes.
+      #   request.complete
+      def complete
+        if defined?(@on_complete)
+          @on_complete.map{ |callback| callback.call(self) }
         end
-
-        callbacks.map{ |callback| callback.call(self.response) }
       end
     end
   end

data/lib/typhoeus/requests/memoizable.rb

@@ -4,7 +4,7 @@ module Typhoeus
     # This module handles the GET request memoization
     # on the request side. Memoization needs to be turned
     # on:
-    #   Typhoeus.configure do |config|
+    #   Typhoeus.configre do |config|
     #     config.memoize = true
     #   end
     module Memoizable

data/lib/typhoeus/requests/operations.rb

@@ -42,9 +42,8 @@ module Typhoeus
         easy.prepare
         easy.perform
         @response = Response.new(easy.to_hash)
-        @response.request = self
         Typhoeus.release_easy(easy)
-        execute_callbacks
+        complete
         @response
       end
     end

data/lib/typhoeus/response.rb

@@ -1,17 +1,17 @@
-require 'typhoeus/responses/header'
-require 'typhoeus/responses/informations'
 require 'typhoeus/responses/legacy'
+require 'typhoeus/responses/informations'
 require 'typhoeus/responses/status'
+require 'typhoeus/responses/header'
 
 module Typhoeus
 
   # This class respresents the response.
   class Response
+    include Responses::Status
     include Responses::Informations
     include Responses::Legacy
-    include Responses::Status
 
-    attr_accessor :request, :options, :mock
+    attr_accessor :request, :options
 
     # Create a new response.
     #
@@ -23,7 +23,6 @@ module Typhoeus
     # @return [ Response ] The new response.
     def initialize(options = {})
       @options = options
-      @header = options[:header]
     end
   end
 end

data/lib/typhoeus/responses/informations.rb

@@ -22,7 +22,7 @@ module Typhoeus
       #
       # @return [ Header ] The response header.
       def header
-        return nil if response_header.nil? && @header.nil?
+        return nil unless response_header
         @header ||= Responses::Header.new(response_header.split("\r\n\r\n").last)
       end
 

data/lib/typhoeus/responses/legacy.rb

@@ -13,13 +13,12 @@ module Typhoeus
         :time => :total_time,
         :app_connect_time => :appconnect_time,
         :start_transfer_time => :starttransfer_time,
-        :name_lookup_time => :namelookup_time,
-        :headers_hash => :header
+        :name_lookup_time => :namelookup_time
       }
 
       MAPPING.each do |old, new|
         define_method(old) do
-          options[new] || options[old]
+          options[new]
         end
       end
     end

data/lib/typhoeus/responses/status.rb

@@ -13,7 +13,6 @@ module Typhoeus
       # @return [ String ] The message.
       def status_message
         return @status_message if defined?(@status_message) && @status_message
-        return options[:status_message] unless options[:status_message].nil?
 
         # HTTP servers can choose not to include the explanation to HTTP codes. The RFC
         # states this (http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4):
@@ -46,7 +45,7 @@ module Typhoeus
       #
       # @return [ Boolean ] Return true if successful, false else.
       def success?
-        return_code == :ok && response_code >= 200 && response_code < 300
+        (200..299).include?(response_code)
       end
 
       # Return wether the response is modified.
@@ -56,7 +55,7 @@ module Typhoeus
       #
       # @return [ Boolean ] Return true if modified, false else.
       def modified?
-        return_code == :ok && response_code != 304
+        response_code != 304
       end
 
       # Return wether the response is timed out.

data/lib/typhoeus/version.rb

@@ -1,5 +1,5 @@
 module Typhoeus
 
   # The current Typhoeus version.
-  VERSION = '0.5.0.alpha'
+  VERSION = '0.5.0.pre'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha
+  version: 0.5.0.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,119 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.4
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 description: Like a modern code version of the mythical beast with 100 serpent heads,
   Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.
 email:
@@ -38,27 +150,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/typhoeus/config.rb
-- lib/typhoeus/errors/no_stub.rb
-- lib/typhoeus/errors/typhoeus_error.rb
-- lib/typhoeus/errors.rb
-- lib/typhoeus/expectation.rb
 - lib/typhoeus/hydra.rb
-- lib/typhoeus/hydras/block_connection.rb
 - lib/typhoeus/hydras/easy_factory.rb
 - lib/typhoeus/hydras/easy_pool.rb
 - lib/typhoeus/hydras/memoizable.rb
 - lib/typhoeus/hydras/queueable.rb
 - lib/typhoeus/hydras/runnable.rb
-- lib/typhoeus/hydras/stubbable.rb
 - lib/typhoeus/request.rb
 - lib/typhoeus/requests/actions.rb
-- lib/typhoeus/requests/block_connection.rb
 - lib/typhoeus/requests/callbacks.rb
 - lib/typhoeus/requests/marshal.rb
 - lib/typhoeus/requests/memoizable.rb
 - lib/typhoeus/requests/operations.rb
 - lib/typhoeus/requests/responseable.rb
-- lib/typhoeus/requests/stubbable.rb
 - lib/typhoeus/response.rb
 - lib/typhoeus/responses/header.rb
 - lib/typhoeus/responses/informations.rb
@@ -85,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 835980537043066263
+      hash: -87429564240378902
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Parallel HTTP library on top of libcurl multi.

data/lib/typhoeus/errors.rb

@@ -1,9 +0,0 @@
-require 'typhoeus/errors/typhoeus_error'
-require 'typhoeus/errors/no_stub'
-
-module Typhoeus
-
-  # This namespace contains all errors raised by typhoeus.
-  module Errors
-  end
-end

data/lib/typhoeus/errors/no_stub.rb

@@ -1,12 +0,0 @@
-module Typhoeus
-  module Errors
-
-    # Raises when block connection is turned on
-    # and making a real request.
-    class NoStub < TyphoeusError
-      def initialize(request)
-        super("The connection is blocked and no stub defined.")
-      end
-    end
-  end
-end

data/lib/typhoeus/errors/typhoeus_error.rb

@@ -1,8 +0,0 @@
-module Typhoeus
-  module Errors
-
-    # Default typhoeus error class for all custom errors.
-    class TyphoeusError < StandardError
-    end
-  end
-end

data/lib/typhoeus/expectation.rb

@@ -1,126 +0,0 @@
-module Typhoeus
-
-  # This class represents an expectation. It is part
-  # of the stubbing mechanism. An expectation contains
-  # an url and options, like a request. They were compared
-  # to the request url and options in order to evaluate
-  # wether they match. If thats the case, the attached
-  # responses were returned one by one.
-  class Expectation
-    attr_reader :url, :options
-
-    class << self
-
-      # Returns all expectations.
-      #
-      # @example Return expectations.
-      #   Typhoeus::Expectation.all
-      #
-      # @return [ Array ] The expectations.
-      def all
-        @expectations ||= []
-      end
-
-      # Clears expectations.
-      #
-      # @example Clear expectations.
-      #   Typhoeus:;Expectation.clear
-      def clear
-        all.clear
-      end
-
-      # Returns expecation matching the provided
-      # request.
-      #
-      # @example Find expectation.
-      #   Typhoeus::Expectation.find_by(request)
-      #
-      # @return [ Expectation ] The matching expectation.
-      def find_by(request)
-        all.find do |expectation|
-          expectation.matches?(request)
-        end
-      end
-    end
-
-    # Creates an expactation.
-    #
-    # @example Create expactation.
-    #   Typhoeus::Expectation.new(url)
-    #
-    # @return [ Expectation ] The created expactation.
-    def initialize(url, options = {})
-      @url = url
-      @options = options
-      @response_counter = 0
-    end
-
-    # Specify what should be returned,
-    # when this expactation is hit.
-    #
-    # @example Add response.
-    #   expectation.and_return(response)
-    def and_return(response)
-      responses << response
-    end
-
-    # Checks wether this expectation matches
-    # the provided request.
-    #
-    # @example Check if request matches.
-    #   expectation.matches? request
-    #
-    # @param [ Request ] The request to check.
-    #
-    # @return [ Boolean ] True when matches, else false.
-    def matches?(request)
-      url_match?(request.url) &&
-        (options ? options.all?{ |k,v| request.original_options[k] == v } : true)
-    end
-
-    # Return canned responses.
-    #
-    # @example Return responses.
-    #   expectation.responses
-    #
-    # @return [ Array ] The responses.
-    def responses
-      @responses ||= []
-    end
-
-    # Return the response. When there are
-    # multiple responses, they were returned one
-    # by one.
-    #
-    # @example Return response.
-    #   expectation.response
-    #
-    # @return [ Response ] The response.
-    def response
-      response = responses.fetch(@response_counter, responses.last)
-      @response_counter += 1
-      response
-    end
-
-    private
-
-    # Check wether the url matches the request url.
-    # The url can be a string, regex or nil. String and
-    # regexp were checked, nil is always true. Else false.
-    #
-    # Nil serves as a placeholder in case you want to match
-    # all urls.
-    def url_match?(request_url)
-      case url
-      when String
-        url == request_url
-      when Regexp
-        !!request_url.match(url)
-      when nil
-        true
-      else
-        false
-      end
-    end
-  end
-end

data/lib/typhoeus/hydras/block_connection.rb

@@ -1,33 +0,0 @@
-module Typhoeus
-  module Hydras
-
-    # This module handles the blocked connection request mode on
-    # the hydra side, where only stubbed requests
-    # are allowed.
-    # Connection blocking needs to be turned on:
-    #   Typhoeus.configure do |config|
-    #     config.block_connection = true
-    #   end
-    #
-    # When trying to do real requests a NoStub error
-    # is raised.
-    module BlockConnection
-
-      # Overrides queue in order to check before if block connection
-      # is turned on. If thats the case a NoStub error is
-      # raised.
-      #
-      # @example Queue the request.
-      #   hydra.queue(request)
-      #
-      # @param [ Request ] request The request to enqueue.
-      def queue(request)
-        if Typhoeus::Config.block_connection
-          raise Typhoeus::Errors::NoStub.new(request)
-        else
-          super
-        end
-      end
-    end
-  end
-end

data/lib/typhoeus/hydras/stubbable.rb

@@ -1,27 +0,0 @@
-module Typhoeus
-  module Hydras
-
-    # This module handles stubbing on the hydra side.
-    # It plays well with the block_connection configuration,
-    # which raises when you make a request which is not stubbed.
-    module Stubbable
-
-      # Override queue in order to check for matching expecations.
-      # When an expecation is found, super is not called. Instead a
-      # canned response is assigned to the request.
-      #
-      # @example Queue the request.
-      #   hydra.queue(request)
-      def queue(request)
-        if expectation = Expectation.find_by(request)
-          request.response = expectation.response
-          request.response.mock = true
-          request.execute_callbacks
-          request.response
-        else
-          super
-        end
-      end
-    end
-  end
-end

data/lib/typhoeus/requests/block_connection.rb

@@ -1,31 +0,0 @@
-module Typhoeus
-  module Requests
-
-    # This module handles the blocked connection request mode on
-    # the request side, where only stubbed requests
-    # are allowed.
-    # Connection blocking needs to be turned on:
-    #   Typhoeus.configure do |config|
-    #     config.block_connection = true
-    #   end
-    #
-    # When trying to do real requests a NoStub error
-    # is raised.
-    module BlockConnection
-
-      # Overrides run in order to check before if block connection
-      # is turned on. If thats the case a NoStub error is
-      # raised.
-      #
-      # @example Run request.
-      #   request.run
-      def run
-        if Typhoeus::Config.block_connection
-          raise Typhoeus::Errors::NoStub.new(self)
-        else
-          super
-        end
-      end
-    end
-  end
-end

data/lib/typhoeus/requests/stubbable.rb

@@ -1,29 +0,0 @@
-module Typhoeus
-  module Requests
-
-    # This module handles stubbing on the request side.
-    # It plays well with the block_connection configuration,
-    # which raises when you make a request which is not stubbed.
-    module Stubbable
-
-      # Override run in order to check for matching expecations.
-      # When an expecation is found, super is not called. Instead a
-      # canned response is assigned to the request.
-      #
-      # @example Run the request.
-      #   request.run
-      #
-      # @return [ Response ] The response.
-      def run
-        if expectation = Expectation.find_by(self)
-          @response = expectation.response
-          @response.mock = true
-          execute_callbacks
-          @response
-        else
-          super
-        end
-      end
-    end
-  end
-end