taf2-curb 0.4.9.0 → 0.5.0.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.4.9.0"
-#define CURB_VER_NUM   490
+#define CURB_VERSION   "0.5.0.0"
+#define CURB_VER_NUM   500
 #define CURB_VER_MAJ   0
-#define CURB_VER_MIN   4
-#define CURB_VER_MIC   9
+#define CURB_VER_MIN   5
+#define CURB_VER_MIC   0
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -1669,7 +1669,6 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, VALUE *body_buffer, VALUE *hea
     }
   }
   if (rbce->cacert != Qnil) {
-    // XXX: This should really be using the output of 'curl-config --ca'
 #ifdef HAVE_CURL_CONFIG_CA
     curl_easy_setopt(curl, CURLOPT_CAINFO, CURL_CONFIG_CA);
 #else
@@ -1682,7 +1681,6 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, VALUE *body_buffer, VALUE *hea
     curl_easy_setopt(curl, CURLOPT_USERAGENT, StringValuePtr(rbce->useragent));
   }
 
-
   /* Setup HTTP headers if necessary */
   curl_easy_setopt(curl, CURLOPT_HTTPHEADER, NULL);   // XXX: maybe we shouldn't be clearing this?
 
@@ -1772,7 +1770,7 @@ static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) {
 
   VALUE multi = ruby_curl_multi_new(cCurlMulti);
   ruby_curl_multi_add(multi, self);
-  VALUE ret = ruby_curl_multi_perform(multi);
+  VALUE ret = rb_funcall(multi, rb_intern("perform"), 0);
 
   /* check for errors in the easy response and raise exceptions if anything went wrong and their is no on_failure handler */
   if( rbce->last_result != 0 && rbce->failure_proc == Qnil ) {
@@ -1875,9 +1873,7 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
   rb_scan_args(argc, argv, "*", &args_ary);
 
   Data_Get_Struct(self, ruby_curl_easy, rbce);
-  curl = curl_easy_duphandle(rbce->curl);
-  curl_easy_cleanup(rbce->curl);
-  rbce->curl = curl;
+  curl = rbce->curl;
 
   if (rbce->multipart_form_post) {
     VALUE ret;
@@ -1976,9 +1972,19 @@ static VALUE ruby_curl_easy_perform_put(VALUE self, VALUE data) {
   
   ruby_curl_easy_put_data_set(self, data);
   
-  VALUE ret = handle_perform(self, rbce);
-  
-  return ret;
+  return handle_perform(self, rbce);
+}
+
+/*
+ * call-seq:
+ *   Curl::Easy.http_put(url, data) {|c| ... }
+ *
+ * see easy.http_put
+ */
+static VALUE ruby_curl_easy_class_perform_put(VALUE klass, VALUE url, VALUE data) {
+  VALUE c = ruby_curl_easy_new(1, &url, klass);
+  ruby_curl_easy_perform_put(c, data);
+  return c;
 }
 
 /* =================== DATA FUNCS =============== */
@@ -2653,10 +2659,6 @@ static VALUE ruby_curl_easy_class_perform(int argc, VALUE *argv, VALUE klass) {
 static VALUE ruby_curl_easy_class_perform_get(int argc, VALUE *argv, VALUE klass) {
   VALUE c = ruby_curl_easy_new(argc, argv, klass);
 
-  if (rb_block_given_p()) {
-    rb_yield(c);
-  }
-
   ruby_curl_easy_perform_get(c);
   return c;
 }
@@ -2674,10 +2676,6 @@ static VALUE ruby_curl_easy_class_perform_get(int argc, VALUE *argv, VALUE klass
 static VALUE ruby_curl_easy_class_perform_delete(int argc, VALUE *argv, VALUE klass) {
   VALUE c = ruby_curl_easy_new(argc, argv, klass);
 
-  if (rb_block_given_p()) {
-    rb_yield(c);
-  }
-
   ruby_curl_easy_perform_delete(c);
   return c;
 }
@@ -2695,10 +2693,6 @@ static VALUE ruby_curl_easy_class_perform_delete(int argc, VALUE *argv, VALUE kl
 static VALUE ruby_curl_easy_class_perform_head(int argc, VALUE *argv, VALUE klass) {
   VALUE c = ruby_curl_easy_new(argc, argv, klass);
 
-  if (rb_block_given_p()) {
-    rb_yield(c);
-  }
-
   ruby_curl_easy_perform_head(c);
 
   return c;
@@ -2756,6 +2750,7 @@ void init_curb_easy() {
   rb_define_singleton_method(cCurlEasy, "http_get", ruby_curl_easy_class_perform_get, -1);
   rb_define_singleton_method(cCurlEasy, "http_post", ruby_curl_easy_class_perform_post, -1);
   rb_define_singleton_method(cCurlEasy, "http_head", ruby_curl_easy_class_perform_head, -1);
+  rb_define_singleton_method(cCurlEasy, "http_put", ruby_curl_easy_class_perform_put, 2);
 
   /* Attributes for config next perform */
   rb_define_method(cCurlEasy, "url=", ruby_curl_easy_url_set, 1);

data/ext/curb_multi.c

@@ -57,6 +57,11 @@ static void curl_multi_flush_easy(VALUE key, VALUE easy, ruby_curl_multi *rbcm)
   }
 }
 
+static int
+rb_hash_clear_i(VALUE key, VALUE value, VALUE dummy) {
+  return ST_DELETE;
+}
+
 static void curl_multi_free(ruby_curl_multi *rbcm) {
 
   //printf("hash entries: %d\n", RHASH(rbcm->requests)->tbl->num_entries );
@@ -64,7 +69,7 @@ static void curl_multi_free(ruby_curl_multi *rbcm) {
 
     rb_hash_foreach( rbcm->requests, (int (*)())curl_multi_flush_easy, (VALUE)rbcm );
 
-    //rb_hash_clear(rbcm->requests)
+    rb_hash_foreach(rbcm->requests, rb_hash_clear_i, 0); //rb_hash_clear(rbcm->requests);
     rbcm->requests = Qnil;
   }
   curl_multi_cleanup(rbcm->handle);
@@ -381,7 +386,7 @@ static void rb_curl_multi_run(VALUE self, CURLM *multi_handle, int *still_runnin
  *
  * Run multi handles, looping selecting when data can be transfered
  */
-VALUE ruby_curl_multi_perform(VALUE self) {
+VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
   CURLMcode mcode;
   ruby_curl_multi *rbcm;
   int maxfd, rc;
@@ -389,9 +394,11 @@ VALUE ruby_curl_multi_perform(VALUE self) {
 
   long timeout_milliseconds;
   struct timeval tv = {0, 0};
+  VALUE block = Qnil;
+
+  rb_scan_args(argc, argv, "0&", &block);
 
   Data_Get_Struct(self, ruby_curl_multi, rbcm);
-  //rb_gc_mark(self);
 
   rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
 
@@ -440,9 +447,12 @@ VALUE ruby_curl_multi_perform(VALUE self) {
       rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno));
       break;
     case 0:
-      if (rb_block_given_p()) {
-        rb_yield(self);
+      if (block != Qnil) {
+        rb_funcall(block, rb_intern("call"), 1, self); 
       }
+//      if (rb_block_given_p()) {
+//        rb_yield(self);
+//      }
     default: 
       rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
       break;
@@ -472,5 +482,5 @@ void init_curb_multi() {
   rb_define_method(cCurlMulti, "add", ruby_curl_multi_add, 1);
   rb_define_method(cCurlMulti, "remove", ruby_curl_multi_remove, 1);
   rb_define_method(cCurlMulti, "cancel!", ruby_curl_multi_cancel, 0);
-  rb_define_method(cCurlMulti, "perform", ruby_curl_multi_perform, 0);
+  rb_define_method(cCurlMulti, "perform", ruby_curl_multi_perform, -1);
 }

data/ext/curb_multi.h

@@ -21,7 +21,7 @@ typedef struct {
 extern VALUE cCurlMulti;
 void init_curb_multi();
 VALUE ruby_curl_multi_new(VALUE klass);
-VALUE ruby_curl_multi_perform(VALUE self);
+VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self);
 VALUE ruby_curl_multi_add(VALUE self, VALUE easy);
 VALUE ruby_curl_multi_remove(VALUE self, VALUE easy);
 

data/tests/tc_curl_easy.rb

@@ -499,6 +499,19 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     curl.http_post
     assert_equal "POST\n", curl.body_str
   end
+
+  def test_post_remote_is_easy_handle
+    # see: http://pastie.org/560852 and
+    # http://groups.google.com/group/curb---ruby-libcurl-bindings/browse_thread/thread/216bb2d9b037f347?hl=en
+    [:post, :get,:head,:delete].each do |method|
+      count = 0
+      curl = Curl::Easy.send("http_#{method}", TestServlet.url) do|c|
+        count += 1
+        assert_equal Curl::Easy, c.class
+      end
+      assert_equal 1, count, "For request method: #{method.to_s.upcase}"
+    end
+  end
   
   def test_post_with_body_remote
     curl = Curl::Easy.new(TestServlet.url)
@@ -574,6 +587,16 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     end
     assert_equal "PUT\n#{File.read(__FILE__)}", curl.body_str
   end
+  
+  def test_put_class_method
+    count = 0
+    curl = Curl::Easy.http_put(TestServlet.url,File.open(__FILE__,'rb')) do|c|
+      count += 1
+      assert_equal Curl::Easy, c.class
+    end
+    assert_equal 1, count
+    assert_equal "PUT\n#{File.read(__FILE__)}", curl.body_str
+  end
 
   # Generate a self-signed cert with
   # openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.4.9.0
+  version: 0.5.0.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-26 00:00:00 -07:00
+date: 2009-07-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -46,6 +46,7 @@ files:
 - ext/curb_multi.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -68,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: curb
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Ruby libcurl bindings