curb 0.6.4.1 → 0.6.5.0

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.4.1"
-#define CURB_VER_NUM   641
+#define CURB_VERSION   "0.6.5.0"
+#define CURB_VER_NUM   650
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   6
-#define CURB_VER_MIC   4
-#define CURB_VER_PATCH 1
+#define CURB_VER_MIC   5
+#define CURB_VER_PATCH 0
 
 
 // Maybe not yet defined in Ruby

data/ext/curb_easy.c

@@ -656,7 +656,7 @@ static VALUE ruby_curl_easy_post_body_set(VALUE self, VALUE post_body) {
   
   char *data;
   long len;
-  
+
   Data_Get_Struct(self, ruby_curl_easy, rbce);
   
   curl = rbce->curl;
@@ -1988,12 +1988,16 @@ static VALUE ruby_curl_easy_perform_post(int argc, VALUE *argv, VALUE self) {
 
     return ret;
   } else {
-    VALUE post_body;
+    VALUE post_body = Qnil;
     if ((post_body = rb_funcall(args_ary, idJoin, 1, rbstrAmp)) == Qnil) {
       rb_raise(eCurlErrError, "Failed to join arguments");
       return Qnil;
     } else {
-      ruby_curl_easy_post_body_set(self, post_body);
+      /* if the function call above returns an empty string because no additional arguments were passed this makes sure
+         a previously set easy.post_body = "arg=foo&bar=bin"  will be honored */
+      if( post_body != Qnil && rb_type(post_body) == T_STRING && RSTRING_LEN(post_body) > 0 ) {
+        ruby_curl_easy_post_body_set(self, post_body);
+      }
 
       return handle_perform(self,rbce);
     }

data/tests/bug_curb_easy_post_with_string_no_content_length_header.rb

@@ -0,0 +1,83 @@
+=begin
+From jwhitmire
+Todd, I'm trying to use curb to post data to a REST url. We're using it to post support questions from our iphone app directly to tender. The post looks good to me, but curl is not adding the content-length header so I get a 411 length required response from the server.
+
+Here's my post block, do you see anything obvious? Do I need to manually add the Content-Length header?
+
+c = Curl::Easy.http_post(url) do |curl|
+  curl.headers["User-Agent"] = "Curl/Ruby"
+  if user
+    curl.headers["X-Multipass"] = user.multipass
+  else
+    curl.headers["X-Tender-Auth"] = TOKEN
+  end
+  curl.headers["Accept"] = "application/vnd.tender-v1+json"
+
+  curl.post_body = params.map{|f,k| "#{curl.escape(f)}=#{curl.escape(k)}"}.join('&')
+
+  curl.verbose = true
+  curl.follow_location = true
+  curl.enable_cookies = true
+end
+Any insight you care to share would be helpful. Thanks.
+=end
+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 BugCurbEasyPostWithStringNoContentLengthHeader < Test::Unit::TestCase
+  def test_bug_workaround
+    server = WEBrick::HTTPServer.new( :Port => 9999 )
+    server.mount_proc("/test") do|req,res|
+      assert_equal '15', req['Content-Length']
+      res.body = "hi"
+      res['Content-Type'] = "text/html"
+    end
+
+    thread = Thread.new(server) do|srv|
+      srv.start
+    end
+    params = {:cat => "hat", :foo => "bar"}
+
+    post_body = params.map{|f,k| "#{Curl::Easy.new.escape(f)}=#{Curl::Easy.new.escape(k)}"}.join('&')
+    c = Curl::Easy.http_post("http://127.0.0.1:9999/test",post_body) do |curl|
+      curl.headers["User-Agent"] = "Curl/Ruby"
+      curl.headers["X-Tender-Auth"] = "A Token"
+      curl.headers["Accept"] = "application/vnd.tender-v1+json"
+
+      curl.follow_location = true
+      curl.enable_cookies = true
+    end
+
+    server.shutdown
+    thread.join
+  end
+  def test_bug
+    server = WEBrick::HTTPServer.new( :Port => 9999 )
+    server.mount_proc("/test") do|req,res|
+      assert_equal '15', req['Content-Length']
+      res.body = "hi"
+      res['Content-Type'] = "text/html"
+    end
+
+    thread = Thread.new(server) do|srv|
+      srv.start
+    end
+    params = {:cat => "hat", :foo => "bar"}
+
+    c = Curl::Easy.http_post("http://127.0.0.1:9999/test") do |curl|
+      curl.headers["User-Agent"] = "Curl/Ruby"
+      curl.headers["X-Tender-Auth"] = "A Token"
+      curl.headers["Accept"] = "application/vnd.tender-v1+json"
+
+      curl.post_body = params.map{|f,k| "#{curl.escape(f)}=#{curl.escape(k)}"}.join('&')
+
+      curl.follow_location = true
+      curl.enable_cookies = true
+    end
+
+    server.shutdown
+    thread.join
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  version: 0.6.4.1
+  version: 0.6.5.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 -05:00
+date: 2010-01-26 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -29,21 +29,21 @@ files:
 - Rakefile
 - doc.rb
 - ext/extconf.rb
-- lib/curb.rb
 - lib/curl.rb
+- lib/curb.rb
 - ext/curb.c
+- ext/curb_upload.c
+- ext/curb_postfield.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.c
 - ext/curb_errors.h
-- ext/curb_macros.h
 - ext/curb_multi.h
+- ext/curb.h
+- ext/curb_easy.h
 - ext/curb_postfield.h
 - ext/curb_upload.h
+- ext/curb_macros.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
@@ -75,17 +75,18 @@ signing_key:
 specification_version: 3
 summary: Ruby libcurl bindings
 test_files: 
-- tests/alltests.rb
-- tests/bug_curb_easy_blocks_ruby_threads.rb
+- tests/mem_check.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/helper.rb
+- tests/tc_curl_postfield.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_multi_segfault.rb
+- tests/alltests.rb
 - tests/bug_postfields_crash.rb
-- tests/bug_require_last_or_segfault.rb
-- tests/helper.rb
-- tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
+- tests/unittests.rb
+- tests/tc_curl_multi.rb
+- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
-- tests/tc_curl_multi.rb
-- tests/tc_curl_postfield.rb
-- tests/unittests.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb