curb 0.5.1.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.1.0"
-#define CURB_VER_NUM   510
+#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   1
+#define CURB_VER_MIC   4
 #define CURB_VER_PATCH 0
 
 

data/ext/curb_easy.c

@@ -1954,6 +1954,27 @@ static VALUE ruby_curl_easy_set_head_option(VALUE self, VALUE onoff) {
 
   return onoff;
 }
+/*
+ *call-seq:
+ * easy = Curl::Easy.new("url") do|c|
+ *  c.delete = true
+ * end
+ * easy.perform
+ */
+static VALUE ruby_curl_easy_set_delete_option(VALUE self, VALUE onoff) {
+  ruby_curl_easy *rbce;
+
+  Data_Get_Struct(self, ruby_curl_easy, rbce);
+
+  if( onoff == Qtrue ) {
+    curl_easy_setopt(rbce->curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+  }
+  else {
+    curl_easy_setopt(rbce->curl, CURLOPT_CUSTOMREQUEST, NULL);
+  }
+
+  return onoff;
+}
 
 /*
  * call-seq:
@@ -2554,11 +2575,16 @@ static VALUE ruby_curl_easy_inspect(VALUE self) {
   char buf[64];
   ruby_curl_easy *rbce;
   Data_Get_Struct(self, ruby_curl_easy, rbce);
-  // "#<Net::HTTP http://www.google.com/:80 open=false>"
-  snprintf(buf,sizeof(buf),"#<Curl::Easy %s", RSTRING_PTR(rbce->url));
-  size_t r = strlen(buf);
-  buf[r-1] = '>';
-  return rb_str_new(buf,r);
+  /* if we don't have a url set... we'll crash... */
+  if(rbce->url != Qnil && rb_type(rbce->url) == T_STRING) {
+    size_t len = 13+((RSTRING_LEN(rbce->url) > 50) ? 50 : RSTRING_LEN(rbce->url));
+    /* "#<Net::HTTP http://www.google.com/:80 open=false>" */
+    memcpy(buf,"#<Curl::Easy ", 13);
+    memcpy(buf+13,RSTRING_PTR(rbce->url), (len - 13));
+    buf[len-1] = '>';
+    return rb_str_new(buf,len);
+  }
+  return rb_str_new2("#<Curl::Easy");
 }
 
 
@@ -2573,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
@@ -2847,6 +2877,7 @@ void init_curb_easy() {
   rb_define_method(cCurlEasy, "http_head", ruby_curl_easy_perform_head, 0);
   rb_define_method(cCurlEasy, "http_put", ruby_curl_easy_perform_put, 1);
   rb_define_method(cCurlEasy, "head=", ruby_curl_easy_set_head_option, 1);
+  rb_define_method(cCurlEasy, "delete=", ruby_curl_easy_set_delete_option, 1);
 
   /* Post-perform info methods */
   rb_define_method(cCurlEasy, "body_str", ruby_curl_easy_body_str_get, 0);

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,25 +86,95 @@ 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)
+      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
+
+      # 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
+        self.http(url_confs, multi_options) {|c,code,method| blk.call(c) }
+      end
+
+
+      # call-seq:
+      #
+      # Curl::Multi.http( [
+      #   { :url => 'url1', :method => :post,
+      #     :post_fields => {'field1' => 'value1', 'field2' => 'value2'} },
+      #   { :url => 'url2', :method => :get,
+      #     :follow_location => true, :max_redirects => 3 },
+      #   { :url => 'url3', :method => :put, :put_data => File.open('file.txt','rb') },
+      #   { :url => 'url4', :method => :head }
+      # ], {:pipeline => true})
+      #
+      # Blocking call to issue multiple HTTP requests with varying verb's.
+      #
+      # urls_with_config: is a hash of url's pointing to the easy handle options as well as the special option :method, that can by one of [:get, :post, :put, :delete, :head], when no verb is provided e.g. :method => nil -> GET is used
+      # 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)
         m = Curl::Multi.new
         # configure the multi handle
-        multi_options.each do|k,v|
-          m.send("#{k}=", v)
-        end
+        multi_options.each { |k,v| m.send("#{k}=", v) }
 
         urls_with_config.each do|conf|
           c = conf.dup # avoid being destructive to input
-          url    = c.delete(:url)
-          fields = c.delete(:post_fields)
-          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)
+          url     = c.delete(:url)
+          method  = c.delete(:method)
+          headers = c.delete(:headers)
+
+          easy    = Curl::Easy.new(url)
+
+          case method
+          when :post
+            fields = c.delete(:post_fields)
+            # set the post post using the url fields
+            easy.post_body = fields.map{|f,k| "#{easy.escape(f)}=#{easy.escape(k)}"}.join('&')
+          when :put
+            easy.put_data = c.delete(:put_data)
+          when :head
+            easy.head = true
+          when :delete
+            easy.delete = true
+          when :get
+          else
+            # XXX: nil is treated like a GET
           end
-          easy.on_complete {|curl| blk.call curl } if blk
+
+          # headers is a special key
+          headers.each {|k,v| easy.headers[k] = v } if headers
+ 
+          #
+          # use the remaining options as specific configuration to the easy handle
+          # bad options should raise an undefined method error
+          #
+          c.each { |k,v| easy.send("#{k}=",v) }
+
+          easy.on_complete {|curl,code| blk.call(curl,code,method) } if blk
           m.add(easy)
         end
         m.perform

data/tests/tc_curl_easy.rb

@@ -145,6 +145,15 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     
     assert_not_equal c.last_effective_url, c.url
   end
+
+  def test_http_get_block
+    curl = Curl::Easy.http_get(TestServlet.url) do|c|
+      c.follow_location = true
+      c.max_redirects = 3
+    end
+    assert_equal curl.url, curl.last_effective_url
+    assert_equal 'GET', curl.body_str
+  end
   
   def test_local_port_01
     c = Curl::Easy.new($TEST_URL)

data/tests/tc_curl_multi.rb

@@ -325,6 +325,40 @@ 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'}},
+      { :url => TestServlet.url + '?q=2', :method => :post, :post_fields => {'field2' => 'value2', 'foo' => 'bar', 'i' => 'j' }},
+      { :url => TestServlet.url + '?q=3', :method => :post, :post_fields => {'field3' => 'value3', 'field4' => 'value4'}},
+      { :url => TestServlet.url, :method => :put, :put_data => "message", 
+        :headers => {'Content-Type' => 'application/json' } },
+      { :url => TestServlet.url, :method => :get }
+    ]
+    Curl::Multi.http(urls, {:pipeline => true}) do|easy, code, method|
+      assert_equal nil, code
+      case method
+      when :post
+        assert_match /POST/, easy.body_str
+      when :get
+        assert_match /GET/, easy.body_str
+      when :put
+        assert_match /PUT/, easy.body_str
+      end
+      #puts "#{easy.body_str.inspect}, #{method.inspect}, #{code.inspect}"
+    end
+  end
+
   def test_mutli_recieves_500
     m = Curl::Multi.new
     e = Curl::Easy.new("http://127.0.0.1:9129/methods")

metadata

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