curb 0.6.5.0 → 0.8.4

data/lib/curl.rb

@@ -1,2 +1,62 @@
-require 'curb'
+require 'curb_core'
+require 'curl/easy'
+require 'curl/multi'
+require 'uri'
 
+# expose shortcut methods
+module Curl
+  
+  def self.http(verb, url, post_body=nil, put_data=nil, &block)
+    handle = Thread.current[:curb_curl] ||= Curl::Easy.new
+    handle.url = url
+    handle.post_body = post_body if post_body
+    handle.put_data = put_data if put_data
+    yield handle if block_given?
+    handle.http(verb)
+    handle
+  end
+
+  def self.get(url, params={}, &block)
+    http :GET, urlalize(url, params), nil, nil, &block
+  end
+
+  def self.post(url, params={}, &block)
+    http :POST, url, postalize(params), nil, &block
+  end
+
+  def self.put(url, params={}, &block)
+    http :PUT, url, nil, postalize(params), &block
+  end
+
+  def self.delete(url, params={}, &block)
+    http :DELETE, url, postalize(params), nil, &block
+  end
+
+  def self.patch(url, params={}, &block)
+    http :PATCH, url, postalize(params), nil, &block
+  end
+
+  def self.head(url, params={}, &block)
+    http :HEAD, urlalize(url, params), nil, nil, &block
+  end
+
+  def self.options(url, params={}, &block)
+    http :OPTIONS, urlalize(url, params), nil, nil, &block
+  end
+
+  def self.urlalize(url, params={})
+    query_str = params.map {|k,v| "#{URI.escape(k.to_s)}=#{URI.escape(v.to_s)}" }.join('&')
+    if url.match(/\?/)
+      "#{url}&#{query_str}"
+    elsif query_str.size > 0
+      "#{url}?#{query_str}"
+    else
+      url
+    end
+  end
+
+  def self.postalize(params={})
+    params.respond_to?(:map) ? URI.encode_www_form(params) : (params.respond_to?(:to_s) ? params.to_s : params)
+  end
+
+end

data/tests/bug_crash_on_debug.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+require 'webrick'
+class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
+class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
+
+require 'curl'
+
+class BugCrashOnDebug < Test::Unit::TestCase
+
+  def test_on_debug
+    server = WEBrick::HTTPServer.new( :Port => 9999 )
+    server.mount_proc("/test") do|req,res|
+      res.body = "hi"
+      res['Content-Type'] = "text/html"
+    end
+    puts 'a'
+    thread = Thread.new(server) do|srv|
+      srv.start
+    end
+    puts 'b'
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    c.on_debug do|x|
+      puts x.inspect
+      raise "error" # this will get swallowed
+    end
+    c.perform
+    puts 'c'
+  ensure
+    puts 'd'
+    server.shutdown
+    puts 'e'
+    puts thread.exit
+    puts 'f'
+  end
+
+end
+
+#test_on_debug

data/tests/bug_crash_on_progress.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'webrick'
+class ::WEBrick::HTTPServer ; def access_log(config, req, res) ; end ; end
+class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
+
+class BugCrashOnDebug < Test::Unit::TestCase
+  
+  def test_on_debug
+    server = WEBrick::HTTPServer.new( :Port => 9999 )
+    server.mount_proc("/test") do|req,res|
+      res.body = "hi"
+      res['Content-Type'] = "text/html"
+    end
+
+    thread = Thread.new(server) do|srv|
+      srv.start
+    end
+
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    c.on_progress do|x|
+      raise "error"
+    end
+    c.perform
+
+    assert false, "should not reach this point"
+
+  rescue => e
+    assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
+    c.close
+  ensure
+    server.shutdown
+  end
+end

data/tests/bug_curb_easy_blocks_ruby_threads.rb

@@ -21,7 +21,7 @@ class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
 
     5.times do |i|
       t = Thread.new do
-        c = Curl::Easy.perform('http://localhost:9999/test')
+        c = Curl::Easy.perform('http://127.0.0.1:9999/test')
         c.header_str
       end
       threads << t
@@ -37,7 +37,7 @@ class BugTestInstancePostDiffersFromClassPost < Test::Unit::TestCase
     timer = Time.now
     single_responses = []
     5.times do |i|
-      c = Curl::Easy.perform('http://localhost:9999/test')
+      c = Curl::Easy.perform('http://127.0.0.1:9999/test')
       single_responses << c.header_str
     end
     

data/tests/bug_issue102.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugIssue102 < Test::Unit::TestCase
+
+  def test_interface
+    test = "https://api.twitter.com/1/users/show.json?screen_name=TwitterAPI&include_entities=true"
+    ip = "192.168.1.61"
+
+    c = Curl::Easy.new do |curl|
+      curl.url = test
+      curl.interface = ip
+    end  
+
+    c.perform
+  end
+
+end

data/tests/bug_multi_segfault.rb

@@ -6,5 +6,9 @@
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','ext'))
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__),'..','lib'))
 require 'curb'
-multi = Curl::Multi.new
-exit
+
+class BugMultiSegfault < Test::Unit::TestCase
+  def test_bug
+    multi = Curl::Multi.new
+  end
+end

data/tests/bug_postfields_crash2.rb

@@ -0,0 +1,57 @@
+# Not sure if this is an IRB bug, but thought you guys should know.
+#
+# ** My Ruby version: ruby 1.8.7 (2009-06-12 patchlevel 174) [x86_64-linux]
+# ** Version of Rubygems: 1.3.5
+# ** Version of the Curb gem: 0.6.6.0
+#
+#
+# Transcript of IRB session:
+# ------------------------------------------------------------------------------------------------------------------
+# irb(main):001:0>  a =  {
+# irb(main):002:1*     :type => :pie,
+# irb(main):003:1*     :series => {
+# irb(main):004:2*       :names => [:a,:b],
+# irb(main):005:2*       :values => [70,30],
+# irb(main):006:2*       :colors => [:red,:green]
+# irb(main):007:2>     },
+# irb(main):008:1*     :output_format => :png
+# irb(main):009:1>   }
+# => {:type=>:pie, :output_format=>:png, :series=>{:names=>[:a, :b], :values=>[70, 30], :colors=>[:red, :green]}}
+# irb(main):010:0> post = []
+# => []
+# irb(main):011:0> require 'rubygems'
+# => true
+# irb(main):012:0> require 'curb'
+# => true
+# irb(main):013:0> include Curl
+# => Object
+# irb(main):014:0> a.each_pair do |k,v|
+# irb(main):015:1* post << PostField.content(k,v)
+# irb(main):016:1> end
+# => {:type=>:pie, :output_format=>:png, :series=>{:names=>[:a, :b], :values=>[70, 30], :colors=>[:red, :green]}}
+# irb(main):017:0> post
+# /usr/lib/ruby/1.8/irb.rb:302: [BUG] Segmentation fault
+# ruby 1.8.7 (2009-06-12 patchlevel 174) [x86_64-linux]
+#
+# Aborted
+# ------------------------------------------------------------------------------------------------------------------
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class BugPostFieldsCrash2 < Test::Unit::TestCase
+  def test_crash
+    a =  {
+       :type => :pie,
+       :series => {
+         :names => [:a,:b],
+         :values => [70,30],
+         :colors => [:red,:green]
+       },
+       :output_format => :png
+    }
+    post = []
+    a.each_pair do |k,v|
+      post << Curl::PostField.content(k,v)
+    end
+    post.inspect
+  end
+end

data/tests/bug_require_last_or_segfault.rb

@@ -24,7 +24,7 @@
 require 'test/unit'
 require 'rbconfig'
 
-$rubycmd = Config::CONFIG['RUBY_INSTALL_NAME'] || 'ruby'
+$rubycmd = RbConfig::CONFIG['RUBY_INSTALL_NAME'] || 'ruby'
 
 class BugTestRequireLastOrSegfault < Test::Unit::TestCase
   def test_bug

data/tests/bugtests.rb

@@ -0,0 +1,9 @@
+$: << $TESTDIR = File.expand_path(File.dirname(__FILE__))
+puts "start"
+begin
+Dir[File.join($TESTDIR, 'bug_*.rb')].each { |lib| require lib }
+rescue Object => e
+  puts e.message
+ensure
+puts "done"
+end

data/tests/helper.rb

@@ -11,6 +11,7 @@ $:.unshift($EXTDIR)
 
 require 'curb'
 require 'test/unit'
+require 'fileutils'
 
 $TEST_URL = "file://#{URI.escape(File.expand_path(__FILE__).tr('\\','/').tr(':','|'))}"
 
@@ -64,23 +65,35 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_GET(req,res)
-    respond_with(:GET,req,res)
+    if req.path.match /redirect$/
+      res.status = 302
+      res['Location'] = '/foo'
+    elsif req.path.match /not_here$/
+      res.status = 404
+    elsif req.path.match /error$/
+      res.status = 500
+    end
+    respond_with("GET#{req.query_string}",req,res)
   end
 
   def do_HEAD(req,res)
     res['Location'] = "/nonexistent"
-    respond_with(:HEAD, req, res)
+    respond_with("HEAD#{req.query_string}",req,res)
   end
 
   def do_POST(req,res)
-    if req.body
-      params = {}
-      req.body.split('&').map{|s| k,v=s.split('='); params[k] = v }
-    end
-    if params and params['s'] == '500'
-      res.status = 500
+    if req.query['filename'].nil?
+      if req.body
+        params = {}
+        req.body.split('&').map{|s| k,v=s.split('='); params[k] = v }
+      end
+      if params and params['s'] == '500'
+        res.status = 500
+      else
+        respond_with("POST\n#{req.body}",req,res)
+      end
     else
-      respond_with("POST\n#{req.body}",req,res)
+      respond_with(req.query['filename'],req,res)
     end
   end
 
@@ -90,7 +103,23 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_DELETE(req,res)
-    respond_with(:DELETE,req,res)
+    respond_with("DELETE#{req.query_string}",req,res)
+  end
+
+  def do_PURGE(req,res)
+    respond_with("PURGE#{req.query_string}",req,res)
+  end
+
+  def do_COPY(req,res)
+    respond_with("COPY#{req.query_string}",req,res)
+  end
+
+  def do_PATCH(req,res)
+    respond_with("PATCH\n#{req.body}",req,res)
+  end
+
+  def do_OPTIONS(req,res)
+    respond_with("OPTIONS#{req.query_string}",req,res)
   end
 
 end
@@ -165,5 +194,6 @@ module TestServerMethods
       at_exit{exit_code.call}
 
     end
+  rescue Errno::EADDRINUSE
   end
 end

data/tests/signals.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+# This test suite requires the timeout server to be running
+# See tests/timeout.rb for more info about the timeout server
+class TestCurbSignals < Test::Unit::TestCase
+
+  # Testcase for https://github.com/taf2/curb/issues/117
+  def test_continue_after_signal
+    trap("SIGUSR1") { }
+
+    curl = Curl::Easy.new(wait_url(2))
+    pid = $$
+    Thread.new do
+      sleep 1
+      Process.kill("SIGUSR1", pid)
+    end
+    assert_equal true, curl.http_get
+  end
+
+  private
+  
+  def wait_url(time)
+    "#{server_base}/wait/#{time}"
+  end
+  
+  def serve_url(chunk_size, time, count)
+    "#{server_base}/serve/#{chunk_size}/every/#{time}/for/#{count}"
+  end
+  
+  def server_base
+    'http://127.0.0.1:9128'
+  end
+end

data/tests/tc_curl.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class TestCurl < Test::Unit::TestCase
+  def test_get
+    curl = Curl.get(TestServlet.url, {:foo => "bar"})
+    assert_equal "GETfoo=bar", curl.body_str
+
+    curl = Curl.options(TestServlet.url, {:foo => "bar"}) do|http|
+      http.headers['Cookie'] = 'foo=1;bar=2'
+    end
+    assert_equal "OPTIONSfoo=bar", curl.body_str
+  end
+
+  def test_post
+    curl = Curl.post(TestServlet.url, {:foo => "bar"})
+    assert_equal "POST\nfoo=bar",  curl.body_str
+  end
+
+  def test_put
+    curl = Curl.put(TestServlet.url, {:foo => "bar"})
+    assert_equal "PUT\nfoo=bar",  curl.body_str
+  end
+
+  def test_patch
+    curl = Curl.patch(TestServlet.url, {:foo => "bar"})
+    assert_equal "PATCH\nfoo=bar", curl.body_str
+  end
+
+  def test_options
+    curl = Curl.options(TestServlet.url, {:foo => "bar"})
+    assert_equal "OPTIONSfoo=bar", curl.body_str
+  end
+
+  include TestServerMethods 
+
+  def setup
+    server_setup
+  end
+end

data/tests/tc_curl_download.rb

@@ -7,7 +7,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
     server_setup
   end
   
-  def test_download_url_to_file
+  def test_download_url_to_file_via_string
     dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
 
@@ -18,6 +18,49 @@ class TestCurbCurlDownload < Test::Unit::TestCase
     File.unlink(dl_path) if File.exist?(dl_path)
   end
 
+  def test_download_url_to_file_via_file_io
+    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
+    dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
+    io = File.open(dl_path, 'wb')
+
+    curb = Curl::Easy.download(dl_url, io)
+    assert io.closed?
+    assert File.exist?(dl_path)
+    assert_equal File.read(File.join(File.dirname(__FILE__), '..','ext','curb_easy.c')), File.read(dl_path)
+  ensure
+    File.unlink(dl_path) if File.exist?(dl_path)
+  end
+
+  def test_download_url_to_file_via_io
+    dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
+    dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
+    reader, writer = IO.pipe
+
+    # Write to local file
+    fork do
+      begin
+        writer.close
+        File.open(dl_path, 'wb') { |file| file << reader.read }
+      ensure
+        reader.close rescue IOError # if the stream has already been closed
+      end
+    end
+
+    # Download remote source
+    begin
+      reader.close
+      curb = Curl::Easy.download(dl_url, writer)
+      Process.wait
+    ensure
+      writer.close rescue IOError # if the stream has already been closed, which occurs in Easy::download
+    end
+
+    assert File.exist?(dl_path)
+    assert_equal File.read(File.join(File.dirname(__FILE__), '..','ext','curb_easy.c')), File.read(dl_path)
+  ensure
+    File.unlink(dl_path) if File.exist?(dl_path)
+  end
+
   def test_download_bad_url_gives_404
     dl_url = "http://127.0.0.1:9129/this_file_does_not_exist.html"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")