Merge branch 'master' of git://github.com/rails/rails

3 files changed, 42 insertions, 42 deletions

diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index 560105670f..f0fb78c8f4 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -12,6 +12,10 @@ require 'rails/configuration'
 RAILS_ENV = (ENV['RAILS_ENV'] || 'development').dup unless defined?(RAILS_ENV)
 
 module Rails
+  # Sanity check to make sure this file is only loaded once
+  # TODO: Get to the point where this can be removed.
+  raise "It looks like initializer.rb was required twice" if defined?(Initializer)
+
   class Initializer
     class Error < StandardError ; end
 
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index d877915460..1a2f217d20 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -62,33 +62,19 @@ module Rails
         end
 
       @paths = Rails::Application::Root.new(root_path)
-      @paths.app                 = "app"
-      @paths.app.metals          = "app/metal"
-      @paths.app.models          = "app/models"
-      @paths.app.controllers     = "app/controllers"
-      @paths.app.helpers         = "app/helpers"
-      @paths.app.services        = "app/services"
-      @paths.lib                 = "lib"
-      @paths.vendor              = "vendor"
-      @paths.vendor.plugins      = "vendor/plugins"
-      @paths.cache               = "tmp/cache"
-      @paths.config              = "config"
-      @paths.config.locales      = "config/locales"
-      @paths.config.environments = "config/environments"
-
-      @paths.app.controllers.concat builtin_directories
-
-      @paths.app.load_path!
-      @paths.app.metals.load_path!
-      @paths.app.models.eager_load!
-      @paths.app.controllers.eager_load!
-      @paths.app.helpers.eager_load!
-      @paths.app.services.load_path!
-      @paths.app.metals.eager_load!
-      @paths.lib.load_path!
-      @paths.vendor.load_path!
-
-      @paths.config.environments.glob = "#{RAILS_ENV}.rb"
+      @paths.app                 "app",             :load_path => true
+      @paths.app.metals          "app/metal",       :eager_load => true
+      @paths.app.models          "app/models",      :eager_load => true
+      @paths.app.controllers     "app/controllers", builtin_directories, :eager_load => true
+      @paths.app.helpers         "app/helpers",     :eager_load => true
+      @paths.app.services        "app/services",    :load_path => true
+      @paths.lib                 "lib",             :load_path => true
+      @paths.vendor              "vendor",          :load_path => true
+      @paths.vendor.plugins      "vendor/plugins"
+      @paths.cache               "tmp/cache"
+      @paths.config              "config"
+      @paths.config.locales      "config/locales"
+      @paths.config.environments "config/environments", :glob => "#{RAILS_ENV}.rb"
 
       RAILS_ROOT.replace root_path
     end
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index d2f6d83659..3899b744b0 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -6,8 +6,8 @@ module Rails
       def method_missing(id, *args)
         name = id.to_s
 
-        if name =~ /^(.*)=$/
-          @children[$1] = Path.new(args.first, @root)
+        if name =~ /^(.*)=$/ || args.any?
+          @children[$1 || name] = Path.new(@root, *args)
         elsif path = @children[name]
           path
         else
@@ -28,17 +28,15 @@ module Rails
         # TODO: Move logic from set_root_path initializer
         @path = File.expand_path(path)
         @root = self
-        @load_once, @eager_load, @all_paths = [], [], []
+        @all_paths = []
       end
 
       def load_once
-        @load_once.uniq!
-        @load_once
+        all_paths.map { |path| path.paths if path.load_once? }.compact.flatten.uniq
       end
 
       def eager_load
-        @eager_load.uniq!
-        @eager_load
+        all_paths.map { |path| path.paths if path.eager_load? }.compact.flatten.uniq
       end
 
       def all_paths
@@ -47,7 +45,7 @@ module Rails
       end
 
       def load_paths
-        all_paths.map { |path| path.paths }.flatten
+        all_paths.map { |path| path.paths if path.load_path? }.compact.flatten.uniq
       end
 
       def add_to_load_path
@@ -55,6 +53,14 @@ module Rails
           $LOAD_PATH.unshift(path) if File.directory?(path)
         end
       end
+
+      def push(*)
+        raise "Application root can only have one physical path"
+      end
+
+      alias unshift push
+      alias << push
+      alias concat push
     end
 
     class Path
@@ -63,11 +69,18 @@ module Rails
       attr_reader :path
       attr_accessor :glob
 
-      def initialize(path, root)
+      def initialize(root, *paths)
+        @options  = paths.last.is_a?(::Hash) ? paths.pop : {}
         @children = {}
         @root     = root
-        @paths    = [path].flatten
-        @glob     = "**/*.rb"
+        @paths    = paths.flatten
+        @glob     = @options[:glob] || "**/*.rb"
+
+        @load_once  = @options[:load_once]
+        @eager_load = @options[:eager_load]
+        @load_path  = @options[:load_path] || @eager_load
+
+        @root.all_paths << self
       end
 
       def push(path)
@@ -86,7 +99,6 @@ module Rails
 
       def load_once!
         @load_once = true
-        @root.load_once.push *self.paths
       end
 
       def load_once?
@@ -95,8 +107,7 @@ module Rails
 
       def eager_load!
         @eager_load = true
-        @root.all_paths << self
-        @root.eager_load.push *self.paths
+        @load_path  = true
       end
 
       def eager_load?
@@ -105,7 +116,6 @@ module Rails
 
       def load_path!
         @load_path = true
-        @root.all_paths << self
       end
 
       def load_path?