Changeset 4728

Timestamp:

08/08/06 21:21:04 (2 years ago)

Author:

ulysses

Message:

New dependencies implementation

Files:

• trunk/actionmailer/CHANGELOG (modified) (1 diff)
• trunk/actionmailer/lib/action_mailer/base.rb (modified) (1 diff)
• trunk/actionpack/CHANGELOG (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/caching.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/layout.rb (modified) (1 diff)
• trunk/actionpack/test/template/compiled_templates_test.rb (modified) (1 diff)
• trunk/actionwebservice/CHANGELOG (modified) (1 diff)
• trunk/actionwebservice/lib/action_web_service/api.rb (modified) (1 diff)
• trunk/actionwebservice/lib/action_web_service/base.rb (modified) (1 diff)
• trunk/actionwebservice/lib/action_web_service/struct.rb (modified) (1 diff)
• trunk/activerecord/CHANGELOG (modified) (2 diffs)
• trunk/activerecord/lib/active_record/base.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/observer.rb (modified) (1 diff)
• trunk/activesupport/CHANGELOG (modified) (2 diffs)
• trunk/activesupport/lib/active_support/dependencies.rb (modified) (8 diffs)
• trunk/activesupport/lib/active_support/deprecation.rb (modified) (1 diff)
• trunk/activesupport/lib/active_support/reloadable.rb (modified) (2 diffs)
• trunk/activesupport/test/autoloading_fixtures/conflict.rb (added)
• trunk/activesupport/test/caching_tools_test.rb (modified) (1 diff)
• trunk/activesupport/test/dependencies_test.rb (modified) (4 diffs)
• trunk/activesupport/test/dependencies/conflict.rb (added)
• trunk/activesupport/test/deprecation_test.rb (modified) (2 diffs)
• trunk/activesupport/test/reloadable_test.rb (modified) (1 diff)
• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/lib/initializer.rb (modified) (5 diffs)
• trunk/railties/lib/webrick_server.rb (modified) (1 diff)

trunk/actionmailer/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
-
-* Mailer template root applies to a class and its subclasses rather than acting globally. #5555 [somekool@gmail.com]

trunk/actionmailer/lib/action_mailer/base.rb

@@ -188 +188 @@
-    # Action Mailer subclasses should be reloaded by the dispatcher in Rails
-    # when Dependencies.mechanism = :load.
-Subclasses
+Deprecated
-    
-    private_class_method :new #:nodoc:

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+<<<<<<< .mine
+* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
+
+=======
-* Deprecation: check whether instance variables have been monkeyed with before assigning them to deprecation proxies. Raises a RuntimeError if so. [Jeremy Kemper]
-
@@ -7 +11 @@
-* Deprecation! @params, @session, @flash will be removed after 1.2. Use the corresponding instance methods instead. You'll get printed warnings during tests and logged warnings in dev mode when you access either instance variable directly. [Jeremy Kemper]
-
+>>>>>>> .r4727
-* Make Routing noisy when an anchor regexp is assigned to a segment. #5674 [francois.beausoleil@gmail.com]
-

trunk/actionpack/lib/action_controller/base.rb

@@ -207 +207 @@
-    DEFAULT_RENDER_STATUS_CODE = "200 OK"
-    
-Subclasses
+Deprecated
-    
-    # Determines whether the view has access to controller internals @request, @response, @session, and @template.

trunk/actionpack/lib/action_controller/caching.rb

@@ -1 +1 @@
-require 'fileutils'
+require 'uri'
-
-module ActionController #:nodoc:
@@ -579 +580 @@
-        # ActiveRecord::Observer will mark this class as reloadable even though it should not be.
-        # However, subclasses of ActionController::Caching::Sweeper should be Reloadable
-Subclasses
+Deprecated
-        
-        def before(controller)

trunk/actionpack/lib/action_controller/layout.rb

@@ -184 +184 @@
-        def inherited_with_layout(child)
-          inherited_without_layout(child)
-          child.send :include, Reloadable
-          layout_match = child.name.underscore.sub(/_controller$/, '').sub(/^controllers\//, '')
-          child.layout(layout_match) unless layout_list.grep(%r{layouts/#{layout_match}\.[a-z][0-9a-z]*$}).empty?

trunk/actionpack/test/template/compiled_templates_test.rb

@@ -1 +1 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/action_view/helpers/date_helper'
+require File.dirname(__FILE__) + '/../../lib/action_view/compiled_templates'
-require File.dirname(__FILE__) + "/../abstract_unit"
-

trunk/actionwebservice/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
-
-* Fix invoke_layered since api_method didn't declare :expects. Closes #4720. [Kevin Ballard <kevin@sb.org>, Kent Sibilev]

trunk/actionwebservice/lib/action_web_service/api.rb

@@ -17 +17 @@
-      # Action WebService API subclasses should be reloaded by the dispatcher in Rails
-      # when Dependencies.mechanism = :load.
-Subclasses
+Deprecated
-      
-      # Whether to transform the public API method names into camel-cased names 

trunk/actionwebservice/lib/action_web_service/base.rb

@@ -34 +34 @@
-    # Action WebService subclasses should be reloaded by the dispatcher in Rails
-    # when Dependencies.mechanism = :load.
-Subclasses
+Deprecated
-
-    # Whether to report exceptions back to the caller in the protocol's exception

trunk/actionwebservice/lib/action_web_service/struct.rb

@@ -22 +22 @@
-    # Action WebService Struct subclasses should be reloaded by the dispatcher in Rails
-    # when Dependencies.mechanism = :load.
-Subclasses
+Deprecated
-    
-    # If a Hash is given as argument to an ActionWebService::Struct constructor,

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+<<<<<<< .mine
+* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
+
+=======
-* Cache nil results for has_one associations so multiple calls don't call the database.  Closes #5757. [Michael A. Schoen]
-
@@ -7 +11 @@
-* Don't save has_one associations unnecessarily.  #5735 [Jonathan Viney]
-
+>>>>>>> .r4727
-* Refactor ActiveRecord::Base.reset_subclasses to #reset, and add global observer resetting.  [Rick Olson]
-

trunk/activerecord/lib/active_record/base.rb

@@ -265 +265 @@
-    cattr_accessor :logger
-    
-Subclasses
+Deprecated
-    
-    def self.inherited(child) #:nodoc:
@@ -280 +280 @@
-      nonreloadables = []
-      subclasses.each do |klass|
-klass.reloadable?
+Dependencies.autoloaded? klass
-          nonreloadables << klass
-          next

trunk/activerecord/lib/active_record/observer.rb

@@ -130 +130 @@
-    # Observer subclasses should be reloaded by the dispatcher in Rails
-    # when Dependencies.mechanism = :load.
-Subclasses
+Deprecated
-
-    class << self

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+<<<<<<< .mine
+* Replace Reloadable with improvements to the Dependencies mechanism. [Nicholas Seckar]
+
+=======
-* DateTime#to_time gives hour/minute/second resolution.  #5747 [jon.evans@pobox.com]
-
@@ -9 +13 @@
-    attr_internal :foo
-
+>>>>>>> .r4727
-* Raise fully qualified names upon name errors. #5533 [lars@pinds.com, Nicholas Seckar]
-

trunk/activesupport/lib/active_support/dependencies.rb

@@ -23 +23 @@
-  self.mechanism = :load
-
+  # The set of directories from which we may autoload files
+  mattr_accessor :autoload_paths
+  self.autoload_paths = []
+
+  mattr_accessor :autoloaded_constants
+  self.autoloaded_constants = []
+  
-  def load?
-    mechanism == :load
@@ -28 +35 @@
-
-  def depend_on(file_name, swallow_load_errors = false)
-
+
+
-  rescue LoadError
-    raise unless swallow_load_errors
@@ -39 +47 @@
-  def clear
-    loaded.clear
-
-
-
+
+
+
+
-    file_name = $1 if file_name =~ /^(.*)\.rb$/
-    return if loaded.include?(file_name)
@@ -53 +62 @@
-        # Enable warnings iff this file has not been loaded before and
-        # warnings_on_first_load is set.
+        load_args = ["#{file_name}.rb"]
+        load_args << const_path unless const_path.nil?
+        
-        if !warnings_on_first_load or history.include?(file_name)
- "#{file_name}.rb"
+_file(*load_args)
-        else
- "#{file_name}.rb"
+_file(*load_args)
-        end
-      rescue
@@ -70 +82 @@
-  end
-  
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-  
@@ -85 +215 @@
-    end
-  end
+
+protected
+  
+  # Convert the provided const desc to a qualified constant name (as a string).
+  # A module, class, symbol, or string may be provided.
+  def to_constant_name(desc)
+    name = case desc
+      when String then desc.starts_with?('::') ? desc[2..-1] : desc
+      when Symbol then desc.to_s
+      when Module then desc.name
+      else raise TypeError, "Not a valid constant descriptor: #{desc.inspect}"
+    end
+  end
+  
-end
-
@@ -98 +242 @@
-  # require_association when using single-table inheritance.
-  def const_missing(class_id)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  end
-end
@@ -141 +255 @@
-      rescue NameError => e
-        # Make sure that the name we are missing is the one that caused the error
-constant_path
+qualified_name
-        raise unless e.missing_name? parent_qualified_name
-constant_path
+qualified_name
-        raise NameError.new("uninitialized constant #{qualified_name}").copy_blame!(e)
-      end

trunk/activesupport/lib/active_support/deprecation.rb

@@ -50 +50 @@
-    module Assertions
-      def assert_deprecated(match = nil, &block)
-with_last_message_tracking_deprecation_behavior(&block)
+collect_deprecations(&block).last
-        assert last, "Expected a deprecation warning within the block but received none"
-
-
+
+
+
+
-      end
-
-      def assert_not_deprecated(&block)
-last = with_last_message_tracking_deprecation_behavior
-_nil last, "Expected no deprecation warning within the block but received one: #{last
+deprecations = collect_deprecations
+ deprecations.empty?, "Expected no deprecation warning within the block but received #{deprecations.size}: \n  #{deprecations * "\n  "
-      end
-
-      private
-
+
+
-          old_behavior = ActiveSupport::Deprecation.behavior
-
-
+
+
+
+
+
-          yield
-last_message
+return deprecations
-        ensure
-          ActiveSupport::Deprecation.behavior = old_behavior

trunk/activesupport/lib/active_support/reloadable.rb

@@ -1 @@
-
-
+
+
+
+
+
+
-module Reloadable
-  class << self
+    
-    def included(base) #nodoc:
+      unless base.ancestors.include?(Reloadable::Subclasses) # Avoid double warning
+        ActiveSupport::Deprecation.warn "Reloadable has been deprecated and has no effect.", caller
+      end
+      
-      raise TypeError, "Only Classes can be Reloadable!" unless base.is_a? Class
-      
-      unless base.respond_to?(:reloadable?)
-        class << base
-
+
+
+
+
-        end
-      end
@@ -16 +28 @@
-      included_in_classes.select { |klass| klass.reloadable? }
-    end
+    # Commented out so dispatcher doesn't warn. Should we just disable Reloadable?
+    # deprecate :reloadable_classes
-  end
-  
-  # Captures the common pattern where a base class should not be reloaded,
-  # but its subclasses should be.
+  # 
+  # Deprecated as of Rails 1.2.
+  # All autoloaded objects are now unloaded.
-  module Subclasses
-    def self.included(base) #nodoc:
-      base.send :include, Reloadable
+      ActiveSupport::Deprecation.warn "Reloadable::Subclasses has been deprecated and has no effect.", caller
-      (class << base; self; end).send(:define_method, :reloadable?) do
-
+
+
-      end
-    end
-  end
+  
+  module Deprecated
+    
+    def self.included(base)
+      class << base
+        define_method(:reloadable?) do
+          ActiveSupport::Deprecation.warn "Reloadable has been deprecated and reloadable? has no effect", caller
+          true # This might not have the desired effect, as AR::B.reloadable? => true.
+        end
+      end
+    end
+    
+  end
+  
-end

trunk/activesupport/test/caching_tools_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/abstract_unit'
+require File.join(File.dirname(File.dirname(__FILE__)), 'lib/active_support/caching_tools.rb')
-
-class HashCachingTests < Test::Unit::TestCase

trunk/activesupport/test/dependencies_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/abstract_unit'
-#require 'dependencies'
-
-class DependenciesTest < Test::Unit::TestCase
+  
-  def teardown
-    Dependencies.clear
-  end
-
-
-
-
+
-    old_mechanism, Dependencies.mechanism = Dependencies.mechanism, :load
+    dir = File.dirname(__FILE__)
+    prior_autoload_paths = Dependencies.autoload_paths
+    Dependencies.autoload_paths = from.collect { |f| "#{dir}/#{f}" }
-    yield
-  ensure
-
-
+
-    Dependencies.mechanism = old_mechanism
-  end
@@ -160 +160 @@
-    with_loading 'autoloading_fixtures' do
-      begin
-
+.nil?
-        flunk "No raise!!"
-      rescue NameError => e
@@ -166 +166 @@
-      end
-      begin
-
+.nil?
-        flunk "No raise!!"
-      rescue NameError => e
@@ -183 +183 @@
-  end
-  
+  def test_autoloadable_constants_for_path_should_handle_empty_autoloads
+    assert_equal [], Dependencies.autoloadable_constants_for_path('hello')
+  end
+  
+  def test_autoloadable_constants_for_path_should_handle_relative_paths
+    fake_root = 'dependencies'
+    relative_root = File.dirname(__FILE__) + '/dependencies'
+    ['', '/'].each do |suffix|
+      with_loading fake_root + suffix do
+        assert_equal ["A::B"], Dependencies.autoloadable_constants_for_path(relative_root + '/a/b')
+      end
+    end
+  end
+  
+  def test_autoloadable_constants_for_path_should_provide_all_results
+    fake_root = '/usr/apps/backpack'
+    with_loading fake_root, fake_root + '/lib' do
+      root = Dependencies.autoload_paths.first
+      assert_equal ["Lib::A::B", "A::B"], Dependencies.autoloadable_constants_for_path(root + '/lib/a/b')
+    end
+  end
+  
+  def test_autoloadable_constants_for_path_should_uniq_results
+    fake_root = '/usr/apps/backpack/lib'
+    with_loading fake_root, fake_root + '/' do
+      root = Dependencies.autoload_paths.first
+      assert_equal ["A::B"], Dependencies.autoloadable_constants_for_path(root + '/a/b')
+    end
+  end
+  
+  def test_qualified_const_defined
+    assert Dependencies.qualified_const_defined?("Object")
+    assert Dependencies.qualified_const_defined?("::Object")
+    assert Dependencies.qualified_const_defined?("::Object::Kernel")
+    assert Dependencies.qualified_const_defined?("::Object::Dependencies")
+    assert Dependencies.qualified_const_defined?("::Test::Unit::TestCase")
+  end
+  
+  def test_autoloaded?
+    with_loading 'autoloading_fixtures' do
+      assert ! Dependencies.autoloaded?("ModuleFolder")
+      assert ! Dependencies.autoloaded?("ModuleFolder::NestedClass")
+      
+      assert Dependencies.autoloaded?(ModuleFolder)
+      
+      assert Dependencies.autoloaded?("ModuleFolder")
+      assert ! Dependencies.autoloaded?("ModuleFolder::NestedClass")
+      
+      assert Dependencies.autoloaded?(ModuleFolder::NestedClass)
+      
+      assert Dependencies.autoloaded?("ModuleFolder")
+      assert Dependencies.autoloaded?("ModuleFolder::NestedClass")
+      
+      assert Dependencies.autoloaded?("::ModuleFolder")
+      assert Dependencies.autoloaded?(:ModuleFolder)
+      
+      Object.send :remove_const, :ModuleFolder
+    end
+  end
+  
+  def test_qualified_name_for
+    assert_equal "A", Dependencies.qualified_name_for(Object, :A)
+    assert_equal "A", Dependencies.qualified_name_for(:Object, :A)
+    assert_equal "A", Dependencies.qualified_name_for("Object", :A)
+    assert_equal "A", Dependencies.qualified_name_for("::Object", :A)
+    assert_equal "A", Dependencies.qualified_name_for("::Kernel", :A)
+    
+    assert_equal "Dependencies::A", Dependencies.qualified_name_for(:Dependencies, :A)
+    assert_equal "Dependencies::A", Dependencies.qualified_name_for(Dependencies, :A)
+  end
+  
+  def test_file_search
+    with_loading 'dependencies' do
+      root = Dependencies.autoload_paths.first
+      assert_equal nil, Dependencies.search_for_autoload_file('service_three')
+      assert_equal nil, Dependencies.search_for_autoload_file('service_three.rb')
+      assert_equal root + '/service_one.rb', Dependencies.search_for_autoload_file('service_one')
+      assert_equal root + '/service_one.rb', Dependencies.search_for_autoload_file('service_one.rb')
+    end
+  end
+  
+  def test_file_search_uses_first_in_autoload_path
+    with_loading 'dependencies', 'autoloading_fixtures' do
+      deps, autoload = Dependencies.autoload_paths
+      assert_match %r/dependencies/, deps
+      assert_match %r/autoloading_fixtures/, autoload
+      
+      assert_equal deps + '/conflict.rb', Dependencies.search_for_autoload_file('conflict')
+    end
+    with_loading 'autoloading_fixtures', 'dependencies' do
+      autoload, deps = Dependencies.autoload_paths
+      assert_match %r/dependencies/, deps
+      assert_match %r/autoloading_fixtures/, autoload
+      
+      assert_equal autoload + '/conflict.rb', Dependencies.search_for_autoload_file('conflict')
+    end
+    
+  end
+    
+  def test_custom_const_missing_should_work
+    Object.module_eval <<-end_eval
+      module ModuleWithCustomConstMissing
+        def self.const_missing(name)
+          const_set name, name.to_s.hash
+        end
+
+        module A
+        end
+      end
+    end_eval
+    
+    with_loading 'autoloading_fixtures' do
+      assert_kind_of Integer, ::ModuleWithCustomConstMissing::B
+      assert_kind_of Module, ::ModuleWithCustomConstMissing::A
+      assert_kind_of String, ::ModuleWithCustomConstMissing::A::B
+    end
+  end
+  
-end

trunk/activesupport/test/deprecation_test.rb

@@ -40 +40 @@
-    end
-  end
-
+
-  def test_undeprecated
-    assert_not_deprecated do
@@ -68 +68 @@
-  def test_deprecated_instance_variable_proxy
-    assert_not_deprecated { @dtc.request.size }
-
+
-    assert_deprecated('@request.size') { assert_equal @dtc.request.size, @dtc.old_request.size }
-    assert_deprecated('@request.to_s') { assert_equal @dtc.request.to_s, @dtc.old_request.to_s }
-  end
+  
+  def test_assert_deprecation_without_match
+    assert_deprecated do
+      @dtc.partially
+    end
+  end
+  
-end

trunk/activesupport/test/reloadable_test.rb

@@ -79 +79 @@
-    end
-  end
+  
+  def test_including_reloadable_should_warn
+    c = Class.new
+    assert_deprecated %r{Reloadable} do
+      c.send :include, Reloadable
+    end
+    
+    assert_deprecated { c.reloadable? }
+  end
+  
+  def test_include_subclasses_should_warn
+    c = Class.new
+    deps = collect_deprecations do
+      c.send :include, Reloadable::Subclasses
+    end
+    assert_equal 1, deps.size
+    assert_match %r{Reloadable::Subclasses}, deps.first
+    
+    assert_deprecated { c.reloadable? }
+  end
+  
+  def test_include_deprecated_should_not_warn
+    c = Class.new
+    deps = collect_deprecations do
+      c.send :include, Reloadable::Deprecated
+    end
+    assert_equal 0, deps.size
+    
+    assert c.respond_to?(:reloadable?)
+    assert_deprecated { c.reloadable? }
+  end
+  
-end

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+<<<<<<< .mine
+* Add "require 'dispatcher'" to webrick server in the continuing quest to squash webrick weirdness. [Nicholas Seckar]
+
+* Add autoload_paths support to Initializer. [Nicholas Seckar]
+
+=======
-* Fix Dispatcher.reset_application! so that AR subclasses are removed and Observers re-initialized *after* Reloadable classes are removed. Closes #5743.  [Rick Olson]
-
-* Clarify usage of script/plugin source. Closes #5344. [james.adam@gmail.com]
-
+>>>>>>> .r4727
-* Add Dispatcher.to_prepare and config.to_prepare to provide a pre-request hook. [Nicholas Seckar]
-

trunk/railties/lib/initializer.rb

@@ -81 +81 @@
-
-      require_frameworks
+      set_autoload_paths
-      load_environment
-
@@ -124 +125 @@
-      configuration.load_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
-      $LOAD_PATH.uniq!
+    end
+    
+    # Set the paths from which Rails will automatically load source files.
+    def set_autoload_paths
+      Dependencies.autoload_paths = configuration.autoload_paths.uniq
+      # Freeze the array so future modifications will fail rather than do nothing mysteriously
+      configuration.autoload_paths.freeze
-    end
-    
@@ -413 +421 @@
-    attr_accessor :load_paths
-    
+    # An array of paths from which Rails will automatically load classes and
+    # modules from. By default, all +app+, +lib+, +vendor+ and mock paths are
+    # included in this list.
+    attr_accessor :autoload_paths
+    
-    # The log level to use for the default Rails logger. In production mode,
-    # this defaults to <tt>:info</tt>. In development mode, it defaults to
@@ -444 +457 @@
-      self.frameworks                   = default_frameworks
-      self.load_paths                   = default_load_paths
+      self.autoload_paths               = default_autoload_paths
-      self.log_path                     = default_log_path
-      self.log_level                    = default_log_level
@@ -547 +561 @@
-        ).map { |dir| "#{framework_root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
-      end
+      
+      def default_autoload_paths
+        paths = []
+        
+        # Add the app's controller directory
+        paths.concat(Dir["#{root_path}/app/controllers/"])
+
+        # Then model subdirectories.
+        # TODO: Don't include .rb models as load paths
+        paths.concat(Dir["#{root_path}/app/models/[_a-z]*"])
+        paths.concat(Dir["#{root_path}/components/[_a-z]*"])
+
+        # Followed by the standard includes.
+        paths.concat %w(
+          app
+          app/models
+          app/controllers
+          app/helpers
+          app/services
+          app/apis
+          components
+          config
+          lib
+        ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+        
+        paths.concat Dir["#{root_path}/vendor/plugins/*/lib/"]
+      end
-
-      def default_log_path

trunk/railties/lib/webrick_server.rb

@@ -4 +4 @@
-require 'cgi'
-require 'stringio'
+require 'dispatcher'
-
-include WEBrick