curb 0.3.7 → 0.4.2.0

data/ext/curb_errors.h

@@ -1,7 +1,7 @@
 /* curb_errors.h - Ruby exception types for curl errors
- * Copyright (c)2006 Ross Bamford. 
+ * Copyright (c)2006 Ross Bamford.
  * Licensed under the Ruby License. See LICENSE for details.
- * 
+ *
  * $Id: curb_errors.h 4 2006-11-17 18:35:31Z roscopeco $
  */
 #ifndef __CURB_ERRORS_H

data/ext/curb_multi.c

@@ -1,7 +1,7 @@
 /* curb_easy.c - Curl easy mode
- * Copyright (c)2008 Todd A. Fisher. 
+ * Copyright (c)2008 Todd A. Fisher.
  * Licensed under the Ruby License. See LICENSE for details.
- * 
+ *
  * $Id$
  */
 
@@ -66,17 +66,18 @@ static void curl_multi_free(ruby_curl_multi *rbcm) {
     //rb_hash_clear(rbcm->requests)
     rbcm->requests = Qnil;
   }
+  free(rbcm);
 }
 
 /*
  * call-seq:
  *   Curl::Multi.new                                   => #<Curl::Easy...>
- * 
+ *
  * Create a new Curl::Multi instance
  */
-static VALUE ruby_curl_multi_new(VALUE self) {
+static VALUE ruby_curl_multi_new(VALUE klass) {
   VALUE new_curlm;
-  
+
   ruby_curl_multi *rbcm = ALLOC(ruby_curl_multi);
 
   rbcm->handle = curl_multi_init();
@@ -85,8 +86,8 @@ static VALUE ruby_curl_multi_new(VALUE self) {
 
   rbcm->active = 0;
   rbcm->running = 0;
-  
-  new_curlm = Data_Wrap_Struct(cCurlMulti, curl_multi_mark, curl_multi_free, rbcm);
+
+  new_curlm = Data_Wrap_Struct(klass, curl_multi_mark, curl_multi_free, rbcm);
 
   return new_curlm;
 }
@@ -179,7 +180,7 @@ static VALUE ruby_curl_multi_add(VALUE self, VALUE easy) {
  * easy = Curl::Easy.new('url')
  *
  * multi.add(easy)
- * 
+ *
  * # sometime later
  * multi.remove(easy)
  *
@@ -203,7 +204,7 @@ static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy) {
   CURLMcode result;
   ruby_curl_easy *rbce;
   Data_Get_Struct(easy, ruby_curl_easy, rbce);
- 
+
   rbcm->active--;
 
   //printf( "calling rb_curl_multi_remove: 0x%X, active: %d\n", (long)easy, rbcm->active );
@@ -212,7 +213,7 @@ static void rb_curl_multi_remove(ruby_curl_multi *rbcm, VALUE easy) {
   if (result != 0) {
     raise_curl_multi_error_exception(result);
   }
- 
+
   ruby_curl_easy_cleanup( easy, rbce, rbce->bodybuf, rbce->headerbuf, rbce->curl_headers );
   rbce->headerbuf = Qnil;
   rbce->bodybuf = Qnil;
@@ -248,15 +249,15 @@ static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {
       ruby_curl_multi_remove( self, rbce->self );
 
       if (rbce->complete_proc != Qnil) {
-        rb_funcall( rbce->complete_proc, idCall, 1, self );
+        rb_funcall( rbce->complete_proc, idCall, 1, rbce->self );
       }
 
       long response_code = -1;
       curl_easy_getinfo(rbce->curl, CURLINFO_RESPONSE_CODE, &response_code);
- 
+
       if (result != 0) {
         if (rbce->failure_proc != Qnil) {
-          rb_funcall( rbce->failure_proc, idCall, 1, rbce->self );
+          rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
         }
       }
       else if (rbce->success_proc != Qnil &&
@@ -266,7 +267,7 @@ static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {
       }
       else if (rbce->failure_proc != Qnil &&
               (response_code >= 300 && response_code <= 999)) {
-        rb_funcall( rbce->failure_proc, idCall, 1, rbce->self );
+        rb_funcall( rbce->failure_proc, idCall, 2, rbce->self, INT2FIX(result) );
       }
       rbce->self = Qnil;
     }
@@ -320,7 +321,7 @@ static VALUE ruby_curl_multi_perform(VALUE self) {
 
   rb_curl_multi_run( self, rbcm->handle, &(rbcm->running) );
 
-  while(rbcm->running) { 
+  while(rbcm->running) {
     FD_ZERO(&fdread);
     FD_ZERO(&fdwrite);
     FD_ZERO(&fdexcep);
@@ -331,7 +332,7 @@ static VALUE ruby_curl_multi_perform(VALUE self) {
       raise_curl_multi_error_exception(mcode);
     }
 
-#ifdef HAVE_CURL_MULTI_TIMEOUT 
+#ifdef HAVE_CURL_MULTI_TIMEOUT
     /* get the curl suggested time out */
     mcode = curl_multi_timeout(rbcm->handle, &timeout);
     if (mcode != CURLM_OK) {
@@ -353,7 +354,7 @@ static VALUE ruby_curl_multi_perform(VALUE self) {
     if (rb_block_given_p()) {
       rb_yield(self);
     }
- 
+
     tv.tv_sec = timeout / 1000;
     tv.tv_usec = (timeout * 1000) % 1000000;
 
@@ -376,7 +377,7 @@ void init_curb_multi() {
   cCurlMulti = rb_define_class_under(mCurl, "Multi", rb_cObject);
 
   /* Class methods */
-  rb_define_singleton_method(cCurlMulti, "new", ruby_curl_multi_new, -1);
+  rb_define_singleton_method(cCurlMulti, "new", ruby_curl_multi_new, 0);
 
   /* Instnace methods */
   rb_define_method(cCurlMulti, "max_connects=", ruby_curl_multi_max_connects, 1);

data/ext/curb_multi.h

@@ -1,7 +1,7 @@
 /* curb_multi.h - Curl easy mode
- * Copyright (c)2008 Todd A. Fisher. 
+ * Copyright (c)2008 Todd A. Fisher.
  * Licensed under the Ruby License. See LICENSE for details.
- * 
+ *
  * $Id$
  */
 #ifndef __CURB_MULTI_H

data/ext/curb_upload.c

@@ -0,0 +1,56 @@
+/* curb_upload.c - Curl upload handle
+ * Copyright (c)2009 Todd A Fisher. 
+ * Licensed under the Ruby License. See LICENSE for details.
+ */
+#include "curb_upload.h"
+extern VALUE mCurl;
+VALUE cCurlUpload;
+
+static void curl_upload_mark(ruby_curl_upload *rbcu) {
+  if (rbcu->stream) rb_gc_mark(rbcu->stream);
+}
+static void curl_upload_free(ruby_curl_upload *rbcu) {
+  free(rbcu);
+}
+
+VALUE ruby_curl_upload_new(VALUE klass) {
+  VALUE upload;
+  ruby_curl_upload *rbcu = ALLOC(ruby_curl_upload);
+  rbcu->stream = Qnil;
+  rbcu->offset = 0;
+  upload = Data_Wrap_Struct(klass, curl_upload_mark, curl_upload_free, rbcu);
+  return upload;
+}
+
+VALUE ruby_curl_upload_stream_set(VALUE self, VALUE stream) {
+  ruby_curl_upload *rbcu;
+  Data_Get_Struct(self, ruby_curl_upload, rbcu);
+  rbcu->stream = stream;
+  return stream;
+}
+VALUE ruby_curl_upload_stream_get(VALUE self) {
+  ruby_curl_upload *rbcu;
+  Data_Get_Struct(self, ruby_curl_upload, rbcu);
+  return rbcu->stream;
+}
+VALUE ruby_curl_upload_offset_set(VALUE self, VALUE offset) {
+  ruby_curl_upload *rbcu;
+  Data_Get_Struct(self, ruby_curl_upload, rbcu);
+  rbcu->offset = FIX2INT(offset);
+  return offset;
+}
+VALUE ruby_curl_upload_offset_get(VALUE self) {
+  ruby_curl_upload *rbcu;
+  Data_Get_Struct(self, ruby_curl_upload, rbcu);
+  return INT2FIX(rbcu->offset);
+}
+
+/* =================== INIT LIB =====================*/
+void init_curb_upload() {
+  cCurlUpload = rb_define_class_under(mCurl, "Upload", rb_cObject);
+  rb_define_singleton_method(cCurlUpload, "new", ruby_curl_upload_new, 0);
+  rb_define_method(cCurlUpload, "stream=", ruby_curl_upload_stream_set, 1);
+  rb_define_method(cCurlUpload, "stream", ruby_curl_upload_stream_get, 0);
+  rb_define_method(cCurlUpload, "offset=", ruby_curl_upload_offset_set, 1);
+  rb_define_method(cCurlUpload, "offset", ruby_curl_upload_offset_get, 0);
+}

data/ext/curb_upload.h

@@ -0,0 +1,30 @@
+/* curb_upload.h - Curl upload handle
+ * Copyright (c)2009 Todd A Fisher. 
+ * Licensed under the Ruby License. See LICENSE for details.
+ */
+#ifndef __CURB_UPLOAD_H
+#define __CURB_UPLOAD_H
+
+#include "curb.h"
+
+#include <curl/easy.h>
+
+/*
+ * Maintain the state of an upload e.g. for putting large streams with very little memory
+ * out to a server. via PUT requests
+ */
+typedef struct {
+  VALUE stream;
+  size_t offset;
+} ruby_curl_upload;
+
+extern VALUE cCurlUpload;
+void init_curb_upload();
+
+VALUE ruby_curl_upload_new(VALUE klass);
+VALUE ruby_curl_upload_stream_set(VALUE self, VALUE stream);
+VALUE ruby_curl_upload_stream_get(VALUE self);
+VALUE ruby_curl_upload_offset_set(VALUE self, VALUE offset);
+VALUE ruby_curl_upload_offset_get(VALUE self);
+
+#endif

data/lib/curb.rb

@@ -1,9 +1,4 @@
-begin
-  require 'curb_core'
-rescue LoadError
-  $: << File.dirname(__FILE__)
-  require 'curb_core'
-end
+require 'curb_core'
 
 module Curl
   class Easy
@@ -44,5 +39,32 @@ module Curl
       end
     end
   end
-end
+  class Multi
+    class << self
+      # call-seq:
+      #   Curl::Multi.get('url1','url2','url3','url4','url5', :follow_location => true) do|easy|
+      #     easy
+      #   end
+      # 
+      # Blocking call to fetch multiple url's in parallel.
+      def get(urls, easy_options={}, multi_options={}, &blk)
+        m = Curl::Multi.new
+        # configure the multi handle
+        multi_options.each do|k,v|
+          m.send("#{k}=", v)
+        end
 
+        # create and configure each easy handle
+        urls.each do|url|
+          c = Curl::Easy.new(url)
+          easy_options.each do|k,v|
+            c.send("#{k}=",v)
+          end
+          c.on_complete {|curl| blk.call curl }
+          m.add(c)
+        end
+        m.perform
+      end
+    end
+  end
+end

data/tests/helper.rb

@@ -21,7 +21,7 @@ require 'webrick'
 # or to test with multiple threads set it to false
 # this is important since, some code paths will change depending
 # on the presence of multiple threads
-TEST_SINGLE_THREADED=false
+TEST_SINGLE_THREADED=true
 
 # keep webrick quiet
 class ::WEBrick::HTTPServer
@@ -76,6 +76,7 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_PUT(req,res)
+    res['X-Requested-Content-Type'] = req.content_type
     respond_with("PUT\n#{req.body}",req,res)
   end
 
@@ -105,6 +106,8 @@ module TestServerMethods
           server = WEBrick::HTTPServer.new :Port => port, :DocumentRoot => File.expand_path(File.dirname(__FILE__))
 
           server.mount(servlet.path, servlet)
+          server.mount("/ext", WEBrick::HTTPServlet::FileHandler, File.join(File.dirname(__FILE__),'..','ext'))
+
           trap("INT") { server.shutdown }
           GC.start
           wr.flush
@@ -119,6 +122,7 @@ module TestServerMethods
         @server = WEBrick::HTTPServer.new :Port => port, :DocumentRoot => File.expand_path(File.dirname(__FILE__))
 
         @server.mount(servlet.path, servlet)
+        @server.mount("/ext", WEBrick::HTTPServlet::FileHandler, File.join(File.dirname(__FILE__),'..','ext'))
         queue = Queue.new # synchronize the thread startup to the main thread
 
         @test_thread = Thread.new { queue << 1; @server.start }

data/tests/tc_curl_download.rb

@@ -13,6 +13,9 @@ class TestCurbCurlDownload < Test::Unit::TestCase
 
     curb = Curl::Easy.download(dl_url, dl_path)
     assert File.exist?(dl_path)
+    assert_equal File.read(File.join(File.dirname(__FILE__), '..','ext','curb_easy.c')), File.read(dl_path)
+  ensure
+    File.unlink(dl_path) if File.exist?(dl_path)
   end
 
   def test_download_bad_url_gives_404
@@ -22,6 +25,8 @@ class TestCurbCurlDownload < Test::Unit::TestCase
     curb = Curl::Easy.download(dl_url, dl_path)
     assert_equal Curl::Easy, curb.class
     assert_equal 404, curb.response_code
+  ensure
+    File.unlink(dl_path) if File.exist?(dl_path)
   end
 
 end

data/tests/tc_curl_easy.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'helper')
 
 class TestCurbCurlEasy < Test::Unit::TestCase
   def test_class_perform_01   
-    assert_instance_of Curl::Easy, c = Curl::Easy.perform($TEST_URL)    
+    assert_instance_of Curl::Easy, c = Curl::Easy.perform($TEST_URL)
     assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
     assert_equal "", c.header_str
   end    
@@ -22,6 +22,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   
   def test_new_01
     c = Curl::Easy.new
+    assert_equal Curl::Easy, c.class
     assert_nil c.url
     assert_nil c.body_str
     assert_nil c.header_str
@@ -54,8 +55,19 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal $TEST_URL, c.url
     assert_equal blk, c.on_body   # sets handler nil, returns old handler
     assert_equal nil, c.on_body
-  end    
-  
+  end
+
+  class Foo < Curl::Easy
+  end
+  def test_new_05
+    # can use Curl::Easy as a base class
+    c = Foo.new
+    assert_equal Foo, c.class
+    c.url = $TEST_URL
+    c.perform
+    assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
+  end
+
   def test_escape
     c = Curl::Easy.new
     
@@ -471,7 +483,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     curl = Curl::Easy.new("#{$TEST_URL.gsub(/file:\/\//,'')}/not_here")
     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| on_failure_called = true }
+    curl.on_failure {|c,code| on_failure_called = true }
     curl.perform
     assert on_failure_called, "Failure handler not called" 
   end
@@ -520,9 +532,19 @@ class TestCurbCurlEasy < Test::Unit::TestCase
 
   def test_put_remote
     curl = Curl::Easy.new(TestServlet.url)
+    curl.headers['Content-Type'] = 'application/json'
     assert curl.http_put("message")
     assert_match /^PUT/, curl.body_str
     assert_match /message$/, curl.body_str
+    assert_match /application\/json/, curl.header_str
+  end
+
+  def test_put_remote_file
+    curl = Curl::Easy.new(TestServlet.url)
+    File.open(__FILE__,'r') do|f|
+      assert curl.http_put(f)
+    end
+    assert_equal "PUT\n#{File.read(__FILE__)}", curl.body_str
   end
 
   include TestServerMethods 

data/tests/tc_curl_multi.rb

@@ -146,7 +146,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
       #assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
     end
 
-    c1.on_failure do|c|
+    c1.on_failure do|c,rc|
       #puts "failure called: #{c.body_str.inspect}"
     end
 
@@ -180,7 +180,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     def t_method
       @buf = ""
       @m = Curl::Multi.new
-      10.times do
+      10.times do|i|
         c = Curl::Easy.new($TEST_URL)
         c.on_success{|b| @buf << b.body_str }
         ObjectSpace.garbage_collect
@@ -246,4 +246,22 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   end
 =end
 
+  def test_multi_easy_get_01
+    urls = []
+    root_uri = 'http://127.0.0.1:9129/ext/'
+    # send a request to fetch all c files in the ext dir
+    Dir[File.dirname(__FILE__) + "/../ext/*.c"].each do|path|
+      urls << root_uri + File.basename(path)
+    end
+    Curl::Multi.get(urls, {:follow_location => true}, {:pipeline => true}) do|curl|
+      assert_equal 200, curl.response_code
+    end
+  end
+
+  include TestServerMethods 
+
+  def setup
+    server_setup
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.4.2.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -04:00
+date: 2009-06-25 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - ext/curb_errors.c
 - ext/curb_multi.c
 - ext/curb_postfield.c
+- ext/curb_upload.c
 - ext/curb.h
 - ext/curb_config.h
 - ext/curb_easy.h
@@ -43,6 +44,7 @@ files:
 - ext/curb_macros.h
 - ext/curb_multi.h
 - ext/curb_postfield.h
+- ext/curb_upload.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []