ghazel-curb 0.5.9.1 → 0.6.1.0

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.5.9.1"
-#define CURB_VER_NUM   591
+#define CURB_VERSION   "0.6.1.0"
+#define CURB_VER_NUM   610
 #define CURB_VER_MAJ   0
-#define CURB_VER_MIN   5
-#define CURB_VER_MIC   9
-#define CURB_VER_PATCH 1
+#define CURB_VER_MIN   6
+#define CURB_VER_MIC   1
+#define CURB_VER_PATCH 0
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_easy.c

@@ -162,10 +162,6 @@ void curl_easy_mark(ruby_curl_easy *rbce) {
   rb_gc_mark(rbce->bodybuf);
   rb_gc_mark(rbce->headerbuf);
 
-  if( rbce->self != Qnil ) {
-    rb_gc_mark(rbce->self);
-  }
-
   if( rbce->upload != Qnil ) {
     rb_gc_mark(rbce->upload);
   }
@@ -263,13 +259,12 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
   rbce->headerbuf = Qnil;
   rbce->curl_headers = NULL;
 
-  rbce->self = Qnil;
   rbce->upload = Qnil;
 
   new_curl = Data_Wrap_Struct(klass, curl_easy_mark, curl_easy_free, rbce);
 
-  /* set the rbce pointer to the curl handle */
-  ecode = curl_easy_setopt(rbce->curl, CURLOPT_PRIVATE, (void*)rbce);
+  /* set the new_curl pointer to the curl handle */
+  ecode = curl_easy_setopt(rbce->curl, CURLOPT_PRIVATE, (void*)new_curl);
   if (ecode != CURLE_OK) {
     raise_curl_easy_error_exception(ecode);
   }
@@ -2636,7 +2631,7 @@ static VALUE ruby_curl_easy_escape(VALUE self, VALUE svalue) {
 
 /*
  * call-seq:
- *   easy.unescape("some text")                       => "some%20text"
+ *   easy.unescape("some%20text")                       => "some text"
  *
  * Convert the given URL encoded input string to a "plain string" and return
  * the result. All input characters that are URL encoded (%XX where XX is a

data/ext/curb_easy.h

@@ -86,7 +86,7 @@ typedef struct {
   VALUE headerbuf;
   struct curl_slist *curl_headers;
 
-  VALUE self; /* pointer to self, used by multi interface */
+//  VALUE self; /* pointer to self, used by multi interface */
   VALUE upload; /* pointer to an active upload otherwise Qnil */
 
   int last_result; /* last result code from multi loop */

data/ext/curb_multi.c

@@ -199,9 +199,6 @@ VALUE ruby_curl_multi_add(VALUE self, VALUE easy) {
     raise_curl_multi_error_exception(mcode);
   }
 
-  /* save a pointer to self */
-  rbce->self = easy;
-
   /* setup the easy handle */
   ruby_curl_easy_setup( rbce, &(rbce->bodybuf), &(rbce->headerbuf), &(rbce->curl_headers) );
 
@@ -263,11 +260,11 @@ static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy) {
   // active should equal INT2FIX(RHASH(rbcm->requests)->tbl->num_entries)
   r = rb_hash_delete( rbcm->requests, easy );
   if( r != easy || r == Qnil ) {
-    rb_raise(rb_eRuntimeError, "Critical:: Unable to remove easy from requests");
+    rb_warn("Possibly lost tack of Curl::Easy VALUE, it may not be reclaimed by GC");
   }
 }
 
-// Hash#foreach callback for ruby_curl_multi_cancel
+/* Hash#foreach callback for ruby_curl_multi_cancel */
 static int ruby_curl_multi_cancel_callback(VALUE key, VALUE value, ruby_curl_multi *rbcm) {
   rb_curl_multi_remove(rbcm, value);
   
@@ -287,16 +284,19 @@ static VALUE ruby_curl_multi_cancel(VALUE self) {
   
   rb_hash_foreach( rbcm->requests, ruby_curl_multi_cancel_callback, (VALUE)rbcm );
   
-  // for chaining
+  /* for chaining */
   return self;
 }
 
 static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int result) {
 
   long response_code = -1;
+  VALUE easy;
   ruby_curl_easy *rbce = NULL;
-  VALUE ref;
-  CURLcode ecode = curl_easy_getinfo(easy_handle, CURLINFO_PRIVATE, (char**)&rbce);
+
+  CURLcode ecode = curl_easy_getinfo(easy_handle, CURLINFO_PRIVATE, (char**)&easy);
+
+  Data_Get_Struct(easy, ruby_curl_easy, rbce);
 
   if (ecode != 0) {
     raise_curl_easy_error_exception(ecode);
@@ -304,31 +304,27 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
 
   rbce->last_result = result; /* save the last easy result code */
 
-  ruby_curl_multi_remove( self, rbce->self );
+  ruby_curl_multi_remove( self, easy );
 
   if (rbce->complete_proc != Qnil) {
-    rb_funcall( rbce->complete_proc, idCall, 1, rbce->self );
+    rb_funcall( rbce->complete_proc, idCall, 1, easy );
   }
 
   curl_easy_getinfo(rbce->curl, CURLINFO_RESPONSE_CODE, &response_code);
 
-  ref = rbce->self;
-  /* break reference */
-  rbce->self = Qnil;
-
   if (result != 0) {
     if (rbce->failure_proc != Qnil) {
-      rb_funcall( rbce->failure_proc, idCall, 2, ref, rb_curl_easy_error(result) );
+      rb_funcall( rbce->failure_proc, idCall, 2, easy, rb_curl_easy_error(result) );
     }
   }
   else if (rbce->success_proc != Qnil &&
           ((response_code >= 200 && response_code < 300) || response_code == 0)) {
     /* NOTE: we allow response_code == 0, in the case of non http requests e.g. reading from disk */
-    rb_funcall( rbce->success_proc, idCall, 1, ref );
+    rb_funcall( rbce->success_proc, idCall, 1, easy );
   }
   else if (rbce->failure_proc != Qnil &&
           (response_code >= 300 && response_code <= 999)) {
-    rb_funcall( rbce->failure_proc, idCall, 2, ref, rb_curl_easy_error(result) );
+    rb_funcall( rbce->failure_proc, idCall, 2, easy, rb_curl_easy_error(result) );
   }
 }
 

data/tests/tc_curl_multi.rb

@@ -391,7 +391,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   def test_retry_easy_handle
     m = Curl::Multi.new
 
-    tries = 2
+    tries = 10
 
     c1 = Curl::Easy.new('http://127.1.1.1:99911') do |curl|
       curl.on_failure {|c,e|
@@ -406,13 +406,24 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     tries -= 1
     m.add(c1)
 
-    while not m.requests.empty?
-      m.perform
-    end
+    m.perform
     assert_equal 0, tries
     assert_equal 0, m.requests.size
   end
 
+  def test_reusing_handle
+    m = Curl::Multi.new
+
+    c = Curl::Easy.new('http://127.0.0.1') do|easy|
+      easy.on_complete{|e,r| puts e.inspect }
+    end
+
+    m.add(c)
+    m.add(c)
+  rescue => e
+    assert_equal Curl::Err::MultiBadEasyHandle, e.class
+  end
+
   include TestServerMethods
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ghazel-curb
 version: !ruby/object:Gem::Version 
-  version: 0.5.9.1
+  version: 0.6.1.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -08:00
+date: 2009-12-06 00:00:00 -08:00
 default_executable: 
 dependencies: []