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

Changeset 5720

Show
Ignore:
Timestamp:
12/15/06 23:41:58 (3 years ago)
Author:
nzkoz
Message:

Make config.plugins affect $LOAD_PATH and remove duplication from $LOAD_PATH [James Adam]

Closes #6581
Closes #6842

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/railties/CHANGELOG

    r5692 r5720  
    11*SVN* 
     2 
     3* Make config.plugins affect $LOAD_PATH, not just which init.rb files get required [James Adam] 
    24 
    35* Don't generate a components directory in new Rails apps.  [Jeremy Kemper] 

  • trunk/railties/lib/initializer.rb

    r5624 r5720  
    4949    def initialize(configuration) 
    5050      @configuration = configuration 
    51       @loaded_plugins = Set.new 
     51      @loaded_plugins = [] 
    5252    end 
    5353 
    …… 
    177177    # 
    178178    # After all plugins are loaded, duplicates are removed from the load path. 
    179     # Plugins are loaded in alphabetical order. 
     179    # If an array of plugin names is specified in config.plugins, the plugins 
     180    # will be loaded in that order. Otherwise, plugins are loaded in alphabetical  
     181    # order. 
    180182    def load_plugins 
    181       find_plugins(configuration.plugin_paths).sort.each { |path| load_plugin path } 
     183      if configuration.plugins.nil? 
     184        # a nil value implies we don't care about plugins; load 'em all in a reliable order 
     185        find_plugins(configuration.plugin_paths).sort.each { |path| load_plugin path } 
     186      elsif !configuration.plugins.empty? 
     187        # we've specified a config.plugins array, so respect that order 
     188        plugin_paths = find_plugins(configuration.plugin_paths) 
     189        configuration.plugins.each do |name| 
     190          path = plugin_paths.find { |p| File.basename(p) == name } 
     191          load_plugin path 
     192        end 
     193      end  
    182194      $LOAD_PATH.uniq! 
    183195    end 
    …… 
    346358 
    347359      def plugin_enabled?(path) 
    348         configuration.plugins.empty? || configuration.plugins.include?(File.basename(path)) 
     360        configuration.plugins.nil? || configuration.plugins.include?(File.basename(path)) 
    349361      end 
    350362 
    …… 
    365377        raise LoadError, "No such plugin: #{directory}" unless plugin_path?(directory) 
    366378 
    367         lib_path  = File.join(directory, 'lib') 
     379        lib_path  = File.join(directory, 'lib', '') 
    368380        init_path = File.join(directory, 'init.rb') 
    369381        has_lib   = File.directory?(lib_path) 
    …… 
    471483    attr_accessor :whiny_nils 
    472484 
    473     # The list of plugins to load. If this is set to <tt>[]</tt>, all plugins will be loaded. 
     485    # The list of plugins to load. If this is set to <tt>nil</tt>, all plugins will 
     486    # be loaded. If this is set to <tt>[]</tt>, no plugins will be loaded. Otherwise, 
     487    # plugins will be loaded in the order specified. 
    474488    attr_accessor :plugins 
    475489 
    …… 
    593607        ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) } 
    594608 
    595         paths.concat Dir["#{root_path}/vendor/plugins/*/lib/"] 
    596609        paths.concat builtin_directories 
    597610      end 
    …… 
    643656 
    644657      def default_plugins 
    645         [] 
     658        nil 
    646659      end 
    647660 

  • trunk/railties/test/plugin_test.rb

    r4842 r5720  
    4444  def test_load_plugin 
    4545    stubby = "#{File.dirname(__FILE__)}/fixtures/plugins/default/stubby" 
    46     expected = Set.new(['stubby']) 
     46    expected = ['stubby'] 
    4747 
    4848    assert @init.send(:load_plugin, stubby) 
    …… 
    6767    assert_loaded_plugins %w(a stubby acts_as_chunky_bacon), ['default', 'alternate'] 
    6868  end 
     69   
     70  def test_load_all_plugins_when_config_plugins_is_nil 
     71    @init.configuration.plugins = nil 
     72    assert_loaded_plugins %w(a stubby acts_as_chunky_bacon), ['default', 'alternate'] 
     73  end 
    6974 
     75  def test_load_no_plugins_when_config_plugins_is_empty_array 
     76    @init.configuration.plugins = [] 
     77    assert_loaded_plugins [], ['default', 'alternate']     
     78  end 
     79   
     80  def test_load_only_selected_plugins 
     81    plugins = %w(stubby a) 
     82    @init.configuration.plugins = plugins 
     83    assert_loaded_plugins plugins, ['default', 'alternate'] 
     84  end 
     85   
     86  def test_load_plugins_in_order 
     87    plugins = %w(stubby acts_as_chunky_bacon a) 
     88    @init.configuration.plugins = plugins 
     89    assert_plugin_load_order plugins, ['default', 'alternate'] 
     90  end 
     91   
    7092  protected 
    7193    def assert_loaded_plugins(plugins, path) 
    72       assert_equal Set.new(plugins), load_plugins(path) 
     94      assert_equal plugins.sort, load_plugins(path).sort 
     95    end 
     96     
     97    def assert_plugin_load_order(plugins, path) 
     98      assert_equal plugins, load_plugins(path) 
    7399    end 
    74100