Changeset 402

Show
Ignore:
Timestamp:
08/08/07 12:52:44 (1 year ago)
Author:
e.@brainspl.at
Message:

slight change to merb.rb

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb.rb

    r401 r402  
    1414require 'json' 
    1515require 'set' 
     16autoload :MerbUploadHandler, 'merb/upload_handler' 
     17autoload :MerbHandler, 'merb/mongrel_handler' 
    1618 
    1719module Merb 
    1820  VERSION='0.4.0' unless defined?VERSION 
     21  autoload :Authentication, 'merb/mixins/basic_authentication' 
     22  autoload :ControllerMixin, 'merb/mixins/controller' 
     23  autoload :ErubisCaptureMixin, 'merb/mixins/erubis_capture' 
     24  autoload :FormControls, 'merb/mixins/form_control' 
     25  autoload :RenderMixin, 'merb/mixins/render' 
     26  autoload :ResponderMixin, 'merb/mixins/responder' 
     27  autoload :ViewContextMixin, 'merb/mixins/view_context' 
     28  autoload :Caching, 'merb/caching' 
     29  autoload :AbstractController, 'merb/abstract_controller' 
     30  autoload :Const, 'merb/constants' 
     31  autoload :Controller, 'merb/controller' 
     32  autoload :Dispatcher, 'merb/dispatcher' 
     33  autoload :DrbServiceProvidermerb, 'drb_server' 
     34  autoload :ControllerExceptions, 'merb/exceptions' 
     35  autoload :MailController, 'merb/mail_controller' 
     36  autoload :Mailer, 'merb/mailer' 
     37  autoload :PartController, 'merb/part_controller' 
     38  autoload :PluginManager, 'merb/plugins' 
     39  autoload :Request, 'merb/request' 
     40  autoload :Router, 'merb/router' 
     41  autoload :Server, 'merb/server' 
     42  autoload :UploadProgress, 'merb/upload_progress' 
     43  autoload :ViewContext, 'merb/view_context' 
     44  autoload :SessionMixin, 'merb/session' 
     45  autoload :Template, 'merb/template' 
     46   
    1947  class Server 
    2048    class << self 
    …… 
    3462    end   
    3563  end 
    36 end 
    37  
    38 autoload :MerbUploadHandler, 'merb/upload_handler' 
    39 autoload :MerbHandler, 'merb/mongrel_handler' 
    40  
    41 module Merb 
    42   autoload :Authentication, 'merb/mixins/basic_authentication' 
    43   autoload :ControllerMixin, 'merb/mixins/controller' 
    44   autoload :ErubisCaptureMixin, 'merb/mixins/erubis_capture' 
    45   autoload :FormControls, 'merb/mixins/form_control' 
    46   autoload :RenderMixin, 'merb/mixins/render' 
    47   autoload :ResponderMixin, 'merb/mixins/responder' 
    48   autoload :ViewContextMixin, 'merb/mixins/view_context' 
    49  
    50   autoload :Caching, 'merb/caching' 
    51   autoload :AbstractController, 'merb/abstract_controller' 
    52   autoload :Const, 'merb/constants' 
    53   autoload :Controller, 'merb/controller' 
    54   autoload :Dispatcher, 'merb/dispatcher' 
    55   autoload :DrbServiceProvidermerb, 'drb_server' 
    56   autoload :ControllerExceptions, 'merb/exceptions' 
    57  
    58   autoload :MailController, 'merb/mail_controller' 
    59   autoload :Mailer, 'merb/mailer' 
    60   autoload :PartController, 'merb/part_controller' 
    61   autoload :PluginManager, 'merb/plugins' 
    62   autoload :Request, 'merb/request' 
    63   autoload :Router, 'merb/router' 
    64   autoload :Server, 'merb/server' 
    65   autoload :UploadProgress, 'merb/upload_progress' 
    66   autoload :ViewContext, 'merb/view_context' 
    67   autoload :SessionMixin, 'merb/session' 
    68   autoload :Template, 'merb/template' 
    6964end 
    7065