Changeset 401

Show
Ignore:
Timestamp:
08/07/07 20:43:16 (1 year ago)
Author:
e.@brainspl.at
Message:

renamed all merb_'s out of the system. First pass at Kernel#autoload loading of framework classes. specs pass now with new setup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bin/merb

    r286 r401  
    22 
    33require 'rubygems' 
    4 require 'merb/merb_server' 
     4require 'merb/server' 
    55 
    66Merb::Server.run 

  • trunk/examples/skeleton/Rakefile

    r371 r401  
    44require 'fileutils' 
    55require 'rubygems' 
    6 if File.directory?( File.join(File.dirname(__FILE__), "dist/framework")) 
    7   require File.join(File.dirname(__FILE__), "dist/framework/merb") 
     6if File.directory?( File.join(File.dirname(__FILE__), "framework")) 
     7  require File.join(File.dirname(__FILE__), "framework/merb") 
    88else   
    99  require 'merb' 
    1010end 
    11 require MERB_FRAMEWORK_ROOT+'/merb_tasks' 
     11require MERB_FRAMEWORK_ROOT+'/tasks' 
    1212MERB_ROOT = File.dirname(__FILE__) 
    1313include FileUtils 
    …… 
    2020task :merb_init do 
    2121  require 'merb' 
    22   require File.dirname(__FILE__)+'/dist/conf/merb_init.rb' 
     22  require File.dirname(__FILE__)+'/conf/merb_init.rb' 
    2323end   
    2424 
    2525desc "Load db schema" 
    2626task :load_schema => [:merb_init] do 
    27   require File.dirname(__FILE__)+'/dist/schema/schema.rb' 
     27  require File.dirname(__FILE__)+'/schema/schema.rb' 
    2828end 
    2929 

  • trunk/lib/merb.rb

    r398 r401  
    1313require 'logger' 
    1414require 'json' 
    15  
     15require 'set' 
    1616 
    1717module Merb 
    …… 
    3636end 
    3737 
     38autoload :MerbUploadHandler, 'merb/upload_handler' 
     39autoload :MerbHandler, 'merb/mongrel_handler' 
     40 
     41module 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' 
     69end 
     70 
    3871module Erubis 
    3972  class MEruby < Erubis::Eruby 
    …… 
    4477 
    4578def __DIR__; File.dirname(__FILE__); end 
     79lib = File.join(__DIR__, 'merb') 
    4680 
    4781require File.join(__DIR__, 'merb/core_ext') 
    4882 
    4983MERB_FRAMEWORK_ROOT = __DIR__ 
    50  
    5184MERB_ROOT = Merb::Server.merb_root || Dir.pwd 
    5285MERB_ENV  = Merb::Server.config[:environment].nil? ? 'development' : Merb::Server.config[:environment] 
    5386MERB_VIEW_ROOT = MERB_ROOT / "app/views" 
    54  
    5587logpath = $TESTING ? "/tmp/merb_test.log" : "#{MERB_ROOT}/log/merb.#{Merb::Server.port}.log" 
    5688MERB_LOGGER = Logger.new(logpath) 
    57 # DEBUG < INFO < WARN < ERROR < FATAL < UNKNOWN 
    58 MERB_LOGGER.level = case (Merb::Server.log_level.downcase rescue '') 
    59                     when 'debug'  
    60                       Logger::DEBUG 
    61                     when 'info'   
    62                       Logger::INFO 
    63                     when 'warn'  
    64                       Logger::WARN 
    65                     when 'error'   
    66                       Logger::ERROR 
    67                     when 'fatal'  
    68                       Logger::FATAL 
    69                     when 'unknown'   
    70                       Logger::UNKNOWN 
    71                     else                         
    72                       Logger::INFO 
    73                     end   
    74           
    75 lib = File.join(__DIR__, 'merb') 
    76 Dir.entries(lib).sort.select{|f| f !~ /merb\/session\// }.each {|fn| require File.join(lib, fn) if fn =~ /\.rb$/} 
    77  
    78 require File.join(__DIR__, 'merb/vendor/paginator/paginator') 
     89MERB_LOGGER.level = Logger.const_get(Merb::Server.log_level.upcase) rescue Logger::INFO 
    7990 
    8091class Merb::Controller 

  • trunk/lib/merb/abstract_controller.rb

    r399 r401  
    1 require File.dirname(__FILE__)+'/mixins/render_mixin' 
    2  
    31module Merb 
    42   

  • trunk/lib/merb/controller.rb

    r399 r401  
    1 require File.dirname(__FILE__)+'/mixins/controller_mixin' 
    2 require File.dirname(__FILE__)+'/mixins/responder_mixin' 
    3 require File.dirname(__FILE__)+'/merb_request' 
    4 require File.dirname(__FILE__)+'/merb_exceptions' 
    5 require 'set' 
    61module Merb 
    72   

  • trunk/lib/merb/core_ext.rb

    r250 r401  
    11corelib = __DIR__+'/merb/core_ext' 
    22 
    3 %w[ merb_inflector 
    4     merb_class 
    5     merb_kernel 
    6     merb_object 
    7     merb_enumerable 
    8     merb_module 
    9     merb_string 
    10     merb_hash 
    11     merb_numeric 
    12     merb_symbol 
     3%w[ inflector 
     4    class 
     5    kernel 
     6    object 
     7    enumerable 
     8    module 
     9    string 
     10    hash 
     11    numeric 
     12    symbol 
    1313  ].each {|fn| require File.join(corelib, fn)} 

  • trunk/lib/merb/core_ext/inflector.rb

    r400 r401  
    273273end 
    274274 
    275 require File.dirname(__FILE__) + '/merb_inflections' 
     275require File.dirname(__FILE__) + '/inflections' 

  • trunk/lib/merb/mail_controller.rb

    r399 r401  
    1 require File.dirname(__FILE__)+'/merb_mailer' 
    21 
    32module Merb 

  • trunk/lib/merb/mixins/render.rb

    r374 r401  
    22 
    33  module RenderMixin 
    4     
     4     
    55    def self.included(base) 
    66      base.class_eval {         
    …… 
    209209      # as the view context object for the Erubis templates. 
    210210      def cached_view_context 
    211         @_view_context_cache ||= ViewContext.new(self) 
     211        @_view_context_cache ||= ::Merb::ViewContext.new(self) 
    212212      end 
    213213       
    214214      def clean_view_context 
    215         ViewContext.new(self) 
     215        ::Merb::ViewContext.new(self) 
    216216      end 
    217217     

  • trunk/lib/merb/template.rb

    r195 r401  
    11module Merb 
    22  module Template 
    3     # TODO : pull up common methods from template engines. 
     3    autoload :Erubis,  'merb/template/erubis' 
     4    autoload :Haml,  'merb/template/haml' 
     5    autoload :Markaby,  'merb/template/markaby' 
     6    autoload :XMLBuilder,  'merb/template/xml_builder'   
    47  end   
    58end   
    6  
    7 template = __DIR__+'/merb/template' 
    8  
    9 %w[ erubis markaby xml_builder haml 
    10   ].each {|fn| require File.join(template, fn)} 

  • trunk/lib/merb/upload_handler.rb

    r399 r401  
    3737      Mongrel.const_set :Uploads, DRbObject.new(nil, "druby://#{Merb::Server.host}:#{Merb::Server.drb_server_port}").upload_progress 
    3838    else 
    39       require File.dirname(__FILE__)+'/merb_upload_progress' 
    4039      Mongrel.const_set :Uploads, Merb::UploadProgress.new 
    4140    end 

  • trunk/lib/merb/view_context.rb

    r399 r401  
    1 require File.dirname(__FILE__)+'/mixins/erubis_capture_mixin' 
    2 require File.dirname(__FILE__)+'/mixins/view_context_mixin' 
    3 require File.dirname(__FILE__)+'/mixins/form_control_mixin' 
     1 
    42 
    53module Merb 

  • trunk/specs/merb/merb_controller_spec.rb

    r381 r401  
    22require 'stringio' 
    33require File.dirname(__FILE__) + '/../spec_helper' 
    4 # require File.dirname(__FILE__) + '/../multipart' 
    54 
    65describe "Merb::Controller" do 

  • trunk/specs/merb/merb_render_spec.rb

    r394 r401  
    2626  end 
    2727end 
     28 
     29module Merb::Template 
     30  Erubis 
     31  Haml 
     32  Markaby 
     33  XMLBuilder 
     34end     
    2835 
    2936describe "Merb Rendering" do 

  • trunk/specs/spec_helper.rb

    r381 r401  
    2626 
    2727class Merb::Controller 
    28   require "lib/merb/session/merb_memory_session" 
     28  require "lib/merb/session/memory_session" 
    2929  Merb::MemorySessionContainer.setup 
    3030  include ::Merb::SessionMixin