curb 0.7.7.1 → 0.7.8

data/ext/curb.c

@@ -255,9 +255,17 @@ void Init_curb_core() {
   /* Passed to on_debug handler to indicate that the data is protocol data sent to the peer. */
   rb_define_const(mCurl, "CURLINFO_DATA_OUT", INT2FIX(CURLINFO_DATA_OUT));
 
+#ifdef HAVE_CURLFTPMETHOD_MULTICWD 
   rb_define_const(mCurl, "CURL_MULTICWD",  INT2FIX(CURLFTPMETHOD_MULTICWD));
+#endif
+
+#ifdef HAVE_CURLFTPMETHOD_NOCWD 
   rb_define_const(mCurl, "CURL_NOCWD",     INT2FIX(CURLFTPMETHOD_NOCWD));
+#endif
+
+#ifdef HAVE_CURLFTPMETHOD_SINGLECWD 
   rb_define_const(mCurl, "CURL_SINGLECWD", INT2FIX(CURLFTPMETHOD_SINGLECWD));
+#endif
 
   /* When passed to Curl::Easy#proxy_type , indicates that the proxy is an HTTP proxy. (libcurl >= 7.10) */
 #ifdef HAVE_CURLPROXY_HTTP

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.7.7.1"
-#define CURB_VER_NUM   707
+#define CURB_VERSION   "0.7.8"
+#define CURB_VER_NUM   708
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   7
-#define CURB_VER_MIC   7
-#define CURB_VER_PATCH 1
+#define CURB_VER_MIC   8
+#define CURB_VER_PATCH 0
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_easy.c

@@ -57,7 +57,7 @@ static size_t read_data_handler(void *ptr,
       return 0;
     }
   }
-  else {
+  else if (rb_respond_to(stream, rb_intern("to_s"))) {
     ruby_curl_upload *rbcu;
     VALUE str;
     size_t len;
@@ -68,6 +68,7 @@ static size_t read_data_handler(void *ptr,
     len = RSTRING_LEN(str);
     remaining = len - rbcu->offset;
     str_ptr = RSTRING_PTR(str);
+
     if( remaining < read_bytes ) {
       if( remaining > 0 ) {
         memcpy(ptr, str_ptr+rbcu->offset, remaining);
@@ -86,7 +87,9 @@ static size_t read_data_handler(void *ptr,
     }
     return read_bytes;
   }
-
+  else {
+    return 0;
+  }
 }
 
 static size_t proc_data_handler(char *stream,
@@ -412,7 +415,7 @@ static VALUE ruby_curl_easy_proxy_url_get(VALUE self) {
  * To remove a standard header (this is useful when removing libcurls default
  * 'Expect: 100-Continue' header when using HTTP form posts):
  *
- *    easy.headers["Expect:"] = ''
+ *    easy.headers["Expect"] = ''
  *
  * Anything passed to libcurl as a header will be converted to a string during
  * the perform step.
@@ -807,10 +810,14 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
     }
   }
 
+  // exit fast if the payload is empty
+  if (NIL_P(data)) { return data; }
+
   headers = rb_easy_get("headers");
   if( headers == Qnil ) { 
     headers = rb_hash_new();
   }
+
   if (rb_respond_to(data, rb_intern("read"))) {
     VALUE stat = rb_funcall(data, rb_intern("stat"), 0);
     if( stat ) {
@@ -835,7 +842,7 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
     rb_raise(rb_eRuntimeError, "PUT data must respond to read or to_s");
   }
   rb_easy_set("headers",headers);
-  
+
   // if we made it this far, all should be well.
   return data;
 }
@@ -2162,7 +2169,17 @@ static VALUE ruby_curl_easy_perform_delete(VALUE self) {
  * This method always returns true or raises an exception (defined under Curl::Err) on error.
  */
 static VALUE ruby_curl_easy_perform_verb(VALUE self, VALUE verb) {
-  return ruby_curl_easy_perform_verb_str(self, RSTRING_PTR(verb));
+  VALUE str_verb;
+  if (rb_type(verb) == T_STRING) {
+    return ruby_curl_easy_perform_verb_str(self, RSTRING_PTR(verb));
+  }
+  else if (rb_respond_to(verb,rb_intern("to_s"))) {
+    str_verb = rb_funcall(verb, rb_intern("to_s"), 0);
+    return ruby_curl_easy_perform_verb_str(self, RSTRING_PTR(str_verb));
+  }
+  else {
+    rb_raise(rb_eRuntimeError, "Invalid HTTP VERB, must response to 'to_s'");
+  }
 }
 
 /*
@@ -2995,10 +3012,10 @@ static VALUE ruby_curl_easy_inspect(VALUE self) {
     /* "#<Net::HTTP http://www.google.com/:80 open=false>" */
     memcpy(buf,"#<Curl::Easy ", 13);
     memcpy(buf+13,RSTRING_PTR(url), (len - 13));
-    buf[len-1] = '>';
+    buf[len++] = '>';
     return rb_str_new(buf,len);
   }
-  return rb_str_new2("#<Curl::Easy");
+  return rb_str_new2("#<Curl::Easy>");
 }
 
 

data/ext/curb_multi.c

@@ -332,6 +332,12 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
 
   ruby_curl_multi_remove( self, easy );
 
+  /* after running a request cleanup the headers, these are set before each request */
+  if (rbce->curl_headers) {
+    curl_slist_free_all(rbce->curl_headers);
+    rbce->curl_headers = NULL;
+  }
+
   if (ecode != 0) {
     raise_curl_easy_error_exception(ecode);
   }
@@ -356,6 +362,7 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
           (response_code >= 300 && response_code <= 999)) {
     rb_funcall( rb_easy_get("failure_proc"), idCall, 2, easy, rb_curl_easy_error(result) );
   }
+
 }
 
 static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {

data/ext/curb_postfield.c

@@ -235,7 +235,7 @@ static VALUE ruby_curl_postfield_new_content(int argc, VALUE *argv, VALUE klass)
   rbcpf->local_file = Qnil;
   rbcpf->remote_file = Qnil;
   rbcpf->buffer_str = Qnil;
-  
+ 
   return Data_Wrap_Struct(cCurlPostField, curl_postfield_mark, curl_postfield_free, rbcpf);
 }
 
@@ -253,11 +253,11 @@ static VALUE ruby_curl_postfield_new_content(int argc, VALUE *argv, VALUE klass)
  * data.
  */
 static VALUE ruby_curl_postfield_new_file(int argc, VALUE *argv, VALUE klass) {
-  // TODO needs to handle content-type too 
+  // TODO needs to handle content-type too
   ruby_curl_postfield *rbcpf = ALLOC(ruby_curl_postfield);
-  
+
   rb_scan_args(argc, argv, "21&", &rbcpf->name, &rbcpf->local_file, &rbcpf->remote_file, &rbcpf->content_proc);
-  
+
   // special handling if theres a block, second arg is actually remote name.
   if (rbcpf->content_proc != Qnil) {
     if (rbcpf->local_file != Qnil) {
@@ -267,7 +267,7 @@ static VALUE ruby_curl_postfield_new_file(int argc, VALUE *argv, VALUE klass) {
         // (correct block call form)
         rbcpf->remote_file = rbcpf->local_file;
       }
-      
+ 
       // Shouldn't get a local file, so can ignore it.
       rbcpf->local_file = Qnil;
     }
@@ -275,8 +275,8 @@ static VALUE ruby_curl_postfield_new_file(int argc, VALUE *argv, VALUE klass) {
     if (rbcpf->remote_file == Qnil) {
       rbcpf->remote_file = rbcpf->local_file;
     }
-  }    
-      
+  }
+ 
   /* assoc objects */
   rbcpf->content = Qnil;
   rbcpf->content_type = Qnil;
@@ -424,55 +424,66 @@ static VALUE ruby_curl_postfield_to_str(VALUE self) {
   // FIXME This is using the deprecated curl_escape func
   ruby_curl_postfield *rbcpf;
   VALUE result = Qnil;
+  VALUE name = Qnil;
   
   Data_Get_Struct(self, ruby_curl_postfield, rbcpf);
 
-  if ((rbcpf->local_file == Qnil) && (rbcpf->remote_file == Qnil)) {
-    if (rbcpf->name != Qnil && rb_type(rbcpf->name) == T_STRING) {
+    if (rbcpf->name != Qnil) {
+      name = rbcpf->name;
+      if (rb_type(name) == T_STRING) {
+        name = rbcpf->name;
+      } else if (rb_respond_to(name,rb_intern("to_s"))) {
+        name = rb_funcall(name, rb_intern("to_s"), 0);
+      }
+      else {
+        name = Qnil; // we can't handle this object
+      }
+    }
+    if (name == Qnil) {
+      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(rbcpf->name), RSTRING_LEN(rbcpf->name));
+    char *tmpchrs = curl_escape(StringValuePtr(name), RSTRING_LEN(name));
+    
+    if (!tmpchrs) {
+      rb_raise(eCurlErrInvalidPostField, "Failed to url-encode name `%s'", tmpchrs);
+    } else {
+      VALUE tmpcontent = Qnil;
+      VALUE escd_name = rb_str_new2(tmpchrs);
+      curl_free(tmpchrs);
       
+      if (rbcpf->content_proc != Qnil) {
+        tmpcontent = rb_funcall(rbcpf->content_proc, idCall, 1, self);
+      } else if (rbcpf->content != Qnil) {
+        tmpcontent = rbcpf->content;
+      } else if (rbcpf->local_file != Qnil) {
+        tmpcontent = rbcpf->local_file;
+      } else if (rbcpf->remote_file != Qnil) {
+        tmpcontent = rbcpf->remote_file;
+      } else {
+        tmpcontent = rb_str_new2("");
+      }
+      if (TYPE(tmpcontent) != T_STRING) {
+        if (rb_respond_to(tmpcontent, rb_intern("to_s"))) {
+          tmpcontent = rb_funcall(tmpcontent, rb_intern("to_s"), 0);
+        }
+        else {
+          rb_raise(rb_eRuntimeError, "postfield(%s) is not a string and does not respond_to to_s", RSTRING_PTR(escd_name) );
+        }
+      }
+      //fprintf(stderr, "encoding content: %ld - %s\n", RSTRING_LEN(tmpcontent), RSTRING_PTR(tmpcontent) );
+      tmpchrs = curl_escape(RSTRING_PTR(tmpcontent), RSTRING_LEN(tmpcontent));
       if (!tmpchrs) {
-        rb_raise(eCurlErrInvalidPostField, "Failed to url-encode name `%s'", tmpchrs);
+        rb_raise(eCurlErrInvalidPostField, "Failed to url-encode content `%s'", tmpchrs);
       } else {
-        VALUE tmpcontent = Qnil;
-        VALUE escd_name = rb_str_new2(tmpchrs);
+        VALUE escd_content = rb_str_new2(tmpchrs);
         curl_free(tmpchrs);
         
-        if (rbcpf->content_proc != Qnil) {
-          tmpcontent = rb_funcall(rbcpf->content_proc, idCall, 1, self);
-        } else if (rbcpf->content != Qnil) {
-          tmpcontent = rbcpf->content;
-        } else {
-          tmpcontent = rb_str_new2("");
-        }
-        if (TYPE(tmpcontent) != T_STRING) {
-          if (rb_respond_to(tmpcontent, rb_intern("to_s"))) {
-            tmpcontent = rb_funcall(tmpcontent, rb_intern("to_s"), 0);
-          }
-          else {
-            rb_raise(rb_eRuntimeError, "postfield(%s) is not a string and does not respond_to to_s", RSTRING_PTR(escd_name) );
-          }
-        }
-        //fprintf(stderr, "encoding content: %ld - %s\n", RSTRING_LEN(tmpcontent), RSTRING_PTR(tmpcontent) );
-        tmpchrs = curl_escape(RSTRING_PTR(tmpcontent), RSTRING_LEN(tmpcontent));
-        if (!tmpchrs) {
-          rb_raise(eCurlErrInvalidPostField, "Failed to url-encode content `%s'", tmpchrs);
-        } else {
-          VALUE escd_content = rb_str_new2(tmpchrs);
-          curl_free(tmpchrs);
-          
-          result = escd_name;
-          rb_str_cat(result, "=", 1);
-          rb_str_concat(result, escd_content); 
-        }
+        result = escd_name;
+        rb_str_cat(result, "=", 1);
+        rb_str_concat(result, escd_content); 
       }
-    } else {
-      rb_raise(eCurlErrInvalidPostField, "Cannot convert unnamed field to string %s:%d", __FILE__, __LINE__);
     }
-  } else {
-    rb_raise(eCurlErrInvalidPostField, "Local file and remote file are both nil %s:%d", __FILE__, __LINE__);
-  }
   
   return result;
 }

data/ext/curb_upload.c

@@ -11,7 +11,7 @@ VALUE cCurlUpload;
 #endif
 
 static void curl_upload_mark(ruby_curl_upload *rbcu) {
-  if (rbcu->stream) rb_gc_mark(rbcu->stream);
+  if (rbcu->stream && !NIL_P(rbcu->stream)) rb_gc_mark(rbcu->stream);
 }
 static void curl_upload_free(ruby_curl_upload *rbcu) {
   free(rbcu);

data/ext/extconf.rb

@@ -119,6 +119,11 @@ have_constant "curlinfo_primary_ip"
 # ie quirk added in 7.19.3
 have_constant "curlauth_digest_ie"
 
+# added in 7.15.1
+have_constant "curlftpmethod_multicwd"
+have_constant "curlftpmethod_nocwd"
+have_constant "curlftpmethod_singlecwd"
+
 # centos 4.5 build of libcurl
 have_constant "curlm_bad_socket"
 have_constant "curlm_unknown_option"

data/tests/helper.rb

@@ -102,6 +102,10 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
     respond_with(:PURGE,req,res)
   end
 
+  def do_COPY(req,res)
+    respond_with(:COPY,req,res)
+  end
+
 end
 
 module TestServerMethods

data/tests/tc_curl_easy.rb

@@ -1,4 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+class FooNoToS 
+  undef to_s
+end
 
 class TestCurbCurlEasy < Test::Unit::TestCase
   def test_class_perform_01   
@@ -360,6 +363,25 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal blk, c.on_body   # sets handler nil, returns old handler
     assert_equal nil, c.on_body
   end
+
+  def test_inspect_with_no_url
+    c = Curl::Easy.new
+    assert_equal '#<Curl::Easy>', c.inspect
+  end
+  
+  def test_inspect_with_short_url
+    c = Curl::Easy.new('http://www.google.com/')
+    assert_equal "#<Curl::Easy http://www.google.com/>", c.inspect
+  end
+  
+  def test_inspect_truncates_to_64_chars
+    base_url      = 'http://www.google.com/'
+    truncated_url = base_url + 'x' * (64 - '#<Curl::Easy >'.size - base_url.size)
+    long_url      = truncated_url + 'yyyy'
+    c = Curl::Easy.new(long_url)
+    assert_equal 64, c.inspect.size
+    assert_equal "#<Curl::Easy #{truncated_url}>", c.inspect
+  end
   
   def test_on_header
     blk = lambda { |i| i.length }
@@ -547,6 +569,15 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal 'foo=bar&encoded%20string=val', curl.post_body
   end
 
+  def test_post_multipart_file_remote
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.multipart_form_post = true
+    pf = Curl::PostField.file('readme', File.expand_path(File.join(File.dirname(__FILE__),'..','README')))
+    curl.http_post(pf)
+    assert_match /HTTP POST file upload/, curl.body_str
+    assert_match /Content-Disposition: form-data/, curl.body_str
+  end
+
   def test_delete_remote
     curl = Curl::Easy.new(TestServlet.url)
     curl.http_delete
@@ -602,6 +633,13 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_match /message$/, curl.body_str
   end
 
+  def test_put_nil_data_no_crash
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.put_data = nil
+    
+    curl.perform
+  end
+
   def test_put_remote_file
     curl = Curl::Easy.new(TestServlet.url)
     File.open(__FILE__,'r') do|f|
@@ -755,6 +793,20 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal 'PURGE', curl.body_str
     curl.http_put('hello')
     assert_equal "PUT\nhello", curl.body_str
+    curl.http('COPY')
+    assert_equal 'COPY', curl.body_str
+  end
+
+  def test_easy_http_verbs_must_respond_to_str
+    # issue http://github.com/taf2/curb/issues#issue/45
+    assert_nothing_raised do
+      c = Curl::Easy.new ; c.url = 'http://example.com' ; c.http(:get)
+    end
+
+    assert_raise RuntimeError do
+      c = Curl::Easy.new ; c.url = 'http://example.com' ; c.http(FooNoToS.new)
+    end
+
   end
 
   # http://github.com/taf2/curb/issues/#issue/33

data/tests/tc_curl_multi.rb

@@ -70,7 +70,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
     m.perform
 
-    assert n, responses.size
+    assert_equal n, responses.size
     n.times do|i|
       assert_match(/^# DO NOT REMOVE THIS COMMENT/, responses[i], "response #{i}")
     end
@@ -93,7 +93,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
       end
       m.perform
 
-      assert n, responses.size
+      assert_equal n, responses.size
       n.times do|i|
         assert_match(/^# DO NOT REMOVE THIS COMMENT/, responses[i], "response #{i}")
       end

data/tests/tc_curl_postfield.rb

@@ -62,6 +62,7 @@ class TestCurbCurlPostfield < Test::Unit::TestCase
     assert_equal 'foo', pf.name
     assert_equal 'localname', pf.local_file
     assert_equal 'localname', pf.remote_file
+    assert_nothing_raised { pf.to_s }
     assert_nil pf.content_type
     assert_nil pf.content
     assert_nil pf.set_content_proc
@@ -136,6 +137,7 @@ class TestCurbCurlPostfield < Test::Unit::TestCase
 
   def test_to_s_04
     pf = Curl::PostField.file('foo.file', 'bar.file')
-    assert_raise(Curl::Err::InvalidPostFieldError) { pf.to_s }
+    assert_nothing_raised { pf.to_s }
+    #assert_raise(Curl::Err::InvalidPostFieldError) { pf.to_s }
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  hash: 105
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 7
-  - 7
-  - 1
-  version: 0.7.7.1
+  - 8
+  version: 0.7.8
 platform: ruby
 authors: 
 - Ross Bamford
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 -04:00
+date: 2010-08-17 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -36,38 +35,38 @@ files:
 - Rakefile
 - doc.rb
 - ext/extconf.rb
-- lib/curl.rb
 - lib/curb.rb
+- lib/curl.rb
 - ext/curb.c
-- ext/curb_upload.c
-- ext/curb_postfield.c
 - ext/curb_easy.c
-- ext/curb_multi.c
 - ext/curb_errors.c
-- ext/curb_errors.h
-- ext/curb_multi.h
+- ext/curb_multi.c
+- ext/curb_postfield.c
+- ext/curb_upload.c
 - ext/curb.h
 - ext/curb_easy.h
+- ext/curb_errors.h
+- ext/curb_macros.h
+- ext/curb_multi.h
 - ext/curb_postfield.h
 - ext/curb_upload.h
-- ext/curb_macros.h
-- tests/bugtests.rb
-- tests/mem_check.rb
-- tests/bug_require_last_or_segfault.rb
-- tests/helper.rb
-- tests/tc_curl_postfield.rb
+- tests/alltests.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb
+- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_multi_segfault.rb
-- tests/alltests.rb
 - tests/bug_postfields_crash.rb
-- tests/require_last_or_segfault_script.rb
 - tests/bug_postfields_crash2.rb
-- tests/unittests.rb
-- tests/tc_curl_multi.rb
-- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/bugtests.rb
+- tests/helper.rb
+- tests/mem_check.rb
+- tests/require_last_or_segfault_script.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
-- tests/bug_curb_easy_blocks_ruby_threads.rb
+- tests/tc_curl_multi.rb
+- tests/tc_curl_postfield.rb
+- tests/unittests.rb
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
@@ -105,20 +104,20 @@ signing_key:
 specification_version: 3
 summary: Ruby libcurl bindings
 test_files: 
-- tests/bugtests.rb
-- tests/mem_check.rb
-- tests/bug_require_last_or_segfault.rb
-- tests/helper.rb
-- tests/tc_curl_postfield.rb
+- tests/alltests.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb
+- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_multi_segfault.rb
-- tests/alltests.rb
 - tests/bug_postfields_crash.rb
-- tests/require_last_or_segfault_script.rb
 - tests/bug_postfields_crash2.rb
-- tests/unittests.rb
-- tests/tc_curl_multi.rb
-- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/bugtests.rb
+- tests/helper.rb
+- tests/mem_check.rb
+- tests/require_last_or_segfault_script.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
-- tests/bug_curb_easy_blocks_ruby_threads.rb
+- tests/tc_curl_multi.rb
+- tests/tc_curl_postfield.rb
+- tests/unittests.rb