ghazel-curb 0.6.2.3 → 0.7.9.1

data/README

@@ -144,14 +144,21 @@ 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|
       puts responses[url]
     end
+
+### Easy Callbacks
+
+on_success:  is called when the response code is 20x
+on_failure: is called when the response code is not success, including redirects e.g. 30x
+on_complete: is called in all cases.

data/Rakefile

@@ -100,7 +100,7 @@ Rake::TestTask.new(:bugtests) do |t|
   t.test_files = FileList['tests/bug_*.rb']
   t.verbose = false
 end
-                          
+ 
 #Rake::TestTask.new(:funtests) do |t|
   #  t.test_files = FileList['test/func_*.rb']
   #t.warning = true
@@ -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.c

@@ -255,6 +255,18 @@ void Init_curb_core() {
   /* Passed to on_debug handler to indicate that the data is protocol data sent to the peer. */
   rb_define_const(mCurl, "CURLINFO_DATA_OUT", INT2FIX(CURLINFO_DATA_OUT));
 
+#ifdef HAVE_CURLFTPMETHOD_MULTICWD 
+  rb_define_const(mCurl, "CURL_MULTICWD",  INT2FIX(CURLFTPMETHOD_MULTICWD));
+#endif
+
+#ifdef HAVE_CURLFTPMETHOD_NOCWD 
+  rb_define_const(mCurl, "CURL_NOCWD",     INT2FIX(CURLFTPMETHOD_NOCWD));
+#endif
+
+#ifdef HAVE_CURLFTPMETHOD_SINGLECWD 
+  rb_define_const(mCurl, "CURL_SINGLECWD", INT2FIX(CURLFTPMETHOD_SINGLECWD));
+#endif
+
   /* When passed to Curl::Easy#proxy_type , indicates that the proxy is an HTTP proxy. (libcurl >= 7.10) */
 #ifdef HAVE_CURLPROXY_HTTP
   rb_define_const(mCurl, "CURLPROXY_HTTP", INT2FIX(CURLPROXY_HTTP));
@@ -262,6 +274,28 @@ void Init_curb_core() {
   rb_define_const(mCurl, "CURLPROXY_HTTP", INT2FIX(-1));
 #endif
 
+#ifdef CURL_VERSION_SSL
+  rb_define_const(mCurl, "CURL_SSLVERSION_DEFAULT", INT2FIX(CURL_SSLVERSION_DEFAULT));
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1",   INT2FIX(CURL_SSLVERSION_TLSv1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_SSLv2",   INT2FIX(CURL_SSLVERSION_SSLv2));
+  rb_define_const(mCurl, "CURL_SSLVERSION_SSLv3",   INT2FIX(CURL_SSLVERSION_SSLv3));
+
+  rb_define_const(mCurl, "CURL_USESSL_CONTROL", INT2FIX(CURB_FTPSSL_CONTROL));
+  rb_define_const(mCurl, "CURL_USESSL_NONE", INT2FIX(CURB_FTPSSL_NONE));
+  rb_define_const(mCurl, "CURL_USESSL_TRY", INT2FIX(CURB_FTPSSL_TRY));
+  rb_define_const(mCurl, "CURL_USESSL_ALL", INT2FIX(CURB_FTPSSL_ALL));
+#else
+  rb_define_const(mCurl, "CURL_SSLVERSION_DEFAULT", INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_TLSv1",   INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_SSLv2",   INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_SSLVERSION_SSLv3",   INT2FIX(-1));
+
+  rb_define_const(mCurl, "CURL_USESSL_CONTROL", INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_USESSL_NONE", INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_USESSL_TRY", INT2FIX(-1));
+  rb_define_const(mCurl, "CURL_USESSL_ALL", INT2FIX(-1));
+#endif
+
   /* When passed to Curl::Easy#proxy_type , indicates that the proxy is a SOCKS4 proxy. (libcurl >= 7.15.2) */
 #ifdef HAVE_CURLPROXY_SOCKS4
   rb_define_const(mCurl, "CURLPROXY_SOCKS4", INT2FIX(CURLPROXY_SOCKS4));

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.6.4.0"
-#define CURB_VER_NUM   640
+#define CURB_VERSION   "0.7.9"
+#define CURB_VER_NUM   790
 #define CURB_VER_MAJ   0
-#define CURB_VER_MIN   6
-#define CURB_VER_MIC   4
+#define CURB_VER_MIN   7
+#define CURB_VER_MIC   9
 #define CURB_VER_PATCH 0
 
 
@@ -37,11 +37,13 @@
   #define RSTRING_PTR(x) RSTRING(x)->ptr
 #endif
 
+#ifndef RHASH_LEN
 #ifdef HAVE_RUBY19_HASH
   #define RHASH_LEN(hash) RHASH(hash)->ntbl->num_entries
 #else
   #define RHASH_LEN(hash) RHASH(hash)->tbl->num_entries
 #endif
+#endif
 
 extern VALUE mCurl;