curb 0.6.5.0 → 0.8.4

data/README

@@ -40,19 +40,41 @@ 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 report the issue at http://github.com/taf2/curb/issues
 
+On Ubuntu, the dependencies can be satisfied by installing the following packages:
+
+    $ sudo apt-get install libcurl3 libcurl3-gnutls libcurl4-openssl-dev
+
 Curb has fairly extensive RDoc comments in the source. You can build the
 documentation with:
 
     $ rake doc
 
-## Examples
+## Usage & examples
+
+Curb provides two classes:
+
++ Curl::Easy - simple API, for day-to-day tasks.
++ Curl::Multi - more advanced API, for operating on multiple URLs simultaneously.
+
+### Super simple API (less typing)
+
+    http = Curl.get("http://www.google.com/")
+    puts http.body_str
+
+    http = Curl.post("http://www.google.com/", {:foo => "bar"})
+    puts http.body_str
+
+    http = Curl.get("http://www.google.com/") do|http|
+      http.headers['Cookie'] = 'foo=1;bar=2'
+    end
+    puts http.body_str
 
 ### Simple fetch via HTTP:
 
     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
@@ -65,7 +87,7 @@ documentation with:
       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"
@@ -74,6 +96,14 @@ documentation with:
   
     c.perform
 
+### HTTP basic authentication:
+
+    c = Curl::Easy.new("http://github.com/")
+    c.http_auth_types = :basic
+    c.username = 'foo'
+    c.password = 'bar'
+    c.perform
+
 ### Supplying custom handlers:
 
     c = Curl::Easy.new("http://www.google.co.uk")
@@ -103,7 +133,7 @@ documentation with:
 
     c = Curl::Easy.new("http://my.rails.box/files/upload")
     c.multipart_form_post = true
-    c.http_post(Curl::PostField.file('myfile.rb'))
+    c.http_post(Curl::PostField.file('thing[file]', 'myfile.rb'))
 
 ### Multi Interface (Basic HTTP GET):
 
@@ -144,14 +174,21 @@ documentation with:
       c = Curl::Easy.new(url) do|curl|
         curl.follow_location = true
         curl.on_body{|data| responses[url] << data; data.size }
+        curl.on_success {|easy| puts "success, add more easy handles" }
       end
       m.add(c)
     end
    
     m.perform do
-      puts "idling... can do some work here, including add new requests"
+      puts "idling... can do some work here"
     end
    
     requests.each do|url|
       puts responses[url]
     end
+
+### Easy Callbacks
+
+on_success:  is called when the response code is 20x
+on_failure: is called when the response code is not success, including redirects e.g. 30x
+on_complete: is called in all cases.

data/Rakefile

@@ -2,10 +2,14 @@
 # 
 require 'rake/clean'
 require 'rake/testtask'
-require 'rake/rdoctask'
+begin
+  require 'rdoc/task'
+rescue LoadError => e
+  require 'rake/rdoctask'
+end
 
 CLEAN.include '**/*.o'
-CLEAN.include "**/*.#{Config::MAKEFILE_CONFIG['DLEXT']}"
+CLEAN.include "**/*.#{(defined?(RbConfig) ? RbConfig : Config)::MAKEFILE_CONFIG['DLEXT']}"
 CLOBBER.include 'doc'
 CLOBBER.include '**/*.log'
 CLOBBER.include '**/Makefile'
@@ -40,7 +44,7 @@ make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
 MAKECMD = ENV['MAKE_CMD'] || make_program
 MAKEOPTS = ENV['MAKE_OPTS'] || ''
 
-CURB_SO = "ext/curb_core.#{Config::MAKEFILE_CONFIG['DLEXT']}"
+CURB_SO = "ext/curb_core.#{(defined?(RbConfig) ? RbConfig : Config)::MAKEFILE_CONFIG['DLEXT']}"
 
 file 'ext/Makefile' => 'ext/extconf.rb' do
   Dir.chdir('ext') do
@@ -100,7 +104,7 @@ Rake::TestTask.new(:bugtests) do |t|
   t.test_files = FileList['tests/bug_*.rb']
   t.verbose = false
 end
-                          
+ 
 #Rake::TestTask.new(:funtests) do |t|
   #  t.test_files = FileList['test/func_*.rb']
   #t.warning = true
@@ -110,6 +114,25 @@ end
 task :unittests => :compile
 task :bugtests => :compile
 
+def has_gem?(file,name)
+  begin
+    require file
+    has_http_persistent = true
+  rescue LoadError => e
+    puts "Skipping #{name}"
+  end
+end
+
+desc "Benchmark curl against http://127.0.0.1/zeros-2k - will fail if /zeros-2k or 127.0.0.1 are missing"
+task :bench do
+  sh "ruby bench/curb_easy.rb"
+  sh "ruby bench/curb_multi.rb"
+  sh "ruby bench/nethttp_test.rb" if has_gem?("net/http/persistent","net-http-persistent")
+  sh "ruby bench/patron_test.rb" if has_gem?("patron","patron")
+  sh "ruby bench/typhoeus_test.rb" if has_gem?("typhoeus","typhoeus")
+  sh "ruby bench/typhoeus_hydra_test.rb" if has_gem?("typhoeus","typhoeus")
+end
+
 # RDoc Tasks ---------------------------------------------------------
 desc "Create the RDOC documentation"
 task :doc do