curb 0.8.4 → 0.9.11

data/tests/bug_crash_on_progress.rb

@@ -5,7 +5,7 @@ class ::WEBrick::BasicLog ; def log(level, data) ; end ; end
 
 class BugCrashOnDebug < Test::Unit::TestCase
   
-  def test_on_debug
+  def test_on_progress_raise
     server = WEBrick::HTTPServer.new( :Port => 9999 )
     server.mount_proc("/test") do|req,res|
       res.body = "hi"
@@ -30,4 +30,44 @@ class BugCrashOnDebug < Test::Unit::TestCase
   ensure
     server.shutdown
   end
+
+  def test_on_progress_abort
+    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
+
+    # see: https://github.com/taf2/curb/issues/192,
+    # to pass:
+    # 
+    # c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    # c.on_progress do|x|
+    #   puts "we're in the progress callback"
+    #   false
+    # end
+    # c.perform
+    # 
+    #  notice no return keyword
+    #
+    c = Curl::Easy.new('http://127.0.0.1:9999/test')
+    c.on_progress do|x|
+      puts "we're in the progress callback"
+      return false
+    end
+    c.perform
+
+    assert false, "should not reach this point"
+
+  rescue => e
+    assert_equal 'Curl::Err::AbortedByCallbackError', e.class.to_s
+    c.close
+  ensure
+    server.shutdown
+  end
+
 end

data/tests/bug_issue102.rb

@@ -4,7 +4,7 @@ class BugIssue102 < Test::Unit::TestCase
 
   def test_interface
     test = "https://api.twitter.com/1/users/show.json?screen_name=TwitterAPI&include_entities=true"
-    ip = "192.168.1.61"
+    ip = "0.0.0.0"
 
     c = Curl::Easy.new do |curl|
       curl.url = test

data/tests/bug_issue277.rb

@@ -0,0 +1,32 @@
+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/helper.rb

@@ -2,6 +2,7 @@
 # Copyright (c)2006 Ross Bamford. See LICENSE.
 $CURB_TESTING = true
 require 'uri'
+require 'stringio'
 
 $TOPDIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 $EXTDIR = File.join($TOPDIR, 'ext')
@@ -10,10 +11,15 @@ $:.unshift($LIBDIR)
 $:.unshift($EXTDIR)
 
 require 'curb'
-require 'test/unit'
+begin
+  require 'test/unit'
+rescue LoadError
+  gem 'test/unit'
+  require 'test/unit'
+end
 require 'fileutils'
 
-$TEST_URL = "file://#{URI.escape(File.expand_path(__FILE__).tr('\\','/').tr(':','|'))}"
+$TEST_URL = "file://#{'/' if RUBY_DESCRIPTION =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/}#{File.expand_path(__FILE__).tr('\\','/')}"
 
 require 'thread'
 require 'webrick'
@@ -25,19 +31,22 @@ require 'webrick'
 TEST_SINGLE_THREADED=false
 
 # keep webrick quiet
-class ::WEBrick::HTTPServer
+::WEBrick::HTTPServer.send(:remove_method,:access_log) if ::WEBrick::HTTPServer.instance_methods.include?(:access_log)
+::WEBrick::BasicLog.send(:remove_method,:log) if ::WEBrick::BasicLog.instance_methods.include?(:log)
+
+::WEBrick::HTTPServer.class_eval do
   def access_log(config, req, res)
     # nop
   end
 end
-class ::WEBrick::BasicLog
+::WEBrick::BasicLog.class_eval do
   def log(level, data)
     # nop
   end
 end
 
 #
-# Simple test server to record number of times a request is sent/recieved of a specific 
+# Simple test server to record number of times a request is sent/recieved of a specific
 # request type, e.g. GET,POST,PUT,DELETE
 #
 class TestServlet < WEBrick::HTTPServlet::AbstractServlet
@@ -47,13 +56,12 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def self.port
-    (@port or 9129)
+    @port ||= 9129
   end
 
   def self.path
     '/methods'
   end
-
   def self.url
     "http://127.0.0.1:#{port}#{path}"
   end
@@ -65,12 +73,12 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_GET(req,res)
-    if req.path.match /redirect$/
+    if req.path.match(/redirect$/)
       res.status = 302
       res['Location'] = '/foo'
-    elsif req.path.match /not_here$/
+    elsif req.path.match(/not_here$/)
       res.status = 404
-    elsif req.path.match /error$/
+    elsif req.path.match(/error$/)
       res.status = 500
     end
     respond_with("GET#{req.query_string}",req,res)
@@ -89,6 +97,9 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
       end
       if params and params['s'] == '500'
         res.status = 500
+      elsif params and params['c']
+        cookie = URI.decode_www_form_component(params['c']).split('=')
+        res.cookies << WEBrick::Cookie.new(*cookie)
       else
         respond_with("POST\n#{req.body}",req,res)
       end
@@ -131,7 +142,7 @@ module TestServerMethods
 
   def server_setup(port=9129,servlet=TestServlet)
     @__port = port
-    if @server.nil? and !File.exist?(locked_file)
+    if (@server ||= nil).nil? and !File.exist?(locked_file)
 
       File.open(locked_file,'w') {|f| f << 'locked' }
       if TEST_SINGLE_THREADED
@@ -140,7 +151,7 @@ module TestServerMethods
           rd.close
           rd = nil
 
-          # start up a webrick server for testing delete 
+          # start up a webrick server for testing delete
           server = WEBrick::HTTPServer.new :Port => port, :DocumentRoot => File.expand_path(File.dirname(__FILE__))
 
           server.mount(servlet.path, servlet)
@@ -156,7 +167,7 @@ module TestServerMethods
         rd.read
         rd.close
       else
-        # start up a webrick server for testing delete 
+        # start up a webrick server for testing delete
         @server = WEBrick::HTTPServer.new :Port => port, :DocumentRoot => File.expand_path(File.dirname(__FILE__))
 
         @server.mount(servlet.path, servlet)
@@ -197,3 +208,81 @@ module TestServerMethods
   rescue Errno::EADDRINUSE
   end
 end
+
+
+
+# Backport for Ruby 1.8
+module Backports
+  module Ruby18
+    module URIFormEncoding
+      TBLENCWWWCOMP_ = {}
+      TBLDECWWWCOMP_ = {}
+
+      def encode_www_form_component(str)
+        if TBLENCWWWCOMP_.empty?
+          256.times do |i|
+            TBLENCWWWCOMP_[i.chr] = '%%%02X' % i
+          end
+          TBLENCWWWCOMP_[' '] = '+'
+          TBLENCWWWCOMP_.freeze
+        end
+        str.to_s.gsub( /([^*\-.0-9A-Z_a-z])/ ) {|*| TBLENCWWWCOMP_[$1] }
+      end
+
+      def decode_www_form_component(str)
+        if TBLDECWWWCOMP_.empty?
+          256.times do |i|
+            h, l = i>>4, i&15
+            TBLDECWWWCOMP_['%%%X%X' % [h, l]] = i.chr
+            TBLDECWWWCOMP_['%%%x%X' % [h, l]] = i.chr
+            TBLDECWWWCOMP_['%%%X%x' % [h, l]] = i.chr
+            TBLDECWWWCOMP_['%%%x%x' % [h, l]] = i.chr
+          end
+          TBLDECWWWCOMP_['+'] = ' '
+          TBLDECWWWCOMP_.freeze
+        end
+
+        raise ArgumentError, "invalid %-encoding (#{str.dump})" unless /\A(?:%[[:xdigit:]]{2}|[^%]+)*\z/ =~ str
+        str.gsub( /(\+|%[[:xdigit:]]{2})/ ) {|*| TBLDECWWWCOMP_[$1] }
+      end
+
+      def encode_www_form( enum )
+        enum.map do |k,v|
+          if v.nil?
+            encode_www_form_component(k)
+          elsif v.respond_to?(:to_ary)
+            v.to_ary.map do |w|
+              str = encode_www_form_component(k)
+              unless w.nil?
+                str << '='
+                str << encode_www_form_component(w)
+              end
+            end.join('&')
+          else
+            str = encode_www_form_component(k)
+            str << '='
+            str << encode_www_form_component(v)
+          end
+        end.join('&')
+      end
+
+      WFKV_ = '(?:%\h\h|[^%#=;&])'
+      def decode_www_form(str, _)
+        return [] if str.to_s == ''
+
+        unless /\A#{WFKV_}=#{WFKV_}(?:[;&]#{WFKV_}=#{WFKV_})*\z/ =~ str
+          raise ArgumentError, "invalid data of application/x-www-form-urlencoded (#{str})"
+        end
+        ary = []
+        $&.scan(/([^=;&]+)=([^;&]*)/) do
+          ary << [decode_www_form_component($1, enc), decode_www_form_component($2, enc)]
+        end
+        ary
+      end
+    end
+  end
+end
+
+unless URI.methods.include?(:encode_www_form)
+  URI.extend(Backports::Ruby18::URIFormEncoding)
+end

data/tests/tc_curl.rb

@@ -31,7 +31,37 @@ class TestCurl < Test::Unit::TestCase
     assert_equal "OPTIONSfoo=bar", curl.body_str
   end
 
-  include TestServerMethods 
+  def test_urlalize_without_extra_params
+    url_no_params = 'http://localhost/test'
+    url_with_params = 'http://localhost/test?a=1'
+
+    assert_equal(url_no_params, Curl.urlalize(url_no_params))
+    assert_equal(url_with_params, Curl.urlalize(url_with_params))
+  end
+
+  def test_urlalize_with_nil_as_params
+    url = 'http://localhost/test'
+    assert_equal(url, Curl.urlalize(url, nil))
+  end
+
+  def test_urlalize_with_extra_params
+    url_no_params = 'http://localhost/test'
+    url_with_params = 'http://localhost/test?a=1'
+    extra_params = { :b => 2 }
+
+    expected_url_no_params = 'http://localhost/test?b=2'
+    expected_url_with_params = 'http://localhost/test?a=1&b=2'
+
+    assert_equal(expected_url_no_params, Curl.urlalize(url_no_params, extra_params))
+    assert_equal(expected_url_with_params, Curl.urlalize(url_with_params, extra_params))
+  end
+
+  def test_urlalize_does_not_strip_trailing_?
+    url_empty_params = 'http://localhost/test?'
+    assert_equal(url_empty_params, Curl.urlalize(url_empty_params))
+  end
+
+  include TestServerMethods
 
   def setup
     server_setup

data/tests/tc_curl_download.rb

@@ -6,12 +6,12 @@ class TestCurbCurlDownload < Test::Unit::TestCase
   def setup
     server_setup
   end
-  
+
   def test_download_url_to_file_via_string
     dl_url = "http://127.0.0.1:9129/ext/curb_easy.c"
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
 
-    curb = Curl::Easy.download(dl_url, dl_path)
+    Curl::Easy.download(dl_url, dl_path)
     assert File.exist?(dl_path)
     assert_equal File.read(File.join(File.dirname(__FILE__), '..','ext','curb_easy.c')), File.read(dl_path)
   ensure
@@ -23,7 +23,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
     dl_path = File.join(Dir::tmpdir, "dl_url_test.file")
     io = File.open(dl_path, 'wb')
 
-    curb = Curl::Easy.download(dl_url, io)
+    Curl::Easy.download(dl_url, io)
     assert io.closed?
     assert File.exist?(dl_path)
     assert_equal File.read(File.join(File.dirname(__FILE__), '..','ext','curb_easy.c')), File.read(dl_path)
@@ -49,7 +49,7 @@ class TestCurbCurlDownload < Test::Unit::TestCase
     # Download remote source
     begin
       reader.close
-      curb = Curl::Easy.download(dl_url, writer)
+      Curl::Easy.download(dl_url, writer)
       Process.wait
     ensure
       writer.close rescue IOError # if the stream has already been closed, which occurs in Easy::download