curb 0.9.6 → 0.9.11

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|
@@ -125,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))
@@ -135,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
@@ -148,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
@@ -192,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|
@@ -484,5 +548,4 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   def setup
     server_setup
   end
-
 end

data/tests/tc_curl_postfield.rb

@@ -2,63 +2,63 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class TestCurbCurlPostfield < Test::Unit::TestCase
   def test_private_new
-    assert_raise(NoMethodError) { Curl::PostField.new }  
+    assert_raise(NoMethodError) { Curl::PostField.new }
   end
-  
+
   def test_new_content_01
     pf = Curl::PostField.content('foo', 'bar')
-    
+
     assert_equal 'foo', pf.name
     assert_equal 'bar', pf.content
     assert_nil pf.content_type
     assert_nil pf.local_file
-    assert_nil pf.remote_file    
+    assert_nil pf.remote_file
     assert_nil pf.set_content_proc
   end
-    
+
   def test_new_content_02
     pf = Curl::PostField.content('foo', 'bar', 'text/html')
-    
+
     assert_equal 'foo', pf.name
     assert_equal 'bar', pf.content
     assert_equal 'text/html', pf.content_type
     assert_nil pf.local_file
     assert_nil pf.remote_file
-    assert_nil pf.set_content_proc    
-  end    
-  
+    assert_nil pf.set_content_proc
+  end
+
   def test_new_content_03
     l = lambda { |field| "never gets run" }
     pf = Curl::PostField.content('foo', &l)
-    
+
     assert_equal 'foo', pf.name
     assert_nil pf.content
     assert_nil pf.content_type
     assert_nil pf.local_file
     assert_nil pf.remote_file
-    
+
     # N.B. This doesn't just get the proc, but also removes it.
     assert_equal l, pf.set_content_proc
-  end    
+  end
 
   def test_new_content_04
     l = lambda { |field| "never gets run" }
     pf = Curl::PostField.content('foo', 'text/html', &l)
-    
+
     assert_equal 'foo', pf.name
     assert_nil pf.content
     assert_equal 'text/html', pf.content_type
     assert_nil pf.local_file
     assert_nil pf.remote_file
-    
+
     # N.B. This doesn't just get the proc, but also removes it.
     assert_equal l, pf.set_content_proc
-  end    
+  end
 
 
   def test_new_file_01
     pf = Curl::PostField.file('foo', 'localname')
-    
+
     assert_equal 'foo', pf.name
     assert_equal 'localname', pf.local_file
     assert_equal 'localname', pf.remote_file
@@ -67,44 +67,44 @@ class TestCurbCurlPostfield < Test::Unit::TestCase
     assert_nil pf.content
     assert_nil pf.set_content_proc
   end
-    
+
   def test_new_file_02
     pf = Curl::PostField.file('foo', 'localname', 'remotename')
-    
+
     assert_equal 'foo', pf.name
     assert_equal 'localname', pf.local_file
     assert_equal 'remotename', pf.remote_file
     assert_nil pf.content_type
     assert_nil pf.content
     assert_nil pf.set_content_proc
-  end    
-  
+  end
+
   def test_new_file_03
     l = lambda { |field| "never gets run" }
     pf = Curl::PostField.file('foo', 'remotename', &l)
-    
+
     assert_equal 'foo', pf.name
     assert_equal 'remotename', pf.remote_file
     assert_nil pf.local_file
     assert_nil pf.content_type
     assert_nil pf.content
-    
+
     # N.B. This doesn't just get the proc, but also removes it.
     assert_equal l, pf.set_content_proc
-  end    
+  end
 
   def test_new_file_04
     assert_raise(ArgumentError) do
       # no local name, no block
       Curl::PostField.file('foo')
     end
-    
+
     assert_raise(ArgumentError) do
       # no remote name with block
       Curl::PostField.file('foo') { |field| "never runs" }
     end
   end
-  
+
   def test_new_file_05
     # local gets ignored when supplying a block, but remote
     # is still set up properly.
@@ -118,15 +118,15 @@ class TestCurbCurlPostfield < Test::Unit::TestCase
     assert_nil pf.content
 
     assert_equal l, pf.set_content_proc
-  end    
-  
+  end
+
   def test_to_s_01
-    pf = Curl::PostField.content('foo', 'bar')    
+    pf = Curl::PostField.content('foo', 'bar')
     assert_equal "foo=bar", pf.to_s
   end
 
   def test_to_s_02
-    pf = Curl::PostField.content('foo', 'bar ton')    
+    pf = Curl::PostField.content('foo', 'bar ton')
     assert_equal "foo=bar%20ton", pf.to_s
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.11
 platform: ruby
 authors:
 - Ross Bamford
 - Todd A. Fisher
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-28 00:00:00.000000000 Z
+date: 2020-11-02 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
@@ -26,6 +26,7 @@ files:
 - README.markdown
 - Rakefile
 - doc.rb
+- ext/banned.h
 - ext/curb.c
 - ext/curb.h
 - ext/curb_easy.c
@@ -51,6 +52,7 @@ files:
 - tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_issue102.rb
+- tests/bug_issue277.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
@@ -65,16 +67,17 @@ files:
 - tests/tc_curl_easy.rb
 - tests/tc_curl_easy_resolve.rb
 - tests/tc_curl_easy_setopt.rb
+- tests/tc_curl_maxfilesize.rb
 - tests/tc_curl_multi.rb
 - tests/tc_curl_postfield.rb
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb
-homepage: http://curb.rubyforge.org/
+homepage: https://github.com/taf2/curb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.markdown
@@ -92,9 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: curb
-rubygems_version: 2.4.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Ruby libcurl bindings
 test_files:
@@ -105,6 +107,7 @@ test_files:
 - tests/bug_postfields_crash.rb
 - tests/bug_crash_on_progress.rb
 - tests/helper.rb
+- tests/bug_issue277.rb
 - tests/bug_postfields_crash2.rb
 - tests/bug_require_last_or_segfault.rb
 - tests/timeout.rb
@@ -120,6 +123,7 @@ test_files:
 - tests/tc_curl_easy.rb
 - tests/mem_check.rb
 - tests/tc_curl_postfield.rb
+- tests/tc_curl_maxfilesize.rb
 - tests/bugtests.rb
 - tests/tc_curl_easy_resolve.rb
 - tests/signals.rb