typhoeus 0.5.1 → 0.5.2

data/CHANGELOG.md

@@ -2,7 +2,20 @@
 
 ## Master
 
-[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.5.1...master)
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.5.2...master)
+
+## 0.5.2
+
+[Full Changelog](http://github.com/typhoeus/typhoeus/compare/v0.5.1...v0.5.2)
+
+Enhancements:
+
+* Do not check the return_code in Response#success? when response is mocked.
+* Check for memoization, stubbing, before hooks are delayed to Hydra#run. It
+  was on Hydra#queue before and led to strange behavior because if the request
+  was stubbed, it was wrapped up in queue already. There was no way to add
+  callbacks after queue thatswhy. This is now different, since everything happens
+  in run, just as you expect.
 
 ## 0.5.1
 

data/lib/typhoeus/hydra.rb

@@ -1,3 +1,4 @@
+require 'typhoeus/hydra/addable'
 require 'typhoeus/hydra/before'
 require 'typhoeus/hydra/block_connection'
 require 'typhoeus/hydra/easy_factory'
@@ -40,12 +41,13 @@ module Typhoeus
   #   execution.
   class Hydra
     include Hydra::EasyPool
-    include Hydra::Queueable
+    include Hydra::Addable
     include Hydra::Runnable
     include Hydra::Memoizable
     include Hydra::BlockConnection
     include Hydra::Stubbable
     include Hydra::Before
+    include Hydra::Queueable
 
     # @example Set max_concurrency.
     #   Typhoeus::Hydra.new(max_concurrency: 20)

data/lib/typhoeus/hydra/addable.rb

@@ -0,0 +1,23 @@
+module Typhoeus
+  class Hydra
+
+    # This module handles the request adding on
+    # hydra.
+    #
+    # @api private
+    module Addable
+
+      # Adds request to multi.
+      #
+      # @example Add request.
+      #   hydra.add(request)
+      #
+      # @param [ Typhoeus::Request ] request to add.
+      #
+      # @return [ void ]
+      def add(request)
+        multi.add(Hydra::EasyFactory.new(request, self).get)
+      end
+    end
+  end
+end

data/lib/typhoeus/hydra/before.rb

@@ -9,14 +9,14 @@ module Typhoeus
     # @api private
     module Before
 
-      # Overrride queue in order to execute callbacks in
+      # Overrride add in order to execute callbacks in
       # Typhoeus.before. Will break and return when a
       # callback returns nil or false. Calls super
       # otherwise.
       #
-      # @example Queue the request.
-      #   hydra.queue(request)
-      def queue(request)
+      # @example Add the request.
+      #   hydra.add(request)
+      def add(request)
         Typhoeus.before.each do |callback|
           value = callback.call(request)
           if value.nil? || value == false || value.is_a?(Response)

data/lib/typhoeus/hydra/block_connection.rb

@@ -15,15 +15,15 @@ module Typhoeus
     # @api private
     module BlockConnection
 
-      # Overrides queue in order to check before if block connection
+      # Overrides add 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)
+      # @example Add the request.
+      #   hydra.add(request)
       #
       # @param [ Request ] request The request to enqueue.
-      def queue(request)
+      def add(request)
         if request.blocked?
           raise Typhoeus::Errors::NoStub.new(request)
         else

data/lib/typhoeus/hydra/easy_factory.rb

@@ -70,7 +70,7 @@ module Typhoeus
         easy.on_complete do |easy|
           request.finish(Response.new(easy.to_hash))
           hydra.release_easy(easy)
-          hydra.queue(hydra.queued_requests.shift) unless hydra.queued_requests.empty?
+          hydra.add(hydra.queued_requests.shift) unless hydra.queued_requests.empty?
         end
       end
     end

data/lib/typhoeus/hydra/memoizable.rb

@@ -21,18 +21,18 @@ module Typhoeus
         @memory ||= {}
       end
 
-      # Overrides queue in order to check before if request
+      # Overrides add in order to check before if request
       # is memoizable and already in memory. If thats the case,
       # super is not called, instead the response is set and
       # the on_complete callback called.
       #
-      # @example Queue the request.
-      #   hydra.queue(request)
+      # @example Add the request.
+      #   hydra.add(request)
       #
-      # @param [ Request ] request The request to enqueue.
+      # @param [ Request ] request The request to add.
       #
-      # @return [ Request ] The queued request.
-      def queue(request)
+      # @return [ Request ] The added request.
+      def add(request)
         if request.memoizable? && memory.has_key?(request)
           response = memory[request]
           request.finish(response, true)

data/lib/typhoeus/hydra/queueable.rb

@@ -37,11 +37,7 @@ module Typhoeus
       #  hydra.queue(request)
       def queue(request)
         request.hydra = self
-        if multi.easy_handles.size < max_concurrency
-          multi.add(Hydra::EasyFactory.new(request, self).get)
-        else
-          queued_requests << request
-        end
+        queued_requests << request
       end
     end
   end

data/lib/typhoeus/hydra/runnable.rb

@@ -2,8 +2,6 @@ module Typhoeus
   class Hydra
 
     # This module contains logic to run a hydra.
-    #
-    # @api private
     module Runnable
 
       # Start the hydra run.
@@ -13,6 +11,9 @@ module Typhoeus
       #
       # @return [ Symbol ] Return value from multi.perform.
       def run
+        queued_requests.pop(max_concurrency).map do |request|
+          add(request)
+        end
         multi.perform
       end
     end

data/lib/typhoeus/hydra/stubbable.rb

@@ -8,13 +8,13 @@ module Typhoeus
     # @api private
     module Stubbable
 
-      # Override queue in order to check for matching expecations.
+      # Override add 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)
+      # @example Add the request.
+      #   hydra.add(request)
+      def add(request)
         if expectation = Expectation.find_by(request)
           request.finish(expectation.response)
         else

data/lib/typhoeus/response/status.rb

@@ -46,7 +46,7 @@ module Typhoeus
       #
       # @return [ Boolean ] Return true if successful, false else.
       def success?
-        return_code == :ok && response_code >= 200 && response_code < 300
+        (mock || return_code == :ok) && response_code && response_code >= 200 && response_code < 300
       end
 
       # Return wether the response is modified.
@@ -56,7 +56,7 @@ module Typhoeus
       #
       # @return [ Boolean ] Return true if modified, false else.
       def modified?
-        return_code == :ok && response_code != 304
+        (mock || return_code == :ok) && response_code && 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.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,103 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: typhoeus
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.5.1
+  version: 0.5.2
+  prerelease: 
 platform: ruby
 authors:
 - David Balatero
 - Paul Dix
 - Hans Hasselberg
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ethon
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.3
-    none: false
-  prerelease: false
-  type: :runtime
-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.
+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:
 - hans.hasselberg@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- !binary |-
-  bGliL3R5cGhvZXVzLnJi
-- !binary |-
-  bGliL3R5cGhvZXVzL2NvbmZpZy5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL2Vycm9ycy5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL2V4cGVjdGF0aW9uLnJi
-- !binary |-
-  bGliL3R5cGhvZXVzL2h5ZHJhLnJi
-- !binary |-
-  bGliL3R5cGhvZXVzL3JlcXVlc3QucmI=
-- !binary |-
-  bGliL3R5cGhvZXVzL3Jlc3BvbnNlLnJi
-- !binary |-
-  bGliL3R5cGhvZXVzL3ZlcnNpb24ucmI=
-- !binary |-
-  bGliL3R5cGhvZXVzL2FkYXB0ZXJzL2ZhcmFkYXkucmI=
-- !binary |-
-  bGliL3R5cGhvZXVzL2Vycm9ycy9ub19zdHViLnJi
-- !binary |-
-  bGliL3R5cGhvZXVzL2Vycm9ycy90eXBob2V1c19lcnJvci5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL2h5ZHJhL2JlZm9yZS5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL2h5ZHJhL2Jsb2NrX2Nvbm5lY3Rpb24ucmI=
-- !binary |-
-  bGliL3R5cGhvZXVzL2h5ZHJhL2Vhc3lfZmFjdG9yeS5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL2h5ZHJhL2Vhc3lfcG9vbC5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL2h5ZHJhL21lbW9pemFibGUucmI=
-- !binary |-
-  bGliL3R5cGhvZXVzL2h5ZHJhL3F1ZXVlYWJsZS5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL2h5ZHJhL3J1bm5hYmxlLnJi
-- !binary |-
-  bGliL3R5cGhvZXVzL2h5ZHJhL3N0dWJiYWJsZS5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL3JlcXVlc3QvYWN0aW9ucy5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL3JlcXVlc3QvYmVmb3JlLnJi
-- !binary |-
-  bGliL3R5cGhvZXVzL3JlcXVlc3QvYmxvY2tfY29ubmVjdGlvbi5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL3JlcXVlc3QvY2FsbGJhY2tzLnJi
-- !binary |-
-  bGliL3R5cGhvZXVzL3JlcXVlc3QvbWFyc2hhbC5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL3JlcXVlc3QvbWVtb2l6YWJsZS5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL3JlcXVlc3Qvb3BlcmF0aW9ucy5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL3JlcXVlc3QvcmVzcG9uc2VhYmxlLnJi
-- !binary |-
-  bGliL3R5cGhvZXVzL3JlcXVlc3Qvc3R1YmJhYmxlLnJi
-- !binary |-
-  bGliL3R5cGhvZXVzL3Jlc3BvbnNlL2hlYWRlci5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL3Jlc3BvbnNlL2luZm9ybWF0aW9ucy5yYg==
-- !binary |-
-  bGliL3R5cGhvZXVzL3Jlc3BvbnNlL3N0YXR1cy5yYg==
+- lib/typhoeus/adapters/faraday.rb
+- 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/addable.rb
+- lib/typhoeus/hydra/before.rb
+- lib/typhoeus/hydra/block_connection.rb
+- lib/typhoeus/hydra/easy_factory.rb
+- lib/typhoeus/hydra/easy_pool.rb
+- lib/typhoeus/hydra/memoizable.rb
+- lib/typhoeus/hydra/queueable.rb
+- lib/typhoeus/hydra/runnable.rb
+- lib/typhoeus/hydra/stubbable.rb
+- lib/typhoeus/hydra.rb
+- lib/typhoeus/request/actions.rb
+- lib/typhoeus/request/before.rb
+- lib/typhoeus/request/block_connection.rb
+- lib/typhoeus/request/callbacks.rb
+- lib/typhoeus/request/marshal.rb
+- lib/typhoeus/request/memoizable.rb
+- lib/typhoeus/request/operations.rb
+- lib/typhoeus/request/responseable.rb
+- lib/typhoeus/request/stubbable.rb
+- lib/typhoeus/request.rb
+- lib/typhoeus/response/header.rb
+- lib/typhoeus/response/informations.rb
+- lib/typhoeus/response/status.rb
+- lib/typhoeus/response.rb
+- lib/typhoeus/version.rb
+- lib/typhoeus.rb
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -105,31 +76,29 @@ files:
 - Rakefile
 homepage: https://github.com/typhoeus/typhoeus
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 2
-      version: !binary |-
-        MA==
-  none: false
+      hash: 2893915302486658705
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
-  none: false
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.8.24
-signing_key:
+rubygems_version: 1.8.23
+signing_key: 
 specification_version: 3
 summary: Parallel HTTP library on top of libcurl multi.
 test_files: []
-...