curb 0.7.5 → 0.7.6

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.7.5"
-#define CURB_VER_NUM   705
+#define CURB_VERSION   "0.7.6"
+#define CURB_VER_NUM   706
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   7
-#define CURB_VER_MIC   5
+#define CURB_VER_MIC   6
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -1458,6 +1458,25 @@ static VALUE ruby_curl_easy_use_netrc_q(VALUE self) {
 static VALUE ruby_curl_easy_follow_location_set(VALUE self, VALUE follow_location) {
   CURB_BOOLEAN_SETTER(ruby_curl_easy, follow_location);
 }
+/*
+ * call-seq:
+ *
+ * easy = Curl::Easy.new
+ * easy.autoreferer=true
+ */
+static VALUE ruby_curl_easy_autoreferer_set(VALUE self, VALUE autoreferer) {
+  ruby_curl_easy *rbce;
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  if (Qtrue == autoreferer) {
+    curl_easy_setopt(rbce->curl, CURLOPT_AUTOREFERER, 1);
+  }
+  else {
+    curl_easy_setopt(rbce->curl, CURLOPT_AUTOREFERER, 0);
+  }
+
+  return autoreferer;
+}
 
 /*
  * call-seq:
@@ -1849,7 +1868,6 @@ VALUE ruby_curl_easy_setup( ruby_curl_easy *rbce ) {
   /* general opts */
 
   curl_easy_setopt(curl, CURLOPT_HEADER, rbce->header_in_body);
-
   curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, rbce->follow_location);
   curl_easy_setopt(curl, CURLOPT_MAXREDIRS, rbce->max_redirs);
 
@@ -2098,6 +2116,7 @@ static VALUE ruby_curl_easy_perform_get(VALUE self) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
+  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
   curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
 
   return handle_perform(self,rbce);
@@ -2197,6 +2216,8 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
 
+  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
+
   if (rbce->multipart_form_post) {
     VALUE ret;
     struct curl_httppost *first = NULL, *last = NULL;
@@ -2358,6 +2379,7 @@ static VALUE ruby_curl_easy_perform_put(VALUE self, VALUE data) {
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   curl = rbce->curl;
   
+  curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, NULL);
   ruby_curl_easy_put_data_set(self, data);
   
   return handle_perform(self, rbce);
@@ -3261,6 +3283,7 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "use_netrc?", ruby_curl_easy_use_netrc_q, 0);
   rb_define_method(cCurlEasy, "follow_location=", ruby_curl_easy_follow_location_set, 1);
   rb_define_method(cCurlEasy, "follow_location?", ruby_curl_easy_follow_location_q, 0);
+  rb_define_method(cCurlEasy, "autoreferer=", ruby_curl_easy_autoreferer_set, 1);
   rb_define_method(cCurlEasy, "unrestricted_auth=", ruby_curl_easy_unrestricted_auth_set, 1);
   rb_define_method(cCurlEasy, "unrestricted_auth?", ruby_curl_easy_unrestricted_auth_q, 0);
   rb_define_method(cCurlEasy, "verbose=", ruby_curl_easy_verbose_set, 1);

data/ext/curb_multi.c

@@ -325,14 +325,14 @@ static void rb_curl_mutli_handle_complete(VALUE self, CURL *easy_handle, int res
 
   Data_Get_Struct(easy, ruby_curl_easy, rbce);
 
-  if (ecode != 0) {
-    raise_curl_easy_error_exception(ecode);
-  }
-
   rbce->last_result = result; /* save the last easy result code */
 
   ruby_curl_multi_remove( self, easy );
 
+  if (ecode != 0) {
+    raise_curl_easy_error_exception(ecode);
+  }
+
   if (!rb_easy_nil("complete_proc")) {
     rb_funcall( rb_easy_get("complete_proc"), idCall, 1, easy );
   }

data/tests/tc_curl_easy.rb

@@ -742,6 +742,32 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     easy.http_get
   end
 
+  def test_easy_http_verbs
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.http_delete
+    assert_equal 'DELETE', curl.body_str
+    curl.http_get
+    assert_equal 'GET', curl.body_str
+    curl.http_post
+    assert_equal "POST\n", curl.body_str
+    curl.http('PURGE')
+    assert_equal 'PURGE', curl.body_str
+    curl.http_put('hello')
+    assert_equal "PUT\nhello", curl.body_str
+  end
+
+  # http://github.com/taf2/curb/issues/#issue/33
+  def test_easy_http_verbs_with_errors
+    curl = Curl::Easy.new("http://127.0.0.1:9012/") # test will fail if http server on port 9012
+    assert_raise Curl::Err::ConnectionFailedError do
+      curl.http_delete
+    end
+    curl.url = TestServlet.url
+    curl.http_get
+    assert_equal 'GET', curl.body_str
+  end
+
+
   include TestServerMethods 
 
   def setup

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - Ross Bamford
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 -04:00
+date: 2010-06-11 00:00:00 -04:00
 default_executable: 
 dependencies: []