taf2-curb 0.5.1.0 → 0.5.2.0

data/README

@@ -17,9 +17,9 @@ Ruby license. See the LICENSE file for the gory details.
 
 ## You will need
 
-+ A working Ruby installation (1.8+, tested with 1.8.5, 1.8.6, 1.8.7, and 1.9.1)
-+ A working (lib)curl installation, with development stuff (7.5+, tested with 7.15)
-+ A sane build environment
++ A working Ruby installation (1.8+, tested with 1.8.6, 1.8.7, 1.9.1, and 1.9.2)
++ A working (lib)curl installation, with development stuff (7.5+, tested with 7.19.x)
++ A sane build environment (e.g. gcc, make)
 
 ## Installation...
 
@@ -36,10 +36,9 @@ them like so:
 
     $ rake install EXTCONF_OPTS='--with-curl-dir=/path/to/libcurl --prefix=/what/ever'
 	
-Currently, Curb is tested only on GNU/Linux x86 - YMMV on other platforms.
+Curb is tested only on GNU/Linux x86 and Mac OSX - YMMV on other platforms.
 If you do use another platform and experience problems, or if you can 
-expand on the above instructions, please get in touch via the mailing
-list on Curb's Rubyforge page.
+expand on the above instructions, please report the issue at http://github.com/taf2/curb/issues
 
 Curb has fairly extensive RDoc comments in the source. You can build the
 documentation with:
@@ -106,7 +105,7 @@ documentation with:
     c.multipart_form_post = true
     c.http_post(Curl::PostField.file('myfile.rb'))
 
-### Multi Interface (Basic):
+### Multi Interface (Basic HTTP GET):
 
     # make multiple GET requests
     easy_options = {:follow_location => true}
@@ -117,6 +116,8 @@ documentation with:
       puts easy.last_effective_url
     end
 
+### Multi Interface (Basic HTTP POST):
+
     # make multiple POST requests
     easy_options = {:follow_location => true, :multipart_form_post => true}
     multi_options = {:pipeline => true}

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.2.0"
+#define CURB_VER_NUM   520
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   5
-#define CURB_VER_MIC   1
+#define CURB_VER_MIC   2
 #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");
 }
 
 
@@ -2847,6 +2873,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

@@ -106,20 +106,87 @@ module Curl
 
         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)
+          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)
         end
         m.perform
       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 { |k,v| m.send("#{k}=", v) }
+
+        urls_with_config.each do|conf|
+          c = conf.dup # avoid being destructive to input
+          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
+
+          # 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
+      end
     end
   end
 end

data/tests/tc_curl_multi.rb

@@ -325,6 +325,29 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     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: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.5.1.0
+  version: 0.5.2.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-11 00:00:00 -07:00
+date: 2009-08-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,18 +32,18 @@ files:
 - lib/curb.rb
 - lib/curl.rb
 - ext/curb.c
-- ext/curb_easy.c
-- ext/curb_errors.c
-- ext/curb_multi.c
 - ext/curb_postfield.c
+- ext/curb_multi.c
+- ext/curb_errors.c
+- ext/curb_easy.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_multi.h
+- ext/curb.h
 - ext/curb_postfield.h
-- ext/curb_upload.h
+- ext/curb_multi.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: 
@@ -74,15 +74,15 @@ signing_key:
 specification_version: 2
 summary: Ruby libcurl bindings
 test_files: 
-- tests/alltests.rb
+- tests/tc_curl_multi.rb
+- tests/tc_curl_postfield.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
-- tests/bug_instance_post_differs_from_class_post.rb
-- tests/bug_multi_segfault.rb
+- tests/unittests.rb
 - tests/bug_require_last_or_segfault.rb
-- tests/helper.rb
-- tests/require_last_or_segfault_script.rb
+- tests/bug_instance_post_differs_from_class_post.rb
 - tests/tc_curl_download.rb
+- tests/alltests.rb
+- tests/helper.rb
 - tests/tc_curl_easy.rb
-- tests/tc_curl_multi.rb
-- tests/tc_curl_postfield.rb
-- tests/unittests.rb
+- tests/bug_multi_segfault.rb
+- tests/require_last_or_segfault_script.rb