taf2-curb 0.3.6.0 → 0.4.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.3.6.0"
-#define CURB_VER_NUM   360
+#define CURB_VERSION   "0.4.0.0"
+#define CURB_VER_NUM   400
 #define CURB_VER_MAJ   0
-#define CURB_VER_MIN   3
-#define CURB_VER_MIC   6
+#define CURB_VER_MIN   4
+#define CURB_VER_MIC   0
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -1629,7 +1629,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, 1, self );
+      rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
     } else {
       raise_curl_easy_error_exception(result);
     }
@@ -1641,7 +1641,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, 1, self );
+    rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
   }
 
   return Qtrue;
@@ -1697,11 +1697,14 @@ static VALUE ruby_curl_easy_perform_delete(VALUE self) {
  * 
  * Transfer the currently configured URL using the options set for this
  * Curl::Easy instance. If this is an HTTP URL, it will be transferred via
- * the GET request method (i.e. this method is a synonym for +http_get+ 
- * when using HTTP URLs).
+ * the GET or HEAD request method.
  */
 static VALUE ruby_curl_easy_perform(VALUE self) {  
-  return ruby_curl_easy_perform_get(self);
+  ruby_curl_easy *rbce;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  
+  return handle_perform(self,rbce);
 }
 
 /*
@@ -1803,6 +1806,28 @@ static VALUE ruby_curl_easy_perform_head(VALUE self) {
   return handle_perform(self,rbce);
 }
 
+/*
+ *call-seq:
+ * easy = Curl::Easy.new("url") do|c|
+ *  c.head = true
+ * end
+ * easy.perform
+ */
+static VALUE ruby_curl_easy_set_head_option(VALUE self, VALUE onoff) {
+  ruby_curl_easy *rbce;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  if( onoff == Qtrue ) {
+    curl_easy_setopt(rbce->curl, CURLOPT_NOBODY, 1);
+  }
+  else {
+    curl_easy_setopt(rbce->curl, CURLOPT_NOBODY, 0);
+  }
+
+  return onoff;
+}
+
 /*
  * call-seq:
  *   easy.http_put(data)                              => true
@@ -2685,6 +2710,7 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "http_post", ruby_curl_easy_perform_post, -1);
   rb_define_method(cCurlEasy, "http_head", ruby_curl_easy_perform_head, 0);
   rb_define_method(cCurlEasy, "http_put", ruby_curl_easy_perform_put, 1);
+  rb_define_method(cCurlEasy, "head=", ruby_curl_easy_set_head_option, 1);
 
   /* Post-perform info methods */
   rb_define_method(cCurlEasy, "body_str", ruby_curl_easy_body_str_get, 0);

data/ext/curb_multi.c

@@ -106,7 +106,28 @@ static VALUE ruby_curl_multi_max_connects(VALUE self, VALUE count) {
   curl_multi_setopt(rbcm->handle, CURLMOPT_MAXCONNECTS, NUM2INT(count));
 #endif
 
-  return self;
+  return count;
+}
+
+/*
+ * call-seq:
+ * multi = Curl::Multi.new
+ * multi.pipeline = true
+ *
+ * Pass a long set to 1 to enable or 0 to disable. Enabling pipelining on a multi handle will make it
+ * attempt to perform HTTP Pipelining as far as possible for transfers using this handle. This means
+ * that if you add a second request that can use an already existing connection, the second request will
+ * be "piped" on the same connection rather than being executed in parallel. (Added in 7.16.0)
+ *
+ */
+static VALUE ruby_curl_multi_pipeline(VALUE self, VALUE onoff) {
+#ifdef HAVE_CURLMOPT_PIPELINING
+  ruby_curl_multi *rbcm;
+
+  Data_Get_Struct(self, ruby_curl_multi, rbcm);
+  curl_multi_setopt(rbcm->handle, CURLMOPT_PIPELINING, onoff == Qtrue ? 1 : 0);
+#endif
+  return onoff;
 }
 
 /*
@@ -235,7 +256,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, 1, rbce->self );
+          rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
         }
       }
       else if (rbce->success_proc != Qnil &&
@@ -245,7 +266,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, 1, rbce->self );
+        rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
       }
       rbce->self = Qnil;
     }
@@ -359,6 +380,7 @@ void init_curb_multi() {
 
   /* Instnace methods */
   rb_define_method(cCurlMulti, "max_connects=", ruby_curl_multi_max_connects, 1);
+  rb_define_method(cCurlMulti, "pipeline=", ruby_curl_multi_pipeline, 1);
   rb_define_method(cCurlMulti, "add", ruby_curl_multi_add, 1);
   rb_define_method(cCurlMulti, "remove", ruby_curl_multi_remove, 1);
   rb_define_method(cCurlMulti, "perform", ruby_curl_multi_perform, 0);

data/tests/tc_curl_easy.rb

@@ -471,7 +471,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     curl = Curl::Easy.new("#{$TEST_URL.gsub(/file:\/\//,'')}/not_here")
     on_failure_called = false
     curl.on_success {|c| } # make sure we get the failure call even though this handler is defined
-    curl.on_failure {|c| on_failure_called = true }
+    curl.on_failure {|c,code| on_failure_called = true }
     curl.perform
     assert on_failure_called, "Failure handler not called" 
   end
@@ -504,6 +504,20 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_match '/nonexistent', redirect[1]
   end
 
+  def test_head_accessor
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.head = true
+    curl.perform
+
+    redirect = curl.header_str.match(/Location: (.*)/)
+
+    assert_equal '', curl.body_str
+    assert_match '/nonexistent', redirect[1]
+    curl.head = false
+    curl.perform
+    assert_equal 'GET', curl.body_str
+  end
+
   def test_put_remote
     curl = Curl::Easy.new(TestServlet.url)
     assert curl.http_put("message")

data/tests/tc_curl_multi.rb

@@ -146,7 +146,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
       #assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
     end
 
-    c1.on_failure do|c|
+    c1.on_failure do|c,rc|
       #puts "failure called: #{c.body_str.inspect}"
     end
 

metadata

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