curb 0.6.7 → 0.6.8

data/ext/curb.h

@@ -20,11 +20,11 @@
 #include "curb_macros.h"
 
 // These should be managed from the Rake 'release' task.
-#define CURB_VERSION   "0.6.7"
-#define CURB_VER_NUM   670
+#define CURB_VERSION   "0.6.8"
+#define CURB_VER_NUM   680
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   6
-#define CURB_VER_MIC   7
+#define CURB_VER_MIC   8
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -666,6 +666,7 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
   ruby_curl_easy *rbce;
   CURL *curl;
   VALUE upload;
+  VALUE headers;
 
   Data_Get_Struct(self, ruby_curl_easy, rbce);
 
@@ -692,7 +693,7 @@ static VALUE ruby_curl_easy_put_data_set(VALUE self, VALUE data) {
     }
   }
 
-  VALUE headers = rb_easy_get("headers");
+  headers = rb_easy_get("headers");
   if( headers == Qnil ) { 
     headers = rb_hash_new();
   }
@@ -856,12 +857,14 @@ static VALUE ruby_curl_easy_proxy_type_get(VALUE self) {
 static VALUE ruby_curl_easy_http_auth_types_set(int argc, VALUE *argv, VALUE self) {//VALUE self, VALUE http_auth_types) {
   ruby_curl_easy *rbce;
   VALUE args_ary;
-  rb_scan_args(argc, argv, "*", &args_ary);
-  Data_Get_Struct(self, ruby_curl_easy, rbce);
-  int i, len = RARRAY_LEN(args_ary);
+  int i, len;
   char* node = NULL;
   long mask = 0x000000;
 
+  rb_scan_args(argc, argv, "*", &args_ary);
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+  len = RARRAY_LEN(args_ary);
+
   if (len == 1 && (TYPE(rb_ary_entry(args_ary,0)) == T_FIXNUM || rb_ary_entry(args_ary,0) == Qnil)) {
     if (rb_ary_entry(args_ary,0) == Qnil) { 
       rbce->http_auth_types = 0;
@@ -1853,14 +1856,9 @@ static VALUE ruby_curl_easy_perform_get(VALUE self) {
 }
 
 /*
- * call-seq:
- *   easy.http_delete
- *
- * DELETE 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.
+ * Common implementation of easy.http(verb) and easy.http_delete
  */
-static VALUE ruby_curl_easy_perform_delete(VALUE self) {
+static VALUE ruby_curl_easy_perform_verb_str(VALUE self, char *verb) {
   ruby_curl_easy *rbce;
   CURL *curl;
   VALUE retval;
@@ -1868,7 +1866,7 @@ static VALUE ruby_curl_easy_perform_delete(VALUE self) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
-  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, verb);
 
   retval = handle_perform(self,rbce);
 
@@ -1877,6 +1875,29 @@ static VALUE ruby_curl_easy_perform_delete(VALUE self) {
   return retval;
 }
 
+/*
+ * call-seq:
+ *   easy.http_delete
+ *
+ * DELETE 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.
+ */
+static VALUE ruby_curl_easy_perform_delete(VALUE self) {
+  return ruby_curl_easy_perform_verb_str(self, "DELETE");
+}
+
+/*
+ * call-seq:
+ *   easy.http(verb)
+ *
+ * Send an HTTP request with method set to verb, 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.
+ */
+static VALUE ruby_curl_easy_perform_verb(VALUE self, VALUE verb) {
+  return ruby_curl_easy_perform_verb_str(self, RSTRING_PTR(verb));
+}
+
 /*
  * call-seq:
  *   easy.perform                                     => true
@@ -2941,6 +2962,7 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "on_complete", ruby_curl_easy_on_complete_set, -1);
 
   rb_define_method(cCurlEasy, "perform", ruby_curl_easy_perform, 0);
+  rb_define_method(cCurlEasy, "http", ruby_curl_easy_perform_verb, 1);
   rb_define_method(cCurlEasy, "http_delete", ruby_curl_easy_perform_delete, 0);
   rb_define_method(cCurlEasy, "http_get", ruby_curl_easy_perform_get, 0);
   rb_define_method(cCurlEasy, "http_post", ruby_curl_easy_perform_post, -1);

data/tests/helper.rb

@@ -93,6 +93,10 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
     respond_with(:DELETE,req,res)
   end
 
+  def do_PURGE(req,res)
+    respond_with(:PURGE,req,res)
+  end
+
 end
 
 module TestServerMethods

data/tests/tc_curl_easy.rb

@@ -554,6 +554,12 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal 'DELETE', curl.body_str
   end
 
+  def test_arbitrary_http_verb
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.http('PURGE')
+    assert_equal 'PURGE', curl.body_str
+  end
+
   def test_head_remote
     curl = Curl::Easy.new(TestServlet.url)
     curl.http_head

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 -05:00
+date: 2010-04-14 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -32,20 +37,22 @@ files:
 - lib/curb.rb
 - lib/curl.rb
 - ext/curb.c
-- ext/curb_postfield.c
-- ext/curb_multi.c
-- ext/curb_errors.c
 - ext/curb_easy.c
+- ext/curb_errors.c
+- ext/curb_multi.c
+- ext/curb_postfield.c
 - ext/curb_upload.c
+- ext/curb.h
 - ext/curb_easy.h
 - ext/curb_errors.h
-- ext/curb_upload.h
 - ext/curb_macros.h
-- ext/curb.h
-- ext/curb_postfield.h
 - ext/curb_multi.h
+- ext/curb_postfield.h
+- ext/curb_upload.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -57,38 +64,38 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: curb
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby libcurl bindings
 test_files: 
-- tests/tc_curl_multi.rb
-- tests/tc_curl_postfield.rb
+- tests/alltests.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
+- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
+- tests/bug_instance_post_differs_from_class_post.rb
+- tests/bug_multi_segfault.rb
+- tests/bug_postfields_crash.rb
+- tests/bug_postfields_crash2.rb
+- tests/bug_require_last_or_segfault.rb
 - tests/bugtests.rb
-- tests/unittests.rb
+- tests/helper.rb
 - tests/mem_check.rb
-- tests/bug_require_last_or_segfault.rb
-- tests/bug_instance_post_differs_from_class_post.rb
+- tests/require_last_or_segfault_script.rb
 - tests/tc_curl_download.rb
-- tests/alltests.rb
-- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
-- tests/helper.rb
 - tests/tc_curl_easy.rb
-- tests/bug_postfields_crash2.rb
-- tests/bug_multi_segfault.rb
-- tests/require_last_or_segfault_script.rb
-- tests/bug_postfields_crash.rb
-- tests/bug_issue20.rb
-- tests/s.rb
+- tests/tc_curl_multi.rb
+- tests/tc_curl_postfield.rb
+- tests/unittests.rb

data/tests/bug_issue20.rb

@@ -1,10 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-require 'webrick'
-class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
-class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
-
-class BugIssue20 < Test::Unit::TestCase
-  def test_bug
-    Curl::Easy.new
-  end
-end

data/tests/s.rb

@@ -1,4 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-c = Curl::Easy.new("http://www.google.com/")
-c.perform