curb 0.7.15 → 1.0.0

data/tests/tc_curl_easy.rb

@@ -4,10 +4,101 @@ 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
+      t << Thread.new do
+        5.times do
+          c = Curl.get($TEST_URL)
+          assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body_str)
+          assert_match(/^# DO NOT REMOVE THIS COMMENT/, c.body)
+        end
+      end
+    end
+
+    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
@@ -15,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
@@ -110,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
@@ -122,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    
 
@@ -305,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)
     
@@ -329,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)
     
@@ -461,7 +613,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 +660,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?
@@ -535,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
@@ -549,13 +722,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 +766,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::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.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)
+  end
   
   def test_post_with_body_remote
     curl = Curl::Easy.new(TestServlet.url)
@@ -603,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
@@ -628,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
@@ -639,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
@@ -649,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
@@ -660,8 +876,19 @@ 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
+  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
@@ -673,10 +900,10 @@ 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
+    assert_equal "PUT\n#{File.read(__FILE__)}", curl.body_str.tr("\r", '')
   end
   
   def test_put_class_method
@@ -686,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
@@ -695,13 +922,15 @@ 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
     curl = Curl::Easy.new(TestServlet.url)
-    curl.cert= File.join(File.dirname(__FILE__),"cert.pem:password")
-    assert_match /cert.pem$/,curl.cert
+    path = File.join(File.dirname(__FILE__),"cert.pem")
+    curl.certpassword = 'password'
+    curl.cert = path
+    assert_match(/cert.pem$/,curl.cert)
   end
 
   def test_cert_type
@@ -722,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
@@ -769,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)
 
@@ -780,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
 
 
@@ -876,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
@@ -888,6 +1117,61 @@ 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
+
+  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_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_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