taf2-curb 0.4.0.0 → 0.4.1.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;
@@ -253,7 +254,7 @@ static void rb_curl_multi_read_info(VALUE self, CURLM *multi_handle) {
 
       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, 2, rbce->self, INT2FIX(result) );
@@ -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

@@ -45,4 +45,3 @@ module Curl
     end
   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
     
@@ -525,6 +537,14 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_match /message$/, curl.body_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 
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.4.0.0
+  version: 0.4.1.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-17 00:00:00 -07:00
+date: 2009-06-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -36,8 +36,10 @@ files:
 - ext/curb_multi.c
 - ext/curb_errors.c
 - ext/curb_easy.c
+- ext/curb_upload.c
 - ext/curb_easy.h
 - ext/curb_errors.h
+- ext/curb_upload.h
 - ext/curb_macros.h
 - ext/curb.h
 - ext/curb_postfield.h