curb 0.1.0 → 0.1.2

data/Rakefile

@@ -289,7 +289,7 @@ task :tag => [:prerelease] do
     s = `svn info`
     if s =~ /URL:\s*([^\n]*)\n/
       svnroot = $1
-      if svnroot =~ /^(.*)\/trunk/
+      if svnroot =~ /^(.*)\/trunk/i
         svnbase = $1
         sh %{svn cp #{svnroot} #{svnbase}/TAGS/#{reltag} -m "Release #{PKG_VERSION}"}
       else

data/ext/curb.c

@@ -222,16 +222,19 @@ void Init_curb_core() {
   // TODO we need to call curl_global_cleanup at exit!
   curl_global_init(CURL_GLOBAL_ALL);
   curl_version_info_data *ver = curl_version_info(CURLVERSION_NOW);
-  VALUE curlver, curllongver;
+  VALUE curlver, curllongver, curlvernum;
 
   mCurl = rb_define_module("Curl");  
   
   curlver = rb_str_new2(ver->version);
   curllongver = rb_str_new2(curl_version());
+  curlvernum = LONG2NUM(LIBCURL_VERSION_NUM);
   
   rb_define_const(mCurl, "CURB_VERSION", rb_str_new2(CURB_VERSION));    
   rb_define_const(mCurl, "VERSION", curlver);
   rb_define_const(mCurl, "CURL_VERSION", curlver);
+  rb_define_const(mCurl, "VERNUM", curlvernum);
+  rb_define_const(mCurl, "CURL_VERNUM", curlvernum);
   rb_define_const(mCurl, "LONG_VERSION", curllongver);  
   rb_define_const(mCurl, "CURL_LONG_VERSION", curllongver);  
 

data/ext/curb.h

@@ -18,11 +18,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.1.0"
-#define CURB_VER_NUM   100
+#define CURB_VERSION   "0.1.2"
+#define CURB_VER_NUM   120
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   1
-#define CURB_VER_MIC   0
+#define CURB_VER_MIC   2
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -8,6 +8,8 @@
 #include "curb_errors.h"
 #include "curb_postfield.h"
 
+#include <string.h>
+
 extern VALUE mCurl;
 
 static VALUE idCall;
@@ -78,6 +80,7 @@ static int proc_debug_handler(CURL *curl,
 /* ================== MARK/FREE FUNC ==================*/
 void curl_easy_mark(ruby_curl_easy *rbce) {
   rb_gc_mark(rbce->url);
+  rb_gc_mark(rbce->proxy_url);
   rb_gc_mark(rbce->body_proc);
   rb_gc_mark(rbce->body_data);
   rb_gc_mark(rbce->header_proc);
@@ -86,7 +89,7 @@ void curl_easy_mark(ruby_curl_easy *rbce) {
   rb_gc_mark(rbce->debug_proc);
   rb_gc_mark(rbce->interface);
   rb_gc_mark(rbce->userpwd);
-  rb_gc_mark(rbce->proxypwd);
+  rb_gc_mark(rbce->proxypwd);  
   rb_gc_mark(rbce->headers);
   rb_gc_mark(rbce->cookiejar);
 
@@ -124,13 +127,13 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
   
   /* assoc objects */
   rbce->url = url;
+  rbce->proxy_url = Qnil;
   rbce->body_data = Qnil;
   rbce->body_proc = Qnil;
   rbce->header_data = Qnil;
   rbce->header_proc = Qnil;
   rbce->progress_proc = Qnil;
   rbce->debug_proc = Qnil;
-  rbce->proxy_addr = Qnil;
   rbce->interface = Qnil;
   rbce->userpwd = Qnil;
   rbce->proxypwd = Qnil;
@@ -219,6 +222,45 @@ static VALUE ruby_curl_easy_url_get(VALUE self) {
   CURB_OBJECT_GETTER(ruby_curl_easy, url);
 }
 
+/*
+ * call-seq:
+ *   easy.proxy_url = "some.url"                      => "some.url"
+ * 
+ * Set the URL of the HTTP proxy to use for subsequent calls to +perform+.
+ * The URL should specify the the host name or dotted IP address. To specify 
+ * port number in this string, append :[port] to the end of the host name. 
+ * The proxy string may be prefixed with [protocol]:// since any such prefix
+ * will be ignored. The proxy's port number may optionally be specified with 
+ * the separate option proxy_port .
+ * 
+ * When you tell the library to use an HTTP proxy, libcurl will transparently 
+ * convert operations to HTTP even if you specify an FTP URL etc. This may have
+ * an impact on what other features of the library you can use, such as 
+ * FTP specifics that don't work unless you tunnel through the HTTP proxy. Such 
+ * tunneling is activated with proxy_tunnel = true.
+ * 
+ * libcurl respects the environment variables *http_proxy*, *ftp_proxy*, 
+ * *all_proxy* etc, if any of those is set. The proxy_url option does however 
+ * override any possibly set environment variables. 
+ * 
+ * Starting with libcurl 7.14.1, the proxy host string given in environment 
+ * variables can be specified the exact same way as the proxy can be set with 
+ * proxy_url, including protocol prefix (http://) and embedded user + password.
+  */
+static VALUE ruby_curl_easy_proxy_url_set(VALUE self, VALUE proxy_url) {
+  CURB_OBJECT_SETTER(ruby_curl_easy, proxy_url);
+}
+
+/*
+ * call-seq:
+ *   easy.proxy_url                                   => "some.url"
+ * 
+ * Obtain the HTTP Proxy URL that will be used by subsequent calls to +perform+.
+ */ 
+static VALUE ruby_curl_easy_proxy_url_get(VALUE self) {
+  CURB_OBJECT_GETTER(ruby_curl_easy, proxy_url);
+}
+
 /*
  * call-seq:
  *   easy.headers = "Header: val"                              => ["Header: val", ...]
@@ -1003,6 +1045,12 @@ static VALUE handle_perform(ruby_curl_easy *rbce) {
       curl_easy_setopt(curl, CURLOPT_USERPWD, NULL);
     }      
     
+    if (rbce->proxy_url != Qnil) {
+      curl_easy_setopt(curl, CURLOPT_PROXY, StringValuePtr(rbce->proxy_url));
+    } else {
+      curl_easy_setopt(curl, CURLOPT_PROXY, NULL);
+    }      
+    
     if (rbce->proxypwd != Qnil) {
       curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, StringValuePtr(rbce->proxypwd));
     } else {
@@ -1904,7 +1952,12 @@ static VALUE ruby_curl_easy_escape(VALUE self, VALUE str) {
 
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   
+#if (LIBCURL_VERSION_NUM >= 0x070f04)
   result = (char*)curl_easy_escape(rbce->curl, StringValuePtr(str), RSTRING_LEN(str));
+#else
+  result = (char*)curl_escape(StringValuePtr(str), RSTRING_LEN(str));
+#endif
+
   rresult = rb_str_new2(result);
   curl_free(result); 
   
@@ -1927,7 +1980,13 @@ static VALUE ruby_curl_easy_unescape(VALUE self, VALUE str) {
   
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   
+#if (LIBCURL_VERSION_NUM >= 0x070f04)
   result = (char*)curl_easy_unescape(rbce->curl, StringValuePtr(str), RSTRING_LEN(str), &rlen);
+#else
+  result = (char*)curl_unescape(StringValuePtr(str), RSTRING_LEN(str));
+  rlen = strlen(result);
+#endif
+
   rresult = rb_str_new(result, rlen);
   curl_free(result); 
   
@@ -2032,6 +2091,8 @@ void init_curb_easy() {
   /* Attributes for config next perform */
   rb_define_method(cCurlEasy, "url=", ruby_curl_easy_url_set, 1);
   rb_define_method(cCurlEasy, "url", ruby_curl_easy_url_get, 0);  
+  rb_define_method(cCurlEasy, "proxy_url=", ruby_curl_easy_proxy_url_set, 1);
+  rb_define_method(cCurlEasy, "proxy_url", ruby_curl_easy_proxy_url_get, 0);
   rb_define_method(cCurlEasy, "headers=", ruby_curl_easy_headers_set, 1);
   rb_define_method(cCurlEasy, "headers", ruby_curl_easy_headers_get, 0);
   rb_define_method(cCurlEasy, "interface=", ruby_curl_easy_interface_set, 1);

data/ext/curb_easy.h

@@ -20,7 +20,7 @@ typedef struct {
   
   /* Objects we associate */
   VALUE url;  
-  VALUE proxy_addr;
+  VALUE proxy_url;
   
   VALUE body_proc;
   VALUE header_proc;  

data/samples/gmail.rb

@@ -3,7 +3,9 @@
 # stop working altogether when they next change gmail but 
 # it's still an example of posting with curb...
 
-require '../curb'
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'ext'))
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'curb'
 
 $EMAIL = '<YOUR GMAIL LOGIN>'
 $PASSWD = '<YOUR GMAIL PASSWORD>'

data/tests/tc_curl_easy.rb

@@ -67,7 +67,11 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     c = Curl::Easy.new
     
     assert_equal "one two", c.unescape('one%20two')
-    assert_equal "one\000two three", c.unescape("one%00two%20three")    
+    
+    # prior to 7.15.4 embedded nulls cannot be unescaped
+    if Curl::VERNUM >= 0x070f04
+      assert_equal "one\000two three", c.unescape("one%00two%20three")
+    end
   end
   
   def test_headers
@@ -178,6 +182,22 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_raise(ArgumentError) { c.local_port_range = -1 }
   end
   
+  def test_proxy_url_01
+    c = Curl::Easy.new($TEST_URL)
+    
+    assert_equal $TEST_URL, c.url
+    assert_nil c.proxy_url
+    
+    c.proxy_url = "http://some.proxy"    
+
+    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
+  end
+  
   def test_proxy_port_01
     c = Curl::Easy.new($TEST_URL)
     

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: curb
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-12-23 00:00:00 +00:00
+  version: 0.1.2
+date: 2007-01-14 00:00:00 +00:00
 summary: Ruby bindings for the libcurl(3) URL transfer library.
 require_paths: 
 - lib