curb 0.8.4 → 0.9.11

data/tests/tc_curl_easy.rb

@@ -4,6 +4,82 @@ class FooNoToS
 end
 
 class TestCurbCurlEasy < Test::Unit::TestCase
+  def test_global_reset
+    Curl.get($TEST_URL)
+    # in a Timeout block you should reset the thread current handle 
+    Curl.reset
+  end
+
+  def test_curlopt_stderr_with_file
+    # does not work with Tempfile directly
+    path = Tempfile.new('curb_test_curlopt_stderr').path
+    File.open(path, 'w') do |file|
+      easy = Curl::Easy.new(TestServlet.url)
+      easy.verbose = true
+      easy.setopt(Curl::CURLOPT_STDERR, file)
+      easy.perform
+    end
+    output = File.read(path)
+
+    assert_match('HTTP/1.1 200 OK ', output)
+    assert_match('Host: 127.0.0.1:9129', output)
+  end
+
+  def test_curlopt_stderr_with_io
+    path = Tempfile.new('curb_test_curlopt_stderr').path
+    fd = IO.sysopen(path, 'w')
+    io = IO.for_fd(fd)
+
+    easy = Curl::Easy.new(TestServlet.url)
+    easy.verbose = true
+    easy.setopt(Curl::CURLOPT_STDERR, io)
+    easy.perform
+
+
+    output = File.read(path)
+
+    assert_match(output, 'HTTP/1.1 200 OK')
+    assert_match(output, 'Host: 127.0.0.1:9129')
+  end
+
+  def test_curlopt_stderr_fails_with_tempdir
+    Tempfile.open('curb_test_curlopt_stderr') do |tempfile|
+      easy = Curl::Easy.new(TestServlet.url)
+
+      assert_raise(TypeError) do
+        easy.setopt(Curl::CURLOPT_STDERR, tempfile)
+      end
+    end
+  end
+
+  def test_curlopt_stderr_fails_with_stringio
+    stringio = StringIO.new
+    easy = Curl::Easy.new(TestServlet.url)
+
+    assert_raise(TypeError) do
+      easy.setopt(Curl::CURLOPT_STDERR, stringio)
+    end
+  end
+
+  def test_curlopt_stderr_fails_with_string
+    string = String.new
+    easy = Curl::Easy.new(TestServlet.url)
+
+    assert_raise(TypeError) do
+      easy.setopt(Curl::CURLOPT_STDERR, string)
+    end
+  end
+
+  def test_exception
+    begin
+      Curl.get('NOT_FOUND_URL')
+    rescue
+      assert true
+    rescue Exception
+      assert false, "We should raise StandardError"
+    end
+  end
+
   def test_threads
     t = []
     5.times do
@@ -11,18 +87,18 @@ class TestCurbCurlEasy < Test::Unit::TestCase
         5.times do
           c = Curl.get($TEST_URL)
           assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
-          assert_equal "", c.header_str
+          assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body)
         end
       end
     end
 
-    t.each {|t| t.join }
+    t.each {|x| x.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)
-    assert_equal "", c.header_str
+    assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body)
   end    
 
   def test_class_perform_02
@@ -30,12 +106,11 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_instance_of Curl::Easy, c = Curl::Easy.perform($TEST_URL) { |curl| curl.on_body { |d| data << d; d.length } }    
 
     assert_nil c.body_str
-    assert_equal "", c.header_str
     assert_match(/^# DO NOT REMOVE THIS COMMENT/, data)
   end    
 
   def test_class_perform_03
-    assert_raise(Curl::Err::CouldntReadError) { c = Curl::Easy.perform($TEST_URL + "nonexistent") }
+    assert_raise(Curl::Err::CouldntReadError) { Curl::Easy.perform($TEST_URL + "nonexistent") }
   end    
   
   def test_new_01
@@ -125,7 +200,6 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     c = Curl::Easy.new($TEST_URL)    
     assert_equal true, c.http_get
     assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
-    assert_equal "", c.header_str
   end    
 
   def test_get_02
@@ -137,7 +211,6 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal true, c.http_get    
     
     assert_nil c.body_str
-    assert_equal "", c.header_str
     assert_match(/^# DO NOT REMOVE THIS COMMENT/, data)
   end    
 
@@ -320,19 +393,71 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     c.max_redirects = nil
     assert_nil c.max_redirects
   end
-  
+
+  def test_timeout_with_floats
+    c = Curl::Easy.new($TEST_URL)
+
+    c.timeout = 1.5
+    assert_equal 1500, c.timeout_ms
+    assert_equal 1.5, c.timeout
+  end
+
+  def test_timeout_with_negative
+    c = Curl::Easy.new($TEST_URL)
+
+    c.timeout = -1.5
+    assert_equal 0, c.timeout
+    assert_equal 0, c.timeout_ms
+
+    c.timeout = -4.8
+    assert_equal 0, c.timeout
+    assert_equal 0, c.timeout_ms
+  end
+
   def test_timeout_01
     c = Curl::Easy.new($TEST_URL)
-    
-    assert_nil c.timeout
-    
+
+    assert_equal 0, c.timeout
+
     c.timeout = 3
     assert_equal 3, c.timeout
-    
-    c.timeout = nil
-    assert_nil c.timeout
+
+    c.timeout = 0
+    assert_equal 0, c.timeout
   end
-  
+
+  def test_timeout_ms_01
+    c = Curl::Easy.new($TEST_URL)
+
+    assert_equal 0, c.timeout_ms
+
+    c.timeout_ms = 100
+    assert_equal 100, c.timeout_ms
+
+    c.timeout_ms = nil
+    assert_equal 0, c.timeout_ms
+  end
+
+  def test_timeout_ms_with_floats
+    c = Curl::Easy.new($TEST_URL)
+
+    c.timeout_ms = 55.5
+    assert_equal 55, c.timeout_ms
+    assert_equal 0.055, c.timeout
+  end
+
+  def test_timeout_ms_with_negative
+    c = Curl::Easy.new($TEST_URL)
+
+    c.timeout_ms = -1.5
+    assert_equal 0, c.timeout
+    assert_equal 0, c.timeout_ms
+
+    c.timeout_ms = -4.8
+    assert_equal 0, c.timeout
+    assert_equal 0, c.timeout_ms
+  end
+
   def test_connect_timeout_01
     c = Curl::Easy.new($TEST_URL)
     
@@ -344,7 +469,19 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     c.connect_timeout = nil
     assert_nil c.connect_timeout
   end
-  
+
+  def test_connect_timeout_ms_01
+    c = Curl::Easy.new($TEST_URL)
+
+    assert_nil c.connect_timeout_ms
+
+    c.connect_timeout_ms = 100
+    assert_equal 100, c.connect_timeout_ms
+
+    c.connect_timeout_ms = nil
+    assert_nil c.connect_timeout_ms
+  end
+
   def test_ftp_response_timeout_01
     c = Curl::Easy.new($TEST_URL)
     
@@ -562,6 +699,15 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal "some.file", c.cookiejar        
   end
 
+  def test_cookielist
+    c = Curl::Easy.new TestServlet.url
+    c.enable_cookies = true
+    c.post_body = URI.encode_www_form('c' => 'somename=somevalue')
+    assert_nil c.cookielist
+    c.perform
+    assert_match(/somevalue/, c.cookielist.join(''))
+  end
+
   def test_on_success
     curl = Curl::Easy.new($TEST_URL)    
     on_success_called = false
@@ -624,7 +770,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
       retries = 0
       begin
         count = 0
-        curl = Curl::Easy.send("http_#{method}", TestServlet.url) do|c|
+        Curl::Easy.send("http_#{method}", TestServlet.url) do|c|
           count += 1
           assert_equal Curl::Easy, c.class
         end
@@ -642,12 +788,12 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     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::PostField.file('foo', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown'))),
+      Curl::PostField.file('bar', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown')))
     ]
     curl.http_post(fields)
-    assert_match /HTTP POST file upload/, curl.body_str
-    assert_match /Content-Disposition: form-data/, curl.body_str
+    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
@@ -671,10 +817,10 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_post_multipart_file_remote
     curl = Curl::Easy.new(TestServlet.url)
     curl.multipart_form_post = true
-    pf = Curl::PostField.file('readme', File.expand_path(File.join(File.dirname(__FILE__),'..','README')))
+    pf = Curl::PostField.file('readme', File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown')))
     curl.http_post(pf)
-    assert_match /HTTP POST file upload/, curl.body_str
-    assert_match /Content-Disposition: form-data/, curl.body_str
+    assert_match(/HTTP POST file upload/, curl.body_str)
+    assert_match(/Content-Disposition: form-data/, curl.body_str)
   end
 
   def test_delete_remote
@@ -696,7 +842,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     redirect = curl.header_str.match(/Location: (.*)/)
 
     assert_equal '', curl.body_str
-    assert_match '/nonexistent', redirect[1]
+    assert_match('/nonexistent', redirect[1])
   end
 
   def test_head_accessor
@@ -707,7 +853,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     redirect = curl.header_str.match(/Location: (.*)/)
 
     assert_equal '', curl.body_str
-    assert_match '/nonexistent', redirect[1]
+    assert_match('/nonexistent', redirect[1])
     curl.head = false
     curl.perform
     assert_equal 'GET', curl.body_str
@@ -717,9 +863,11 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     curl = Curl::Easy.new(TestServlet.url)
     curl.headers['Content-Type'] = 'application/json'
     assert curl.http_put("message")
-    assert_match /^PUT/, curl.body_str
-    assert_match /message$/, curl.body_str
-    assert_match /application\/json/, curl.header_str
+    assert_match(/^PUT/, curl.body_str)
+    assert_match(/message$/, curl.body_str)
+    assert_match(/message$/, curl.body)
+    assert_match(/application\/json/, curl.header_str)
+    assert_match(/application\/json/, curl.head)
   end 
   
   def test_put_data
@@ -728,8 +876,8 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     
     curl.perform
     
-    assert_match /^PUT/, curl.body_str
-    assert_match /message$/, curl.body_str
+    assert_match(/^PUT/, curl.body_str)
+    assert_match(/message$/, curl.body_str)
   end
 
   # https://github.com/taf2/curb/issues/101
@@ -739,8 +887,8 @@ class TestCurbCurlEasy < Test::Unit::TestCase
  
     curl.perform
     
-    assert_match /^PUT/, curl.body_str
-    assert_match "a\0b", curl.body_str
+    assert_match(/^PUT/, curl.body_str)
+    assert_match("a\0b", curl.body_str)
   end
 
   def test_put_nil_data_no_crash
@@ -755,7 +903,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     File.open(__FILE__,'rb') do|f|
       assert curl.http_put(f)
     end
-    assert_equal "PUT\n#{File.read(__FILE__)}", curl.body_str
+    assert_equal "PUT\n#{File.read(__FILE__)}", curl.body_str.tr("\r", '')
   end
   
   def test_put_class_method
@@ -765,7 +913,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
       assert_equal Curl::Easy, c.class
     end
     assert_equal 1, count
-    assert_equal "PUT\n#{File.read(__FILE__)}", curl.body_str
+    assert_equal "PUT\n#{File.read(__FILE__)}", curl.body_str.tr("\r", '')
   end
 
   # Generate a self-signed cert with
@@ -774,7 +922,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_cert
     curl = Curl::Easy.new(TestServlet.url)
     curl.cert= File.join(File.dirname(__FILE__),"cert.pem")
-    assert_match /cert.pem$/,curl.cert
+    assert_match(/cert.pem$/,curl.cert)
   end
 
   def test_cert_with_password
@@ -782,7 +930,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     path = File.join(File.dirname(__FILE__),"cert.pem")
     curl.certpassword = 'password'
     curl.cert = path
-    assert_match /cert.pem$/,curl.cert
+    assert_match(/cert.pem$/,curl.cert)
   end
 
   def test_cert_type
@@ -803,7 +951,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_ca_cert
     curl = Curl::Easy.new(TestServlet.url)
     curl.cacert= File.join(File.dirname(__FILE__),"cacert.pem")
-    assert_match /cacert.pem$/, curl.cacert
+    assert_match(/cacert.pem$/, curl.cacert)
   end
 
   def test_user_agent
@@ -850,7 +998,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   end
 
   def test_post_streaming
-    readme = File.expand_path(File.join(File.dirname(__FILE__),'..','README'))
+    readme = File.expand_path(File.join(File.dirname(__FILE__),'..','README.markdown'))
     
     pf = Curl::PostField.file("filename", readme)
 
@@ -861,7 +1009,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     easy.http_post(pf)
 
     assert_not_equal(0,easy.body_str.size)
-    assert_equal(easy.body_str,File.read(readme))
+    assert_equal(easy.body_str.tr("\r", ''), File.read(readme))
   end
 
 
@@ -957,8 +1105,8 @@ class TestCurbCurlEasy < Test::Unit::TestCase
       curl.headers['Accept']         = '*/*'
       curl.headers['Authorization']  = 'Foo Bar Biz Baz'
       curl.http_put(rd)
-      assert_match /^PUT/, curl.body_str
-      assert_match /hello$/, curl.body_str
+      assert_match(/^PUT/, curl.body_str)
+      assert_match(/hello$/, curl.body_str)
       curl.header_str
       curl.body_str
     end
@@ -1017,6 +1165,13 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     end
   end
 
+  def test_set_unsupported_options
+    curl = Curl::Easy.new
+    assert_raises TypeError do
+      curl.set(99999, 1)
+    end
+  end
+
   include TestServerMethods 
 
   def setup

data/tests/tc_curl_easy_resolve.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class TestCurbCurlEasyResolve < Test::Unit::TestCase
+  def setup
+    @easy = Curl::Easy.new
+  end
+
+  def test_resolve
+    @easy.resolve = [ "example.com:80:127.0.0.1" ]
+    assert_equal @easy.resolve, [ "example.com:80:127.0.0.1" ]
+  end
+
+  def test_empty_resolve
+    assert_equal @easy.resolve, nil
+  end
+end

data/tests/tc_curl_maxfilesize.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class TestCurbCurlMaxFileSize < Test::Unit::TestCase
+  def setup
+    @easy = Curl::Easy.new
+  end
+
+  def test_maxfilesize
+    @easy.set(Curl::CURLOPT_MAXFILESIZE, 5000000)
+  end
+
+end

data/tests/tc_curl_multi.rb

@@ -6,6 +6,70 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     ObjectSpace.garbage_collect
   end
 
+  # for https://github.com/taf2/curb/issues/277
+  # must connect to an external
+  def test_connection_keepalive
+    # 0123456 default & reserved RubyVM. It will probably include 7 from Dir.glob
+    lsof=`/usr/bin/which lsof`.strip
+    open_fds = lambda do 
+      `#{lsof} -p #{Process.pid} | egrep "TCP|UDP" | wc -l`.strip.to_i
+    end
+    before_open = open_fds.call
+    assert !Curl::Multi.autoclose
+    multi = Curl::Multi.new
+    multi.max_connects = 1 # limit to 1 connection within the multi handle
+
+    did_complete = false
+    5.times do |n|
+      # NOTE: we use google here because connecting to our TEST_URL as a local host address appears to not register correctly with lsof as a socket... if anyone knows a better way would be great to not have an external dependency here in the test
+      easy = Curl::Easy.new("http://google.com/") do |curl|
+        curl.timeout = 5 # ensure we don't hang for ever connecting to an external host
+        curl.on_complete {
+          did_complete = true
+        }
+      end
+      multi.add(easy)
+    end
+
+    multi.perform
+    assert did_complete
+    after_open = open_fds.call
+    assert_equal (after_open - before_open), 1, "with max connections set to 1 at this point the connection to google should still be open"
+    multi.close
+
+    after_open = open_fds.call
+    assert_equal (after_open - before_open), 0, "after closing the multi handle all connections should be closed"
+
+    Curl::Multi.autoclose = true
+    multi = Curl::Multi.new
+    did_complete = false
+    5.times do |n|
+      # NOTE: we use google here because connecting to our TEST_URL as a local host address appears to not register correctly with lsof as a socket... if anyone knows a better way would be great to not have an external dependency here in the test
+      easy = Curl::Easy.new("http://google.com/") do |curl|
+        curl.timeout = 5 # ensure we don't hang for ever connecting to an external host
+        curl.on_complete {
+          did_complete = true
+        }
+      end
+      multi.add(easy)
+    end
+
+    multi.perform
+    assert did_complete
+    after_open = open_fds.call
+    assert_equal (after_open - before_open), 0, "auto close the connections"
+  ensure
+    Curl::Multi.autoclose = false # restore default
+  end
+
+  def test_connection_autoclose
+    assert !Curl::Multi.autoclose
+    Curl::Multi.autoclose = true
+    assert Curl::Multi.autoclose
+  ensure
+    Curl::Multi.autoclose = false # restore default
+  end
+
   def test_new_multi_01
     d1 = ""
     c1 = Curl::Easy.new($TEST_URL) do |curl|
@@ -109,8 +173,12 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
     assert(m.idle?, 'A new Curl::Multi handle should be idle')
 
+    assert_nil e.multi
+
     m.add(e)
 
+    assert_not_nil e.multi
+
     assert((not m.idle?), 'A Curl::Multi handle with a request should not be idle')
 
     m.perform
@@ -121,7 +189,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   def test_requests
     m = Curl::Multi.new
 
-    assert_equal([], m.requests, 'A new Curl::Multi handle should have no requests')
+    assert_equal(0, m.requests.length, 'A new Curl::Multi handle should have no requests')
 
     10.times do
       m.add(Curl::Easy.new($TEST_URL))
@@ -131,7 +199,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
     m.perform
 
-    assert_equal([], m.requests, 'A new Curl::Multi handle should have no requests after a perform')
+    assert_equal(0, m.requests.length, 'A new Curl::Multi handle should have no requests after a perform')
   end
 
   def test_cancel
@@ -144,7 +212,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
     m.cancel!
 
-    assert_equal([], m.requests, 'A new Curl::Multi handle should have no requests after being canceled')
+    assert_equal(0, m.requests.size, 'A new Curl::Multi handle should have no requests after being canceled')
   end
 
   def test_with_success
@@ -188,7 +256,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     c1.on_success do|c|
       success_called1 = true
       #puts "success 1 called: #{c.body_str.inspect}"
-      #assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
+      assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
     end
 
     c1.on_failure do|c,rc|
@@ -327,7 +395,6 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     Curl::Multi.download(urls,{},{},downloads) do|curl,download_path|
       assert_equal 200, curl.response_code
       assert File.exist?(download_path)
-      store = file_info[File.basename(download_path)]
       assert_equal file_info[File.basename(download_path)][:size], File.size(download_path), "incomplete download: #{download_path}"
     end
   ensure
@@ -342,7 +409,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     ]
     Curl::Multi.post(urls, {:follow_location => true, :multipart_form_post => true}, {:pipeline => true}) do|easy|
       str = easy.body_str
-      assert_match /POST/, 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 }
@@ -357,8 +424,8 @@ class TestCurbCurlMulti < Test::Unit::TestCase
            { :url => TestServlet.url, :method => :put, :put_data => "message",
              :headers => {'Content-Type' => 'application/json' } }]
     Curl::Multi.put(urls, {}, {:pipeline => true}) do|easy|
-      assert_match /PUT/, easy.body_str
-      assert_match /message/, easy.body_str
+      assert_match(/PUT/, easy.body_str)
+      assert_match(/message/, easy.body_str)
     end
   end
 
@@ -375,11 +442,11 @@ class TestCurbCurlMulti < Test::Unit::TestCase
       assert_equal nil, code
       case method
       when :post
-        assert_match /POST/, easy.body_str
+        assert_match(/POST/, easy.body_str)
       when :get
-        assert_match /GET/, easy.body_str
+        assert_match(/GET/, easy.body_str)
       when :put
-        assert_match /PUT/, easy.body_str
+        assert_match(/PUT/, easy.body_str)
       end
       #puts "#{easy.body_str.inspect}, #{method.inspect}, #{code.inspect}"
     end
@@ -395,11 +462,11 @@ class TestCurbCurlMulti < Test::Unit::TestCase
       assert_equal nil, code
       case method
       when :post
-        assert_match /POST/, easy.body_str
+        assert_match(/POST/, easy.body_str)
       when :get
-        assert_match /GET/, easy.body_str
+        assert_match(/GET/, easy.body_str)
       when :put
-        assert_match /PUT/, easy.body_str
+        assert_match(/PUT/, easy.body_str)
       end
     end
   end
@@ -466,7 +533,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     m.add(c)
     m.add(c)
   rescue => e
-    assert_equal Curl::Err::MultiBadEasyHandle, e.class
+    assert Curl::Err::MultiBadEasyHandle == e.class || Curl::Err::MultiAddedAlready == e.class
   end
 
   def test_multi_default_timeout
@@ -481,5 +548,4 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   def setup
     server_setup
   end
-
 end