curb 0.5.9.1 → 0.6.0.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.0.0"
+#define CURB_VER_NUM   600
 #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   0
+#define CURB_VER_PATCH 0
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_multi.c

@@ -263,11 +263,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("Critical:: Unable to remove easy from requests");
   }
 }
 
-// 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);
   

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: curb
 version: !ruby/object:Gem::Version 
-  version: 0.5.9.1
+  version: 0.6.0.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -05:00
+date: 2009-11-27 00:00:00 -05:00
 default_executable: 
 dependencies: []