rhodes 3.2.0.beta.4 → 3.2.0.beta.5

data/spec/framework_spec/extensions/test-libs/test/unit/util/backtracefilter.rb

@@ -0,0 +1,42 @@
+module Test
+  module Unit
+    module Util
+      module BacktraceFilter
+        TESTUNIT_FILE_SEPARATORS = %r{[\\/:]}
+        TESTUNIT_PREFIX = __FILE__.split(TESTUNIT_FILE_SEPARATORS)[0..-3]
+        TESTUNIT_RB_FILE = /\.rb\Z/
+
+        module_function
+        def filter_backtrace(backtrace, prefix=nil)
+          return ["No backtrace"] unless(backtrace)
+          return backtrace if ENV["TEST_UNIT_ALL_BACKTRACE"]
+          split_p = if(prefix)
+            prefix.split(TESTUNIT_FILE_SEPARATORS)
+          else
+            TESTUNIT_PREFIX
+          end
+          match = proc do |e|
+            split_e = e.split(TESTUNIT_FILE_SEPARATORS)[0, split_p.size]
+            next false unless(split_e[0..-2] == split_p[0..-2])
+            split_e[-1].sub(TESTUNIT_RB_FILE, '') == split_p[-1]
+          end
+          return backtrace unless(backtrace.detect(&match))
+          found_prefix = false
+          new_backtrace = backtrace.reverse.reject do |e|
+            if(match[e])
+              found_prefix = true
+              true
+            elsif(found_prefix)
+              false
+            else
+              true
+            end
+          end.reverse
+          new_backtrace = (new_backtrace.empty? ? backtrace : new_backtrace)
+          new_backtrace = new_backtrace.reject(&match)
+          new_backtrace.empty? ? backtrace : new_backtrace
+        end
+      end
+    end
+  end
+end

data/spec/framework_spec/extensions/test-libs/test/unit/util/method-owner-finder.rb

@@ -0,0 +1,28 @@
+module Test
+  module Unit
+    module Util
+      module MethodOwnerFinder
+        module_function
+        def find(object, method_name)
+          method = object.method(method_name)
+          return method.owner if method.respond_to?(:owner)
+
+          if /\((.+?)\)\#/ =~ method.to_s
+            owner_name = $1
+            if /\A#</ =~ owner_name
+              ObjectSpace.each_object(Module) do |mod|
+                return mod if mod.to_s == owner_name
+              end
+            else
+              owner_name.split(/::/).inject(Object) do |parent, name|
+                parent.const_get(name)
+              end
+            end
+          else
+            object.class
+          end
+        end
+      end
+    end
+  end
+end

data/spec/framework_spec/extensions/test-libs/test/unit/util/observable.rb

@@ -0,0 +1,90 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+require 'test/unit/util/procwrapper'
+
+module Test
+  module Unit
+    module Util
+
+      # This is a utility class that allows anything mixing
+      # it in to notify a set of listeners about interesting
+      # events.
+      module Observable
+        # We use this for defaults since nil might mean something
+        NOTHING = "NOTHING/#{__id__}"
+
+        # Adds the passed proc as a listener on the
+        # channel indicated by channel_name. listener_key
+        # is used to remove the listener later; if none is
+        # specified, the proc itself is used.
+        #
+        # Whatever is used as the listener_key is
+        # returned, making it very easy to use the proc
+        # itself as the listener_key:
+        #
+        #  listener = add_listener("Channel") { ... }
+        #  remove_listener("Channel", listener)
+        def add_listener(channel_name, listener_key=NOTHING, &listener) # :yields: value
+          unless(block_given?)
+            raise ArgumentError.new("No callback was passed as a listener")
+          end
+      
+          key = listener_key
+          if (listener_key == NOTHING)
+            listener_key = listener
+            key = ProcWrapper.new(listener)
+          end
+      
+          channels[channel_name] ||= {}
+          channels[channel_name][key] = listener
+          return listener_key
+        end
+
+        # Removes the listener indicated by listener_key
+        # from the channel indicated by
+        # channel_name. Returns the registered proc, or
+        # nil if none was found.
+        def remove_listener(channel_name, listener_key)
+          channel = channels[channel_name]
+          return nil unless (channel)
+          key = listener_key
+          if (listener_key.instance_of?(Proc))
+            key = ProcWrapper.new(listener_key)
+          end
+          if (channel.has_key?(key))
+            return channel.delete(key)
+          end
+          return nil
+        end
+
+        # Calls all the procs registered on the channel
+        # indicated by channel_name. If value is
+        # specified, it is passed in to the procs,
+        # otherwise they are called with no arguments.
+        #
+        #--
+        #
+        # Perhaps this should be private? Would it ever
+        # make sense for an external class to call this
+        # method directly?
+        def notify_listeners(channel_name, *arguments)
+          channel = channels[channel_name]
+          return 0 unless (channel)
+          listeners = channel.values
+          listeners.each { |listener| listener.call(*arguments) }
+          return listeners.size
+        end
+
+        private
+        def channels
+          @channels ||= {}
+          return @channels
+        end
+      end
+    end
+  end
+end

data/spec/framework_spec/extensions/test-libs/test/unit/util/output.rb

@@ -0,0 +1,31 @@
+module Test
+  module Unit
+    module Util
+      module Output
+        ##
+        # Returns output for standard output and standard
+        # error as string.
+        #
+        # Example:
+        #   capture_output do
+        #     puts("stdout")
+        #     warn("stderr")
+        #   end # -> ["stdout\n", "stderr\n"]
+        def capture_output
+          require 'stringio'
+
+          output = StringIO.new
+          error = StringIO.new
+          stdout_save, stderr_save = $stdout, $stderr
+          $stdout, $stderr = output, error
+          begin
+            yield
+            [output.string, error.string]
+          ensure
+            $stdout, $stderr = stdout_save, stderr_save
+          end
+        end
+      end
+    end
+  end
+end

data/spec/framework_spec/extensions/test-libs/test/unit/util/procwrapper.rb

@@ -0,0 +1,48 @@
+#--
+#
+# Author:: Nathaniel Talbott.
+# Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+# License:: Ruby license.
+
+module Test
+  module Unit
+    module Util
+
+      # Allows the storage of a Proc passed through '&' in a
+      # hash.
+      #
+      # Note: this may be inefficient, since the hash being
+      # used is not necessarily very good. In Observable,
+      # efficiency is not too important, since the hash is
+      # only accessed when adding and removing listeners,
+      # not when notifying.
+
+      class ProcWrapper
+
+        # Creates a new wrapper for a_proc.
+        def initialize(a_proc)
+          @a_proc = a_proc
+          @hash = a_proc.inspect.sub(/^(#<#{a_proc.class}:)/){''}.sub(/(>)$/){''}.hex
+        end
+
+        def hash
+          return @hash
+        end
+
+        def ==(other)
+          case(other)
+            when ProcWrapper
+              return @a_proc == other.to_proc
+            else
+              return super
+          end
+        end
+        alias :eql? :==
+
+        def to_proc
+          return @a_proc
+        end
+      end
+    end
+  end
+end

data/spec/framework_spec/extensions/test-libs/test/unit/version.rb

@@ -0,0 +1,5 @@
+module Test
+  module Unit
+    VERSION = '2.4.0'
+  end
+end

data/spec/framework_spec/extensions/test-libs/webrick/accesslog.rb

@@ -53,15 +53,23 @@ module WEBrick
          when ?e, ?i, ?n, ?o
            raise AccessLogError,
              "parameter is required for \"#{spec}\"" unless param
-           params[spec][param] || "-"
+           (param = params[spec][param]) ? escape(param) : "-"
          when ?t
            params[spec].strftime(param || CLF_TIME_FORMAT)
          when ?%
            "%"
          else
-           params[spec]
+           escape(params[spec].to_s)
          end
       }
     end
+
+    def escape(data)
+      if data.tainted?
+        data.gsub(/[[:cntrl:]\\]+/) {$&.dump[1...-1]}.untaint
+      else
+        data
+      end
+    end
   end
 end

data/spec/framework_spec/extensions/test-libs/webrick/cgi.rb

@@ -5,7 +5,7 @@
 # Copyright (c) 2003 Internet Programming with Ruby writers. All rights
 # reserved.
 #
-# $Id: cgi.rb 18678 2008-08-17 17:33:13Z gotoyuzo $
+# $Id: cgi.rb 25189 2009-10-02 12:04:37Z akr $
 
 require "webrick/httprequest"
 require "webrick/httpresponse"

data/spec/framework_spec/extensions/test-libs/webrick/config.rb

@@ -22,7 +22,7 @@ module WEBrick
     General = {
       :ServerName     => Utils::getservername,
       :BindAddress    => nil,   # "0.0.0.0" or "::" or nil
-      :Port           => nil,   # users MUST specifiy this!!
+      :Port           => nil,   # users MUST specify this!!
       :MaxClients     => 100,   # maximum number of the concurrent connections
       :ServerType     => nil,   # default: WEBrick::SimpleServer
       :Logger         => nil,   # default: WEBrick::Log.new

data/spec/framework_spec/extensions/test-libs/webrick/httpauth/digestauth.rb

@@ -222,7 +222,7 @@ module WEBrick
             end
           }.join(', ')
         end
-        info('%s: authentication scceeded.', auth_req['username'])
+        info('%s: authentication succeeded.', auth_req['username'])
         req.user = auth_req['username']
         return true
       end

data/spec/framework_spec/extensions/test-libs/webrick/httpresponse.rb

@@ -208,7 +208,7 @@ module WEBrick
         @keep_alive = false
         self.status = HTTPStatus::RC_INTERNAL_SERVER_ERROR
       end
-      @header['content-type'] = "text/html"
+      @header['content-type'] = "text/html; charset=ISO-8859-1"
 
       if respond_to?(:create_error_page)
         create_error_page()

data/spec/framework_spec/extensions/test-libs/webrick/https.rb

@@ -33,7 +33,7 @@ module WEBrick
     alias orig_parse_uri parse_uri
 
     def parse_uri(str, scheme="https")
-      if @server_cert
+      if server_cert
         return orig_parse_uri(str, scheme)
       end
       return orig_parse_uri(str)
@@ -43,7 +43,7 @@ module WEBrick
 
     def meta_vars
       meta = orig_meta_vars
-      if @server_cert
+      if server_cert
         meta["HTTPS"] = "on"
         meta["SSL_SERVER_CERT"] = @server_cert.to_pem
         meta["SSL_CLIENT_CERT"] = @client_cert ? @client_cert.to_pem : ""

data/spec/framework_spec/extensions/test-libs/webrick/httpservlet/abstract.rb

@@ -48,8 +48,7 @@ module WEBrick
       end
 
       def do_OPTIONS(req, res)
-        m = self.methods.grep(/^do_[A-Z]+$/)
-        m.collect!{|i| i.sub(/do_/, "") }
+        m = self.methods.grep(/\Ado_([A-Z]+)\z/) {$1}
         m.sort!
         res["allow"] = m.join(",")
       end

data/spec/framework_spec/extensions/test-libs/webrick/httpservlet/cgihandler.rb

@@ -34,9 +34,9 @@ module WEBrick
         status = -1
 
         cgi_in = IO::popen(@cgicmd, "wb")
-        cgi_out = Tempfile.new("webrick.cgiout.", @tempdir)
+        cgi_out = Tempfile.new("webrick.cgiout.", @tempdir, mode: IO::BINARY)
         cgi_out.set_encoding("ASCII-8BIT")
-        cgi_err = Tempfile.new("webrick.cgierr.", @tempdir)
+        cgi_err = Tempfile.new("webrick.cgierr.", @tempdir, mode: IO::BINARY)
         cgi_err.set_encoding("ASCII-8BIT")
         begin
           cgi_in.sync = true

data/spec/framework_spec/extensions/test-libs/webrick/httpservlet/filehandler.rb

@@ -87,7 +87,7 @@ module WEBrick
               content = io.read(last-first+1)
               body << "--" << boundary << CRLF
               body << "Content-Type: #{mtype}" << CRLF
-              body << "Content-Range: #{first}-#{last}/#{filesize}" << CRLF
+              body << "Content-Range: bytes #{first}-#{last}/#{filesize}" << CRLF
               body << CRLF
               body << content
               body << CRLF
@@ -107,7 +107,7 @@ module WEBrick
               content = io.read(last-first+1)
             end
             res['content-type'] = mtype
-            res['content-range'] = "#{first}-#{last}/#{filesize}"
+            res['content-range'] = "bytes #{first}-#{last}/#{filesize}"
             res['content-length'] = last - first + 1
             res.body = content
           else
@@ -214,16 +214,20 @@ module WEBrick
         # character in URI notation. So the value of path_info should be
         # normalize before accessing to the filesystem.
 
+        # dirty hack for filesystem encoding; in nature, File.expand_path
+        # should not be used for path normalization.  [Bug #3345]
+        path = req.path_info.dup.force_encoding(Encoding.find("filesystem"))
         if trailing_pathsep?(req.path_info)
           # File.expand_path removes the trailing path separator.
           # Adding a character is a workaround to save it.
           #  File.expand_path("/aaa/")        #=> "/aaa"
           #  File.expand_path("/aaa/" + "x")  #=> "/aaa/x"
-          expanded = File.expand_path(req.path_info + "x")
+          expanded = File.expand_path(path + "x")
           expanded.chop!  # remove trailing "x"
         else
-          expanded = File.expand_path(req.path_info)
+          expanded = File.expand_path(path)
         end
+        expanded.force_encoding(req.path_info.encoding)
         req.path_info = expanded
       end
 
@@ -412,7 +416,7 @@ module WEBrick
           else
             dname = name
           end
-          s =  " <A HREF=\"#{HTTPUtils::escape(name)}\">#{dname}</A>"
+          s =  " <A HREF=\"#{HTTPUtils::escape(name)}\">#{HTMLUtils::escape(dname)}</A>"
           s << " " * (30 - dname.bytesize)
           s << (time ? time.strftime("%Y/%m/%d %H:%M      ") : " " * 22)
           s << (size >= 0 ? size.to_s : "-") << "\n"

data/spec/framework_spec/extensions/test-libs/webrick/httpstatus.rb

@@ -12,7 +12,18 @@ module WEBrick
 
   module HTTPStatus
 
-    class Status      < StandardError; end
+    class Status < StandardError
+      def initialize(*args)
+        args[0] = AccessLog.escape(args[0]) unless args.empty?
+        super(*args)
+      end
+      class << self
+        attr_reader :code, :reason_phrase
+      end
+      def code() self::class::code end
+      def reason_phrase() self::class::reason_phrase end
+      alias to_i code
+    end
     class Info        < Status; end
     class Success     < Status; end
     class Redirect    < Status; end
@@ -67,326 +78,26 @@ module WEBrick
 
     CodeToError = {}
 
-    class InternalServerError < ServerError
-      def code() 500 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[500] = const_get('InternalServerError')
-
-    class PreconditionFailed < ClientError
-      def code() 412 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[412] = const_get('PreconditionFailed')
-
-    class Unauthorized < ClientError
-      def code() 401 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[401] = const_get('Unauthorized')
-
-    class Found < Redirect
-      def code() 302 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[302] = const_get('Found')
-
-    class NonAuthoritativeInformation < Success
-      def code() 203 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[203] = const_get('NonAuthoritativeInformation')
-
-    class ProxyAuthenticationRequired < ClientError
-      def code() 407 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[407] = const_get('ProxyAuthenticationRequired')
-
-    class NotImplemented < ServerError
-      def code() 501 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[501] = const_get('NotImplemented')
-
-    class RequestEntityTooLarge < ClientError
-      def code() 413 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[413] = const_get('RequestEntityTooLarge')
-
-    class PaymentRequired < ClientError
-      def code() 402 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[402] = const_get('PaymentRequired')
-
-    class SeeOther < Redirect
-      def code() 303 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[303] = const_get('SeeOther')
-
-    class NoContent < Success
-      def code() 204 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[204] = const_get('NoContent')
-
-    class RequestTimeout < ClientError
-      def code() 408 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[408] = const_get('RequestTimeout')
-
-    class Continue < Info
-      def code() 100 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[100] = const_get('Continue')
-
-    class BadGateway < ServerError
-      def code() 502 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[502] = const_get('BadGateway')
-
-    class RequestURITooLarge < ClientError
-      def code() 414 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[414] = const_get('RequestURITooLarge')
-
-    class Forbidden < ClientError
-      def code() 403 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[403] = const_get('Forbidden')
-
-    class NotModified < Redirect
-      def code() 304 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[304] = const_get('NotModified')
-
-    class ResetContent < Success
-      def code() 205 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[205] = const_get('ResetContent')
-
-    class Conflict < ClientError
-      def code() 409 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[409] = const_get('Conflict')
-
-    class OK < Success
-      def code() 200 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[200] = const_get('OK')
-
-    class SwitchingProtocols < Info
-      def code() 101 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[101] = const_get('SwitchingProtocols')
-
-    class ServiceUnavailable < ServerError
-      def code() 503 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[503] = const_get('ServiceUnavailable')
-
-    class UnsupportedMediaType < ClientError
-      def code() 415 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[415] = const_get('UnsupportedMediaType')
-
-    class NotFound < ClientError
-      def code() 404 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[404] = const_get('NotFound')
-
-    class UseProxy < Redirect
-      def code() 305 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[305] = const_get('UseProxy')
-
-    class PartialContent < Success
-      def code() 206 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[206] = const_get('PartialContent')
-
-    class Gone < ClientError
-      def code() 410 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[410] = const_get('Gone')
-
-    class MultipleChoices < Redirect
-      def code() 300 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[300] = const_get('MultipleChoices')
-
-    class Created < Success
-      def code() 201 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[201] = const_get('Created')
-
-    class GatewayTimeout < ServerError
-      def code() 504 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[504] = const_get('GatewayTimeout')
-
-    class RequestRangeNotSatisfiable < ClientError
-      def code() 416 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[416] = const_get('RequestRangeNotSatisfiable')
-
-    class MethodNotAllowed < ClientError
-      def code() 405 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[405] = const_get('MethodNotAllowed')
-
-    class LengthRequired < ClientError
-      def code() 411 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[411] = const_get('LengthRequired')
-
-    class BadRequest < ClientError
-      def code() 400 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[400] = const_get('BadRequest')
-
-    class MovedPermanently < Redirect
-      def code() 301 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[301] = const_get('MovedPermanently')
-
-    class Accepted < Success
-      def code() 202 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[202] = const_get('Accepted')
-
-    class HTTPVersionNotSupported < ServerError
-      def code() 505 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[505] = const_get('HTTPVersionNotSupported')
-
-    class ExpectationFailed < ClientError
-      def code() 417 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[417] = const_get('ExpectationFailed')
-
-    class NotAcceptable < ClientError
-      def code() 406 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[406] = const_get('NotAcceptable')
-
-    class TemporaryRedirect < Redirect
-      def code() 307 end
-      def reason_phrase() StatusMessage[code] end
-      alias to_i code
-    end
-
-    CodeToError[307] = const_get('TemporaryRedirect')
-
+    StatusMessage.each{|code, message|
+      message.freeze
+      var_name = message.gsub(/[ \-]/,'_').upcase
+      err_name = message.gsub(/[ \-]/,'')
+
+      case code
+      when 100...200; parent = Info
+      when 200...300; parent = Success
+      when 300...400; parent = Redirect
+      when 400...500; parent = ClientError
+      when 500...600; parent = ServerError
+      end
+
+      const_set("RC_#{var_name}", code)
+      err_class = Class.new(parent)
+      err_class.instance_variable_set(:@code, code)
+      err_class.instance_variable_set(:@reason_phrase, message)
+      const_set(err_name, err_class)
+      CodeToError[code] = err_class
+    }
 
     def reason_phrase(code)
       StatusMessage[code.to_i]