curb 0.7.9 → 0.7.10

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.7.9"
-#define CURB_VER_NUM   790
+#define CURB_VERSION   "0.7.10"
+#define CURB_VER_NUM   710
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   7
-#define CURB_VER_MIC   9
+#define CURB_VER_MIC   1
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -753,8 +753,18 @@ static VALUE ruby_curl_easy_post_body_set(VALUE self, VALUE post_body) {
     rb_easy_del("postdata_buffer");
     
   } else {  
-    data = StringValuePtr(post_body);
-    len = RSTRING_LEN(post_body);
+    if (rb_type(post_body) == T_STRING) {
+      data = StringValuePtr(post_body);
+      len = RSTRING_LEN(post_body);
+    }
+    else if (rb_respond_to(post_body, rb_intern("to_s"))) {
+      VALUE str_body = rb_funcall(post_body, rb_intern("to_s"), 0);
+      data = StringValuePtr(str_body);
+      len = RSTRING_LEN(post_body);
+    }
+    else {
+      rb_raise(rb_eRuntimeError, "post data must respond_to .to_s");
+    }
   
     // Store the string, since it has to hang around for the duration of the 
     // request.  See CURLOPT_POSTFIELDS in the libcurl docs.
@@ -2141,6 +2151,7 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
 VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce ) {
 
   CURL *curl = rbce->curl;
+  struct curl_slist *ftp_commands;
 
   /* Free everything up */
   if (rbce->curl_headers) {
@@ -2148,7 +2159,7 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce ) {
     rbce->curl_headers = NULL;
   }
 
-  struct curl_slist *ftp_commands = rbce->curl_ftp_commands;
+  ftp_commands = rbce->curl_ftp_commands;
   if (ftp_commands) {
     curl_slist_free_all(ftp_commands);
     rbce->curl_ftp_commands = NULL;

data/ext/curb_multi.c

@@ -19,6 +19,11 @@
 
 #include <errno.h>
 
+#ifdef _WIN32
+  // for O_RDWR and O_BINARY
+  #include <fcntl.h>
+#endif
+
 extern VALUE mCurl;
 static VALUE idCall;
 
@@ -396,6 +401,35 @@ static void rb_curl_multi_run(VALUE self, CURLM *multi_handle, int *still_runnin
   
 }
 
+#ifdef _WIN32
+void create_crt_fd(fd_set *os_set, fd_set *crt_set)
+{
+  int i;
+  crt_set->fd_count = os_set->fd_count;
+  for (i = 0; i < os_set->fd_count; i++) {
+    WSAPROTOCOL_INFO wsa_pi;
+    // dupicate the SOCKET
+    int r = WSADuplicateSocket(os_set->fd_array[i], GetCurrentProcessId(), &wsa_pi);
+    SOCKET s = WSASocket(wsa_pi.iAddressFamily, wsa_pi.iSocketType, wsa_pi.iProtocol, &wsa_pi, 0, 0);
+    // create the CRT fd so ruby can get back to the SOCKET
+    int fd = _open_osfhandle(s, O_RDWR|O_BINARY);
+    os_set->fd_array[i] = s;
+    crt_set->fd_array[i] = fd;
+  }
+}
+
+void cleanup_crt_fd(fd_set *os_set, fd_set *crt_set)
+{
+  int i;
+  for (i = 0; i < os_set->fd_count; i++) {
+    // cleanup the CRT fd
+    _close(crt_set->fd_array[i]);
+    // cleanup the duplicated SOCKET
+    closesocket(os_set->fd_array[i]);
+  }
+}
+#endif
+
 /*
  * call-seq:
  * multi = Curl::Multi.new
@@ -416,6 +450,9 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
   ruby_curl_multi *rbcm;
   int maxfd, rc;
   fd_set fdread, fdwrite, fdexcep;
+#ifdef _WIN32
+  fd_set crt_fdread, crt_fdwrite, crt_fdexcep;
+#endif
 
   long timeout_milliseconds;
   struct timeval tv = {0, 0};
@@ -474,7 +511,20 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
         raise_curl_multi_error_exception(mcode);
       }
 
+#ifdef _WIN32
+      create_crt_fd(&fdread, &crt_fdread);
+      create_crt_fd(&fdwrite, &crt_fdwrite);
+      create_crt_fd(&fdexcep, &crt_fdexcep);
+#endif
+
       rc = rb_thread_select(maxfd+1, &fdread, &fdwrite, &fdexcep, &tv);
+
+#ifdef _WIN32
+      cleanup_crt_fd(&fdread, &crt_fdread);
+      cleanup_crt_fd(&fdwrite, &crt_fdwrite);
+      cleanup_crt_fd(&fdexcep, &crt_fdexcep);
+#endif
+
       switch(rc) {
       case -1:
         rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno));

data/ext/curb_postfield.c

@@ -213,7 +213,7 @@ static VALUE ruby_curl_postfield_new_content(int argc, VALUE *argv, VALUE klass)
   // wierdness - we actually require two args, unless a block is provided, but
   // we have to work that out below.
   rb_scan_args(argc, argv, "12&", &rbcpf->name, &rbcpf->content, &rbcpf->content_type, &rbcpf->content_proc);
-  
+
   // special handling if theres a block, second arg is actually content_type
   if (rbcpf->content_proc != Qnil) {
     if (rbcpf->content != Qnil) {
@@ -425,6 +425,7 @@ static VALUE ruby_curl_postfield_to_str(VALUE self) {
   ruby_curl_postfield *rbcpf;
   VALUE result = Qnil;
   VALUE name = Qnil;
+  char *tmpchrs;
   
   Data_Get_Struct(self, ruby_curl_postfield, rbcpf);
 
@@ -443,7 +444,7 @@ static VALUE ruby_curl_postfield_to_str(VALUE self) {
       rb_raise(eCurlErrInvalidPostField, "Cannot convert unnamed field to string %s:%d, make sure your field name responds_to :to_s", __FILE__, __LINE__);
     }
 
-    char *tmpchrs = curl_escape(StringValuePtr(name), (int)RSTRING_LEN(name));
+    tmpchrs = curl_escape(StringValuePtr(name), (int)RSTRING_LEN(name));
     
     if (!tmpchrs) {
       rb_raise(eCurlErrInvalidPostField, "Failed to url-encode name `%s'", tmpchrs);

data/tests/tc_curl_easy.rb

@@ -565,8 +565,8 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   
   def test_post_remote
     curl = Curl::Easy.new(TestServlet.url)
-    curl.http_post
-    assert_equal "POST\n", curl.body_str
+    curl.http_post([Curl::PostField.content('document_id', 5)])
+    assert_equal "POST\ndocument%5Fid=5", curl.body_str
   end
 
   def test_post_remote_is_easy_handle

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 7
-  - 9
-  version: 0.7.9
+  - 10
+  version: 0.7.10
 platform: ruby
 authors: 
 - Ross Bamford
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 -05:00
+date: 2011-01-20 00:00:00 -05:00
 default_executable: 
 dependencies: []