taf2-curb 0.2.4 → 0.2.7

data/README

@@ -2,6 +2,8 @@
 
 * http://curb.rubyforge.org/
 * http://rubyforge.org/projects/curb
+* http://groups.google.com/group/curb---ruby-libcurl-bindings
+* http://github.com/taf2/curb/tree/master
 
 Curb (probably CUrl-RuBy or something) provides Ruby-language bindings for the
 libcurl(3), a fully-featured client-side URL transfer library.

data/ext/curb.h

@@ -20,7 +20,7 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.2.4.1"
+#define CURB_VERSION   "0.2.7.2"
 #define CURB_VER_NUM   224
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   2

data/ext/curb_easy.c

@@ -35,6 +35,23 @@ static size_t default_data_handler(char *stream,
   return size * nmemb;
 }
 
+// size_t function( void *ptr, size_t size, size_t nmemb, void *stream);
+static size_t read_data_handler(char *stream,
+                                size_t size, 
+                                size_t nmemb, 
+                                char **buffer) {
+    size_t result = 0;
+
+    if (buffer != NULL && *buffer != NULL) {
+        int len = size * nmemb;
+        char *s1 = strncpy(stream, *buffer, len);
+        result = strlen(s1);
+        *buffer += result;
+    }
+
+    return result;
+}
+
 static size_t proc_data_handler(char *stream, 
                                 size_t size, 
                                 size_t nmemb, 
@@ -1575,9 +1592,12 @@ static VALUE ruby_curl_easy_perform_delete(VALUE self) {
   curl = rbce->curl;
   
   curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
-  // curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
 
-  return handle_perform(self,rbce);
+  VALUE retval = handle_perform(self,rbce);
+
+  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
+
+  return retval;
 }
 
 /*
@@ -1679,10 +1699,17 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
  * method always returns true, or raises an exception (defined under 
  * Curl::Err) on error.
  * 
- * TODO Not yet implemented
  */
-static VALUE ruby_curl_easy_perform_head(VALUE self) {  
-  rb_raise(eCurlErrError, "Not yet implemented");
+static VALUE ruby_curl_easy_perform_head(VALUE self) {
+  ruby_curl_easy *rbce;
+  CURL *curl;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  curl = rbce->curl;
+
+  curl_easy_setopt(curl, CURLOPT_NOBODY, 1);
+
+  return handle_perform(self,rbce);
 }
 
 /*
@@ -1692,11 +1719,25 @@ static VALUE ruby_curl_easy_perform_head(VALUE self) {
  * PUT the supplied data to the currently configured URL using the
  * current options set for this Curl::Easy instance. This method always
  * returns true, or raises an exception (defined under Curl::Err) on error.
- * 
- * TODO Not yet implemented
  */
-static VALUE ruby_curl_easy_perform_put(VALUE self) {  
-  rb_raise(eCurlErrError, "Not yet implemented");
+static VALUE ruby_curl_easy_perform_put(VALUE self, VALUE data) {
+  ruby_curl_easy *rbce;
+  CURL *curl;
+  char *buffer;
+  int len;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  curl = rbce->curl;
+
+  buffer = StringValuePtr(data);
+  len = RSTRING_LEN(data);
+
+  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, &buffer);
+  curl_easy_setopt(curl, CURLOPT_INFILESIZE, len);
+
+  return handle_perform(self, rbce);
 }
 
 /* =================== DATA FUNCS =============== */
@@ -2385,6 +2426,29 @@ static VALUE ruby_curl_easy_class_perform_delete(int argc, VALUE *argv, VALUE kl
   return c;
 }
 
+/*
+ * call-seq:
+ *   Curl::Easy.http_head(url) { |easy| ... }          => #<Curl::Easy...>
+ *
+ * Convenience method that creates a new Curl::Easy instance with
+ * the specified URL and calls +http_head+, before returning the new instance.
+ *
+ * If a block is supplied, the new instance will be yielded just prior to
+ * the +http_head+ call.
+ */
+static VALUE ruby_curl_easy_class_perform_head(int argc, VALUE *argv, VALUE klass) {
+  VALUE c = ruby_curl_easy_new(argc, argv, klass);
+
+  if (rb_block_given_p()) {
+    rb_yield(c);
+  }
+
+  ruby_curl_easy_perform_head(c);
+  return c;
+}
+
+// TODO: add convenience method for http_post
+
 /*
  * call-seq:
  *   Curl::Easy.http_post(url, "some=urlencoded%20form%20data&and=so%20on") => true
@@ -2434,6 +2498,7 @@ void init_curb_easy() {
   rb_define_singleton_method(cCurlEasy, "http_delete", ruby_curl_easy_class_perform_delete, -1);
   rb_define_singleton_method(cCurlEasy, "http_get", ruby_curl_easy_class_perform_get, -1);
   rb_define_singleton_method(cCurlEasy, "http_post", ruby_curl_easy_class_perform_post, -1);
+  rb_define_singleton_method(cCurlEasy, "http_head", ruby_curl_easy_class_perform_head, -1);
 
   /* Attributes for config next perform */
   rb_define_method(cCurlEasy, "url=", ruby_curl_easy_url_set, 1);
@@ -2514,7 +2579,7 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "http_get", ruby_curl_easy_perform_get, 0);
   rb_define_method(cCurlEasy, "http_post", ruby_curl_easy_perform_post, -1);
   rb_define_method(cCurlEasy, "http_head", ruby_curl_easy_perform_head, 0);
-  rb_define_method(cCurlEasy, "http_put", ruby_curl_easy_perform_put, 0);
+  rb_define_method(cCurlEasy, "http_put", ruby_curl_easy_perform_put, 1);
 
   /* Post-perform info methods */
   rb_define_method(cCurlEasy, "body_str", ruby_curl_easy_body_str_get, 0);

data/ext/extconf.rb

@@ -71,8 +71,6 @@ have_constant "curle_tftp_unknownid"
 have_constant "curle_tftp_exists"
 have_constant "curle_tftp_nosuchuser"
 
-$INSTALLFILES = [["curb.rb", "$(RUBYLIBDIR)", "../ext"], ["curl.rb", "$(RUBYLIBDIR)", "../ext"]]
-
 if try_compile('int main() { return 0; }','-Wall')
   $CFLAGS << ' -Wall'
 end

data/tests/helper.rb

@@ -60,12 +60,17 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
     respond_with(:GET,req,res)
   end
 
+  def do_HEAD(req,res)
+    res['Location'] = "/nonexistent"
+    respond_with(:HEAD, req, res)
+  end
+
   def do_POST(req,res)
     respond_with(:POST,req,res)
   end
 
   def do_PUT(req,res)
-    respond_with(:PUT,req,res)
+    respond_with("PUT\n#{req.body}",req,res)
   end
 
   def do_DELETE(req,res)

data/tests/tc_curl_easy.rb

@@ -110,7 +110,8 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal "", c.body_str
     assert_equal "", c.header_str
   end    
-  
+
+
   def test_last_effective_url_01
     c = Curl::Easy.new($TEST_URL)
     
@@ -478,13 +479,23 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     curl.http_delete
     assert_equal 'DELETE', curl.body_str
   end
-  
-  # TODO: Curl::Err::CurlError: Not yet implemented
-#  def test_put_remote
-#    curl = Curl::Easy.new(TestServlet.url)
-#    curl.http_put
-#    assert_equal 'PUT', curl.body_str
-#  end
+
+  def test_head_remote
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.http_head
+
+    redirect = curl.header_str.match(/Location: (.*)/)
+
+    assert_equal '', curl.body_str
+    assert_match '/nonexistent', redirect[1]
+  end
+
+  def test_put_remote
+    curl = Curl::Easy.new(TestServlet.url)
+    assert curl.http_put("message")
+    assert_match /^PUT/, curl.body_str
+    assert_match /message$/, curl.body_str
+  end
 
   include TestServerMethods 
 

metadata

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