curb 0.7.14 → 0.7.15

data/ext/curb.h

@@ -20,12 +20,12 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.7.14"
-#define CURB_VER_NUM   712
+#define CURB_VERSION   "0.7.15"
+#define CURB_VER_NUM   715
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   7
 #define CURB_VER_MIC   1
-#define CURB_VER_PATCH 4
+#define CURB_VER_PATCH 5
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_multi.c

@@ -482,29 +482,23 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
 
       if (timeout_milliseconds == 0) { /* no delay */
         rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
+        rb_curl_multi_read_info( self, rbcm->handle );
+        if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
         continue;
       }
-      else if (timeout_milliseconds < 0) {
-        timeout_milliseconds = cCurlMutiDefaulttimeout; /* libcurl doesn't know how long to wait, use a default timeout */
-      }
 
-      if (timeout_milliseconds > cCurlMutiDefaulttimeout) {
-        timeout_milliseconds = cCurlMutiDefaulttimeout; /* buggy versions libcurl sometimes reports huge timeouts... let's cap it */
+      if (timeout_milliseconds < 0 || timeout_milliseconds > cCurlMutiDefaulttimeout) {
+        timeout_milliseconds = cCurlMutiDefaulttimeout; /* libcurl doesn't know how long to wait, use a default timeout */
+                                                        /* or buggy versions libcurl sometimes reports huge timeouts... let's cap it */
       }
 
       tv.tv_sec  = 0; /* never wait longer than 1 second */
       tv.tv_usec = (int)(timeout_milliseconds * 1000); /* XXX: int is the right type for OSX, what about linux? */
 
-      if (timeout_milliseconds == 0) { /* no delay */
-        rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
-        continue;
-      }
-
-      if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
-
       FD_ZERO(&fdread);
       FD_ZERO(&fdwrite);
       FD_ZERO(&fdexcep);
+
       /* load the fd sets from the multi handle */
       mcode = curl_multi_fdset(rbcm->handle, &fdread, &fdwrite, &fdexcep, &maxfd);
       if (mcode != CURLM_OK) {
@@ -529,17 +523,19 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
       case -1:
         rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno));
         break;
-      case 0:
+      case 0: /* timeout */
+      default: /* action */
+        rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
         rb_curl_multi_read_info( self, rbcm->handle );
         if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
-      default: 
-        rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
         break;
       }
     }
-    rb_curl_multi_read_info( self, rbcm->handle );
-    if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
+
   } while( rbcm->running );
+
+  rb_curl_multi_read_info( self, rbcm->handle );
+  if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
     
   return Qtrue;
 }

data/lib/curb.rb

@@ -77,7 +77,7 @@ module Curl
         urls.each do|url|
           url_confs << {:url => url, :method => :get}.merge(easy_options)
         end
-        self.http(url_confs, multi_options) {|c,code,method| blk.call(c) }
+        self.http(url_confs, multi_options) {|c,code,method| blk.call(c) if blk }
       end
 
       # call-seq:
@@ -148,17 +148,25 @@ module Curl
       #
       def http(urls_with_config, multi_options={}, &blk)
         m = Curl::Multi.new
+
+        # maintain a sane number of easy handles
+        multi_options[:max_connects] = max_connects = multi_options.key?(:max_connects) ? multi_options[:max_connects] : 10
+
+        free_handles = [] # keep a list of free easy handles
+
         # configure the multi handle
         multi_options.each { |k,v| m.send("#{k}=", v) }
         callbacks = [:on_progress,:on_debug,:on_failure,:on_success,:on_body,:on_header]
 
-        urls_with_config.each do|conf|
-          c = conf.dup # avoid being destructive to input
+        add_free_handle = proc do|conf, easy|
+          c       = conf.dup # avoid being destructive to input
           url     = c.delete(:url)
           method  = c.delete(:method)
           headers = c.delete(:headers)
 
-          easy    = Curl::Easy.new(url)
+          easy    = Curl::Easy.new if easy.nil?
+
+          easy.url = url
 
           # assign callbacks
           callbacks.each do |cb|
@@ -191,10 +199,35 @@ module Curl
           #
           c.each { |k,v| easy.send("#{k}=",v) }
 
-          easy.on_complete {|curl,code| blk.call(curl,code,method) } if blk
+          easy.on_complete {|curl,code|
+            free_handles << curl
+            blk.call(curl,code,method) if blk
+          }
           m.add(easy)
         end
-        m.perform
+
+        max_connects.times do
+          conf = urls_with_config.pop
+          add_free_handle.call conf, nil
+          break if urls_with_config.empty?
+        end
+
+        consume_free_handles = proc do
+          # as we idle consume free handles
+          if urls_with_config.size > 0 && free_handles.size > 0
+            easy = free_handles.pop
+            conf = urls_with_config.pop
+            add_free_handle.call conf, easy
+          end
+        end
+
+        until urls_with_config.empty?
+          m.perform do
+            consume_free_handles.call
+          end
+          consume_free_handles.call
+        end
+        free_handles = nil 
       end
 
       # call-seq:

data/lib/curl.rb

@@ -1,2 +1 @@
 require 'curb'
-

metadata

@@ -1,29 +1,35 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: curb
-version: !ruby/object:Gem::Version
-  version: 0.7.14
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 15
+  version: 0.7.15
 platform: ruby
-authors:
+authors: 
 - Ross Bamford
 - Todd A. Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-17 00:00:00.000000000 -04:00
+
+date: 2011-03-20 00:00:00 -04:00
 default_executable: 
 dependencies: []
-description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings
-  for the libcurl(3), a fully-featured client-side URL transfer library. cURL and
-  libcurl live at http://curl.haxx.se/
+
+description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings for the libcurl(3), a fully-featured client-side URL transfer library. cURL and libcurl live at http://curl.haxx.se/
 email: todd.fisher@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - LICENSE
 - README
-files:
+files: 
 - LICENSE
 - README
 - Rakefile
@@ -66,32 +72,40 @@ files:
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README
-require_paths:
+require_paths: 
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: curb
-rubygems_version: 1.6.2
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Ruby libcurl bindings
-test_files:
+test_files: 
 - tests/alltests.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb