curb 0.7.15 → 0.8.4

data/lib/curl.rb

@@ -1 +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_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/helper.rb

@@ -65,12 +65,20 @@ 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)
@@ -95,15 +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,res)
+    respond_with("PURGE#{req.query_string}",req,res)
   end
 
   def do_COPY(req,res)
-    respond_with(: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

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_easy.rb

@@ -4,6 +4,21 @@ class FooNoToS
 end
 
 class TestCurbCurlEasy < Test::Unit::TestCase
+  def test_threads
+    t = []
+    5.times do
+      t << Thread.new do
+        5.times do
+          c = Curl.get($TEST_URL)
+          assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
+          assert_equal "", c.header_str
+        end
+      end
+    end
+
+    t.each {|t| t.join }
+  end
+
   def test_class_perform_01   
     assert_instance_of Curl::Easy, c = Curl::Easy.perform($TEST_URL)
     assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
@@ -461,7 +476,8 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_ssl_verify_host
     c = Curl::Easy.new    
     assert c.ssl_verify_host?
-    assert !c.ssl_verify_host = false
+    c.ssl_verify_host = 0
+    c.ssl_verify_host = false
     assert !c.ssl_verify_host?
   end
   
@@ -507,6 +523,17 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert c.ignore_content_length?
   end
 
+  def test_resolve_mode
+    c = Curl::Easy.new
+    assert_equal :auto, c.resolve_mode
+    c.resolve_mode = :ipv4
+    assert_equal :ipv4, c.resolve_mode 
+    c.resolve_mode = :ipv6
+    assert_equal :ipv6, c.resolve_mode 
+
+    assert_raises(ArgumentError) { c.resolve_mode = :bad }
+  end
+
   def test_enable_cookies
     c = Curl::Easy.new
     assert !c.enable_cookies?
@@ -549,13 +576,34 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   end
 
   def test_on_success_with_on_failure
-    curl = Curl::Easy.new("#{$TEST_URL.gsub(/file:\/\//,'')}/not_here")
+    curl = Curl::Easy.new(TestServlet.url + '/error')
     on_failure_called = false
     curl.on_success {|c| } # make sure we get the failure call even though this handler is defined
     curl.on_failure {|c,code| on_failure_called = true }
     curl.perform
+    assert_equal 500, curl.response_code
     assert on_failure_called, "Failure handler not called" 
   end
+
+  def test_on_success_with_on_missing
+    curl = Curl::Easy.new(TestServlet.url + '/not_here')
+    on_missing_called = false
+    curl.on_success {|c| } # make sure we get the missing call even though this handler is defined
+    curl.on_missing {|c,code| on_missing_called = true }
+    curl.perform
+    assert_equal 404, curl.response_code
+    assert on_missing_called, "Missing handler not called" 
+  end
+
+  def test_on_success_with_on_redirect
+    curl = Curl::Easy.new(TestServlet.url + '/redirect')
+    on_redirect_called = false
+    curl.on_success {|c| } # make sure we get the redirect call even though this handler is defined
+    curl.on_redirect {|c,code| on_redirect_called = true }
+    curl.perform
+    assert_equal 302, curl.response_code
+    assert on_redirect_called, "Redirect handler not called" 
+  end
   
   def test_get_remote
     curl = Curl::Easy.new(TestServlet.url)
@@ -572,15 +620,35 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_post_remote_is_easy_handle
     # see: http://pastie.org/560852 and
     # http://groups.google.com/group/curb---ruby-libcurl-bindings/browse_thread/thread/216bb2d9b037f347?hl=en
-    [:post, :get,:head,:delete].each do |method|
-      count = 0
-      curl = Curl::Easy.send("http_#{method}", TestServlet.url) do|c|
-        count += 1
-        assert_equal Curl::Easy, c.class
+    [:post, :get, :head, :delete].each do |method|
+      retries = 0
+      begin
+        count = 0
+        curl = Curl::Easy.send("http_#{method}", TestServlet.url) do|c|
+          count += 1
+          assert_equal Curl::Easy, c.class
+        end
+        assert_equal 1, count, "For request method: #{method.to_s.upcase}"
+      rescue Curl::Err::HostResolutionError => e # travis-ci.org fails to resolve... try again?
+        retries+=1
+        retry if retries < 3
+        raise e
       end
-      assert_equal 1, count, "For request method: #{method.to_s.upcase}"
     end
   end
+
+  # see: https://github.com/rvanlieshout/curb/commit/8bcdefddc0162484681ebd1a92d52a642666a445
+  def test_post_multipart_array_remote
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.multipart_form_post = true
+    fields = [
+      Curl::PostField.file('foo', File.expand_path(File.join(File.dirname(__FILE__),'..','README'))),
+      Curl::PostField.file('bar', File.expand_path(File.join(File.dirname(__FILE__),'..','README')))
+    ]
+    curl.http_post(fields)
+    assert_match /HTTP POST file upload/, curl.body_str
+    assert_match /Content-Disposition: form-data/, curl.body_str
+  end
   
   def test_post_with_body_remote
     curl = Curl::Easy.new(TestServlet.url)
@@ -664,6 +732,17 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_match /message$/, curl.body_str
   end
 
+  # https://github.com/taf2/curb/issues/101
+  def test_put_data_null_bytes
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.put_data = "a\0b"
+ 
+    curl.perform
+    
+    assert_match /^PUT/, curl.body_str
+    assert_match "a\0b", curl.body_str
+  end
+
   def test_put_nil_data_no_crash
     curl = Curl::Easy.new(TestServlet.url)
     curl.put_data = nil
@@ -673,7 +752,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
 
   def test_put_remote_file
     curl = Curl::Easy.new(TestServlet.url)
-    File.open(__FILE__,'r') do|f|
+    File.open(__FILE__,'rb') do|f|
       assert curl.http_put(f)
     end
     assert_equal "PUT\n#{File.read(__FILE__)}", curl.body_str
@@ -700,7 +779,9 @@ class TestCurbCurlEasy < Test::Unit::TestCase
 
   def test_cert_with_password
     curl = Curl::Easy.new(TestServlet.url)
-    curl.cert= File.join(File.dirname(__FILE__),"cert.pem:password")
+    path = File.join(File.dirname(__FILE__),"cert.pem")
+    curl.certpassword = 'password'
+    curl.cert = path
     assert_match /cert.pem$/,curl.cert
   end
 
@@ -888,6 +969,54 @@ class TestCurbCurlEasy < Test::Unit::TestCase
 
   end
 
+  def test_get_set_multi_on_easy
+    easy = Curl::Easy.new
+    assert_nil easy.multi
+    multi = Curl::Multi.new
+    easy.multi = multi
+    assert_not_nil easy.multi
+    assert_equal multi, easy.multi
+  end
+
+  def test_raise_on_progress
+    c = Curl::Easy.new($TEST_URL)
+    c.on_progress {|w,x,y,z| raise "error" }
+    c.perform
+  rescue => e
+    assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
+    c.close
+  end
+
+  def test_raise_on_success
+    c = Curl::Easy.new($TEST_URL)
+    c.on_success {|x| raise "error" }
+    c.perform
+  rescue => e
+    assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
+    c.close
+  end
+
+  def test_raise_on_debug
+    c = Curl::Easy.new($TEST_URL)
+    c.on_debug { raise "error" }
+    c.perform
+    assert true, "raise in on debug has no effect"
+  end
+
+  def test_status_codes
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.perform
+    assert_equal '200 OK', curl.status
+  end
+
+  def test_close_in_on_callbacks
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.on_body {|d| curl.close; d.size }
+    assert_raises RuntimeError do
+      curl.perform
+    end
+  end
+
   include TestServerMethods 
 
   def setup

data/tests/tc_curl_easy_setopt.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class TestCurbCurlEasySetOpt < Test::Unit::TestCase
+  def setup
+    @easy = Curl::Easy.new
+  end
+
+  def test_opt_verbose
+    @easy.set :verbose, true
+    assert @easy.verbose?
+  end
+
+  def test_opt_header
+    @easy.set :header, true
+  end
+
+  def test_opt_noprogress
+    @easy.set :noprogress, true
+  end
+
+  def test_opt_nosignal
+    @easy.set :nosignal, true
+  end
+
+  def test_opt_url
+    url = "http://google.com/"
+    @easy.set :url, url
+    assert_equal url, @easy.url
+  end
+
+end

data/tests/tc_curl_multi.rb

@@ -385,7 +385,26 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     end
   end
 
-  def test_mutli_recieves_500
+  def test_multi_easy_http_with_max_connects
+        urls = [
+      { :url => TestServlet.url + '?q=1', :method => :get },
+      { :url => TestServlet.url + '?q=2', :method => :get },
+      { :url => TestServlet.url + '?q=3', :method => :get }
+    ]
+    Curl::Multi.http(urls, {:pipeline => true, :max_connects => 1}) 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
+    end
+  end
+
+  def test_multi_recieves_500
     m = Curl::Multi.new
     e = Curl::Easy.new("http://127.0.0.1:9129/methods")
     failure = false
@@ -410,7 +429,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     c = Curl::Easy.new("http://127.9.9.9:999110")
     m.remove(c)
   rescue => e
-    assert_equal 'Invalid easy handle', e.message
+    assert_equal 'CURLError: Invalid easy handle', e.message
     assert_equal 0, m.requests.size
   end