curb 0.6.2.0 → 0.6.2.1

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.6.2.0"
-#define CURB_VER_NUM   620
+#define CURB_VERSION   "0.6.2.1"
+#define CURB_VER_NUM   621
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   6
 #define CURB_VER_MIC   2
-#define CURB_VER_PATCH 0
+#define CURB_VER_PATCH 1
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_easy.c

@@ -143,8 +143,12 @@ void curl_easy_mark(ruby_curl_easy *rbce) {
   rb_gc_mark(rbce->debug_proc);
   rb_gc_mark(rbce->interface_hm);
   rb_gc_mark(rbce->userpwd);
+#if HAVE_CURLOPT_USERNAME
   rb_gc_mark(rbce->username);
+#endif
+#if HAVE_CURLOPT_PASSWORD
   rb_gc_mark(rbce->password);
+#endif
   rb_gc_mark(rbce->proxypwd);
   rb_gc_mark(rbce->headers);
   rb_gc_mark(rbce->cookies);
@@ -214,8 +218,12 @@ static VALUE ruby_curl_easy_new(int argc, VALUE *argv, VALUE klass) {
   rbce->debug_proc = Qnil;
   rbce->interface_hm = Qnil;
   rbce->userpwd = Qnil;
+#if HAVE_CURLOPT_USERNAME
   rbce->username = Qnil;
+#endif
+#if HAVE_CURLOPT_PASSWORD
   rbce->password = Qnil;
+#endif
   rbce->proxypwd = Qnil;
   rbce->headers = rb_hash_new();
   rbce->cookies = Qnil;
@@ -1096,20 +1104,37 @@ static VALUE ruby_curl_easy_ftp_response_timeout_get(VALUE self, VALUE ftp_respo
   CURB_IMMED_GETTER(ruby_curl_easy, ftp_response_timeout, 0);
 }
 
+
 static VALUE ruby_curl_easy_username_set(VALUE self, VALUE username) {
+#if HAVE_CURLOPT_USERNAME
   CURB_OBJECT_SETTER(ruby_curl_easy, username);
+#else
+  return Qnil;
+#endif
 }
 
 static VALUE ruby_curl_easy_username_get(VALUE self, VALUE username) {
+#if HAVE_CURLOPT_USERNAME
   CURB_OBJECT_GETTER(ruby_curl_easy, username);
+#else
+  return Qnil;
+#endif
 }
 
 static VALUE ruby_curl_easy_password_set(VALUE self, VALUE password) {
+#if HAVE_CURLOPT_PASSWORD
   CURB_OBJECT_SETTER(ruby_curl_easy, password);
+#else
+  return Qnil;
+#endif
 }
 
 static VALUE ruby_curl_easy_password_get(VALUE self, VALUE password) {
+#if HAVE_CURLOPT_PASSWORD
   CURB_OBJECT_GETTER(ruby_curl_easy, password);
+#else
+  return Qnil;
+#endif
 }
 
 /* ================== BOOL ATTRS ===================*/
@@ -1577,7 +1602,11 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce, VALUE *body_buffer, VALUE *hea
 
   if (rbce->userpwd != Qnil) {
     curl_easy_setopt(curl, CURLOPT_USERPWD, StringValuePtr(rbce->userpwd));
+#if HAVE_CURLOPT_USERNAME
   } else if (rbce->username == Qnil && rbce->password == Qnil) { /* don't set this even to NULL if we have set username and password */
+#else
+  } else {
+#endif
     curl_easy_setopt(curl, CURLOPT_USERPWD, NULL);
   }
 

data/ext/curb_errors.c

@@ -23,6 +23,7 @@ VALUE eCurlErrTelnetError;
 VALUE eCurlErrTFTPError;
 
 /* Specific libcurl errors */
+VALUE eCurlErrOK; /* not really an error but a return code */
 VALUE eCurlErrUnsupportedProtocol;
 VALUE eCurlErrFailedInit;
 VALUE eCurlErrMalformedURL;
@@ -127,6 +128,9 @@ VALUE rb_curl_easy_error(CURLcode code) {
   VALUE results;
 
   switch (code) {
+    case CURLE_OK:                      /* 0 */
+      exclz = eCurlErrOK;
+      break;
     case CURLE_UNSUPPORTED_PROTOCOL:    /* 1 */
       exclz = eCurlErrUnsupportedProtocol;
       break;
@@ -509,6 +513,7 @@ void init_curb_errors() {
   eCurlErrTelnetError = rb_define_class_under(mCurlErr, "TelnetError", eCurlErrError);
   eCurlErrTFTPError = rb_define_class_under(mCurlErr, "TFTPError", eCurlErrError);
 
+  eCurlErrOK = rb_define_class_under(mCurlErr, "CurlOK", eCurlErrError);
   eCurlErrUnsupportedProtocol = rb_define_class_under(mCurlErr, "UnsupportedProtocolError", eCurlErrError);
   eCurlErrFailedInit = rb_define_class_under(mCurlErr, "FailedInitError", eCurlErrError);
   eCurlErrMalformedURL = rb_define_class_under(mCurlErr, "MalformedURLError", eCurlErrError);

data/tests/tc_curl_easy.rb

@@ -659,10 +659,13 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     curl = Curl::Easy.new(TestServlet.url)
     curl.username = "foo"
     curl.password = "bar"
-    assert_equal "foo", curl.username
-    assert_equal "bar", curl.password
+    if !curl.username.nil?
+      assert_equal "foo", curl.username
+      assert_equal "bar", curl.password
+    else
+      curl.userpwd = "foo:bar"
+    end
     curl.http_auth_types = :basic
-    #curl.userpwd = "foo:bar"
     #curl.verbose = true
     curl.perform
     assert_equal 'Basic Zm9vOmJhcg==', $auth_header
@@ -673,6 +676,9 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     curl = Curl::Easy.new(TestServlet.url)
     curl.username = "foo"
     curl.password = "bar"
+    if curl.username.nil?
+      curl.userpwd = "foo:bar"
+    end
     curl.http_auth_types = :ntlm
     curl.perform
     assert_equal 'NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=', $auth_header

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  version: 0.6.2.0
+  version: 0.6.2.1
 platform: ruby
 authors: 
 - Ross Bamford