taf2-curb 0.5.2.0 → 0.5.4.0

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.5.2.0"
-#define CURB_VER_NUM   520
+#define CURB_VERSION   "0.5.4.0"
+#define CURB_VER_NUM   540
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   5
-#define CURB_VER_MIC   2
+#define CURB_VER_MIC   4
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -2599,13 +2599,17 @@ static VALUE ruby_curl_easy_inspect(VALUE self) {
  * converted to their "URL escaped" version (%NN where NN is a
  * two-digit hexadecimal number).
  */
-static VALUE ruby_curl_easy_escape(VALUE self, VALUE str) {
+static VALUE ruby_curl_easy_escape(VALUE self, VALUE svalue) {
   ruby_curl_easy *rbce;
   char *result;
   VALUE rresult;
+  VALUE str = svalue;
 
   Data_Get_Struct(self, ruby_curl_easy, rbce);
 
+  /* NOTE: make sure the value is a string, if not call to_s */
+  if( rb_type(str) != T_STRING ) { str = rb_funcall(str,rb_intern("to_s"),0); }
+
 #if (LIBCURL_VERSION_NUM >= 0x070f04)
   result = (char*)curl_easy_escape(rbce->curl, StringValuePtr(str), RSTRING_LEN(str));
 #else

data/lib/curb.rb

@@ -63,22 +63,11 @@ module Curl
       # 
       # Blocking call to fetch multiple url's in parallel.
       def get(urls, easy_options={}, multi_options={}, &blk)
-        m = Curl::Multi.new
-        # configure the multi handle
-        multi_options.each do|k,v|
-          m.send("#{k}=", v)
-        end
-
-        # create and configure each easy handle
+        url_confs = []
         urls.each do|url|
-          c = Curl::Easy.new(url)
-          easy_options.each do|k,v|
-            c.send("#{k}=",v)
-          end
-          c.on_complete {|curl| blk.call curl } if blk
-          m.add(c)
+          url_confs << {:url => url, :method => :get}.merge(easy_options)
         end
-        m.perform
+        self.http(url_confs, multi_options) {|c,code,method| blk.call(c) }
       end
 
       # call-seq:
@@ -97,36 +86,39 @@ module Curl
       # easy_options: are a set of common options to set on all easy handles
       # multi_options: options to set on the Curl::Multi handle
       #
-      def post(urls_with_config, easy_options, multi_options, &blk)
-        m = Curl::Multi.new
-        # configure the multi handle
-        multi_options.each do|k,v|
-          m.send("#{k}=", v)
+      def post(urls_with_config, easy_options={}, multi_options={}, &blk)
+        url_confs = []
+        urls_with_config.each do|uconf|
+          url_confs << uconf.merge(:method => :post).merge(easy_options)
         end
+        self.http(url_confs, multi_options) {|c,code,method| blk.call(c) }
+      end
 
-        urls_with_config.each do|conf|
-          c = conf.dup # avoid being destructive to input
-          url     = c.delete(:url)
-          fields  = c.delete(:post_fields)
-          headers = c.delete(:headers)
-
-          easy    = Curl::Easy.new(url)
-          # set the post post using the url fields
-          easy.post_body = fields.map{|f,k| "#{easy.escape(f)}=#{easy.escape(k)}"}.join('&')
-          # configure the easy handle
-          easy_options.each do|k,v|
-            easy.send("#{k}=",v)
-          end
-
-          # headers is a special key
-          headers.each {|k,v| easy.headers[k] = v } if headers
-
-          easy.on_complete {|curl| blk.call curl } if blk
-          m.add(easy)
+      # call-seq:
+      #
+      #   Curl::Multi.put([{:url => 'url1', :put_data => "some message"},
+      #                    {:url => 'url2', :put_data => IO.read('filepath')},
+      #                    {:url => 'url3', :put_data => "maybe another string or socket?"],
+      #                    {:follow_location => true},
+      #                    {:pipeline => true }) do|easy|
+      #     easy_handle_on_request_complete
+      #   end
+      # 
+      # Blocking call to POST multiple form's in parallel.
+      # 
+      # urls_with_config: is a hash of url's pointing to the postfields to send 
+      # easy_options: are a set of common options to set on all easy handles
+      # multi_options: options to set on the Curl::Multi handle
+      #
+      def put(urls_with_config, easy_options={}, multi_options={}, &blk)
+        url_confs = []
+        urls_with_config.each do|uconf|
+          url_confs << uconf.merge(:method => :put).merge(easy_options)
         end
-        m.perform
+        self.http(url_confs, multi_options) {|c,code,method| blk.call(c) }
       end
 
+
       # call-seq:
       #
       # Curl::Multi.http( [
@@ -144,7 +136,7 @@ module Curl
       # multi_options: options for the multi handle 
       # blk: a callback, that yeilds when a handle is completed
       #
-      def http(urls_with_config, multi_options, &blk)
+      def http(urls_with_config, multi_options={}, &blk)
         m = Curl::Multi.new
         # configure the multi handle
         multi_options.each { |k,v| m.send("#{k}=", v) }

data/tests/tc_curl_multi.rb

@@ -325,6 +325,17 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     end
   end
 
+  def test_multi_easy_put_01
+    urls = [{ :url => TestServlet.url, :method => :put, :put_data => "message", 
+             :headers => {'Content-Type' => 'application/json' } },
+           { :url => TestServlet.url, :method => :put, :put_data => "message", 
+             :headers => {'Content-Type' => 'application/json' } }]
+    Curl::Multi.put(urls, {}, {:pipeline => true}) do|easy|
+      assert_match /PUT/, easy.body_str
+      assert_match /message/, easy.body_str
+    end
+  end
+
   def test_multi_easy_http_01
     urls = [
       { :url => TestServlet.url + '?q=1', :method => :post, :post_fields => {'field1' => 'value1', 'k' => 'j'}},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.5.2.0
+  version: 0.5.4.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-23 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: []