taf2-curb 0.3.5.0 → 0.3.6.0

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.3.5.0"
-#define CURB_VER_NUM   350
+#define CURB_VERSION   "0.3.6.0"
+#define CURB_VER_NUM   360
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   3
-#define CURB_VER_MIC   5
+#define CURB_VER_MIC   6
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -128,6 +128,8 @@ void curl_easy_mark(ruby_curl_easy *rbce) {
   rb_gc_mark(rbce->userpwd);
   rb_gc_mark(rbce->proxypwd);  
   rb_gc_mark(rbce->headers);
+  rb_gc_mark(rbce->cookies);
+  rb_gc_mark(rbce->cookiefile);
   rb_gc_mark(rbce->cookiejar);
   rb_gc_mark(rbce->cert);
   rb_gc_mark(rbce->encoding);
@@ -190,6 +192,8 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
   rbce->userpwd = Qnil;
   rbce->proxypwd = Qnil;
   rbce->headers = rb_hash_new();
+  rbce->cookies = Qnil;
+  rbce->cookiefile = Qnil;
   rbce->cookiejar = Qnil;
   rbce->cert = Qnil;
   rbce->encoding = Qnil;
@@ -435,12 +439,58 @@ static VALUE ruby_curl_easy_proxypwd_get(VALUE self) {
   CURB_OBJECT_GETTER(ruby_curl_easy, proxypwd);
 }
 
+
+/*
+ * call-seq:
+ *   easy.cookies = "name1=content1; name2=content2;"                => "pwd string"
+ *
+ * Set cookies to be sent by this Curl::Easy instance. The format of the string should
+ * be NAME=CONTENTS, where NAME is the cookie name and CONTENTS is what the cookie should contain. 
+ * Set multiple cookies in one string like this: "name1=content1; name2=content2;" etc. 
+ */
+static VALUE ruby_curl_easy_cookies_set(VALUE self, VALUE cookies) {
+  CURB_OBJECT_SETTER(ruby_curl_easy, cookies);
+}
+
+/*
+ * call-seq:
+ *   easy.cookies                                   => "name1=content1; name2=content2;"
+ * 
+ * Obtain the cookies for this Curl::Easy instance. 
+ */ 
+static VALUE ruby_curl_easy_cookies_get(VALUE self) {
+  CURB_OBJECT_GETTER(ruby_curl_easy, cookies);
+}
+
+/*
+ * call-seq:
+ *   easy.cookiefile = "cookies.txt"                => "pwd string"
+ *
+ * Set a file that contains cookies to be sent in subsequent requests by this Curl::Easy instance.
+ * 
+ * *Note* that you must set enable_cookies true to enable the cookie
+ * engine, or this option will be ignored.
+ */
+static VALUE ruby_curl_easy_cookiefile_set(VALUE self, VALUE cookiefile) {
+  CURB_OBJECT_SETTER(ruby_curl_easy, cookiefile);
+}
+
+/*
+ * call-seq:
+ *   easy.cookiefile                                   => "cookies.txt"
+ * 
+ * Obtain the cookiefile file for this Curl::Easy instance. 
+ */ 
+static VALUE ruby_curl_easy_cookiefile_get(VALUE self) {
+  CURB_OBJECT_GETTER(ruby_curl_easy, cookiefile);
+}
+
 /*
  * call-seq:
  *   easy.cookiejar = "cookiejar.file"                => "pwd string"
  * 
- * Set a cookiejar file to use for this Curl::Easy instance. This file
- * will be used to persist cookies.
+ * Set a cookiejar file to use for this Curl::Easy instance.
+ * Cookies from the response will be written into this file.
  * 
  * *Note* that you must set enable_cookies true to enable the cookie
  * engine, or this option will be ignored.
@@ -1380,11 +1430,19 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, VALUE *body_buffer, VALUE *hea
   if (rbce->enable_cookies) {
     if (rbce->cookiejar != Qnil) {
       curl_easy_setopt(curl, CURLOPT_COOKIEJAR, StringValuePtr(rbce->cookiejar));
+    }
+
+    if (rbce->cookiefile != Qnil) {
+      curl_easy_setopt(curl, CURLOPT_COOKIEFILE, StringValuePtr(rbce->cookiefile));
     } else {
       curl_easy_setopt(curl, CURLOPT_COOKIEFILE, ""); /* "" = magic to just enable */
     }
   }
 
+  if (rbce->cookies != Qnil) {
+    curl_easy_setopt(curl, CURLOPT_COOKIE, StringValuePtr(rbce->cookies));
+  }
+
   /* Set up HTTPS cert handling if necessary */
   if (rbce->cert != Qnil) {
     curl_easy_setopt(curl, CURLOPT_SSLCERT, StringValuePtr(rbce->cert));
@@ -2556,6 +2614,10 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "userpwd", ruby_curl_easy_userpwd_get, 0);
   rb_define_method(cCurlEasy, "proxypwd=", ruby_curl_easy_proxypwd_set, 1);
   rb_define_method(cCurlEasy, "proxypwd", ruby_curl_easy_proxypwd_get, 0);
+  rb_define_method(cCurlEasy, "cookies=", ruby_curl_easy_cookies_set, 1);
+  rb_define_method(cCurlEasy, "cookies", ruby_curl_easy_cookies_get, 0);
+  rb_define_method(cCurlEasy, "cookiefile=", ruby_curl_easy_cookiefile_set, 1);
+  rb_define_method(cCurlEasy, "cookiefile", ruby_curl_easy_cookiefile_get, 0);
   rb_define_method(cCurlEasy, "cookiejar=", ruby_curl_easy_cookiejar_set, 1);
   rb_define_method(cCurlEasy, "cookiejar", ruby_curl_easy_cookiejar_get, 0);
   rb_define_method(cCurlEasy, "cert=", ruby_curl_easy_cert_set, 1);

data/ext/curb_easy.h

@@ -32,6 +32,8 @@ typedef struct {
   VALUE userpwd;
   VALUE proxypwd;
   VALUE headers;        /* ruby array of strings with headers to set */
+  VALUE cookies;        /* string */
+  VALUE cookiefile;     /* filename */
   VALUE cookiejar;      /* filename */
   VALUE cert;
   VALUE encoding;

data/ext/curb_errors.c

@@ -98,6 +98,16 @@ VALUE eCurlErrTFTPUnknownID;
 VALUE eCurlErrTFTPFileExists;
 VALUE eCurlErrTFTPNoSuchUser;
 
+VALUE eCurlErrConvFailed;
+VALUE eCurlErrConvReqd;
+VALUE eCurlErrSSLCacertBadfile;
+VALUE eCurlErrRemoteFileNotFound;
+VALUE eCurlErrSSH;
+VALUE eCurlErrSSLShutdownFailed;
+VALUE eCurlErrAgain;
+VALUE eCurlErrSSLCRLBadfile;
+VALUE eCurlErrSSLIssuerError;
+
 /* multi errors */
 VALUE mCurlErrCallMultiPerform;
 VALUE mCurlErrBadHandle;
@@ -360,6 +370,63 @@ void raise_curl_easy_error_exception(CURLcode code) {
     case CURLE_TFTP_NOSUCHUSER:         /* 74 - No such user */
       exclz = eCurlErrTFTPNotFound;
       break;
+#endif
+#ifdef HAVE_CURLE_CONV_FAILED
+    case CURLE_CONV_FAILED:             /* 75 - conversion failed */
+      exclz = eCurlErrConvFailed;
+      break;
+#endif
+#ifdef HAVE_CURLE_CONV_REQD
+    case CURLE_CONV_REQD:               /* 76 - caller must register conversion
+                                                callbacks using curl_easy_setopt options
+                                                CURLOPT_CONV_FROM_NETWORK_FUNCTION,
+                                                CURLOPT_CONV_TO_NETWORK_FUNCTION, and
+                                                CURLOPT_CONV_FROM_UTF8_FUNCTION */
+      exclz = eCurlErrConvReqd;
+      break;
+#endif
+#ifdef HAVE_CURLE_SSL_CACERT_BADFILE
+    case CURLE_SSL_CACERT_BADFILE:      /* 77 - could not load CACERT file, missing
+                                                or wrong format */
+      exclz = eCurlErrSSLCacertBadfile;
+      break;
+#endif
+#ifdef  HAVE_CURLE_REMOTE_FILE_NOT_FOUND
+    case CURLE_REMOTE_FILE_NOT_FOUND:   /* 78 - remote file not found */
+      exclz = eCurlErrRemoteFileNotFound;
+      break;
+#endif
+#ifdef  HAVE_CURLE_SSH
+    case CURLE_SSH:                     /* 79 - error from the SSH layer, somewhat
+                                    generic so the error message will be of
+                                    interest when this has happened */
+      exclz = eCurlErrSSH;
+      break;
+#endif
+#ifdef  HAVE_CURLE_SSL_SHUTDOWN_FAILED
+    case CURLE_SSL_SHUTDOWN_FAILED:     /* 80 - Failed to shut down the SSL
+                                    connection */
+      exclz = eCurlErrSSLShutdownFailed;
+      break;
+#endif
+#ifdef  HAVE_CURLE_AGAIN
+    case CURLE_AGAIN:                   /* 81 - socket is not ready for send/recv,
+                                    wait till it's ready and try again (Added
+                                    in 7.18.2) */
+      exclz = eCurlErrAgain;
+      break;
+#endif
+#ifdef  HAVE_CURLE_SSL_CRL_BADFILE
+    case CURLE_SSL_CRL_BADFILE:         /* 82 - could not load CRL file, missing or
+                                    wrong format (Added in 7.19.0) */
+      exclz = eCurlErrSSLCRLBadfile;
+      break;
+#endif
+#ifdef  HAVE_CURLE_SSL_ISSUER_ERROR
+    case CURLE_SSL_ISSUER_ERROR:        /* 83 - Issuer check failed.  (Added in
+                                    7.19.0) */
+      exclz = eCurlErrSSLIssuerError;
+      break;
 #endif
     default:
       exclz = eCurlErrError;
@@ -501,10 +568,20 @@ void init_curb_errors() {
   eCurlErrRecvError = rb_define_class_under(mCurlErr, "RecvError", eCurlErrError);
   eCurlErrShareInUse = rb_define_class_under(mCurlErr, "ShareInUseError", eCurlErrError);
 
+  eCurlErrConvFailed  = rb_define_class_under(mCurlErr, "ConvFailed", eCurlErrError);
+  eCurlErrConvReqd    = rb_define_class_under(mCurlErr, "ConvReqd", eCurlErrError);
+  eCurlErrRemoteFileNotFound  = rb_define_class_under(mCurlErr, "RemoteFileNotFound", eCurlErrError);
+  eCurlErrAgain  = rb_define_class_under(mCurlErr, "Again", eCurlErrError);
+
   eCurlErrSSLCertificate = rb_define_class_under(mCurlErr, "SSLCertificateError", eCurlErrError);
   eCurlErrSSLCipher = rb_define_class_under(mCurlErr, "SSLCypherError", eCurlErrError);
   eCurlErrSSLCACertificate = rb_define_class_under(mCurlErr, "SSLCACertificateError", eCurlErrError);
   eCurlErrBadContentEncoding = rb_define_class_under(mCurlErr, "BadContentEncodingError", eCurlErrError);
+  eCurlErrSSLCacertBadfile   = rb_define_class_under(mCurlErr, "SSLCaertBadFile", eCurlErrError);
+  eCurlErrSSLCRLBadfile      = rb_define_class_under(mCurlErr, "SSLCRLBadfile", eCurlErrError);
+  eCurlErrSSLIssuerError     = rb_define_class_under(mCurlErr, "SSLIssuerError", eCurlErrError);
+  eCurlErrSSLShutdownFailed  = rb_define_class_under(mCurlErr, "SSLShutdownFailed", eCurlErrError);
+  eCurlErrSSH                = rb_define_class_under(mCurlErr, "SSH", eCurlErrError);
 
   eCurlErrLDAPInvalidURL = rb_define_class_under(mCurlErr, "InvalidLDAPURLError", eCurlErrLDAPError);
 

data/ext/curb_errors.h

@@ -97,6 +97,15 @@ extern VALUE eCurlErrTFTPIllegalOperation;
 extern VALUE eCurlErrTFTPUnknownID;
 extern VALUE eCurlErrTFTPFileExists;
 extern VALUE eCurlErrTFTPNoSuchUser;
+extern VALUE eCurlErrConvFailed;
+extern VALUE eCurlErrConvReqd;
+extern VALUE eCurlErrSSLCacertBadfile;
+extern VALUE eCurlErrRemoteFileNotFound;
+extern VALUE eCurlErrSSH;
+extern VALUE eCurlErrSSLShutdownFailed;
+extern VALUE eCurlErrAgain;
+extern VALUE eCurlErrSSLCRLBadfile;
+extern VALUE eCurlErrSSLIssuerError;
 
 /* multi errors */
 extern VALUE mCurlErrCallMultiPerform;

data/ext/curb_multi.c

@@ -42,7 +42,19 @@ static void curl_multi_mark(ruby_curl_multi *rbcm) {
 }
 
 static void curl_multi_flush_easy(VALUE key, VALUE easy, ruby_curl_multi *rbcm) {
-  rb_curl_multi_remove(rbcm, easy);
+  //rb_curl_multi_remove(rbcm, easy);
+  CURLMcode result;
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(easy, ruby_curl_easy, rbce);
+  result = curl_multi_remove_handle(rbcm->handle, rbce->curl);
+  if (result != 0) {
+    raise_curl_multi_error_exception(result);
+  }
+  // XXX: easy handle may not be finished yet... so don't clean it GC pass will get it next time
+  VALUE r = rb_hash_delete( rbcm->requests, easy );
+  if( r != easy || r == Qnil ) {
+    rb_raise(rb_eRuntimeError, "Critical:: Unable to remove easy from requests");
+  }
 }
 
 static void curl_multi_free(ruby_curl_multi *rbcm) {
@@ -187,7 +199,7 @@ static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy) {
   // active should equal INT2FIX(RHASH(rbcm->requests)->tbl->num_entries)
   VALUE r = rb_hash_delete( rbcm->requests, easy );
   if( r != easy || r == Qnil ) {
-    fprintf(stderr, "Critical:: Unable to remove easy from requests\n");
+    rb_raise(rb_eRuntimeError, "Critical:: Unable to remove easy from requests");
   }
 }
 

data/ext/extconf.rb

@@ -78,6 +78,17 @@ have_constant "curle_login_denied"
 # older than 7.16.3
 have_constant "curlmopt_maxconnects"
 
+# additional consts
+have_constant "curle_conv_failed"
+have_constant "curle_conv_reqd"
+have_constant "curle_ssl_cacert_badfile"
+have_constant "curle_remote_file_not_found"
+have_constant "curle_ssh"
+have_constant "curle_ssl_shutdown_failed"
+have_constant "curle_again"
+have_constant "curle_ssl_crl_badfile"
+have_constant "curle_ssl_issuer_error"
+
 # centos 4.5 build of libcurl
 have_constant "curlm_bad_socket"
 have_constant "curlm_unknown_option"

data/tests/tc_curl_easy.rb

@@ -432,7 +432,21 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert c.enable_cookies = true
     assert c.enable_cookies?
   end
-  
+
+  def test_cookies_option
+    c = Curl::Easy.new
+    assert_nil c.cookies
+    assert_equal "name1=content1; name2=content2;", c.cookies = "name1=content1; name2=content2;"
+    assert_equal "name1=content1; name2=content2;", c.cookies
+  end
+
+  def test_cookiefile
+    c = Curl::Easy.new
+    assert_nil c.cookiefile
+    assert_equal "some.file", c.cookiefile = "some.file"
+    assert_equal "some.file", c.cookiefile       
+  end
+
   def test_cookiejar
     c = Curl::Easy.new
     assert_nil c.cookiejar

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.3.5.0
+  version: 0.3.6.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-09 00:00:00 -07:00
+date: 2009-06-13 00:00:00 -07:00
 default_executable: 
 dependencies: []