curb 0.8.0 → 0.8.4

data/README

@@ -56,6 +56,19 @@ Curb provides two classes:
 + Curl::Easy - simple API, for day-to-day tasks.
 + Curl::Multi - more advanced API, for operating on multiple URLs simultaneously.
 
+### Super simple API (less typing)
+
+    http = Curl.get("http://www.google.com/")
+    puts http.body_str
+
+    http = Curl.post("http://www.google.com/", {:foo => "bar"})
+    puts http.body_str
+
+    http = Curl.get("http://www.google.com/") do|http|
+      http.headers['Cookie'] = 'foo=1;bar=2'
+    end
+    puts http.body_str
+
 ### Simple fetch via HTTP:
 
     c = Curl::Easy.perform("http://www.google.co.uk")

data/ext/curb.c

@@ -424,8 +424,12 @@ void Init_curb_core() {
   CURB_DEFINE(CURLOPT_FAILONERROR);
 #endif
   CURB_DEFINE(CURLOPT_URL);
+#if HAVE_CURLOPT_PROTOCOLS
   CURB_DEFINE(CURLOPT_PROTOCOLS);
+#endif
+#if HAVE_CURLOPT_REDIR_PROTOCOLS
   CURB_DEFINE(CURLOPT_REDIR_PROTOCOLS);
+#endif
   CURB_DEFINE(CURLOPT_PROXY);
   CURB_DEFINE(CURLOPT_PROXYPORT);
 #if HAVE_CURLOPT_PROXYTYPE

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.8.0"
-#define CURB_VER_NUM   800
+#define CURB_VERSION   "0.8.4"
+#define CURB_VER_NUM   804
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   8
-#define CURB_VER_MIC   0
+#define CURB_VER_MIC   4
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -115,6 +115,30 @@ static size_t proc_data_handler(char *stream,
   }
 }
 
+static size_t proc_data_handler_body(char *stream,
+                                     size_t size,
+                                     size_t nmemb,
+                                     ruby_curl_easy *rbce)
+{
+  size_t ret;
+  rbce->callback_active = 1;
+  ret = proc_data_handler(stream, size, nmemb, rb_easy_get("body_proc"));
+  rbce->callback_active = 0;
+  return ret;
+}
+static size_t proc_data_handler_header(char *stream,
+                                       size_t size,
+                                       size_t nmemb,
+                                       ruby_curl_easy *rbce)
+{
+  size_t ret;
+  rbce->callback_active = 1;
+  ret = proc_data_handler(stream, size, nmemb, rb_easy_get("header_proc"));
+  rbce->callback_active = 0;
+  return ret;
+}
+
+
 static VALUE call_progress_handler(VALUE ary) {
   return rb_funcall(rb_ary_entry(ary, 0), idCall, 4,
                     rb_ary_entry(ary, 1), // rb_float_new(dltotal),
@@ -157,13 +181,14 @@ static int proc_debug_handler(CURL *curl,
                               char *data,
                               size_t data_len,
                               VALUE proc) {
-  VALUE procret;
   VALUE callargs = rb_ary_new2(3);
   rb_ary_store(callargs, 0, proc);
   rb_ary_store(callargs, 1, INT2FIX(type));
   rb_ary_store(callargs, 2, rb_str_new(data, data_len));
   rb_rescue(call_debug_handler, callargs, callback_exception, Qnil);
-  // XXX: no way to indicate to libcurl that we should break out given an exception in the on_debug handler... this means exceptions will be swallowed
+  /* no way to indicate to libcurl that we should break out given an exception in the on_debug handler...
+   * this means exceptions will be swallowed
+   */
   //rb_funcall(proc, idCall, 2, INT2FIX(type), rb_str_new(data, data_len));
   return 0;
 }
@@ -234,6 +259,7 @@ static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   rbce->multipart_form_post = 0;
   rbce->enable_cookies = 0;
   rbce->ignore_content_length = 0;
+  rbce->callback_active = 0;
 }
 
 /*
@@ -320,6 +346,10 @@ static VALUE ruby_curl_easy_close(VALUE self) {
 
   Data_Get_Struct(self, ruby_curl_easy, rbce);
 
+  if (rbce->callback_active) {
+    rb_raise(rb_eRuntimeError, "Cannot close an active curl handle within a callback");
+  }
+
   ruby_curl_easy_free(rbce);
 
   /* reinit the handle */
@@ -358,6 +388,11 @@ static VALUE ruby_curl_easy_reset(VALUE self) {
   ruby_curl_easy *rbce;
   VALUE opts_dup;
   Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  if (rbce->callback_active) {
+    rb_raise(rb_eRuntimeError, "Cannot close an active curl handle within a callback");
+  }
+
   opts_dup = rb_funcall(rbce->opts, rb_intern("dup"), 0);
 
   curl_easy_reset(rbce->curl);
@@ -668,8 +703,8 @@ static VALUE ruby_curl_easy_post_body_set(VALUE self, VALUE post_body) {
   curl = rbce->curl;
   
   if ( post_body == Qnil ) {
-    //rbce->postdata_buffer = Qnil;
     rb_easy_del("postdata_buffer");
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
     
   } else {  
     if (rb_type(post_body) == T_STRING) {
@@ -1443,17 +1478,6 @@ static VALUE ruby_curl_easy_use_netrc_q(VALUE self) {
   CURB_BOOLEAN_GETTER(ruby_curl_easy, use_netrc);
 }
 
-/*
- * call-seq:
- *   easy.follow_location = boolean                   => boolean
- *
- * Configure whether this Curl instance will follow Location: headers
- * in HTTP responses. Redirects will only be followed to the extent
- * specified by +max_redirects+.
- */
-static VALUE ruby_curl_easy_follow_location_set(VALUE self, VALUE follow_location) {
-  CURB_BOOLEAN_SETTER(ruby_curl_easy, follow_location);
-}
 /*
  * call-seq:
  *
@@ -1872,7 +1896,7 @@ static VALUE cb_each_ftp_command(VALUE ftp_command, VALUE wrap) {
  *
  * Always returns Qtrue, rb_raise on error.
  */
-VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
+VALUE ruby_curl_easy_setup(ruby_curl_easy *rbce) {
   // TODO this could do with a bit of refactoring...
   CURL *curl;
   VALUE url, _url = rb_easy_get("url");
@@ -1934,8 +1958,8 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
 
   // body/header procs
   if (!rb_easy_nil("body_proc")) {
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, (curl_write_callback)&proc_data_handler);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, rb_easy_get("body_proc"));//rbce->body_proc);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, (curl_write_callback)&proc_data_handler_body);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, rbce);
     /* clear out the body_data if it was set */
     rb_easy_del("body_data");
   } else {
@@ -1945,8 +1969,8 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
   }
 
   if (!rb_easy_nil("header_proc")) {
-    curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, (curl_write_callback)&proc_data_handler);
-    curl_easy_setopt(curl, CURLOPT_HEADERDATA, rb_easy_get("header_proc"));
+    curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, (curl_write_callback)&proc_data_handler_header);
+    curl_easy_setopt(curl, CURLOPT_HEADERDATA, rbce);
     /* clear out the header_data if it was set */
     rb_easy_del("header_data");
   } else {
@@ -2202,27 +2226,6 @@ VALUE ruby_curl_easy_cleanup( VALUE self, ruby_curl_easy *rbce ) {
   return Qnil;
 }
 
-/*
- * call-seq:
- *   easy.http_get                                    => true
- *
- * GET the currently configured URL using the current options set for
- * this Curl::Easy instance. This method always returns true, or raises
- * an exception (defined under Curl::Err) on error.
- */
-static VALUE ruby_curl_easy_perform_get(VALUE self) {
-  ruby_curl_easy *rbce;
-  CURL *curl;
-
-  Data_Get_Struct(self, ruby_curl_easy, rbce);
-  curl = rbce->curl;
-
-  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
-  curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
-
-  return rb_funcall(self, rb_intern("perform"), 0);
-}
-
 /*
  * Common implementation of easy.http(verb) and easy.http_delete
  */
@@ -2243,18 +2246,6 @@ static VALUE ruby_curl_easy_perform_verb_str(VALUE self, const char *verb) {
   return retval;
 }
 
-/*
- * call-seq:
- *   easy.http_delete
- *
- * DELETE the currently configured URL using the current options set for
- * this Curl::Easy instance. This method always returns true, or raises
- * an exception (defined under Curl::Err) on error.
- */
-static VALUE ruby_curl_easy_perform_delete(VALUE self) {
-  return ruby_curl_easy_perform_verb_str(self, "DELETE");
-}
-
 /*
  * call-seq:
  *   easy.http(verb)
@@ -2367,52 +2358,6 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
   }
 }
 
-/*
- * call-seq:
- *   easy.http_head                                   => true
- *
- * Request headers from the currently configured URL using the HEAD
- * method and current options set for this Curl::Easy instance. This
- * method always returns true, or raises an exception (defined under
- * Curl::Err) on error.
- *
- */
-static VALUE ruby_curl_easy_perform_head(VALUE self) {
-  ruby_curl_easy *rbce;
-  CURL *curl;
-  VALUE ret;
-
-  Data_Get_Struct(self, ruby_curl_easy, rbce);
-  curl = rbce->curl;
-
-  curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
-
-  ret = rb_funcall(self, rb_intern("perform"), 0);
-
-  curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
-  return ret;
-}
-
-/*
- *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
@@ -2720,6 +2665,36 @@ static VALUE ruby_curl_easy_redirect_count_get(VALUE self) {
 
 }
 
+/*
+ * call-seq:
+ *   easy.redirect_url                               => "http://some.url" or nil
+ *
+ * Retrieve  the URL a redirect would take you to if you 
+ * would enable CURLOPT_FOLLOWLOCATION.
+ *
+ * Requires libcurl 7.18.2 or higher, otherwise -1 is always returned.
+ */
+static VALUE ruby_curl_easy_redirect_url_get(VALUE self) {
+#ifdef HAVE_CURLINFO_REDIRECT_URL
+  ruby_curl_easy *rbce;
+  char* url;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  curl_easy_getinfo(rbce->curl, CURLINFO_REDIRECT_URL, &url);
+
+  if (url && url[0]) {    // curl returns empty string if none
+    return rb_str_new2(url);
+  } else {
+    return Qnil;
+  }
+#else
+  rb_warn("Installed libcurl is too old to support redirect_url");
+  return INT2FIX(-1);
+#endif
+}
+
+
+
 /*
  * call-seq:
  *   easy.uploaded_bytes                              => float
@@ -3070,11 +3045,10 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
     VALUE verbose = val;
     CURB_BOOLEAN_SETTER(ruby_curl_easy, verbose);
     } break;
-  case CURLOPT_HEADER:
-  case CURLOPT_NOPROGRESS:
-  case CURLOPT_NOSIGNAL:
-    curl_easy_setopt(rbce->curl, CURLOPT_NOSIGNAL, val == Qtrue ? 1 : 0);
-    break;
+  case CURLOPT_FOLLOWLOCATION: {
+    VALUE follow_location = val;
+    CURB_BOOLEAN_SETTER(ruby_curl_easy, follow_location);
+    } break;
   /* TODO: CALLBACK OPTIONS */
   /* TODO: ERROR OPTIONS */
   /* NETWORK OPTIONS */
@@ -3096,6 +3070,22 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
     VALUE interface_hm = val;
     CURB_OBJECT_HSETTER(ruby_curl_easy, interface_hm);
     } break;
+  case CURLOPT_HEADER:
+  case CURLOPT_NOPROGRESS:
+  case CURLOPT_NOSIGNAL:
+  case CURLOPT_HTTPGET:
+  case CURLOPT_NOBODY: {
+    int type = rb_type(val);
+    VALUE value;
+    if (type == T_TRUE) {
+      value = rb_int_new(1);
+    } else if (type == T_FALSE) {
+      value = rb_int_new(0);
+    } else {
+      value = rb_funcall(val, rb_intern("to_i"), 0);
+    }
+    curl_easy_setopt(rbce->curl, option, FIX2INT(value));
+    } break;
   case CURLOPT_USERPWD: {
     VALUE userpwd = val;
     CURB_OBJECT_HSETTER(ruby_curl_easy, userpwd);
@@ -3116,7 +3106,12 @@ static VALUE ruby_curl_easy_set_opt(VALUE self, VALUE opt, VALUE val) {
     VALUE cookiejar = val;
     CURB_OBJECT_HSETTER(ruby_curl_easy, cookiejar);
     } break;
-
+  case CURLOPT_RESUME_FROM: {
+    curl_easy_setopt(rbce->curl, CURLOPT_RESUME_FROM, FIX2LONG(val));
+    } break;
+  case CURLOPT_FAILONERROR: {
+    curl_easy_setopt(rbce->curl, CURLOPT_FAILONERROR, FIX2LONG(val));
+    } break;
   default:
     break;
   }
@@ -3326,7 +3321,6 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "header_in_body?", ruby_curl_easy_header_in_body_q, 0);
   rb_define_method(cCurlEasy, "use_netrc=", ruby_curl_easy_use_netrc_set, 1);
   rb_define_method(cCurlEasy, "use_netrc?", ruby_curl_easy_use_netrc_q, 0);
-  rb_define_method(cCurlEasy, "follow_location=", ruby_curl_easy_follow_location_set, 1);
   rb_define_method(cCurlEasy, "follow_location?", ruby_curl_easy_follow_location_q, 0);
   rb_define_method(cCurlEasy, "autoreferer=", ruby_curl_easy_autoreferer_set, 1);
   rb_define_method(cCurlEasy, "unrestricted_auth=", ruby_curl_easy_unrestricted_auth_set, 1);
@@ -3353,12 +3347,8 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "on_complete", ruby_curl_easy_on_complete_set, -1);
 
   rb_define_method(cCurlEasy, "http", ruby_curl_easy_perform_verb, 1);
-  rb_define_method(cCurlEasy, "http_delete", ruby_curl_easy_perform_delete, 0);
-  rb_define_method(cCurlEasy, "http_get", ruby_curl_easy_perform_get, 0);
   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);
@@ -3378,6 +3368,7 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "start_transfer_time", ruby_curl_easy_start_transfer_time_get, 0);
   rb_define_method(cCurlEasy, "redirect_time", ruby_curl_easy_redirect_time_get, 0);
   rb_define_method(cCurlEasy, "redirect_count", ruby_curl_easy_redirect_count_get, 0);
+  rb_define_method(cCurlEasy, "redirect_url", ruby_curl_easy_redirect_url_get, 0);
   rb_define_method(cCurlEasy, "downloaded_bytes", ruby_curl_easy_downloaded_bytes_get, 0);
   rb_define_method(cCurlEasy, "uploaded_bytes", ruby_curl_easy_uploaded_bytes_get, 0);
   rb_define_method(cCurlEasy, "download_speed", ruby_curl_easy_download_speed_get, 0);

data/ext/curb_easy.h

@@ -71,6 +71,8 @@ typedef struct {
   char multipart_form_post;
   char enable_cookies;
   char ignore_content_length;
+  char callback_active;
+
   struct curl_slist *curl_headers;
   struct curl_slist *curl_ftp_commands;
 

data/ext/curb_errors.c

@@ -459,7 +459,8 @@ VALUE rb_curl_easy_error(CURLcode code) {
 /* rb_raise an approriate exception for the supplied CURLcode */
 void raise_curl_easy_error_exception(CURLcode code) {
   VALUE obj = rb_curl_easy_error(code);
-  rb_raise(rb_ary_entry(obj,0), RSTRING_PTR(rb_ary_entry(obj,1)));
+  VALUE exmsg = rb_ary_entry(obj,1);
+  rb_raise(rb_ary_entry(obj,0), "CURLError: %s", StringValueCStr(exmsg));
 }
 VALUE rb_curl_multi_error(CURLMcode code) {
   VALUE exclz;
@@ -509,7 +510,8 @@ VALUE rb_curl_multi_error(CURLMcode code) {
 }
 void raise_curl_multi_error_exception(CURLMcode code) {
   VALUE obj = rb_curl_multi_error(code);
-  rb_raise(rb_ary_entry(obj,0), RSTRING_PTR(rb_ary_entry(obj,1)));
+  VALUE exmsg = rb_ary_entry(obj,1);
+  rb_raise(rb_ary_entry(obj,0), "CURLError: %s", StringValueCStr(exmsg));
 }
 
 void init_curb_errors() {

data/ext/curb_multi.c

@@ -354,7 +354,9 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
 
   if (!rb_easy_nil("complete_proc")) {
     callargs = rb_ary_new3(2, rb_easy_get("complete_proc"), easy);
+    rbce->callback_active = 1;
     val = rb_rescue(call_status_handler1, callargs, callback_exception, Qnil);
+    rbce->callback_active = 0;
     //rb_funcall( rb_easy_get("complete_proc"), idCall, 1, easy );
   }
 
@@ -363,7 +365,9 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
   if (result != 0) {
     if (!rb_easy_nil("failure_proc")) {
       callargs = rb_ary_new3(3, rb_easy_get("failure_proc"), easy, rb_curl_easy_error(result));
+      rbce->callback_active = 1;
       val = rb_rescue(call_status_handler2, callargs, callback_exception, Qnil);
+      rbce->callback_active = 0;
       //rb_funcall( rb_easy_get("failure_proc"), idCall, 2, easy, rb_curl_easy_error(result) );
     }
   }
@@ -371,23 +375,31 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
           ((response_code >= 200 && response_code < 300) || response_code == 0)) {
     /* NOTE: we allow response_code == 0, in the case of non http requests e.g. reading from disk */
     callargs = rb_ary_new3(2, rb_easy_get("success_proc"), easy);
+    rbce->callback_active = 1;
     val = rb_rescue(call_status_handler1, callargs, callback_exception, Qnil);
+    rbce->callback_active = 0;
     //rb_funcall( rb_easy_get("success_proc"), idCall, 1, easy );
   }
   else if (!rb_easy_nil("redirect_proc") &&
           (response_code >= 300 && response_code < 400)) {
+    rbce->callback_active = 1;
     callargs = rb_ary_new3(3, rb_easy_get("redirect_proc"), easy, rb_curl_easy_error(result));
+    rbce->callback_active = 0;
     val = rb_rescue(call_status_handler2, callargs, callback_exception, Qnil);
   }
   else if (!rb_easy_nil("missing_proc") &&
           (response_code >= 400 && response_code < 500)) {
+    rbce->callback_active = 1;
     callargs = rb_ary_new3(3, rb_easy_get("missing_proc"), easy, rb_curl_easy_error(result));
+    rbce->callback_active = 0;
     val = rb_rescue(call_status_handler2, callargs, callback_exception, Qnil);
   }
   else if (!rb_easy_nil("failure_proc") &&
           (response_code >= 500 && response_code <= 999)) {
     callargs = rb_ary_new3(3, rb_easy_get("failure_proc"), easy, rb_curl_easy_error(result));
+    rbce->callback_active = 1;
     val = rb_rescue(call_status_handler2, callargs, callback_exception, Qnil);
+    rbce->callback_active = 0;
     //rb_funcall( rb_easy_get("failure_proc"), idCall, 2, easy, rb_curl_easy_error(result) );
   }
 
@@ -577,8 +589,10 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
 
       switch(rc) {
       case -1:
-        rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno));
-        break;
+        if(errno != EINTR) {
+          rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno));
+          break;
+        }
       case 0: /* timeout */
       default: /* action */
         rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );

data/ext/extconf.rb

@@ -119,6 +119,9 @@ have_constant "curle_again"
 have_constant "curle_ssl_crl_badfile"
 have_constant "curle_ssl_issuer_error"
 
+# added in 7.18.2
+have_constant "curlinfo_redirect_url"
+
 # username/password added in 7.19.1
 have_constant "curlopt_username"
 have_constant "curlopt_password"

data/lib/curb.rb

@@ -1,3 +1 @@
-require 'curb_core'
-require 'curl/easy'
-require 'curl/multi'
+require 'curl'

data/lib/curl/easy.rb

@@ -1,6 +1,23 @@
 module Curl
   class Easy
 
+    alias post http_post
+    alias put http_put
+
+    #
+    # call-seq:
+    #   easy.status  => String
+    #
+    def status
+      parts = self.header_str.split(/\s/)
+      status = []
+      parts.shift
+      while parts.size > 0 && parts.first != ''
+        status << parts.shift
+      end
+      status.join(' ')
+    end
+
     #
     # call-seq:
     #   easy.set :sym|Fixnum, value
@@ -213,6 +230,72 @@ module Curl
       set :cookiejar, value
     end
 
+    #
+    # call-seq:
+    #  easy = Curl::Easy.new("url") do|c|
+    #   c.head = true
+    #  end
+    #  easy.perform
+    #
+    def head=(onoff)
+      set :nobody, onoff
+    end
+
+    #
+    # call-seq:
+    #   easy.follow_location = boolean                   => boolean
+    #
+    # Configure whether this Curl instance will follow Location: headers
+    # in HTTP responses. Redirects will only be followed to the extent
+    # specified by +max_redirects+.
+    #
+    def follow_location=(onoff)
+      set :followlocation, onoff
+    end
+
+    #
+    # call-seq:
+    #   easy.http_head                                   => true
+    #
+    # Request headers from the currently configured URL using the HEAD
+    # method and current options set for this Curl::Easy instance. This
+    # method always returns true, or raises an exception (defined under
+    # Curl::Err) on error.
+    #
+    def http_head
+      set :nobody, true
+      ret = self.perform
+      set :nobody, false
+      ret
+    end
+
+    #
+    # call-seq:
+    #   easy.http_get                                    => true
+    #
+    # GET the currently configured URL using the current options set for
+    # this Curl::Easy instance. This method always returns true, or raises
+    # an exception (defined under Curl::Err) on error.
+    #
+    def http_get
+      set :httpget, true
+      http :GET
+    end
+    alias get http_get
+
+    #
+    # call-seq:
+    #   easy.http_delete
+    #
+    # DELETE the currently configured URL using the current options set for
+    # this Curl::Easy instance. This method always returns true, or raises
+    # an exception (defined under Curl::Err) on error.
+    #
+    def http_delete
+      self.http :DELETE
+    end
+    alias delete http_delete
+
     class << self
 
       #
@@ -227,7 +310,7 @@ module Curl
       # the +http_get+ call.
       #
       def perform(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.perform
         c
@@ -244,7 +327,7 @@ module Curl
       # the +http_get+ call.
       #
       def http_get(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.http_get
         c
@@ -261,7 +344,7 @@ module Curl
       # the +http_head+ call.
       #
       def http_head(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.http_head
         c
@@ -300,7 +383,7 @@ module Curl
         url = args.shift
         c = Curl::Easy.new url
         yield c if block_given?
-        c.http_post *args
+        c.http_post(*args)
         c
       end
 
@@ -315,7 +398,7 @@ module Curl
       # the +http_delete+ call.
       #
       def http_delete(*args)
-        c = Curl::Easy.new *args
+        c = Curl::Easy.new(*args)
         yield c if block_given?
         c.http_delete
         c

data/lib/curl/multi.rb

@@ -157,13 +157,17 @@ module Curl
           end
         end
 
-        until urls_with_config.empty?
-          m.perform do
+        if urls_with_config.empty?
+          m.perform
+        else
+          until urls_with_config.empty?
+            m.perform do
+              consume_free_handles.call
+            end
             consume_free_handles.call
           end
-          consume_free_handles.call
+          free_handles = nil
         end
-        free_handles = nil 
       end
 
       # call-seq:

data/lib/curl.rb

@@ -1 +1,62 @@
-require 'curb'
+require 'curb_core'
+require 'curl/easy'
+require 'curl/multi'
+require 'uri'
+
+# expose shortcut methods
+module Curl
+  
+  def self.http(verb, url, post_body=nil, put_data=nil, &block)
+    handle = Thread.current[:curb_curl] ||= Curl::Easy.new
+    handle.url = url
+    handle.post_body = post_body if post_body
+    handle.put_data = put_data if put_data
+    yield handle if block_given?
+    handle.http(verb)
+    handle
+  end
+
+  def self.get(url, params={}, &block)
+    http :GET, urlalize(url, params), nil, nil, &block
+  end
+
+  def self.post(url, params={}, &block)
+    http :POST, url, postalize(params), nil, &block
+  end
+
+  def self.put(url, params={}, &block)
+    http :PUT, url, nil, postalize(params), &block
+  end
+
+  def self.delete(url, params={}, &block)
+    http :DELETE, url, postalize(params), nil, &block
+  end
+
+  def self.patch(url, params={}, &block)
+    http :PATCH, url, postalize(params), nil, &block
+  end
+
+  def self.head(url, params={}, &block)
+    http :HEAD, urlalize(url, params), nil, nil, &block
+  end
+
+  def self.options(url, params={}, &block)
+    http :OPTIONS, urlalize(url, params), nil, nil, &block
+  end
+
+  def self.urlalize(url, params={})
+    query_str = params.map {|k,v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" }.join('&')
+    if url.match(/\?/)
+      "#{url}&#{query_str}"
+    elsif query_str.size > 0
+      "#{url}?#{query_str}"
+    else
+      url
+    end
+  end
+
+  def self.postalize(params={})
+    params.respond_to?(:map) ? URI.encode_www_form(params) : (params.respond_to?(:to_s) ? params.to_s : params)
+  end
+
+end

data/tests/bug_crash_on_debug.rb

@@ -19,7 +19,7 @@ class BugCrashOnDebug < Test::Unit::TestCase
       srv.start
     end
     puts 'b'
-    c = Curl::Easy.new('http://localhost:9999/test')
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
     c.on_debug do|x|
       puts x.inspect
       raise "error" # this will get swallowed

data/tests/bug_crash_on_progress.rb

@@ -16,7 +16,7 @@ class BugCrashOnDebug < Test::Unit::TestCase
       srv.start
     end
 
-    c = Curl::Easy.new('http://localhost:9999/test')
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
     c.on_progress do|x|
       raise "error"
     end

data/tests/bug_curb_easy_blocks_ruby_threads.rb

@@ -21,7 +21,7 @@ class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
 
     5.times do |i|
       t = Thread.new do
-        c = Curl::Easy.perform('http://localhost:9999/test')
+        c = Curl::Easy.perform('http://127.0.0.1:9999/test')
         c.header_str
       end
       threads << t
@@ -37,7 +37,7 @@ class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
     timer = Time.now
     single_responses = []
     5.times do |i|
-      c = Curl::Easy.perform('http://localhost:9999/test')
+      c = Curl::Easy.perform('http://127.0.0.1:9999/test')
       single_responses << c.header_str
     end
     

data/tests/bug_issue102.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugIssue102 < Test::Unit::TestCase
+
+  def test_interface
+    test = "https://api.twitter.com/1/users/show.json?screen_name=TwitterAPI&include_entities=true"
+    ip = "192.168.1.61"
+
+    c = Curl::Easy.new do |curl|
+      curl.url = test
+      curl.interface = ip
+    end  
+
+    c.perform
+  end
+
+end

data/tests/bug_require_last_or_segfault.rb

@@ -24,7 +24,7 @@
 require 'test/unit'
 require 'rbconfig'
 
-$rubycmd = Config::CONFIG['RUBY_INSTALL_NAME'] || 'ruby'
+$rubycmd = RbConfig::CONFIG['RUBY_INSTALL_NAME'] || 'ruby'
 
 class BugTestRequireLastOrSegfault < Test::Unit::TestCase
   def test_bug

data/tests/helper.rb

@@ -73,12 +73,12 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
     elsif req.path.match /error$/
       res.status = 500
     end
-    respond_with(:GET,req,res)
+    respond_with("GET#{req.query_string}",req,res)
   end
 
   def do_HEAD(req,res)
     res['Location'] = "/nonexistent"
-    respond_with(:HEAD, req, res)
+    respond_with("HEAD#{req.query_string}",req,res)
   end
 
   def do_POST(req,res)
@@ -103,15 +103,23 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_DELETE(req,res)
-    respond_with(:DELETE,req,res)
+    respond_with("DELETE#{req.query_string}",req,res)
   end
 
   def do_PURGE(req,res)
-    respond_with(:PURGE,req,res)
+    respond_with("PURGE#{req.query_string}",req,res)
   end
 
   def do_COPY(req,res)
-    respond_with(:COPY,req,res)
+    respond_with("COPY#{req.query_string}",req,res)
+  end
+
+  def do_PATCH(req,res)
+    respond_with("PATCH\n#{req.body}",req,res)
+  end
+
+  def do_OPTIONS(req,res)
+    respond_with("OPTIONS#{req.query_string}",req,res)
   end
 
 end

data/tests/signals.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+# This test suite requires the timeout server to be running
+# See tests/timeout.rb for more info about the timeout server
+class TestCurbSignals < Test::Unit::TestCase
+
+  # Testcase for https://github.com/taf2/curb/issues/117
+  def test_continue_after_signal
+    trap("SIGUSR1") { }
+
+    curl = Curl::Easy.new(wait_url(2))
+    pid = $$
+    Thread.new do
+      sleep 1
+      Process.kill("SIGUSR1", pid)
+    end
+    assert_equal true, curl.http_get
+  end
+
+  private
+  
+  def wait_url(time)
+    "#{server_base}/wait/#{time}"
+  end
+  
+  def serve_url(chunk_size, time, count)
+    "#{server_base}/serve/#{chunk_size}/every/#{time}/for/#{count}"
+  end
+  
+  def server_base
+    'http://127.0.0.1:9128'
+  end
+end

data/tests/tc_curl.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class TestCurl < Test::Unit::TestCase
+  def test_get
+    curl = Curl.get(TestServlet.url, {:foo => "bar"})
+    assert_equal "GETfoo=bar", curl.body_str
+
+    curl = Curl.options(TestServlet.url, {:foo => "bar"}) do|http|
+      http.headers['Cookie'] = 'foo=1;bar=2'
+    end
+    assert_equal "OPTIONSfoo=bar", curl.body_str
+  end
+
+  def test_post
+    curl = Curl.post(TestServlet.url, {:foo => "bar"})
+    assert_equal "POST\nfoo=bar",  curl.body_str
+  end
+
+  def test_put
+    curl = Curl.put(TestServlet.url, {:foo => "bar"})
+    assert_equal "PUT\nfoo=bar",  curl.body_str
+  end
+
+  def test_patch
+    curl = Curl.patch(TestServlet.url, {:foo => "bar"})
+    assert_equal "PATCH\nfoo=bar", curl.body_str
+  end
+
+  def test_options
+    curl = Curl.options(TestServlet.url, {:foo => "bar"})
+    assert_equal "OPTIONSfoo=bar", curl.body_str
+  end
+
+  include TestServerMethods 
+
+  def setup
+    server_setup
+  end
+end

data/tests/tc_curl_download.rb

@@ -8,7 +8,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
   
   def test_download_url_to_file_via_string
-    dl_url = "http://localhost:9129/ext/curb_easy.c"
+    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
 
     curb = Curl::Easy.download(dl_url, dl_path)
@@ -19,7 +19,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
 
   def test_download_url_to_file_via_file_io
-    dl_url = "http://localhost:9129/ext/curb_easy.c"
+    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
     io = File.open(dl_path, 'wb')
 
@@ -32,7 +32,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
 
   def test_download_url_to_file_via_io
-    dl_url = "http://localhost:9129/ext/curb_easy.c"
+    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
     reader, writer = IO.pipe
 
@@ -62,7 +62,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   end
 
   def test_download_bad_url_gives_404
-    dl_url = "http://localhost:9129/this_file_does_not_exist.html"
+    dl_url = "http://127.0.0.1:9129/this_file_does_not_exist.html"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
 
     curb = Curl::Easy.download(dl_url, dl_path)

data/tests/tc_curl_easy.rb

@@ -4,6 +4,21 @@ class FooNoToS
 end
 
 class TestCurbCurlEasy < Test::Unit::TestCase
+  def test_threads
+    t = []
+    5.times do
+      t << Thread.new do
+        5.times do
+          c = Curl.get($TEST_URL)
+          assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
+          assert_equal "", c.header_str
+        end
+      end
+    end
+
+    t.each {|t| t.join }
+  end
+
   def test_class_perform_01   
     assert_instance_of Curl::Easy, c = Curl::Easy.perform($TEST_URL)
     assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
@@ -988,6 +1003,20 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert true, "raise in on debug has no effect"
   end
 
+  def test_status_codes
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.perform
+    assert_equal '200 OK', curl.status
+  end
+
+  def test_close_in_on_callbacks
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.on_body {|d| curl.close; d.size }
+    assert_raises RuntimeError do
+      curl.perform
+    end
+  end
+
   include TestServerMethods 
 
   def setup

data/tests/tc_curl_multi.rb

@@ -385,7 +385,26 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     end
   end
 
-  def test_mutli_recieves_500
+  def test_multi_easy_http_with_max_connects
+        urls = [
+      { :url => TestServlet.url + '?q=1', :method => :get },
+      { :url => TestServlet.url + '?q=2', :method => :get },
+      { :url => TestServlet.url + '?q=3', :method => :get }
+    ]
+    Curl::Multi.http(urls, {:pipeline => true, :max_connects => 1}) do|easy, code, method|
+      assert_equal nil, code
+      case method
+      when :post
+        assert_match /POST/, easy.body_str
+      when :get
+        assert_match /GET/, easy.body_str
+      when :put
+        assert_match /PUT/, easy.body_str
+      end
+    end
+  end
+
+  def test_multi_recieves_500
     m = Curl::Multi.new
     e = Curl::Easy.new("http://127.0.0.1:9129/methods")
     failure = false
@@ -410,7 +429,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     c = Curl::Easy.new("http://127.9.9.9:999110")
     m.remove(c)
   rescue => e
-    assert_equal 'Invalid easy handle', e.message
+    assert_equal 'CURLError: Invalid easy handle', e.message
     assert_equal 0, m.requests.size
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000 Z
+date: 2013-05-20 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
@@ -51,6 +51,7 @@ files:
 - 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_issue102.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
@@ -59,6 +60,8 @@ files:
 - tests/helper.rb
 - tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
+- tests/signals.rb
+- tests/tc_curl.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
 - tests/tc_curl_easy_setopt.rb
@@ -82,15 +85,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -243569426931689339
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -243569426931689339
 requirements: []
 rubyforge_project: curb
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby libcurl bindings
@@ -101,6 +110,7 @@ test_files:
 - 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_issue102.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
@@ -109,6 +119,8 @@ test_files:
 - tests/helper.rb
 - tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
+- tests/signals.rb
+- tests/tc_curl.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
 - tests/tc_curl_easy_setopt.rb