curb 1.1.0 → 1.2.0

data/tests/tc_fiber_scheduler.rb

@@ -0,0 +1,190 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+begin
+  require 'async'
+rescue LoadError
+  HAS_ASYNC = false
+else
+  HAS_ASYNC = true
+end
+
+# This test verifies that Curl::Easy#perform cooperates with Ruby's Fiber scheduler
+# by running multiple requests concurrently in a single thread using the Async gem.
+class TestCurbFiberScheduler < Test::Unit::TestCase
+  include BugTestServerSetupTeardown
+
+  ITERS = 4
+  MIN_S = 0.25
+  # Each request sleeps 0.25s; two concurrent requests should be ~0.25–0.5s.
+  # Allow some jitter in CI environments.
+  THRESHOLD = ((MIN_S*(ITERS/2.0)) + (MIN_S/2.0)) # add more jitter for slower CI environments
+  SERIAL_TIME_WOULD_BE_ABOUT = MIN_S * ITERS
+
+  def setup
+    @port = 9993
+
+    @response_proc = lambda do |res|
+      res['Content-Type'] = 'text/plain'
+      sleep MIN_S
+      res.body = '200'
+    end
+    super
+  end
+
+  def test_multi_is_scheduler_friendly
+    if skip_no_async
+      return
+    end
+
+    url = "http://127.0.0.1:#{@port}/test"
+
+    started = Time.now
+    results = []
+
+
+    async_run do
+      m = Curl::Multi.new
+      ITERS.times.each do
+        c = Curl::Easy.new(url)
+        c.on_complete { results << c.code }
+        m.add(c)
+      end
+      m.perform
+    end
+
+    duration = Time.now - started
+
+    assert duration < THRESHOLD, "Requests did not run concurrently under fiber scheduler (#{duration}s) which exceeds the expected threshold of: #{THRESHOLD} serial time would be about: #{SERIAL_TIME_WOULD_BE_ABOUT}"
+    assert_equal ITERS, results.size
+    assert_equal ITERS.times.map {200}, results
+  end
+
+  def test_easy_perform_is_scheduler_friendly
+    if skip_no_async
+      return
+    end
+
+    url = "http://127.0.0.1:#{@port}/test"
+
+    started = Time.now
+    results = []
+
+    async_run do |top|
+      tasks = ITERS.times.map do
+        top.async do
+          #t = Time.now.to_i
+          #puts "starting fiber [#{results.size}] -> #{t}"
+          c = Curl.get(url)
+          #puts "received result: #{results.size} -> #{Time.now.to_f - t.to_f}"
+          results << c.code
+
+        end
+      end
+      tasks.each(&:wait)
+    end
+
+    duration = Time.now - started
+
+    assert duration < THRESHOLD, "Requests did not run concurrently under fiber scheduler (#{duration}s) which exceeds the expected threshold of: #{THRESHOLD} serial time would be about: #{SERIAL_TIME_WOULD_BE_ABOUT}"
+    assert_equal ITERS, results.size
+    assert_equal ITERS.times.map {200}, results
+  end
+
+  def test_multi_perform_yields_block_under_scheduler
+    if skip_no_async
+      return
+    end
+
+    url = "http://127.0.0.1:#{@port}/test"
+    yielded = 0
+    results = []
+
+    async_run do
+      m = Curl::Multi.new
+      ITERS.times do
+        c = Curl::Easy.new(url)
+        c.on_complete { results << c.code }
+        m.add(c)
+      end
+      m.perform do
+        yielded += 1
+      end
+    end
+
+    assert_operator yielded, :>=, 1, 'perform did not yield block while waiting under scheduler'
+    assert_equal ITERS, results.size
+    assert_equal ITERS.times.map {200}, results
+  end
+
+  def test_multi_single_request_scheduler_path
+    if skip_no_async
+      return
+    end
+
+    url = "http://127.0.0.1:#{@port}/test"
+    result = nil
+
+    async_run do
+      m = Curl::Multi.new
+      c = Curl::Easy.new(url)
+      c.on_complete { result = c.code }
+      m.add(c)
+      m.perform
+    end
+
+    assert_equal 200, result
+  end
+
+  def test_multi_reuse_after_scheduler_perform
+    unless HAS_ASYNC
+      warn 'Skipping fiber scheduler test (Async gem not available)'
+      return
+    end
+
+    url = "http://127.0.0.1:#{@port}/test"
+    results = []
+
+    async_run do
+      m = Curl::Multi.new
+      # First round
+      c1 = Curl::Easy.new(url)
+      c1.on_complete { results << c1.code }
+      m.add(c1)
+      m.perform
+
+      # Second round on same multi
+      c2 = Curl::Easy.new(url)
+      c2.on_complete { results << c2.code }
+      m.add(c2)
+      m.perform
+    end
+
+    assert_equal [200, 200], results
+  end
+
+  private
+  def skip_no_async
+    if WINDOWS
+      warn 'Skipping fiber scheduler tests on Windows'
+      return true
+    end
+    unless HAS_ASYNC
+      warn 'Skipping fiber scheduler test (Async gem not available)'
+      return true
+    end
+    false
+  end
+
+  def async_run(&block)
+    # Prefer newer Async.run to avoid deprecated scheduler.async path.
+    if defined?(Async) && Async.respond_to?(:run)
+      Async.run(&block)
+    else
+      Async(&block)
+    end
+  end
+end
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.1')
+  warn 'Skipping fiber scheduler tests on Ruby < 3.1'
+  return
+end

data/tests/test_basic.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class TestBasic < Test::Unit::TestCase
+  include TestServerMethods
+  
+  def setup
+    server_setup
+  end
+  
+  def test_basic_request
+    puts "\n=== Testing basic request ==="
+    easy = Curl::Easy.new(TestServlet.url)
+    easy.perform
+    puts "Response code: #{easy.response_code}"
+    puts "Body (first 100 chars): #{easy.body_str[0..100]}"
+    assert_equal 200, easy.response_code
+  end
+  
+  def test_slow_request
+    puts "\n=== Testing slow request ==="
+    url = TestServlet.url_to("/slow?seconds=0.1")
+    puts "URL: #{url}"
+    easy = Curl::Easy.new(url)
+    easy.perform
+    puts "Response code: #{easy.response_code}"
+    puts "Body: #{easy.body_str}"
+    assert_equal 200, easy.response_code
+  end
+end

data/tests/test_fiber_debug.rb

@@ -0,0 +1,69 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'async'
+
+class TestFiberDebug < Test::Unit::TestCase
+  include TestServerMethods
+  
+  def setup
+    server_setup
+  end
+  
+  def test_simple_fiber_request
+    puts "\n=== Starting simple fiber request test ==="
+    
+    run_async do |task|
+      puts "Inside Async block"
+      puts "Fiber scheduler available: #{Curl::Multi.fiber_scheduler_available?}"
+      
+      multi = Curl::Multi.new
+      easy = Curl::Easy.new(TestServlet.url)
+      easy.on_complete { |curl| puts "Request completed: #{curl.response_code}" }
+      
+      multi.add(easy)
+      puts "Added easy handle to multi"
+      
+      # Perform without block first
+      puts "Calling perform..."
+      multi.perform
+      puts "Perform completed"
+    end
+    
+    puts "Test completed"
+  end
+  
+  def test_fiber_with_block
+    puts "\n=== Starting fiber with block test ==="
+    
+    run_async do |task|
+      puts "Inside Async block"
+      
+      multi = Curl::Multi.new
+      easy = Curl::Easy.new(TestServlet.url_to("/slow?seconds=0.1"))
+      easy.on_complete { |curl| puts "Request completed: #{curl.response_code}" }
+      
+      multi.add(easy)
+      
+      block_calls = 0
+      multi.perform do
+        block_calls += 1
+        puts "Block called: #{block_calls}"
+        if block_calls < 5  # Limit iterations to prevent infinite loop
+          Async::Task.yield
+        end
+      end
+      
+      puts "Perform completed, block called #{block_calls} times"
+    end
+    
+    puts "Test completed"
+  end
+
+  private
+  def run_async(&block)
+    if defined?(Async) && Async.respond_to?(:run)
+      Async.run(&block)
+    else
+      Async(&block)
+    end
+  end
+end

data/tests/test_fiber_simple.rb

@@ -0,0 +1,65 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require 'async'
+
+class TestFiberSimple < Test::Unit::TestCase
+  include TestServerMethods
+  
+  def setup
+    server_setup
+  end
+  
+  def test_simple_concurrent
+    puts "\n=== Testing simple concurrent requests ==="
+    
+    results = []
+    
+    if Async.respond_to?(:run)
+      Async.run do |task|
+        puts "Fiber scheduler available: #{Curl::Multi.fiber_scheduler_available?}"
+        
+        multi = Curl::Multi.new
+        
+        # Add 3 requests
+        3.times do |i|
+          easy = Curl::Easy.new(TestServlet.url_to("/slow?seconds=0.2&id=#{i}"))
+          easy.on_complete { |curl| 
+            results << { id: i, code: curl.response_code }
+            puts "Request #{i} completed"
+          }
+          multi.add(easy)
+        end
+        
+        puts "Starting perform..."
+        start_time = Time.now
+        multi.perform  # No block
+        elapsed = Time.now - start_time
+        puts "Perform completed in #{elapsed.round(2)}s"
+      end
+    else
+      Async do |task|
+      puts "Fiber scheduler available: #{Curl::Multi.fiber_scheduler_available?}"
+      
+      multi = Curl::Multi.new
+      
+      # Add 3 requests
+      3.times do |i|
+        easy = Curl::Easy.new(TestServlet.url_to("/slow?seconds=0.2&id=#{i}"))
+        easy.on_complete { |curl| 
+          results << { id: i, code: curl.response_code }
+          puts "Request #{i} completed"
+        }
+        multi.add(easy)
+      end
+      
+      puts "Starting perform..."
+      start_time = Time.now
+      multi.perform  # No block
+      elapsed = Time.now - start_time
+      puts "Perform completed in #{elapsed.round(2)}s"
+      end
+    end
+    
+    assert_equal 3, results.size
+    results.each { |r| assert_equal 200, r[:code] }
+  end
+end

data/tests/test_real_url.rb

@@ -0,0 +1,65 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/curb'))
+require 'async'
+
+puts "Testing fiber scheduler with real URLs..."
+
+# Test without fiber scheduler
+puts "\n1. Without fiber scheduler:"
+start = Time.now
+multi = Curl::Multi.new
+
+easies = []
+3.times do |i|
+  easy = Curl::Easy.new("https://httpbin.org/delay/1")
+  easy.on_complete { |curl| puts "Request #{i} completed: #{curl.response_code}" }
+  multi.add(easy)
+  easies << easy
+end
+
+multi.perform
+elapsed = Time.now - start
+puts "Total time: #{elapsed.round(2)}s"
+
+# Test with fiber scheduler
+puts "\n2. With fiber scheduler:"
+if Async.respond_to?(:run)
+  Async.run do
+    puts "Fiber scheduler available: #{Curl::Multi.fiber_scheduler_available?}"
+    
+    start = Time.now
+    multi = Curl::Multi.new
+    
+    easies = []
+    3.times do |i|
+      easy = Curl::Easy.new("https://httpbin.org/delay/1")
+      easy.on_complete { |curl| puts "Request #{i} completed: #{curl.response_code}" }
+      multi.add(easy)
+      easies << easy
+    end
+    
+    multi.perform
+    elapsed = Time.now - start
+    puts "Total time: #{elapsed.round(2)}s"
+  end
+else
+  Async do
+    puts "Fiber scheduler available: #{Curl::Multi.fiber_scheduler_available?}"
+    
+    start = Time.now
+    multi = Curl::Multi.new
+    
+    easies = []
+    3.times do |i|
+      easy = Curl::Easy.new("https://httpbin.org/delay/1")
+      easy.on_complete { |curl| puts "Request #{i} completed: #{curl.response_code}" }
+      multi.add(easy)
+      easies << easy
+    end
+    
+    multi.perform
+    elapsed = Time.now - start
+    puts "Total time: #{elapsed.round(2)}s"
+  end
+end
+
+puts "\nDone!"

data/tests/test_simple_fiber.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/curb'))
+require 'async'
+
+puts "Testing simple fiber scheduler..."
+
+if Async.respond_to?(:run)
+  Async.run do
+    puts "Fiber scheduler available: #{Curl::Multi.fiber_scheduler_available?}"
+    
+    multi = Curl::Multi.new
+    easy = Curl::Easy.new("https://httpbin.org/delay/1")
+    easy.on_complete { |curl| puts "Request completed: #{curl.response_code}" }
+    
+    multi.add(easy)
+    puts "Starting perform..."
+    multi.perform
+    puts "Perform completed"
+  end
+else
+  Async do
+    puts "Fiber scheduler available: #{Curl::Multi.fiber_scheduler_available?}"
+    
+    multi = Curl::Multi.new
+    easy = Curl::Easy.new("https://httpbin.org/delay/1")
+    easy.on_complete { |curl| puts "Request completed: #{curl.response_code}" }
+    
+    multi.add(easy)
+    puts "Starting perform..."
+    multi.perform
+    puts "Perform completed"
+  end
+end
+
+puts "Done!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curb
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ross Bamford
 - Todd A. Fisher
 bindir: bin
 cert_chain: []
-date: 2025-07-24 00:00:00.000000000 Z
+date: 2025-08-31 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
@@ -52,13 +52,14 @@ files:
 - tests/bug_follow_redirect_288.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_issue102.rb
-- tests/bug_issue277.rb
+- tests/bug_issue_noproxy.rb
+- tests/bug_issue_post_redirect.rb
+- tests/bug_issue_spnego.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
 - tests/bug_raise_on_callback.rb
 - tests/bug_require_last_or_segfault.rb
-- tests/bug_resolve.rb
 - tests/bugtests.rb
 - tests/helper.rb
 - tests/mem_check.rb
@@ -74,6 +75,12 @@ files:
 - tests/tc_curl_multi.rb
 - tests/tc_curl_postfield.rb
 - tests/tc_curl_protocols.rb
+- tests/tc_fiber_scheduler.rb
+- tests/test_basic.rb
+- tests/test_fiber_debug.rb
+- tests/test_fiber_simple.rb
+- tests/test_real_url.rb
+- tests/test_simple_fiber.rb
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb
@@ -111,13 +118,14 @@ test_files:
 - tests/bug_follow_redirect_288.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_issue102.rb
-- tests/bug_issue277.rb
+- tests/bug_issue_noproxy.rb
+- tests/bug_issue_post_redirect.rb
+- tests/bug_issue_spnego.rb
 - tests/bug_multi_segfault.rb
 - tests/bug_postfields_crash.rb
 - tests/bug_postfields_crash2.rb
 - tests/bug_raise_on_callback.rb
 - tests/bug_require_last_or_segfault.rb
-- tests/bug_resolve.rb
 - tests/bugtests.rb
 - tests/helper.rb
 - tests/mem_check.rb
@@ -133,6 +141,12 @@ test_files:
 - tests/tc_curl_multi.rb
 - tests/tc_curl_postfield.rb
 - tests/tc_curl_protocols.rb
+- tests/tc_fiber_scheduler.rb
+- tests/test_basic.rb
+- tests/test_fiber_debug.rb
+- tests/test_fiber_simple.rb
+- tests/test_real_url.rb
+- tests/test_simple_fiber.rb
 - tests/timeout.rb
 - tests/timeout_server.rb
 - tests/unittests.rb

data/tests/bug_issue277.rb

@@ -1,32 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-
-require 'curb'
-
-class BugIssue102 < Test::Unit::TestCase
-
-  def test_gc_closewait
-		100.times do
-			responses = {}
-			requests = ["http://www.google.co.uk/", "http://www.ruby-lang.org/"]
-			m = Curl::Multi.new
-			# add a few easy handles
-			requests.each do |url|
-				responses[url] = ""
-				c = Curl::Easy.new(url) do|curl|
-					curl.follow_location = true
-					curl.on_body{|data| responses[url] << data; data.size }
-					curl.on_success {|easy| #puts "success, add more easy handles"
-          }
-				end
-				m.add(c)
-			end
-
-			m.perform do
-				#puts "idling... can do some work here"
-			end
-      GC.start
-		end
-	end
-
-end

data/tests/bug_resolve.rb

@@ -1,15 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
-
-class BugResolve < Test::Unit::TestCase
-  include BugTestServerSetupTeardown
-
-  def test_abuse_resolve
-    c = Curl::Easy.new("http://localhost:#{@port}/test")
-    while true
-      c.get
-      assert_equal 200, c.response_code
-      assert_match(/hi/, c.body)
-    end
-  end
-
-end