curb 0.7.6 → 0.7.7

data/README

@@ -144,12 +144,13 @@ documentation with:
       c = Curl::Easy.new(url) do|curl|
         curl.follow_location = true
         curl.on_body{|data| responses[url] << data; data.size }
+        curl.on_success {|easy| puts "success, add more easy handles" }
       end
       m.add(c)
     end
    
     m.perform do
-      puts "idling... can do some work here, including add new requests"
+      puts "idling... can do some work here"
     end
    
     requests.each do|url|

data/Rakefile

@@ -110,6 +110,25 @@ end
 task :unittests => :compile
 task :bugtests => :compile
 
+def has_gem?(file,name)
+  begin
+    require file
+    has_http_persistent = true
+  rescue LoadError => e
+    puts "Skipping #{name}"
+  end
+end
+
+desc "Benchmark curl against http://127.0.0.1/zeros-2k - will fail if /zeros-2k or 127.0.0.1 are missing"
+task :bench do
+  sh "ruby bench/curb_easy.rb"
+  sh "ruby bench/curb_multi.rb"
+  sh "ruby bench/nethttp_test.rb" if has_gem?("net/http/persistent","net-http-persistent")
+  sh "ruby bench/patron_test.rb" if has_gem?("patron","patron")
+  sh "ruby bench/typhoeus_test.rb" if has_gem?("typhoeus","typhoeus")
+  sh "ruby bench/typhoeus_hydra_test.rb" if has_gem?("typhoeus","typhoeus")
+end
+
 # RDoc Tasks ---------------------------------------------------------
 desc "Create the RDOC documentation"
 task :doc do

data/ext/curb.h

@@ -20,11 +20,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.7.6"
-#define CURB_VER_NUM   706
+#define CURB_VERSION   "0.7.7"
+#define CURB_VER_NUM   707
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   7
-#define CURB_VER_MIC   6
+#define CURB_VER_MIC   7
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_multi.c

@@ -32,6 +32,7 @@ static long cCurlMutiDefaulttimeout = 100; /* milliseconds */
 
 static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy);
 static void rb_curl_multi_read_info(VALUE self, CURLM *mptr);
+static void rb_curl_multi_run(VALUE self, CURLM *multi_handle, int *still_running);
 
 static void rb_curl_multi_mark_all_easy(VALUE key, VALUE rbeasy, ruby_curl_multi *rbcm) {
   rb_gc_mark(rbeasy);
@@ -239,6 +240,8 @@ VALUE ruby_curl_multi_add(VALUE self, VALUE easy) {
 
   rb_hash_aset( rbcm->requests, easy, easy );
 
+  rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
+
   return self;
 }
 
@@ -383,8 +386,7 @@ static void rb_curl_multi_run(VALUE self, CURLM *multi_handle, int *still_runnin
   if (mcode != CURLM_OK) {
     raise_curl_multi_error_exception(mcode);
   }
-
-  rb_curl_multi_read_info( self, multi_handle );
+  
 }
 
 /*
@@ -416,65 +418,72 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
 
   Data_Get_Struct(self, ruby_curl_multi, rbcm);
 
-  rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
+  timeout_milliseconds = cCurlMutiDefaulttimeout;
 
-  while (rbcm->running) {
+  rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
+ 
+  do {
+    while (rbcm->running) {
 
 #ifdef HAVE_CURL_MULTI_TIMEOUT
-    /* get the curl suggested time out */
-    mcode = curl_multi_timeout(rbcm->handle, &timeout_milliseconds);
-    if (mcode != CURLM_OK) {
-      raise_curl_multi_error_exception(mcode);
-    }
+      /* get the curl suggested time out */
+      mcode = curl_multi_timeout(rbcm->handle, &timeout_milliseconds);
+      if (mcode != CURLM_OK) {
+        raise_curl_multi_error_exception(mcode);
+      }
 #else
-    /* libcurl doesn't have a timeout method defined, initialize to -1 we'll pick up the default later */
-    timeout_milliseconds = -1;
+      /* libcurl doesn't have a timeout method defined, initialize to -1 we'll pick up the default later */
+      timeout_milliseconds = -1;
 #endif
 
-    if (timeout_milliseconds == 0) { /* no delay */
-      rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
-      continue;
-    }
-    else if (timeout_milliseconds < 0) {
-      timeout_milliseconds = cCurlMutiDefaulttimeout; /* libcurl doesn't know how long to wait, use a default timeout */
-    }
+      if (timeout_milliseconds == 0) { /* no delay */
+        rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
+        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 > cCurlMutiDefaulttimeout) {
+        timeout_milliseconds = cCurlMutiDefaulttimeout; /* buggy versions libcurl sometimes reports huge timeouts... let's cap it */
+      }
 
-    tv.tv_sec  = 0; /* never wait longer than 1 second */
-    tv.tv_usec = timeout_milliseconds * 1000;
+      tv.tv_sec  = 0; /* never wait longer than 1 second */
+      tv.tv_usec = timeout_milliseconds * 1000;
 
-    FD_ZERO(&fdread);
-    FD_ZERO(&fdwrite);
-    FD_ZERO(&fdexcep);
+      if (timeout_milliseconds == 0) { /* no delay */
+        rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
+        continue;
+      }
 
-    /* load the fd sets from the multi handle */
-    mcode = curl_multi_fdset(rbcm->handle, &fdread, &fdwrite, &fdexcep, &maxfd);
-    if (mcode != CURLM_OK) {
-      raise_curl_multi_error_exception(mcode);
-    }
+      if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
 
-    rc = rb_thread_select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv);
-    switch(rc) {
-    case -1:
-      rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno));
-      break;
-    case 0:
-      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) {
+        raise_curl_multi_error_exception(mcode);
       }
-//      if (rb_block_given_p()) {
-//        rb_yield(self);
-//      }
-    default: 
-      rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
-      break;
-    }
-
-  }
 
+      rc = rb_thread_select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv);
+      switch(rc) {
+      case -1:
+        rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno));
+        break;
+      case 0:
+        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 );
+    
   return Qtrue;
 }
 

data/tests/helper.rb

@@ -11,6 +11,7 @@ $:.unshift($EXTDIR)
 
 require 'curb'
 require 'test/unit'
+require 'fileutils'
 
 $TEST_URL = "file://#{URI.escape(File.expand_path(__FILE__).tr('\\','/').tr(':','|'))}"
 
@@ -73,9 +74,7 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_POST(req,res)
-    if !req.query['filename'].nil?
-      respond_with(req.query['filename'],req,res)
-    else
+    if req.query['filename'].nil?
       if req.body
         params = {}
         req.body.split('&').map{|s| k,v=s.split('='); params[k] = v }
@@ -85,6 +84,8 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
       else
         respond_with("POST\n#{req.body}",req,res)
       end
+    else
+      respond_with(req.query['filename'],req,res)
     end
   end
 

data/tests/tc_curl_easy.rb

@@ -674,7 +674,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     #curl.verbose = true
     curl.perform
     assert_equal 'Basic Zm9vOmJhcg==', $auth_header
-
+    $auth_header = nil
     # curl checks the auth type supported by the server, so we have to create a 
     # new easy handle if we're going to change the auth type...
 
@@ -712,6 +712,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal(easy.body_str,File.read(readme))
   end
 
+
   def test_easy_close
     easy = Curl::Easy.new
     easy.close

data/tests/tc_curl_multi.rb

@@ -170,7 +170,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
     m.perform do
       # idle
-      puts "idling..."
+      #puts "idling..."
     end
 
     assert success_called2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 7
-  - 6
-  version: 0.7.6
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Ross Bamford
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 -04:00
+date: 2010-06-21 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -35,38 +35,38 @@ files:
 - Rakefile
 - doc.rb
 - ext/extconf.rb
-- lib/curb.rb
 - lib/curl.rb
+- lib/curb.rb
 - ext/curb.c
+- ext/curb_upload.c
+- ext/curb_postfield.c
 - ext/curb_easy.c
-- ext/curb_errors.c
 - ext/curb_multi.c
-- ext/curb_postfield.c
-- ext/curb_upload.c
-- ext/curb.h
-- ext/curb_easy.h
+- ext/curb_errors.c
 - ext/curb_errors.h
-- ext/curb_macros.h
 - ext/curb_multi.h
+- ext/curb.h
+- ext/curb_easy.h
 - ext/curb_postfield.h
 - ext/curb_upload.h
-- tests/alltests.rb
-- tests/bug_curb_easy_blocks_ruby_threads.rb
-- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
+- ext/curb_macros.h
+- tests/bugtests.rb
+- tests/mem_check.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/helper.rb
+- tests/tc_curl_postfield.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_multi_segfault.rb
+- tests/alltests.rb
 - tests/bug_postfields_crash.rb
-- tests/bug_postfields_crash2.rb
-- tests/bug_require_last_or_segfault.rb
-- tests/bugtests.rb
-- tests/helper.rb
-- tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
+- tests/bug_postfields_crash2.rb
+- tests/unittests.rb
+- tests/tc_curl_multi.rb
+- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
-- tests/tc_curl_multi.rb
-- tests/tc_curl_postfield.rb
-- tests/unittests.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
@@ -104,20 +104,20 @@ signing_key:
 specification_version: 3
 summary: Ruby libcurl bindings
 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
+- tests/bugtests.rb
+- tests/mem_check.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/helper.rb
+- tests/tc_curl_postfield.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_multi_segfault.rb
+- tests/alltests.rb
 - tests/bug_postfields_crash.rb
-- tests/bug_postfields_crash2.rb
-- tests/bug_require_last_or_segfault.rb
-- tests/bugtests.rb
-- tests/helper.rb
-- tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
+- tests/bug_postfields_crash2.rb
+- tests/unittests.rb
+- tests/tc_curl_multi.rb
+- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
-- tests/tc_curl_multi.rb
-- tests/tc_curl_postfield.rb
-- tests/unittests.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb