curb 0.7.18 → 0.8.0

data/README

@@ -120,7 +120,7 @@ Same thing, more manual:
 
     c = Curl::Easy.new("http://my.rails.box/files/upload")
     c.multipart_form_post = true
-    c.http_post(Curl::PostField.file('myfile.rb'))
+    c.http_post(Curl::PostField.file('thing[file]', 'myfile.rb'))
 
 ### Multi Interface (Basic HTTP GET):
 

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.18"
-#define CURB_VER_NUM   718
+#define CURB_VERSION   "0.8.0"
+#define CURB_VER_NUM   800
 #define CURB_VER_MAJ   0
-#define CURB_VER_MIN   7
-#define CURB_VER_MIC   1
-#define CURB_VER_PATCH 8
+#define CURB_VER_MIN   8
+#define CURB_VER_MIC   0
+#define CURB_VER_PATCH 0
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_easy.c

@@ -219,6 +219,7 @@ static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   rbce->ssl_version = -1;
   rbce->use_ssl = -1;
   rbce->ftp_filemethod = -1;
+  rbce->resolve_mode = CURL_IPRESOLVE_WHATEVER;
 
   /* bool opts */
   rbce->proxy_tunnel = 0;
@@ -1715,6 +1716,36 @@ static VALUE ruby_curl_easy_on_failure_set(int argc, VALUE *argv, VALUE self) {
   CURB_HANDLER_PROC_HSETTER(ruby_curl_easy, failure_proc);
 }
 
+/*
+ * call-seq:
+ *  easy.on_missing {|easy,code| ... }                => <old handler;>
+ *
+ *  Assign or remove the on_missing handler for this Curl::Easy instance.
+ *  To remove a previously-supplied handler, call this method with no attached
+ *  block.
+ *
+ *  The +on_missing+ handler is called when request is finished with a 
+ *  status of 40x
+ */
+static VALUE ruby_curl_easy_on_missing_set(int argc, VALUE *argv, VALUE self) {
+  CURB_HANDLER_PROC_HSETTER(ruby_curl_easy, missing_proc);
+}
+
+/*
+ * call-seq:
+ *  easy.on_redirect {|easy,code| ... }                => <old handler;>
+ *
+ *  Assign or remove the on_redirect handler for this Curl::Easy instance.
+ *  To remove a previously-supplied handler, call this method with no attached
+ *  block.
+ *
+ *  The +on_redirect+ handler is called when request is finished with a 
+ *  status of 30x
+ */
+static VALUE ruby_curl_easy_on_redirect_set(int argc, VALUE *argv, VALUE self) {
+  CURB_HANDLER_PROC_HSETTER(ruby_curl_easy, redirect_proc);
+}
+
 /*
  * call-seq:
  *   easy.on_complete {|easy| ... }                   => <old handler>
@@ -1856,7 +1887,6 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
 
   url = rb_check_string_type(_url);
 
-  // Need to configure the handler as per settings in rbce
   curl_easy_setopt(curl, CURLOPT_URL, StringValuePtr(url));
 
   // network stuff and auth
@@ -2291,6 +2321,17 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
     for (i = 0; i < argc; i++) {
       if (rb_obj_is_instance_of(argv[i], cCurlPostField)) {
         append_to_form(argv[i], &first, &last);
+      } else if (rb_type(argv[i]) == T_ARRAY) {
+        // see: https://github.com/rvanlieshout/curb/commit/8bcdefddc0162484681ebd1a92d52a642666a445
+        int c = 0, argv_len = (int)RARRAY_LEN(argv[i]);
+        for (; c < argv_len; ++c) {
+          if (rb_obj_is_instance_of(rb_ary_entry(argv[i],c), cCurlPostField)) {
+            append_to_form(rb_ary_entry(argv[i],c), &first, &last);
+          } else {
+            rb_raise(eCurlErrInvalidPostField, "You must use PostFields only with multipart form posts");
+            return Qnil;
+          }
+        }
       } else {
         rb_raise(eCurlErrInvalidPostField, "You must use PostFields only with multipart form posts");
         return Qnil;
@@ -2364,10 +2405,9 @@ static VALUE ruby_curl_easy_set_head_option(VALUE self, VALUE onoff) {
 
   Data_Get_Struct(self, ruby_curl_easy, rbce);
 
-  if( onoff == Qtrue ) {
+  if (onoff == Qtrue) {
     curl_easy_setopt(rbce->curl, CURLOPT_NOBODY, 1);
-  }
-  else {
+  } else {
     curl_easy_setopt(rbce->curl, CURLOPT_NOBODY, 0);
   }
 
@@ -2384,13 +2424,13 @@ static VALUE ruby_curl_easy_set_head_option(VALUE self, VALUE onoff) {
 static VALUE ruby_curl_easy_perform_put(VALUE self, VALUE data) {
   ruby_curl_easy *rbce;
   CURL *curl;
-  
+
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
-  
+
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
   ruby_curl_easy_put_data_set(self, data);
-  
+
   return rb_funcall(self, rb_intern("perform"), 0);
 }
 
@@ -3308,6 +3348,8 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "on_debug", ruby_curl_easy_on_debug_set, -1);
   rb_define_method(cCurlEasy, "on_success", ruby_curl_easy_on_success_set, -1);
   rb_define_method(cCurlEasy, "on_failure", ruby_curl_easy_on_failure_set, -1);
+  rb_define_method(cCurlEasy, "on_missing", ruby_curl_easy_on_missing_set, -1);
+  rb_define_method(cCurlEasy, "on_redirect", ruby_curl_easy_on_redirect_set, -1);
   rb_define_method(cCurlEasy, "on_complete", ruby_curl_easy_on_complete_set, -1);
 
   rb_define_method(cCurlEasy, "http", ruby_curl_easy_perform_verb, 1);

data/ext/curb_multi.c

@@ -374,8 +374,18 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
     val = rb_rescue(call_status_handler1, callargs, callback_exception, Qnil);
     //rb_funcall( rb_easy_get("success_proc"), idCall, 1, easy );
   }
+  else if (!rb_easy_nil("redirect_proc") &&
+          (response_code >= 300 && response_code < 400)) {
+    callargs = rb_ary_new3(3, rb_easy_get("redirect_proc"), easy, rb_curl_easy_error(result));
+    val = rb_rescue(call_status_handler2, callargs, callback_exception, Qnil);
+  }
+  else if (!rb_easy_nil("missing_proc") &&
+          (response_code >= 400 && response_code < 500)) {
+    callargs = rb_ary_new3(3, rb_easy_get("missing_proc"), easy, rb_curl_easy_error(result));
+    val = rb_rescue(call_status_handler2, callargs, callback_exception, Qnil);
+  }
   else if (!rb_easy_nil("failure_proc") &&
-          (response_code >= 300 && response_code <= 999)) {
+          (response_code >= 500 && response_code <= 999)) {
     callargs = rb_ary_new3(3, rb_easy_get("failure_proc"), easy, rb_curl_easy_error(result));
     val = rb_rescue(call_status_handler2, callargs, callback_exception, Qnil);
     //rb_funcall( rb_easy_get("failure_proc"), idCall, 2, easy, rb_curl_easy_error(result) );

data/tests/bug_crash_on_debug.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+require 'webrick'
+class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
+class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
+
+require 'curl'
+
+class BugCrashOnDebug < Test::Unit::TestCase
+
+  def test_on_debug
+    server = WEBrick::HTTPServer.new( :Port => 9999 )
+    server.mount_proc("/test") do|req,res|
+      res.body = "hi"
+      res['Content-Type'] = "text/html"
+    end
+    puts 'a'
+    thread = Thread.new(server) do|srv|
+      srv.start
+    end
+    puts 'b'
+    c = Curl::Easy.new('http://localhost:9999/test')
+    c.on_debug do|x|
+      puts x.inspect
+      raise "error" # this will get swallowed
+    end
+    c.perform
+    puts 'c'
+  ensure
+    puts 'd'
+    server.shutdown
+    puts 'e'
+    puts thread.exit
+    puts 'f'
+  end
+
+end
+
+#test_on_debug

data/tests/helper.rb

@@ -65,6 +65,14 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_GET(req,res)
+    if req.path.match /redirect$/
+      res.status = 302
+      res['Location'] = '/foo'
+    elsif req.path.match /not_here$/
+      res.status = 404
+    elsif req.path.match /error$/
+      res.status = 500
+    end
     respond_with(:GET,req,res)
   end
 

data/tests/tc_curl_easy.rb

@@ -561,13 +561,34 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   end
 
   def test_on_success_with_on_failure
-    curl = Curl::Easy.new("#{$TEST_URL.gsub(/file:\/\//,'')}/not_here")
+    curl = Curl::Easy.new(TestServlet.url + '/error')
     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,code| on_failure_called = true }
     curl.perform
+    assert_equal 500, curl.response_code
     assert on_failure_called, "Failure handler not called" 
   end
+
+  def test_on_success_with_on_missing
+    curl = Curl::Easy.new(TestServlet.url + '/not_here')
+    on_missing_called = false
+    curl.on_success {|c| } # make sure we get the missing call even though this handler is defined
+    curl.on_missing {|c,code| on_missing_called = true }
+    curl.perform
+    assert_equal 404, curl.response_code
+    assert on_missing_called, "Missing handler not called" 
+  end
+
+  def test_on_success_with_on_redirect
+    curl = Curl::Easy.new(TestServlet.url + '/redirect')
+    on_redirect_called = false
+    curl.on_success {|c| } # make sure we get the redirect call even though this handler is defined
+    curl.on_redirect {|c,code| on_redirect_called = true }
+    curl.perform
+    assert_equal 302, curl.response_code
+    assert on_redirect_called, "Redirect handler not called" 
+  end
   
   def test_get_remote
     curl = Curl::Easy.new(TestServlet.url)
@@ -600,6 +621,19 @@ class TestCurbCurlEasy < Test::Unit::TestCase
       end
     end
   end
+
+  # see: https://github.com/rvanlieshout/curb/commit/8bcdefddc0162484681ebd1a92d52a642666a445
+  def test_post_multipart_array_remote
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.multipart_form_post = true
+    fields = [
+      Curl::PostField.file('foo', File.expand_path(File.join(File.dirname(__FILE__),'..','README'))),
+      Curl::PostField.file('bar', File.expand_path(File.join(File.dirname(__FILE__),'..','README')))
+    ]
+    curl.http_post(fields)
+    assert_match /HTTP POST file upload/, curl.body_str
+    assert_match /Content-Disposition: form-data/, curl.body_str
+  end
   
   def test_post_with_body_remote
     curl = Curl::Easy.new(TestServlet.url)
@@ -703,7 +737,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
 
   def test_put_remote_file
     curl = Curl::Easy.new(TestServlet.url)
-    File.open(__FILE__,'r') do|f|
+    File.open(__FILE__,'rb') do|f|
       assert curl.http_put(f)
     end
     assert_equal "PUT\n#{File.read(__FILE__)}", curl.body_str

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 0.7.18
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-01-19 00:00:00.000000000 Z
 dependencies: []
 description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings
   for the libcurl(3), a fully-featured client-side URL transfer library. cURL and
@@ -46,6 +46,7 @@ files:
 - ext/curb_postfield.h
 - ext/curb_upload.h
 - tests/alltests.rb
+- tests/bug_crash_on_debug.rb
 - tests/bug_crash_on_progress.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb
@@ -95,6 +96,7 @@ specification_version: 3
 summary: Ruby libcurl bindings
 test_files:
 - tests/alltests.rb
+- tests/bug_crash_on_debug.rb
 - tests/bug_crash_on_progress.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb