curb 0.7.15 → 1.0.0

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,20 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_GET(req,res)
-    respond_with(:GET,req,res)
+    if req.path.match(/redirect$/)
+      res.status = 302
+      res['Location'] = '/foo'
+    elsif req.path.match(/not_here$/)
+      res.status = 404
+    elsif req.path.match(/error$/)
+      res.status = 500
+    end
+    respond_with("GET#{req.query_string}",req,res)
   end
 
   def do_HEAD(req,res)
     res['Location'] = "/nonexistent"
-    respond_with(:HEAD, req, res)
+    respond_with("HEAD#{req.query_string}",req,res)
   end
 
   def do_POST(req,res)
@@ -81,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
@@ -95,15 +114,23 @@ class TestServlet < WEBrick::HTTPServlet::AbstractServlet
   end
 
   def do_DELETE(req,res)
-    respond_with(:DELETE,req,res)
+    respond_with("DELETE#{req.query_string}",req,res)
   end
 
   def do_PURGE(req,res)
-    respond_with(:PURGE,req,res)
+    respond_with("PURGE#{req.query_string}",req,res)
   end
 
   def do_COPY(req,res)
-    respond_with(:COPY,req,res)
+    respond_with("COPY#{req.query_string}",req,res)
+  end
+
+  def do_PATCH(req,res)
+    respond_with("PATCH\n#{req.body}",req,res)
+  end
+
+  def do_OPTIONS(req,res)
+    respond_with("OPTIONS#{req.query_string}",req,res)
   end
 
 end
@@ -115,8 +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
         rd, wr = IO.pipe
@@ -124,7 +150,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)
@@ -140,7 +166,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)
@@ -181,3 +207,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/signals.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+# This test suite requires the timeout server to be running
+# See tests/timeout.rb for more info about the timeout server
+class TestCurbSignals < Test::Unit::TestCase
+
+  # Testcase for https://github.com/taf2/curb/issues/117
+  def test_continue_after_signal
+    trap("SIGUSR1") { }
+
+    curl = Curl::Easy.new(wait_url(2))
+    pid = $$
+    Thread.new do
+      sleep 1
+      Process.kill("SIGUSR1", pid)
+    end
+    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/tc_curl.rb

@@ -0,0 +1,69 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+
+class TestCurl < Test::Unit::TestCase
+  def test_get
+    curl = Curl.get(TestServlet.url, {:foo => "bar"})
+    assert_equal "GETfoo=bar", curl.body_str
+
+    curl = Curl.options(TestServlet.url, {:foo => "bar"}) do|http|
+      http.headers['Cookie'] = 'foo=1;bar=2'
+    end
+    assert_equal "OPTIONSfoo=bar", curl.body_str
+  end
+
+  def test_post
+    curl = Curl.post(TestServlet.url, {:foo => "bar"})
+    assert_equal "POST\nfoo=bar",  curl.body_str
+  end
+
+  def test_put
+    curl = Curl.put(TestServlet.url, {:foo => "bar"})
+    assert_equal "PUT\nfoo=bar",  curl.body_str
+  end
+
+  def test_patch
+    curl = Curl.patch(TestServlet.url, {:foo => "bar"})
+    assert_equal "PATCH\nfoo=bar", curl.body_str
+  end
+
+  def test_options
+    curl = Curl.options(TestServlet.url, {:foo => "bar"})
+    assert_equal "OPTIONSfoo=bar", curl.body_str
+  end
+
+  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
+  end
+end

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