ghazel-curb 0.7.9.1 → 0.7.15.1

data/README

@@ -45,14 +45,19 @@ documentation with:
 
     $ rake doc
 
-## Examples
+## Usage & examples
+
+Curb provides two classes:
+
++ Curl::Easy - simple API, for day-to-day tasks.
++ Curl::Multi - more advanced API, for operating on multiple URLs simultaneously.
 
 ### Simple fetch via HTTP:
 
     c = Curl::Easy.perform("http://www.google.co.uk")
     puts c.body_str
 
-### Same thing, more manual:
+Same thing, more manual:
 
     c = Curl::Easy.new("http://www.google.co.uk")
     c.perform
@@ -65,7 +70,7 @@ documentation with:
       curl.verbose = true
     end
 
-### Same thing, more manual:
+Same thing, more manual:
 
     c = Curl::Easy.new("http://www.google.co.uk") do |curl| 
       curl.headers["User-Agent"] = "myapp-0.0"
@@ -74,6 +79,14 @@ documentation with:
   
     c.perform
 
+### HTTP basic authentication:
+
+    c = Curl::Easy.new("http://github.com/")
+    c.http_auth_types = :basic
+    c.username = 'foo'
+    c.password = 'bar'
+    c.perform
+
 ### Supplying custom handlers:
 
     c = Curl::Easy.new("http://www.google.co.uk")

data/ext/curb.c

@@ -6,6 +6,7 @@
  */
 
 #include "curb.h"
+#include "curb_upload.h"
 
 VALUE mCurl;
 
@@ -370,4 +371,5 @@ void Init_curb_core() {
   init_curb_easy();
   init_curb_postfield();
   init_curb_multi();
+  init_curb_upload();
 }

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.9"
-#define CURB_VER_NUM   790
+#define CURB_VERSION   "0.7.15"
+#define CURB_VER_NUM   715
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   7
-#define CURB_VER_MIC   9
-#define CURB_VER_PATCH 0
+#define CURB_VER_MIC   1
+#define CURB_VER_PATCH 5
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_easy.c

@@ -815,7 +815,7 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
                                     the easy handle is active or until the upload
                                     is complete or terminated... */
 
-  curl_easy_setopt(curl, CURLOPT_NOBODY,0);
+  curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
   curl_easy_setopt(curl, CURLOPT_UPLOAD, 1);
   curl_easy_setopt(curl, CURLOPT_READFUNCTION, (curl_read_callback)read_data_handler);
   curl_easy_setopt(curl, CURLOPT_READDATA, rbce);
@@ -840,7 +840,7 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
 
   if (rb_respond_to(data, rb_intern("read"))) {
     VALUE stat = rb_funcall(data, rb_intern("stat"), 0);
-    if( stat ) {
+    if( stat && rb_hash_aref(headers, rb_str_new2("Content-Length")) == Qnil) {
       VALUE size;
       if( rb_hash_aref(headers, rb_str_new2("Expect")) == Qnil ) {
         rb_hash_aset(headers, rb_str_new2("Expect"), rb_str_new2(""));
@@ -848,9 +848,13 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
       size = rb_funcall(stat, rb_intern("size"), 0);
       curl_easy_setopt(curl, CURLOPT_INFILESIZE, FIX2LONG(size));
     }
-    else if( rb_hash_aref(headers, rb_str_new2("Transfer-Encoding")) == Qnil ) {
+    else if( rb_hash_aref(headers, rb_str_new2("Content-Length")) == Qnil && rb_hash_aref(headers, rb_str_new2("Transfer-Encoding")) == Qnil ) {
       rb_hash_aset(headers, rb_str_new2("Transfer-Encoding"), rb_str_new2("chunked"));
     }
+    else if( rb_hash_aref(headers, rb_str_new2("Content-Length")) ) {
+      VALUE size = rb_funcall(rb_hash_aref(headers, rb_str_new2("Content-Length")), rb_intern("to_i"), 0);
+      curl_easy_setopt(curl, CURLOPT_INFILESIZE, FIX2LONG(size));
+    }
   }
   else if (rb_respond_to(data, rb_intern("to_s"))) {
     curl_easy_setopt(curl, CURLOPT_INFILESIZE, RSTRING_LEN(data));
@@ -1812,7 +1816,10 @@ static VALUE ruby_curl_easy_on_debug_set(int argc, VALUE *argv, VALUE self) {
 /***********************************************
  * This is an rb_iterate callback used to set up http headers.
  */
-static VALUE cb_each_http_header(VALUE header, struct curl_slist **list) {
+static VALUE cb_each_http_header(VALUE header, VALUE wrap) {
+  struct curl_slist **list;
+  Data_Get_Struct(wrap, struct curl_slist *, list);
+
   VALUE header_str = Qnil;
 
   //rb_p(header);
@@ -1841,7 +1848,10 @@ static VALUE cb_each_http_header(VALUE header, struct curl_slist **list) {
 /***********************************************
  * This is an rb_iterate callback used to set up ftp commands.
  */
-static VALUE cb_each_ftp_command(VALUE ftp_command, struct curl_slist **list) {
+static VALUE cb_each_ftp_command(VALUE ftp_command, VALUE wrap) {
+  struct curl_slist **list;
+  Data_Get_Struct(wrap, struct curl_slist *, list);
+
   VALUE ftp_command_string = rb_obj_as_string(ftp_command);
   *list = curl_slist_append(*list, StringValuePtr(ftp_command));
 
@@ -1903,16 +1913,16 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
     curl_easy_setopt(curl, CURLOPT_USERPWD, NULL);
   }
 
-  if (!rb_easy_nil("proxy_url")) {
-    curl_easy_setopt(curl, CURLOPT_PROXY, rb_easy_get_str("proxy_url"));
-  } else {
+  if (rb_easy_nil("proxy_url")) {
     curl_easy_setopt(curl, CURLOPT_PROXY, NULL);
+  } else {
+    curl_easy_setopt(curl, CURLOPT_PROXY, rb_easy_get_str("proxy_url"));
   }
 
-  if (!rb_easy_nil("proxypwd")) {
-    curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, rb_easy_get_str("proxy_pwd"));
-  } else {
+  if (rb_easy_nil("proxypwd")) {
     curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, NULL);
+  } else {
+    curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, rb_easy_get_str("proxypwd"));
   }
 
   // body/header procs
@@ -2118,7 +2128,8 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
 
   if (!rb_easy_nil("headers")) {
     if (rb_easy_type_check("headers", T_ARRAY) || rb_easy_type_check("headers", T_HASH)) {
-      rb_iterate(rb_each, rb_easy_get("headers"), cb_each_http_header, (VALUE)hdrs);
+	  VALUE wrap = Data_Wrap_Struct(rb_cObject, 0, 0, hdrs);
+      rb_iterate(rb_each, rb_easy_get("headers"), cb_each_http_header, wrap);
     } else {
       VALUE headers_str = rb_obj_as_string(rb_easy_get("headers"));
       *hdrs = curl_slist_append(*hdrs, StringValuePtr(headers_str));
@@ -2132,7 +2143,8 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
   /* Setup FTP commands if necessary */
   if (!rb_easy_nil("ftp_commands")) {
     if (rb_easy_type_check("ftp_commands", T_ARRAY)) {
-      rb_iterate(rb_each, rb_easy_get("ftp_commands"), cb_each_ftp_command, (VALUE)cmds);
+      VALUE wrap = Data_Wrap_Struct(rb_cObject, 0, 0, cmds);
+      rb_iterate(rb_each, rb_easy_get("ftp_commands"), cb_each_ftp_command, wrap);
     }
 
     if (*cmds) {

data/ext/curb_multi.c

@@ -39,13 +39,9 @@ static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy);
 static void rb_curl_multi_read_info(VALUE self, CURLM *mptr);
 static void rb_curl_multi_run(VALUE self, CURLM *multi_handle, int *still_running);
 
-static void rb_curl_multi_mark_all_easy(VALUE key, VALUE rbeasy, ruby_curl_multi *rbcm) {
-  rb_gc_mark(rbeasy);
-}
-
 static void curl_multi_mark(ruby_curl_multi *rbcm) {
   rb_gc_mark(rbcm->requests);
-  rb_hash_foreach( rbcm->requests, (int (*)())rb_curl_multi_mark_all_easy, (VALUE)rbcm );
+  rb_gc_mark(rbcm->requests);
 }
 
 static void curl_multi_flush_easy(VALUE key, VALUE easy, ruby_curl_multi *rbcm) {
@@ -482,29 +478,23 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
 
       if (timeout_milliseconds == 0) { /* no delay */
         rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
+        rb_curl_multi_read_info( self, rbcm->handle );
+        if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
         continue;
       }
-      else if (timeout_milliseconds < 0) {
-        timeout_milliseconds = cCurlMutiDefaulttimeout; /* libcurl doesn't know how long to wait, use a default timeout */
-      }
 
-      if (timeout_milliseconds > cCurlMutiDefaulttimeout) {
-        timeout_milliseconds = cCurlMutiDefaulttimeout; /* buggy versions libcurl sometimes reports huge timeouts... let's cap it */
+      if (timeout_milliseconds < 0 || timeout_milliseconds > cCurlMutiDefaulttimeout) {
+        timeout_milliseconds = cCurlMutiDefaulttimeout; /* libcurl doesn't know how long to wait, use a default timeout */
+                                                        /* or buggy versions libcurl sometimes reports huge timeouts... let's cap it */
       }
 
       tv.tv_sec  = 0; /* never wait longer than 1 second */
       tv.tv_usec = (int)(timeout_milliseconds * 1000); /* XXX: int is the right type for OSX, what about linux? */
 
-      if (timeout_milliseconds == 0) { /* no delay */
-        rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
-        continue;
-      }
-
-      if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
-
       FD_ZERO(&fdread);
       FD_ZERO(&fdwrite);
       FD_ZERO(&fdexcep);
+
       /* load the fd sets from the multi handle */
       mcode = curl_multi_fdset(rbcm->handle, &fdread, &fdwrite, &fdexcep, &maxfd);
       if (mcode != CURLM_OK) {
@@ -513,7 +503,7 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
 
 #ifdef _WIN32
       create_crt_fd(&fdread, &crt_fdread);
-      create_crt_fd(&fdwrite, &crt_fdrwrite);
+      create_crt_fd(&fdwrite, &crt_fdwrite);
       create_crt_fd(&fdexcep, &crt_fdexcep);
 #endif
 
@@ -521,7 +511,7 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
 
 #ifdef _WIN32
       cleanup_crt_fd(&fdread, &crt_fdread);
-      cleanup_crt_fd(&fdwrite, &crt_fdrwrite);
+      cleanup_crt_fd(&fdwrite, &crt_fdwrite);
       cleanup_crt_fd(&fdexcep, &crt_fdexcep);
 #endif
 
@@ -529,17 +519,19 @@ VALUE ruby_curl_multi_perform(int argc, VALUE *argv, VALUE self) {
       case -1:
         rb_raise(rb_eRuntimeError, "select(): %s", strerror(errno));
         break;
-      case 0:
+      case 0: /* timeout */
+      default: /* action */
+        rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
         rb_curl_multi_read_info( self, rbcm->handle );
         if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
-      default: 
-        rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
         break;
       }
     }
-    rb_curl_multi_read_info( self, rbcm->handle );
-    if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
+
   } while( rbcm->running );
+
+  rb_curl_multi_read_info( self, rbcm->handle );
+  if (block != Qnil) { rb_funcall(block, rb_intern("call"), 1, self);  }
     
   return Qtrue;
 }

data/lib/curb.rb

@@ -77,7 +77,7 @@ module Curl
         urls.each do|url|
           url_confs << {:url => url, :method => :get}.merge(easy_options)
         end
-        self.http(url_confs, multi_options) {|c,code,method| blk.call(c) }
+        self.http(url_confs, multi_options) {|c,code,method| blk.call(c) if blk }
       end
 
       # call-seq:
@@ -148,17 +148,25 @@ module Curl
       #
       def http(urls_with_config, multi_options={}, &blk)
         m = Curl::Multi.new
+
+        # maintain a sane number of easy handles
+        multi_options[:max_connects] = max_connects = multi_options.key?(:max_connects) ? multi_options[:max_connects] : 10
+
+        free_handles = [] # keep a list of free easy handles
+
         # configure the multi handle
         multi_options.each { |k,v| m.send("#{k}=", v) }
         callbacks = [:on_progress,:on_debug,:on_failure,:on_success,:on_body,:on_header]
 
-        urls_with_config.each do|conf|
-          c = conf.dup # avoid being destructive to input
+        add_free_handle = proc do|conf, easy|
+          c       = conf.dup # avoid being destructive to input
           url     = c.delete(:url)
           method  = c.delete(:method)
           headers = c.delete(:headers)
 
-          easy    = Curl::Easy.new(url)
+          easy    = Curl::Easy.new if easy.nil?
+
+          easy.url = url
 
           # assign callbacks
           callbacks.each do |cb|
@@ -191,10 +199,35 @@ module Curl
           #
           c.each { |k,v| easy.send("#{k}=",v) }
 
-          easy.on_complete {|curl,code| blk.call(curl,code,method) } if blk
+          easy.on_complete {|curl,code|
+            free_handles << curl
+            blk.call(curl,code,method) if blk
+          }
           m.add(easy)
         end
-        m.perform
+
+        max_connects.times do
+          conf = urls_with_config.pop
+          add_free_handle.call conf, nil
+          break if urls_with_config.empty?
+        end
+
+        consume_free_handles = proc do
+          # as we idle consume free handles
+          if urls_with_config.size > 0 && free_handles.size > 0
+            easy = free_handles.pop
+            conf = urls_with_config.pop
+            add_free_handle.call conf, easy
+          end
+        end
+
+        until urls_with_config.empty?
+          m.perform do
+            consume_free_handles.call
+          end
+          consume_free_handles.call
+        end
+        free_handles = nil 
       end
 
       # call-seq:

data/lib/curl.rb

@@ -1,2 +1 @@
 require 'curb'
-

data/tests/tc_curl_easy.rb

@@ -224,7 +224,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
 
     assert_equal $TEST_URL, c.url
     assert_equal "http://some.proxy", c.proxy_url
-    
+ 
     c.proxy_url = nil
     assert_equal $TEST_URL, c.url
     assert_nil c.proxy_url
@@ -566,7 +566,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_post_remote
     curl = Curl::Easy.new(TestServlet.url)
     curl.http_post([Curl::PostField.content('document_id', 5)])
-    assert_equal "POST\ndocument%5Fid=5", curl.body_str
+    assert_equal "POST\ndocument_id=5", curl.unescape(curl.body_str)
   end
 
   def test_post_remote_is_easy_handle
@@ -853,6 +853,40 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal 'GET', curl.body_str
   end
 
+  def test_easy_can_put_with_content_length
+    curl = Curl::Easy.new(TestServlet.url)
+    rd, wr = IO.pipe
+    buf = (("hello")* (1000 / 5))
+
+    producer = Thread.new do
+      5.times do
+        wr << buf
+        sleep 0.1 # act as a slow producer
+      end
+    end
+
+    consumer = Thread.new do
+
+      #curl.verbose = true
+      curl.headers['Content-Length'] = buf.size * 5
+      curl.headers['User-Agent']     = "Something else"
+      curl.headers['Content-Type']   = "text/javascript"
+      curl.headers['Date']           = Time.now.httpdate
+      curl.headers['Host']           = 's3.amazonaws.com'
+      curl.headers['Accept']         = '*/*'
+      curl.headers['Authorization']  = 'Foo Bar Biz Baz'
+      curl.http_put(rd)
+      assert_match /^PUT/, curl.body_str
+      assert_match /hello$/, curl.body_str
+      curl.header_str
+      curl.body_str
+    end
+
+    producer.join
+    wr.close
+    consumer.join
+
+  end
 
   include TestServerMethods 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ghazel-curb
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 73
   prerelease: 
   segments: 
   - 0
   - 7
-  - 9
+  - 15
   - 1
-  version: 0.7.9.1
+  version: 0.7.15.1
 platform: ruby
 authors: 
 - Ross Bamford
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 -08:00
+date: 2011-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: curb
-rubygems_version: 1.4.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby libcurl bindings