Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 32

Show
Ignore:
Timestamp:
11/30/04 18:52:20 (4 years ago)
Author:
david
Message:

Abolished ActionController::Base.require_or_load in favor of require_dependency and ActiveRecord::Base.require_or_load in favor of require_association. Both methods are now also available in the global namespace when you need to require dependencies or associations outside of whats done automatically.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_controller/base.rb

    r28 r32  
    257257 
    258258      # Loads the <tt>file_name</tt> if reload_dependencies is true or requires if it's false. 
    259       def require_or_load(file_name) 
     259      def require_dependency(file_name) 
    260260        reload_dependencies ? silence_warnings { load("#{file_name}.rb") } : require(file_name) 
    261261      end 
     262 
     263      Object.send(:define_method, :require_dependency) { |file_name| ActiveRecord::Base.require_dependency(file_name) } 
    262264    end 
    263265 

  • trunk/actionpack/lib/action_controller/dependencies.rb

    r4 r32  
    3939          dependencies.flatten.each do |dependency| 
    4040            begin 
    41               require_or_load(dependency.to_s) 
     41              require_dependency(dependency.to_s) 
    4242            rescue LoadError 
    4343              raise LoadError, "Missing #{layer} #{dependency}.rb" 

  • trunk/actionpack/lib/action_controller/helpers.rb

    r4 r32  
    5555            class_name = Inflector.camelize(file_name) 
    5656            begin 
    57               require_or_load(file_name) 
     57              require_dependency(file_name) 
    5858            rescue LoadError 
    5959              raise LoadError, "Missing helper file helpers/#{file_name}.rb" 

  • trunk/activerecord/lib/active_record/associations.rb

    r27 r32  
    563563        def require_association_class(class_name) 
    564564          begin  
    565             require_or_load(Inflector.underscore(class_name)) 
     565            require_association(Inflector.underscore(class_name)) 
    566566          rescue LoadError 
    567567            # Failed to load the associated class -- let's hope the developer is doing the requiring himself. 

  • trunk/activerecord/lib/active_record/base.rb

    r27 r32  
    547547 
    548548      # Loads the <tt>file_name</tt> if reload_associations is true or requires if it's false. 
    549       def require_or_load(file_name) 
     549      def require_association(file_name) 
    550550        if !associations_loaded.include?(file_name) 
    551551          associations_loaded << file_name 
    …… 
    553553        end 
    554554      end 
     555       
     556      Object.send(:define_method, :require_association) { |file_name| ActiveRecord::Base.require_association(file_name) } 
    555557       
    556558      # Resets the list of dependencies loaded (typically to be called by the end of a request), so when require_or_load is 
    …… 
    783785      end 
    784786 
    785       def require_or_load(file_name) 
    786         self.class.require_or_load(file_name) 
    787       end 
     787      # Loads the <tt>file_name</tt> if reload_associations is true or requires if it's false. 
     788      def require_association(file_name) 
     789        if !associations_loaded.include?(file_name) 
     790          associations_loaded << file_name 
     791          reload_associations ? silence_warnings { load("#{file_name}.rb") } : require(file_name) 
     792        end 
     793      end 
     794       
     795      Object.send(:define_method, :require_association) { |file_name| ActiveRecord::Base.require_association(file_name) } 
    788796       
    789797    private 

  • trunk/railties/environments/shared_for_gem.rb

    r31 r32  
    3333 
    3434# Environment-specific configuration. 
    35 ActionController::Base.require_or_load "environments/#{RAILS_ENV}" 
     35require_dependency "environments/#{RAILS_ENV}" 
    3636ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml")) 
    3737ActiveRecord::Base.establish_connection 

  • trunk/railties/environments/shared.rb

    r31 r32  
    3636 
    3737# Environment-specific configuration. 
    38 ActionController::Base.require_or_load "environments/#{RAILS_ENV}" 
     38require_dependency "environments/#{RAILS_ENV}" 
    3939ActiveRecord::Base.configurations = YAML::load(File.open("#{RAILS_ROOT}/config/database.yml")) 
    4040ActiveRecord::Base.establish_connection 

  • trunk/railties/lib/dispatcher.rb

    r31 r32  
    3232      controller_name, module_name = controller_name(request.parameters), module_name(request.parameters) 
    3333 
    34       ActionController::Base.require_or_load("abstract_application") 
    35       ActionController::Base.require_or_load(controller_path(controller_name, module_name)) 
     34      require_dependency("abstract_application") 
     35      require_dependency(controller_path(controller_name, module_name)) 
    3636 
    3737      controller_class(controller_name).process(request, response).out