typhoeus 0.1.22 → 0.1.23

data/lib/typhoeus.rb

@@ -14,7 +14,7 @@ require 'typhoeus/request'
 require 'typhoeus/hydra'
 
 module Typhoeus
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 
   def self.easy_object_pool
     @easy_objects ||= []

data/lib/typhoeus/hydra.rb

@@ -12,6 +12,7 @@ module Typhoeus
       @retrieved_from_cache = {}
       @queued_requests = []
       @running_requests = 0
+      @stubbed_request_count = 0
     end
 
     def self.hydra
@@ -56,12 +57,16 @@ module Typhoeus
     end
 
     def run
-      @stubs.each do |m|
-        m.requests.each do |request|
-          m.response.request = request
-          handle_request(request, m.response)
+      while @stubbed_request_count > 0
+        @stubs.each do |m|
+          while request = m.requests.shift
+            @stubbed_request_count -= 1
+            m.response.request = request
+            handle_request(request, m.response)
+          end
         end
       end
+
       @multi.perform
       @memoized_requests = {}
       @retrieved_from_cache = {}
@@ -94,7 +99,12 @@ module Typhoeus
 
     def assign_to_stub(request)
       m = @stubs.detect {|stub| stub.matches? request}
-      m && m.add_request(request)
+      if m
+        m.add_request(request)
+        @stubbed_request_count += 1
+      else
+        nil
+      end
     end
     private :assign_to_stub
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: typhoeus
 version: !ruby/object:Gem::Version 
-  version: 0.1.22
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 23
+  version: 0.1.23
 platform: ruby
 authors: 
 - Paul Dix
@@ -14,14 +19,18 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: paul@pauldix.net
 executables: []
@@ -76,18 +85,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: A library for interacting with web services (and building SOAs) at blinding speed.