curb 0.5.8.0-x86-linux → 0.7.7-x86-linux

data/tests/mem_check.rb

@@ -0,0 +1,65 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+#require 'rubygems'
+#require 'rmem'
+
+#
+# Run some tests to measure the memory usage of curb, these tests require fork and ps
+#
+class TestCurbMemory < Test::Unit::TestCase
+
+  def test_easy_memory
+    easy_avg, easy_std = measure_object_memory(Curl::Easy)
+    printf "Easy average: %.2f kilobytes +/- %.2f kilobytes\n", easy_avg.to_f, easy_std.to_f
+
+    multi_avg, multi_std = measure_object_memory(Curl::Multi)
+    printf "Multi average: %.2f kilobytes +/- %.2f kilobytes\n", multi_avg.to_f, multi_std.to_f
+
+    # now that we have the average size of an easy handle lets see how much a multi request consumes with 10 requests
+  end
+
+  def c_avg(report)
+    sum = 0
+    report.each {|r| sum += r.last }
+    (sum.to_f / report.size)
+  end
+
+  def c_std(report,avg)
+    var = 0
+    report.each {|r| var += (r.last-avg)*(r.last-avg) }
+    Math.sqrt(var / (report.size-1))
+  end
+
+  def measure_object_memory(klass)
+    report = []
+    200.times do
+      res = mem_check do
+        obj = klass.new
+      end
+      report << res
+    end
+    avg = c_avg(report)
+    std = c_std(report,avg)
+    [avg,std]
+  end
+
+  def mem_check
+    # see: http://gist.github.com/264060 for inspiration of ps command line
+    rd, wr = IO.pipe
+    memory_usage = `ps -o rss= -p #{Process.pid}`.to_i # in kilobytes
+    fork do
+      before = `ps -o rss= -p #{Process.pid}`.to_i # in kilobytes
+      rd.close
+      yield
+      after = `ps -o rss= -p #{Process.pid}`.to_i # in kilobytes
+      wr.write((after - before))
+      wr.flush
+      wr.close
+    end
+    wr.close
+    total = rd.read.to_i
+    rd.close
+    Process.wait
+    # return the delta and the total
+    [memory_usage, total]
+  end
+end

data/tests/tc_curl_easy.rb

@@ -57,8 +57,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
@@ -554,6 +553,12 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     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
@@ -655,6 +660,115 @@ class TestCurbCurlEasy < Test::Unit::TestCase
     assert /ScrubDog$/,curl.useragent
   end
 
+  def test_username_password
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.username = "foo"
+    curl.password = "bar"
+    if !curl.username.nil?
+      assert_equal "foo", curl.username
+      assert_equal "bar", curl.password
+    else
+      curl.userpwd = "foo:bar"
+    end
+    curl.http_auth_types = :basic
+    #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...
+
+    curl = Curl::Easy.new(TestServlet.url)
+    curl.username = "foo"
+    curl.password = "bar"
+    if curl.username.nil?
+      curl.userpwd = "foo:bar"
+    end
+    curl.http_auth_types = :ntlm
+    curl.perform
+    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
+  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

@@ -44,7 +44,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
     m.perform do
       # idle
-      puts "idling..."
+      #puts "idling..."
     end
 
     assert_match(/^# DO NOT REMOVE THIS COMMENT/, c1.body_str)
@@ -170,7 +170,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
     m.perform do
       # idle
-      puts "idling..."
+      #puts "idling..."
     end
 
     assert success_called2
@@ -308,6 +308,27 @@ 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/")
+    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)}
+    end
+    Curl::Multi.download(urls,{},{},downloads) do|curl,download_path|
+      assert_equal 200, curl.response_code
+      assert File.exist?(download_path)
+      assert file_info[File.basename(download_path)][:size], File.size(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'}},
@@ -381,7 +402,7 @@ class TestCurbCurlMulti < Test::Unit::TestCase
 
   def test_remove_exception_is_descriptive
     m = Curl::Multi.new
-    c = Curl::Easy.new("http://blah.com")
+    c = Curl::Easy.new("http://127.9.9.9:999110")
     m.remove(c)
   rescue => e
     assert_equal 'Invalid easy handle', e.message
@@ -391,11 +412,11 @@ class TestCurbCurlMulti < Test::Unit::TestCase
   def test_retry_easy_handle
     m = Curl::Multi.new
 
-    tries = 2
+    tries = 10
 
-    c1 = Curl::Easy.new('http://127.9.9.9') do |curl|
+    c1 = Curl::Easy.new('http://127.1.1.1:99911') do |curl|
       curl.on_failure {|c,e|
-        assert_equal [Curl::Err::ConnectionFailedError, "Couldn't connect to server"], e
+        assert_equal [Curl::Err::MalformedURLError, "URL using bad/illegal format or missing URL"], e
         if tries > 0
           tries -= 1
           m.add(c)
@@ -406,10 +427,29 @@ class TestCurbCurlMulti < Test::Unit::TestCase
     tries -= 1
     m.add(c1)
 
-    while not m.requests.empty?
-      m.perform
-    end
+    m.perform
     assert_equal 0, tries
+    assert_equal 0, m.requests.size
+  end
+
+  def test_reusing_handle
+    m = Curl::Multi.new
+
+    c = Curl::Easy.new('http://127.0.0.1') do|easy|
+      easy.on_complete{|e,r| puts e.inspect }
+    end
+
+    m.add(c)
+    m.add(c)
+  rescue => e
+    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

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: curb
 version: !ruby/object:Gem::Version 
-  version: 0.5.8.0
+  hash: 13
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 7
+  version: 0.7.7
 platform: x86-linux
 authors: 
 - Ross Bamford
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -05:00
+date: 2010-06-21 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -51,6 +57,23 @@ files:
 - ext/curb_multi.o
 - ext/curb.o
 - ext/curb_core.so
+- tests/bugtests.rb
+- tests/mem_check.rb
+- tests/bug_require_last_or_segfault.rb
+- tests/helper.rb
+- tests/tc_curl_postfield.rb
+- tests/bug_instance_post_differs_from_class_post.rb
+- tests/bug_multi_segfault.rb
+- tests/alltests.rb
+- tests/bug_postfields_crash.rb
+- tests/require_last_or_segfault_script.rb
+- tests/bug_postfields_crash2.rb
+- tests/unittests.rb
+- tests/tc_curl_multi.rb
+- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
+- tests/tc_curl_download.rb
+- tests/tc_curl_easy.rb
+- tests/bug_curb_easy_blocks_ruby_threads.rb
 has_rdoc: true
 homepage: http://curb.rubyforge.org/
 licenses: []
@@ -63,34 +86,45 @@ 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.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby libcurl bindings
 test_files: 
+- tests/bugtests.rb
+- tests/mem_check.rb
 - tests/bug_require_last_or_segfault.rb
 - tests/helper.rb
 - tests/tc_curl_postfield.rb
 - tests/bug_instance_post_differs_from_class_post.rb
 - tests/bug_multi_segfault.rb
 - tests/alltests.rb
+- tests/bug_postfields_crash.rb
 - tests/require_last_or_segfault_script.rb
+- tests/bug_postfields_crash2.rb
 - tests/unittests.rb
 - tests/tc_curl_multi.rb
+- tests/bug_curb_easy_post_with_string_no_content_length_header.rb
 - tests/tc_curl_download.rb
 - tests/tc_curl_easy.rb
 - tests/bug_curb_easy_blocks_ruby_threads.rb