taf2-curb 0.4.4.0 → 0.4.5.0

data/README

@@ -1,40 +1,40 @@
-== Curb - Libcurl bindings for Ruby
+# Curb - Libcurl bindings for Ruby
 
-* http://curb.rubyforge.org/
-* http://rubyforge.org/projects/curb
-* http://github.com/taf2/curb/tree/master
++ [rubyforge rdoc](http://curb.rubyforge.org/)
++ [rubyforge project](http://rubyforge.org/projects/curb)
++ [github project](http://github.com/taf2/curb/tree/master)
 
 Curb (probably CUrl-RuBy or something) provides Ruby-language bindings for the
 libcurl(3), a fully-featured client-side URL transfer library.
-cURL and libcurl live at http://curl.haxx.se/ .
+cURL and libcurl live at [http://curl.haxx.se/](http://curl.haxx.se/) .
 
 Curb is a work-in-progress, and currently only supports libcurl's 'easy' and 'multi' modes.
 
-=== License
+## License
 
 Curb is copyright (c)2006 Ross Bamford, and released under the terms of the 
 Ruby license. See the LICENSE file for the gory details. 
 
-=== You will need
+## 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.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
 
-=== Installation...
+## Installation...
 
 ... will usually be as simple as:
 
-	$ gem install curb
+    $ gem install curb
 	
 Or, if you downloaded the archive:	
 
-  $ rake install 
+    $ rake install 
 
 If you have a wierd setup, you might need extconf options. In this case, pass
 them like so:
 
-	$ rake install EXTCONF_OPTS='--with-curl-dir=/path/to/libcurl --prefix=/what/ever'
+    $ 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.
 If you do use another platform and experience problems, or if you can 
@@ -44,95 +44,113 @@ list on Curb's Rubyforge page.
 Curb has fairly extensive RDoc comments in the source. You can build the
 documentation with:
 
-  $ rake doc
+    $ rake doc
 
-=== Examples
+## Examples
 
-Simple fetch via HTTP:
+### Simple fetch via HTTP:
 
-  c = Curl::Easy.perform("http://www.google.co.uk")
-  puts c.body_str
+    c = Curl::Easy.perform("http://www.google.co.uk")
+    puts c.body_str
 
-Same thing, more manual:
+### Same thing, more manual:
 
-  c = Curl::Easy.new("http://www.google.co.uk")
-  c.perform
-  puts c.body_str
+    c = Curl::Easy.new("http://www.google.co.uk")
+    c.perform
+    puts c.body_str
 
-Additional config:
+### Additional config:
 
-  Curl::Easy.perform("http://www.google.co.uk") do |curl| 
-    curl.headers["User-Agent"] = "myapp-0.0"
-    curl.verbose = true
-  end
+    Curl::Easy.perform("http://www.google.co.uk") do |curl| 
+      curl.headers["User-Agent"] = "myapp-0.0"
+      curl.verbose = true
+    end
 
-Same thing, more manual:
+### Same thing, more manual:
 
-  c = Curl::Easy.new("http://www.google.co.uk") do |curl| 
-    curl.headers["User-Agent"] = "myapp-0.0"
-    curl.verbose = true
-  end
+    c = Curl::Easy.new("http://www.google.co.uk") do |curl| 
+      curl.headers["User-Agent"] = "myapp-0.0"
+      curl.verbose = true
+    end
   
-  c.perform
+    c.perform
 
-Supplying custom handlers:
+### Supplying custom handlers:
 
-  c = Curl::Easy.new("http://www.google.co.uk")
+    c = Curl::Easy.new("http://www.google.co.uk")
   
-  c.on_body { |data| print(data) }
-  c.on_header { |data| print(data) }
+    c.on_body { |data| print(data) }
+    c.on_header { |data| print(data) }
   
-  c.perform
+    c.perform
 
-Reusing Curls:
+### Reusing Curls:
 
-  c = Curl::Easy.new
+    c = Curl::Easy.new
 
-  ["http://www.google.co.uk", "http://www.ruby-lang.org/"].map do |url|
-    c.url = url
-    c.perform
-    c.body_str
-  end
-
-HTTP POST form:
-
-  c = Curl::Easy.http_post("http://my.rails.box/thing/create",
-                           Curl::PostField.content('thing[name]', 'box',
-                           Curl::PostField.content('thing[type]', 'storage')
-
-HTTP POST file upload:
-
-  c = Curl::Easy.new("http://my.rails.box/files/upload")
-  c.multipart_form_post = true
-  c.http_post(Curl::PostField.file('myfile.rb'))
-
-Multi Interface (Basic):
-  easy_options = {:follow_location => true}
-  multi_options = {:pipeline => true}
-
-  Curl::Multi.get('url1','url2','url3','url4','url5', easy_options, multi_options) do|easy|
-    # do something interesting with the easy response
-    puts easy.last_effective_url
-  end
-
-Multi Interface (Advanced):
-  responses = {}
-  requests = ["http://www.google.co.uk/", "http://www.ruby-lang.org/"]
-  m = Curl::Multi.new
-  # add a few easy handles
-  requests.each do |url|
-    responses[url] = ""
-    c = Curl::Easy.new(url) do|curl|
-      curl.follow_location = true
-      curl.on_body{|data| responses[url] << data; data.size }
+    ["http://www.google.co.uk", "http://www.ruby-lang.org/"].map do |url|
+      c.url = url
+      c.perform
+      c.body_str
+    end
+
+### HTTP POST form:
+
+    c = Curl::Easy.http_post("http://my.rails.box/thing/create",
+                             Curl::PostField.content('thing[name]', 'box',
+                             Curl::PostField.content('thing[type]', 'storage')
+
+### HTTP POST file upload:
+
+    c = Curl::Easy.new("http://my.rails.box/files/upload")
+    c.multipart_form_post = true
+    c.http_post(Curl::PostField.file('myfile.rb'))
+
+### Multi Interface (Basic):
+
+    # make multiple GET requests
+    easy_options = {:follow_location => true}
+    multi_options = {:pipeline => true}
+
+    Curl::Multi.get('url1','url2','url3','url4','url5', easy_options, multi_options) do|easy|
+      # do something interesting with the easy response
+      puts easy.last_effective_url
     end
-    m.add(c)
-  end
 
-  m.perform do
-    puts "idling... can do some work here, including add new requests"
-  end
+    # make multiple POST requests
+    easy_options = {:follow_location => true, :multipart_form_post => true}
+    multi_options = {:pipeline => true}
+
+    url_fields = [
+      { :url => 'url1', :post_fields => {'f1' => 'v1'} },
+      { :url => 'url2', :post_fields => {'f1' => 'v1'} },
+      { :url => 'url3', :post_fields => {'f1' => 'v1'} }
+    ]
 
-  requests.each do|url|
-    puts responses[url]
-  end
+    Curl::Multi.post(url_fields, easy_options, multi_options) do|easy|
+      # do something interesting with the easy response
+      puts easy.last_effective_url
+    end
+
+### Multi Interface (Advanced):
+
+    responses = {}
+    requests = ["http://www.google.co.uk/", "http://www.ruby-lang.org/"]
+    m = Curl::Multi.new
+    # add a few easy handles
+    requests.each do |url|
+      responses[url] = ""
+      c = Curl::Easy.new(url) do|curl|
+        curl.follow_location = true
+        curl.on_body{|data| responses[url] << data; data.size }
+      end
+      m.add(c)
+    end
+   
+    m.perform do
+      puts "idling... can do some work here, including add new requests"
+    end
+   
+    requests.each do|url|
+      puts responses[url]
+    end

data/Rakefile

@@ -63,6 +63,11 @@ end
 desc "Compile the shared object"
 task :compile => [CURB_SO]
 
+desc "Create the markdown file"
+task :markdown do
+  cp "README", "README.markdown"
+end
+
 desc "Install to your site_ruby directory"
 task :install => :alltests do
   m = make 'install' 

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.4.4.0"
-#define CURB_VER_NUM   440
+#define CURB_VERSION   "0.4.5.0"
+#define CURB_VER_NUM   450
 #define CURB_VER_MAJ   0
 #define CURB_VER_MIN   4
-#define CURB_VER_MIC   4
+#define CURB_VER_MIC   5
 #define CURB_VER_PATCH 0
 
 

data/lib/curb.rb

@@ -75,11 +75,51 @@ module Curl
           easy_options.each do|k,v|
             c.send("#{k}=",v)
           end
-          c.on_complete {|curl| blk.call curl }
+          c.on_complete {|curl| blk.call curl } if blk
           m.add(c)
         end
         m.perform
       end
+
+      # call-seq:
+      #
+      #   Curl::Multi.post([{:url => 'url1', :post_fields => {'field1' => 'value1', 'field2' => 'value2'}},
+      #                     {:url => 'url2', :post_fields => {'field1' => 'value1', 'field2' => 'value2'}},
+      #                     {:url => 'url3', :post_fields => {'field1' => 'value1', 'field2' => 'value2'}}],
+      #                    { :follow_location => true, :multipart_form_post => 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 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)
+        end
+
+        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)
+          end
+          easy.on_complete {|curl| blk.call curl } if blk
+          m.add(easy)
+        end
+        m.perform
+      end
     end
   end
 end

data/tests/tc_curl_multi.rb

@@ -260,6 +260,23 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     end
   end
 
+  def test_multi_easy_post_01
+    urls = [
+      { :url => TestServlet.url + '?q=1', :post_fields => {'field1' => 'value1', 'k' => 'j'}},
+      { :url => TestServlet.url + '?q=2', :post_fields => {'field2' => 'value2', 'foo' => 'bar', 'i' => 'j' }},
+      { :url => TestServlet.url + '?q=3', :post_fields => {'field3' => 'value3', 'field4' => 'value4'}}
+    ]
+    Curl::Multi.post(urls, {:follow_location => true, :multipart_form_post => true}, {:pipeline => true}) do|easy|
+      str = easy.body_str
+      assert_match /POST/, str
+      fields = {}
+      str.gsub(/POST\n/,'').split('&').map{|sv| k, v = sv.split('='); fields[k] = v }
+      expected = urls.find{|s| s[:url] == easy.last_effective_url }
+      assert_equal expected[:post_fields], fields
+      #puts "#{easy.last_effective_url} #{fields.inspect}"
+    end
+  end
+
   include TestServerMethods 
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taf2-curb
 version: !ruby/object:Gem::Version 
-  version: 0.4.4.0
+  version: 0.4.5.0
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-12 00:00:00 -07:00
+date: 2009-07-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,18 +32,18 @@ files:
 - lib/curb.rb
 - lib/curl.rb
 - ext/curb.c
-- ext/curb_postfield.c
-- ext/curb_multi.c
-- ext/curb_errors.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.h
-- ext/curb_upload.h
 - ext/curb_macros.h
-- ext/curb.h
-- ext/curb_postfield.h
 - ext/curb_multi.h
+- ext/curb_postfield.h
+- ext/curb_upload.h
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 post_install_message: 
@@ -73,15 +73,15 @@ signing_key:
 specification_version: 2
 summary: Ruby libcurl bindings
 test_files: 
-- tests/tc_curl_multi.rb
-- tests/tc_curl_postfield.rb
+- tests/alltests.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
-- tests/unittests.rb
-- tests/bug_require_last_or_segfault.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/bug_multi_segfault.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/helper.rb
 - tests/require_last_or_segfault_script.rb
+- tests/tc_curl_download.rb
+- tests/tc_curl_easy.rb
+- tests/tc_curl_multi.rb
+- tests/tc_curl_postfield.rb
+- tests/unittests.rb