taf2-curb 0.4.1.0 → 0.4.2.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.1.0"
-#define CURB_VER_NUM   410
+#define CURB_VERSION   "0.4.2.0"
+#define CURB_VER_NUM   420
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   4
-#define CURB_VER_MIC   1
+#define CURB_VER_MIC   2
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -1568,27 +1568,27 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce, VALUE bodybuf, V
  */
 static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) {
 
-  int msgs;
-  int still_running = 1;
   CURLcode result = -1;
-  CURLMcode mcode = -1;
-  CURLM *multi_handle = curl_multi_init();
   struct curl_slist *headers = NULL;
   VALUE bodybuf = Qnil, headerbuf = Qnil;
-  long timeout;
-  struct timeval tv = {0, 0};
-  int rc; /* select() return code */
-  int maxfd;
 //  char errors[CURL_ERROR_SIZE*2];
 
   ruby_curl_easy_setup(rbce, &bodybuf, &headerbuf, &headers);
 //  curl_easy_setopt(rbce->curl, CURLOPT_ERRORBUFFER, errors);
 //  curl_easy_setopt(rbce->curl, CURLOPT_VERBOSE, 1);
 
-//  if( rb_thread_alone() ) {
-//    result = curl_easy_perform(rbce->curl);
-//  }
-//  else {
+  if( rb_thread_alone() ) {
+    result = curl_easy_perform(rbce->curl);
+  }
+  else {
+    int msgs;
+    int still_running = 1;
+    CURLMcode mcode = -1;
+    CURLM *multi_handle = curl_multi_init();
+    long timeout;
+    struct timeval tv = {0, 0};
+    int rc; /* select() return code */
+    int maxfd;
 
     /* NOTE:
      * We create an Curl multi handle here and use rb_thread_select allowing other ruby threads to
@@ -1679,7 +1679,7 @@ static VALUE handle_perform(VALUE self, ruby_curl_easy *rbce) {
 
     curl_multi_remove_handle(multi_handle, rbce->curl);
     curl_multi_cleanup(multi_handle);
-//  }
+  }
 
   ruby_curl_easy_cleanup(self, rbce, bodybuf, headerbuf, headers);
 
@@ -1918,20 +1918,34 @@ static VALUE ruby_curl_easy_perform_put(VALUE self, VALUE data) {
   curl_easy_setopt(curl, CURLOPT_READFUNCTION, (curl_read_callback)read_data_handler);
   curl_easy_setopt(curl, CURLOPT_READDATA, rbce);
 
+  /* 
+   * we need to set specific headers for the PUT to work... so
+   * convert the internal headers structure to a HASH if one is set
+   */
+  if (rbce->headers != Qnil) {
+    if (rb_type(rbce->headers) == T_ARRAY || rb_type(rbce->headers) == T_STRING) {
+      rb_raise(rb_eRuntimeError, "Must set headers as a HASH to modify the headers in an http_put request");
+    }
+  }
+
   if (rb_respond_to(data, rb_intern("read"))) {
     VALUE stat = rb_funcall(data, rb_intern("stat"), 0);
     if( stat ) {
-      ruby_curl_easy_headers_set(self,rb_str_new2("Expect:"));
+      if( rb_hash_aref(rbce->headers, rb_str_new2("Expect")) == Qnil ) {
+        rb_hash_aset(rbce->headers, rb_str_new2("Expect"), rb_str_new2(""));
+      }
       VALUE size = rb_funcall(stat, rb_intern("size"), 0);
       curl_easy_setopt(curl, CURLOPT_INFILESIZE, FIX2INT(size));
     }
-    else {
-      ruby_curl_easy_headers_set(self,rb_str_new2("Transfer-Encoding: chunked"));
+    else if( rb_hash_aref(rbce->headers, rb_str_new2("Transfer-Encoding")) == Qnil ) {
+      rb_hash_aset(rbce->headers, rb_str_new2("Transfer-Encoding"), rb_str_new2("chunked"));
     }
   }
   else if (rb_respond_to(data, rb_intern("to_s"))) {
     curl_easy_setopt(curl, CURLOPT_INFILESIZE, RSTRING_LEN(data));
-    ruby_curl_easy_headers_set(self,rb_str_new2("Expect:"));
+    if( rb_hash_aref(rbce->headers, rb_str_new2("Expect")) == Qnil ) {
+      rb_hash_aset(rbce->headers, rb_str_new2("Expect"), rb_str_new2(""));
+    }
   }
   else {
     rb_raise(rb_eRuntimeError, "PUT data must respond to read or to_s");

data/tests/helper.rb

@@ -76,6 +76,7 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_PUT(req,res)
+    res['X-Requested-Content-Type'] = req.content_type
     respond_with("PUT\n#{req.body}",req,res)
   end
 

data/tests/tc_curl_easy.rb

@@ -532,9 +532,11 @@ class TestCurbCurlEasy < Test::Unit::TestCase
 
   def test_put_remote
     curl = Curl::Easy.new(TestServlet.url)
+    curl.headers['Content-Type'] = 'application/json'
     assert curl.http_put("message")
     assert_match /^PUT/, curl.body_str
     assert_match /message$/, curl.body_str
+    assert_match /application\/json/, curl.header_str
   end
 
   def test_put_remote_file

metadata

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