curb 0.7.15 → 0.7.16

data/tests/bug_crash_on_debug.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://localhost:9999/test')
+    c.on_progress do|x|
+      raise "error"
+    end
+    c.easy.on_debug { |type, data| puts "debug: #{type.inspect}, #{data.inspect}" }
+    c.perform
+
+  rescue => e
+    assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
+    c.close
+  ensure
+    puts "shutdown server"
+    server.shutdown
+  end
+end

data/tests/tc_curl_easy.rb

@@ -461,7 +461,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 +508,17 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert c.ignore_content_length?
   end
 
+  def test_resolve_mode
+    c = Curl::Easy.new
+    assert c.resolve_mode == :auto
+    c.resolve_mode = :ipv4
+    assert c.resolve_mode == :ipv4
+    c.resolve_mode = :ipv6
+    assert c.resolve_mode == :ipv6
+
+    assert_raises(ArgumentError) { c.resolve_mode = :bad }
+  end
+
   def test_enable_cookies
     c = Curl::Easy.new
     assert !c.enable_cookies?
@@ -572,13 +584,20 @@ 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
   
@@ -700,7 +719,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 +909,33 @@ 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_handle_exceptions_in_progress_callbacks
+    c = Curl::Easy.new($TEST_URL)
+    c.on_progress {|x| raise "error" }
+    c.perform
+  rescue => e
+    assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
+    c.close
+  end
+
+  def test_handle_exceptions_in_debug_callbacks
+    c = Curl::Easy.new($TEST_URL)
+    c.on_debug {|x| raise "error" }
+    c.perform
+  rescue => e
+    assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
+    c.close
+  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

metadata

@@ -1,41 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: curb
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.7.16
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 15
-  version: 0.7.15
 platform: ruby
-authors: 
+authors:
 - Ross Bamford
 - Todd A. Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-20 00:00:00 -04:00
-default_executable: 
+date: 2011-11-03 00:00:00.000000000 Z
 dependencies: []
-
-description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings for the libcurl(3), a fully-featured client-side URL transfer library. cURL and libcurl live at http://curl.haxx.se/
+description: Curb (probably CUrl-RuBy or something) provides Ruby-language bindings
+  for the libcurl(3), a fully-featured client-side URL transfer library. cURL and
+  libcurl live at http://curl.haxx.se/
 email: todd.fisher@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
-files: 
+files:
 - LICENSE
 - README
 - Rakefile
 - doc.rb
 - ext/extconf.rb
 - lib/curb.rb
+- lib/curl/easy.rb
+- lib/curl/multi.rb
 - lib/curl.rb
 - ext/curb.c
 - ext/curb_easy.c
@@ -51,6 +46,7 @@ files:
 - ext/curb_postfield.h
 - ext/curb_upload.h
 - tests/alltests.rb
+- tests/bug_crash_on_debug.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/bug_instance_post_differs_from_class_post.rb
@@ -64,49 +60,42 @@ files:
 - tests/require_last_or_segfault_script.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
+- tests/tc_curl_easy_setopt.rb
 - tests/tc_curl_multi.rb
 - tests/tc_curl_postfield.rb
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb
-has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: curb
-rubygems_version: 1.4.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby libcurl bindings
-test_files: 
+test_files:
 - tests/alltests.rb
+- tests/bug_crash_on_debug.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/bug_instance_post_differs_from_class_post.rb
@@ -120,6 +109,7 @@ test_files:
 - tests/require_last_or_segfault_script.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
+- tests/tc_curl_easy_setopt.rb
 - tests/tc_curl_multi.rb
 - tests/tc_curl_postfield.rb
 - tests/timeout.rb