ghazel-curb 0.6.2.3 → 0.7.9.1

data/tests/tc_curl_easy.rb

@@ -1,4 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+class FooNoToS 
+  undef to_s
+end
 
 class TestCurbCurlEasy < Test::Unit::TestCase
   def test_class_perform_01   
@@ -57,8 +60,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal nil, c.on_body
   end
 
-  class Foo < Curl::Easy
-  end
+  class Foo < Curl::Easy ; end
   def test_new_05
     # can use Curl::Easy as a base class
     c = Foo.new
@@ -352,6 +354,30 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal 30, c.dns_cache_timeout
   end
   
+  def test_low_speed_limit_01
+    c = Curl::Easy.new($TEST_URL)
+    
+    assert_nil c.low_speed_limit
+    
+    c.low_speed_limit = 3
+    assert_equal 3, c.low_speed_limit
+    
+    c.low_speed_limit = nil
+    assert_nil c.low_speed_limit
+  end
+  
+  def test_low_speed_time_01
+    c = Curl::Easy.new($TEST_URL)
+    
+    assert_nil c.low_speed_time
+    
+    c.low_speed_time = 3
+    assert_equal 3, c.low_speed_time
+    
+    c.low_speed_time = nil
+    assert_nil c.low_speed_time
+  end
+  
   def test_on_body
     blk = lambda { |i| i.length }
     
@@ -361,6 +387,25 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal blk, c.on_body   # sets handler nil, returns old handler
     assert_equal nil, c.on_body
   end
+
+  def test_inspect_with_no_url
+    c = Curl::Easy.new
+    assert_equal '#<Curl::Easy>', c.inspect
+  end
+  
+  def test_inspect_with_short_url
+    c = Curl::Easy.new('http://www.google.com/')
+    assert_equal "#<Curl::Easy http://www.google.com/>", c.inspect
+  end
+  
+  def test_inspect_truncates_to_64_chars
+    base_url      = 'http://www.google.com/'
+    truncated_url = base_url + 'x' * (64 - '#<Curl::Easy >'.size - base_url.size)
+    long_url      = truncated_url + 'yyyy'
+    c = Curl::Easy.new(long_url)
+    assert_equal 64, c.inspect.size
+    assert_equal "#<Curl::Easy #{truncated_url}>", c.inspect
+  end
   
   def test_on_header
     blk = lambda { |i| i.length }
@@ -455,6 +500,13 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert c.multipart_form_post?
   end
 
+  def test_ignore_content_length
+    c = Curl::Easy.new
+    assert !c.ignore_content_length?
+    assert c.ignore_content_length = true
+    assert c.ignore_content_length?
+  end
+
   def test_enable_cookies
     c = Curl::Easy.new
     assert !c.enable_cookies?
@@ -513,8 +565,8 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   
   def test_post_remote
     curl = Curl::Easy.new(TestServlet.url)
-    curl.http_post
-    assert_equal "POST\n", curl.body_str
+    curl.http_post([Curl::PostField.content('document_id', 5)])
+    assert_equal "POST\ndocument%5Fid=5", curl.body_str
   end
 
   def test_post_remote_is_easy_handle
@@ -548,12 +600,27 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal 'foo=bar&encoded%20string=val', curl.post_body
   end
 
+  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')))
+    curl.http_post(pf)
+    assert_match /HTTP POST file upload/, curl.body_str
+    assert_match /Content-Disposition: form-data/, curl.body_str
+  end
+
   def test_delete_remote
     curl = Curl::Easy.new(TestServlet.url)
     curl.http_delete
     assert_equal 'DELETE', curl.body_str
   end
 
+  def test_arbitrary_http_verb
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.http('PURGE')
+    assert_equal 'PURGE', curl.body_str
+  end
+
   def test_head_remote
     curl = Curl::Easy.new(TestServlet.url)
     curl.http_head
@@ -597,6 +664,13 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_match /message$/, curl.body_str
   end
 
+  def test_put_nil_data_no_crash
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.put_data = nil
+    
+    curl.perform
+  end
+
   def test_put_remote_file
     curl = Curl::Easy.new(TestServlet.url)
     File.open(__FILE__,'r') do|f|
@@ -621,24 +695,26 @@ class TestCurbCurlEasy < Test::Unit::TestCase
   def test_cert
     curl = Curl::Easy.new(TestServlet.url)
     curl.cert= File.join(File.dirname(__FILE__),"cert.pem")
-    assert /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 /cert.pem$/,curl.cert
+    assert_match /cert.pem$/,curl.cert
   end
 
   def test_cert_type
     curl = Curl::Easy.new(TestServlet.url)
     curl.certtype= "DER"
-    assert "DER", curl.certtype
+    assert_equal "DER", curl.certtype
   end
 
   def test_default_certtype
     curl = Curl::Easy.new(TestServlet.url)
-    assert "PEM", curl.certtype
+    assert_nil curl.certtype
+    curl.certtype = "PEM"
+    assert_equal "PEM", curl.certtype
   end
 
   # Generate a CA cert with instructions at
@@ -646,13 +722,13 @@ 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 /cacert.pem$/, curl.cacert
+    assert_match /cacert.pem$/, curl.cacert
   end
 
   def test_user_agent
     curl = Curl::Easy.new(TestServlet.url)
     curl.useragent= "Curb-Easy/Ruby"
-    assert /ScrubDog$/,curl.useragent
+    assert_equal "Curb-Easy/Ruby",curl.useragent
   end
 
   def test_username_password
@@ -669,7 +745,7 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     #curl.verbose = true
     curl.perform
     assert_equal 'Basic Zm9vOmJhcg==', $auth_header
-
+    $auth_header = nil
     # curl checks the auth type supported by the server, so we have to create a 
     # new easy handle if we're going to change the auth type...
 
@@ -684,6 +760,100 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert_equal 'NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=', $auth_header
   end
 
+  def test_primary_ip
+    curl = Curl::Easy.new(TestServlet.url)
+    if curl.respond_to?(:primary_ip)
+      curl.perform
+      assert_equal '127.0.0.1', curl.primary_ip
+    end
+  end
+
+  def test_post_streaming
+    readme = File.expand_path(File.join(File.dirname(__FILE__),'..','README'))
+    
+    pf = Curl::PostField.file("filename", readme)
+
+    easy = Curl::Easy.new
+
+    easy.url = TestServlet.url
+    easy.multipart_form_post = true
+    easy.http_post(pf)
+
+    assert_not_equal(0,easy.body_str.size)
+    assert_equal(easy.body_str,File.read(readme))
+  end
+
+
+  def test_easy_close
+    easy = Curl::Easy.new
+    easy.close
+    easy.url = TestServlet.url
+    easy.http_get
+  end
+
+  def test_easy_reset
+    easy = Curl::Easy.new
+    easy.url = TestServlet.url + "?query=foo"
+    easy.http_get
+    settings = easy.reset
+    assert settings.key?(:url)
+    assert settings.key?(:body_data)
+    assert settings.key?(:header_data)
+    easy.url = TestServlet.url
+    easy.http_get
+  end
+
+  def test_easy_use_http_versions
+    easy = Curl::Easy.new
+    easy.url = TestServlet.url + "?query=foo"
+    #puts "http none: #{Curl::HTTP_NONE.inspect}"
+    #puts "http1.0: #{Curl::HTTP_1_0.inspect}"
+    #puts "http1.1: #{Curl::HTTP_1_1.inspect}"
+    easy.version = Curl::HTTP_1_1
+    #easy.verbose = true
+    easy.http_get
+  end
+
+  def test_easy_http_verbs
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.http_delete
+    assert_equal 'DELETE', curl.body_str
+    curl.http_get
+    assert_equal 'GET', curl.body_str
+    curl.http_post
+    assert_equal "POST\n", curl.body_str
+    curl.http('PURGE')
+    assert_equal 'PURGE', curl.body_str
+    curl.http_put('hello')
+    assert_equal "PUT\nhello", curl.body_str
+    curl.http('COPY')
+    assert_equal 'COPY', curl.body_str
+  end
+
+  def test_easy_http_verbs_must_respond_to_str
+    # issue http://github.com/taf2/curb/issues#issue/45
+    assert_nothing_raised do
+      c = Curl::Easy.new ; c.url = 'http://example.com' ; c.http(:get)
+    end
+
+    assert_raise RuntimeError do
+      c = Curl::Easy.new ; c.url = 'http://example.com' ; c.http(FooNoToS.new)
+    end
+
+  end
+
+  # http://github.com/taf2/curb/issues/#issue/33
+  def test_easy_http_verbs_with_errors
+    curl = Curl::Easy.new("http://127.0.0.1:9012/") # test will fail if http server on port 9012
+    assert_raise Curl::Err::ConnectionFailedError do
+      curl.http_delete
+    end
+    curl.url = TestServlet.url
+    curl.http_get
+    assert_equal 'GET', curl.body_str
+  end
+
+
   include TestServerMethods 
 
   def setup

data/tests/tc_curl_multi.rb

@@ -70,7 +70,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
     m.perform
 
-    assert n, responses.size
+    assert_equal n, responses.size
     n.times do|i|
       assert_match(/^# DO NOT REMOVE THIS COMMENT/, responses[i], "response #{i}")
     end
@@ -93,7 +93,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
       end
       m.perform
 
-      assert n, responses.size
+      assert_equal n, responses.size
       n.times do|i|
         assert_match(/^# DO NOT REMOVE THIS COMMENT/, responses[i], "response #{i}")
       end
@@ -170,7 +170,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
     m.perform do
       # idle
-      puts "idling..."
+      #puts "idling..."
     end
 
     assert success_called2
@@ -308,6 +308,32 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     end
   end
 
+  def test_multi_easy_download_01
+    # test collecting response buffers to file e.g. on_body
+    root_uri = 'http://127.0.0.1:9129/ext/'
+    urls = []
+    downloads = []
+    file_info = {}
+    FileUtils.mkdir("tmp/")
+
+    # for each file store the size by file name
+    Dir[File.dirname(__FILE__) + "/../ext/*.c"].each do|path|
+      urls << (root_uri + File.basename(path))
+      downloads << "tmp/" + File.basename(path)
+      file_info[File.basename(path)] = {:size => File.size(path), :path => path}
+    end
+
+    # start downloads
+    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
+    FileUtils.rm_rf("tmp/")
+  end
+
   def test_multi_easy_post_01
     urls = [
       { :url => TestServlet.url + '?q=1', :post_fields => {'field1' => 'value1', 'k' => 'j'}},
@@ -424,6 +450,13 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     assert_equal Curl::Err::MultiBadEasyHandle, e.class
   end
 
+  def test_multi_default_timeout
+    assert_equal 100, Curl::Multi.default_timeout
+    Curl::Multi.default_timeout = 12
+    assert_equal 12, Curl::Multi.default_timeout
+    assert_equal 100, (Curl::Multi.default_timeout = 100)
+  end
+
   include TestServerMethods
 
   def setup

data/tests/tc_curl_postfield.rb

@@ -62,6 +62,7 @@ class TestCurbCurlPostfield < Test::Unit::TestCase
     assert_equal 'foo', pf.name
     assert_equal 'localname', pf.local_file
     assert_equal 'localname', pf.remote_file
+    assert_nothing_raised { pf.to_s }
     assert_nil pf.content_type
     assert_nil pf.content
     assert_nil pf.set_content_proc
@@ -136,6 +137,7 @@ class TestCurbCurlPostfield < Test::Unit::TestCase
 
   def test_to_s_04
     pf = Curl::PostField.file('foo.file', 'bar.file')
-    assert_raise(Curl::Err::InvalidPostFieldError) { pf.to_s }
+    assert_nothing_raised { pf.to_s }
+    #assert_raise(Curl::Err::InvalidPostFieldError) { pf.to_s }
   end
 end

data/tests/timeout.rb

@@ -0,0 +1,100 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+# Run server with: ruby -rubygems timeout_server.rb -p 9128
+
+# Note that curl requires all timeouts to be integers -
+# curl_easy_setopt does not have a provision for floating-point values
+
+class TestCurbTimeouts < Test::Unit::TestCase
+  def test_no_timeout_by_default
+    curl = Curl::Easy.new(wait_url(2))
+    start = Time.now
+    assert_equal true, curl.http_get
+    elapsed = Time.now - start
+    assert elapsed > 2
+  end
+  
+  def test_overall_timeout_on_dead_transfer
+    curl = Curl::Easy.new(wait_url(2))
+    curl.timeout = 1
+    assert_raise(Curl::Err::TimeoutError) do
+      curl.http_get
+    end
+  end
+  
+  def test_clearing_timeout
+    curl = Curl::Easy.new(wait_url(2))
+    curl.timeout = 1
+    curl.timeout = nil
+    start = Time.now
+    assert_equal true, curl.http_get
+    elapsed = Time.now - start
+    assert elapsed > 2
+  end
+  
+  def test_overall_timeout_on_slow_transfer
+    curl = Curl::Easy.new(serve_url(100, 2, 3))
+    curl.timeout = 1
+    # transfer is aborted despite data being exchanged
+    assert_raise(Curl::Err::TimeoutError) do
+      curl.http_get
+    end
+  end
+  
+  def test_low_speed_time_on_slow_transfer
+    curl = Curl::Easy.new(serve_url(100, 1, 3))
+    curl.low_speed_time = 2
+    # use default low_speed_limit of 1
+    assert true, curl.http_get
+  end
+  
+  def test_low_speed_time_on_very_slow_transfer
+    # send data slower than required
+    curl = Curl::Easy.new(serve_url(10, 2, 3))
+    curl.low_speed_time = 1
+    # XXX for some reason this test fails if low speed limit is not specified
+    curl.low_speed_limit = 1
+    # use default low_speed_limit of 1
+    assert_raise(Curl::Err::TimeoutError) do
+      curl.http_get
+    end
+  end
+  
+  def test_low_speed_limit_on_slow_transfer
+    curl = Curl::Easy.new(serve_url(10, 1, 3))
+    curl.low_speed_time = 2
+    curl.low_speed_limit = 1000
+    assert_raise(Curl::Err::TimeoutError) do
+      curl.http_get
+    end
+  end
+  
+  def test_clearing_low_speed_time
+    curl = Curl::Easy.new(serve_url(100, 2, 3))
+    curl.low_speed_time = 1
+    curl.low_speed_time = nil
+    assert_equal true, curl.http_get
+  end
+  
+  def test_clearing_low_speed_limit
+    curl = Curl::Easy.new(serve_url(10, 1, 3))
+    curl.low_speed_time = 2
+    curl.low_speed_limit = 1000
+    curl.low_speed_limit = nil
+    assert_equal true, curl.http_get
+  end
+  
+  private
+  
+  def wait_url(time)
+    "#{server_base}/wait/#{time}"
+  end
+  
+  def serve_url(chunk_size, time, count)
+    "#{server_base}/serve/#{chunk_size}/every/#{time}/for/#{count}"
+  end
+  
+  def server_base
+    'http://127.0.0.1:9128'
+  end
+end

data/tests/timeout_server.rb

@@ -0,0 +1,33 @@
+# This Sinatra application must be run with mongrel
+# or possibly with unicorn for the serve action to work properly.
+# See http://efreedom.com/Question/1-3669674/Streaming-Data-Sinatra-Rack-Application
+
+require 'sinatra'
+
+get '/wait/:time' do |time|
+  time = time.to_i
+  sleep(time)
+  "Slept #{time} at #{Time.now}"
+end
+
+# http://efreedom.com/Question/1-3027435/Way-Flush-Html-Wire-Sinatra
+class Streamer
+  def initialize(time, chunks)
+    @time = time
+    @chunks = chunks
+  end
+  
+  def each
+    @chunks.each do |chunk|
+      sleep(@time)
+      yield chunk
+    end
+  end
+end
+
+get '/serve/:chunk_size/every/:time/for/:count' do |chunk_size, time, count|
+  chunk_size, time, count = chunk_size.to_i, time.to_i, count.to_i
+  chunk = 'x' * chunk_size
+  chunks = [chunk] * count
+  Streamer.new(time, chunks)
+end

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ghazel-curb
 version: !ruby/object:Gem::Version 
-  version: 0.6.2.3
+  hash: 81
+  prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 9
+  - 1
+  version: 0.7.9.1
 platform: ruby
 authors: 
 - Ross Bamford
@@ -10,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-26 00:00:00 -08:00
+date: 2010-12-22 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -44,6 +51,25 @@ files:
 - ext/curb_multi.h
 - ext/curb_postfield.h
 - ext/curb_upload.h
+- tests/alltests.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
+- tests/bug_multi_segfault.rb
+- tests/bug_postfields_crash.rb
+- tests/bug_postfields_crash2.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/bugtests.rb
+- tests/helper.rb
+- tests/mem_check.rb
+- tests/require_last_or_segfault_script.rb
+- tests/tc_curl_download.rb
+- tests/tc_curl_easy.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: []
@@ -56,34 +82,47 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: curb
-rubygems_version: 1.3.5
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Ruby libcurl bindings
 test_files: 
 - tests/alltests.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
 - tests/bug_multi_segfault.rb
+- tests/bug_postfields_crash.rb
+- tests/bug_postfields_crash2.rb
 - tests/bug_require_last_or_segfault.rb
+- tests/bugtests.rb
 - tests/helper.rb
+- tests/mem_check.rb
 - tests/require_last_or_segfault_script.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
 - tests/tc_curl_multi.rb
 - tests/tc_curl_postfield.rb
+- tests/timeout.rb
+- tests/timeout_server.rb
 - tests/unittests.rb