taf2-curb 0.4.3.0 → 0.4.4.0

data/README

@@ -106,7 +106,16 @@ HTTP POST file upload:
   c.multipart_form_post = true
   c.http_post(Curl::PostField.file('myfile.rb'))
 
-Multi Interface:
+Multi Interface (Basic):
+  easy_options = {:follow_location => true}
+  multi_options = {:pipeline => true}
+
+  Curl::Multi.get('url1','url2','url3','url4','url5', easy_options, multi_options) do|easy|
+    # do something interesting with the easy response
+    puts easy.last_effective_url
+  end
+
+Multi Interface (Advanced):
   responses = {}
   requests = ["http://www.google.co.uk/", "http://www.ruby-lang.org/"]
   m = Curl::Multi.new

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.4.3.0"
-#define CURB_VER_NUM   430
+#define CURB_VERSION   "0.4.4.0"
+#define CURB_VER_NUM   440
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   4
-#define CURB_VER_MIC   3
+#define CURB_VER_MIC   4
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -678,6 +678,58 @@ static VALUE ruby_curl_easy_useragent_get(VALUE self) {
   CURB_OBJECT_GETTER(ruby_curl_easy, useragent);
 }
 
+/*
+ * call-seq:
+ *   easy.post_body = "some=form%20data&to=send" => string or nil
+ * 
+ * Sets the POST body of this Curl::Easy instance.  This is expected to be
+ * URL encoded; no additional processing or encoding is done on the string.
+ * The content-type header will be set to application/x-www-form-urlencoded.
+ * 
+ * This is handy if you want to perform a POST against a Curl::Multi instance.
+ */
+static VALUE ruby_curl_easy_post_body_set(VALUE self, VALUE post_body) {
+  ruby_curl_easy *rbce;
+  CURL *curl;
+  
+  char *data;
+  long len;
+  
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  
+  curl = rbce->curl;
+  
+  if ( post_body == Qnil ) {
+    rbce->postdata_buffer = Qnil;
+    
+  } else {  
+    data = StringValuePtr(post_body);
+    len = RSTRING_LEN(post_body);
+  
+    // Store the string, since it has to hang around for the duration of the 
+    // request.  See CURLOPT_POSTFIELDS in the libcurl docs.
+    rbce->postdata_buffer = post_body;
+  
+    curl_easy_setopt(curl, CURLOPT_POST, 1);
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data);
+    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, len);
+    
+    return post_body;
+  }
+  
+  return Qnil;
+}
+
+/*
+ * call-seq:
+ *   easy.post_body                                  => "string" or nil
+ *
+ * Obtain the POST body used in this Curl::Easy instance.
+ */
+static VALUE ruby_curl_easy_post_body_get(VALUE self) {
+  CURB_OBJECT_GETTER(ruby_curl_easy, postdata_buffer);
+}
+
 /* ================== IMMED ATTRS ==================*/
 
 /*
@@ -1789,7 +1841,7 @@ static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) {
   if (result != 0) {
 //    printf("error: %s\n", errors);
     if (rbce->failure_proc != Qnil) {
-      rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
+      rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, rb_curl_easy_error(result) );
     } else {
       raise_curl_easy_error_exception(result);
     }
@@ -1801,7 +1853,7 @@ static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) {
   }
   else if (rbce->failure_proc != Qnil &&
            (response_code >= 300 && response_code <= 999)) {
-    rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
+    rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, rb_curl_easy_error(result) );
   }
 
   return Qtrue;
@@ -1925,19 +1977,12 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
 
     return ret;
   } else {
-    long len;
-    char *data;
-
-    if ((rbce->postdata_buffer = rb_funcall(args_ary, idJoin, 1, rbstrAmp)) == Qnil) {
+    VALUE post_body;
+    if ((post_body = rb_funcall(args_ary, idJoin, 1, rbstrAmp)) == Qnil) {
       rb_raise(eCurlErrError, "Failed to join arguments");
       return Qnil;
     } else {
-      data = StringValuePtr(rbce->postdata_buffer);
-      len = RSTRING_LEN(rbce->postdata_buffer);
-
-      curl_easy_setopt(curl, CURLOPT_POST, 1);
-      curl_easy_setopt(curl, CURLOPT_POSTFIELDS, data);
-      curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, len);
+      ruby_curl_easy_post_body_set(self, post_body);
 
       return handle_perform(self,rbce);
     }
@@ -2847,6 +2892,8 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "encoding", ruby_curl_easy_encoding_get, 0);
   rb_define_method(cCurlEasy, "useragent=", ruby_curl_easy_useragent_set, 1);
   rb_define_method(cCurlEasy, "useragent", ruby_curl_easy_useragent_get, 0);
+  rb_define_method(cCurlEasy, "post_body=", ruby_curl_easy_post_body_set, 1);
+  rb_define_method(cCurlEasy, "post_body", ruby_curl_easy_post_body_get, 0);
 
   rb_define_method(cCurlEasy, "local_port=", ruby_curl_easy_local_port_set, 1);
   rb_define_method(cCurlEasy, "local_port", ruby_curl_easy_local_port_get, 0);

data/ext/curb_errors.c

@@ -121,8 +121,7 @@ VALUE mCurlErrUnknownOption;
 VALUE eCurlErrInvalidPostField;
 
 
-/* rb_raise an approriate exception for the supplied CURLcode */
-void raise_curl_easy_error_exception(CURLcode code) {
+VALUE rb_curl_easy_error(CURLcode code) {
   VALUE exclz;
   const char *exmsg = NULL;
 
@@ -437,9 +436,17 @@ void raise_curl_easy_error_exception(CURLcode code) {
     exmsg = curl_easy_strerror(code);
   }
 
-  rb_raise(exclz, exmsg);
+  VALUE results = rb_ary_new2(2);
+  rb_ary_push(results, exclz);
+  rb_ary_push(results, rb_str_new2(exmsg));
+  return results;
 }
-void raise_curl_multi_error_exception(CURLMcode code) {
+/* rb_raise an approriate exception for the supplied CURLcode */
+void raise_curl_easy_error_exception(CURLcode code) {
+  VALUE obj = rb_curl_easy_error(code);
+  rb_raise(rb_ary_entry(obj,0), RSTRING_PTR(rb_ary_entry(obj,1)));
+}
+VALUE rb_curl_multi_error(CURLMcode code) {
   VALUE exclz;
   const char *exmsg = NULL;
 
@@ -478,7 +485,14 @@ void raise_curl_multi_error_exception(CURLMcode code) {
     exmsg = curl_multi_strerror(code);
   }
 
-  rb_raise(exclz, exmsg);
+  VALUE results = rb_ary_new2(2);
+  rb_ary_push(results, exclz);
+  rb_ary_push(results, rb_str_new2(exmsg));
+  return results;
+}
+void raise_curl_multi_error_exception(CURLMcode code) {
+  VALUE obj = rb_curl_multi_error(code);
+  rb_raise(rb_ary_entry(obj,0), RSTRING_PTR(rb_ary_entry(obj,1)));
 }
 
 void init_curb_errors() {

data/ext/curb_errors.h

@@ -122,5 +122,7 @@ extern VALUE eCurlErrInvalidPostField;
 void init_curb_errors();
 void raise_curl_easy_error_exception(CURLcode code);
 void raise_curl_multi_error_exception(CURLMcode code);
+VALUE rb_curl_easy_error(CURLcode code);
+VALUE rb_curl_multi_error(CURLMcode code);
 
 #endif

data/ext/curb_multi.c

@@ -1,8 +1,7 @@
-/* curb_easy.c - Curl easy mode
+/* curb_multi.c - Curl multi mode
  * Copyright (c)2008 Todd A. Fisher.
  * Licensed under the Ruby License. See LICENSE for details.
  *
- * $Id$
  */
 
 #include "curb_config.h"
@@ -58,14 +57,16 @@ static void curl_multi_flush_easy(VALUE key, VALUE easy, ruby_curl_multi *rbcm)
 }
 
 static void curl_multi_free(ruby_curl_multi *rbcm) {
+
   //printf("hash entries: %d\n", RHASH(rbcm->requests)->tbl->num_entries );
-  if (rbcm && RHASH_LEN(rbcm->requests) > 0) {
+  if (rbcm && !rbcm->requests == Qnil && rb_type(rbcm->requests) == T_HASH && RHASH_LEN(rbcm->requests) > 0) {
+
     rb_hash_foreach( rbcm->requests, (int (*)())curl_multi_flush_easy, (VALUE)rbcm );
 
-    curl_multi_cleanup(rbcm->handle);
     //rb_hash_clear(rbcm->requests)
     rbcm->requests = Qnil;
   }
+  curl_multi_cleanup(rbcm->handle);
   free(rbcm);
 }
 
@@ -257,7 +258,7 @@ static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {
 
       if (result != 0) {
         if (rbce->failure_proc != Qnil) {
-          rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
+          rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, rb_curl_easy_error(result) );
         }
       }
       else if (rbce->success_proc != Qnil &&
@@ -267,7 +268,7 @@ static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {
       }
       else if (rbce->failure_proc != Qnil &&
               (response_code >= 300 && response_code <= 999)) {
-        rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
+        rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, rb_curl_easy_error(result) );
       }
       rbce->self = Qnil;
     }

data/tests/bug_multi_segfault.rb

@@ -0,0 +1,10 @@
+# From safis  http://github.com/taf2/curb/issues#issue/5
+# irb: require 'curb'
+# irb: multi = Curl::Multi.new
+# irb: exit
+# <main>:47140: [BUG] Bus Error
+$:.unshift File.join(File.dirname(__FILE__),'..','ext')
+$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+require 'curb'
+multi = Curl::Multi.new
+exit

data/tests/helper.rb

@@ -72,7 +72,7 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_POST(req,res)
-    respond_with(:POST,req,res)
+    respond_with("POST\n#{req.body}",req,res)
   end
 
   def do_PUT(req,res)

data/tests/tc_curl_easy.rb

@@ -497,7 +497,25 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_post_remote
     curl = Curl::Easy.new(TestServlet.url)
     curl.http_post
-    assert_equal 'POST', curl.body_str
+    assert_equal "POST\n", curl.body_str
+  end
+  
+  def test_post_with_body_remote
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.post_body = 'foo=bar&encoded%20string=val'
+    
+    curl.perform
+    
+    assert_equal "POST\nfoo=bar&encoded%20string=val", curl.body_str
+    assert_equal 'foo=bar&encoded%20string=val', curl.post_body
+  end
+  
+  def test_form_post_body_remote
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.http_post('foo=bar', 'encoded%20string=val')
+    
+    assert_equal "POST\nfoo=bar&encoded%20string=val", curl.body_str
+    assert_equal 'foo=bar&encoded%20string=val', curl.post_body
   end
 
   def test_delete_remote

data/tests/tc_curl_multi.rb

@@ -146,7 +146,10 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     end
 
     c1.on_failure do|c,rc|
-      #puts "failure called: #{c.body_str.inspect}"
+      # rc => [Curl::Err::MalformedURLError, "URL using bad/illegal format or missing URL"]
+      assert_equal Curl::Easy, c.class
+      assert_equal Curl::Err::MalformedURLError, rc.first
+      assert_equal "URL using bad/illegal format or missing URL", rc.last
     end
 
     c2.on_success do|c|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.4.3.0
+  version: 0.4.4.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-02 00:00:00 -07:00
+date: 2009-07-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -83,4 +83,5 @@ test_files:
 - tests/alltests.rb
 - tests/helper.rb
 - tests/tc_curl_easy.rb
+- tests/bug_multi_segfault.rb
 - tests/require_last_or_segfault_script.rb