Move configuration to subfolders.

2 files changed, 49 insertions, 1 deletions

diff --git a/railties/lib/rails/engine/configurable.rb b/railties/lib/rails/engine/configurable.rb
index fb420e8a12..d4b7ecc532 100644
--- a/railties/lib/rails/engine/configurable.rb
+++ b/railties/lib/rails/engine/configurable.rb
@@ -8,7 +8,7 @@ module Rails
 
       module ClassMethods
         def config
-          @config ||= Configuration.new(find_root_with_flag("lib"))
+          @config ||= Engine::Configuration.new(find_root_with_flag("lib"))
         end
 
         def inherited(base)
diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
new file mode 100644
index 0000000000..e2fdf125d3
--- /dev/null
+++ b/railties/lib/rails/engine/configuration.rb
@@ -0,0 +1,48 @@
+require 'rails/railtie/configuration'
+
+module Rails
+  class Engine
+    class Configuration < ::Rails::Railtie::Configuration
+      attr_reader :root
+      attr_writer :eager_load_paths, :load_once_paths, :load_paths
+
+      def initialize(root=nil)
+        @root = root
+      end
+
+      def paths
+        @paths ||= begin
+          paths = Rails::Paths::Root.new(@root)
+          paths.app                 "app",                 :eager_load => true, :glob => "*"
+          paths.app.controllers     "app/controllers",     :eager_load => true
+          paths.app.metals          "app/metal",           :eager_load => true
+          paths.app.views           "app/views"
+          paths.lib                 "lib",                 :load_path => true
+          paths.lib.tasks           "lib/tasks",           :glob => "**/*.rake"
+          paths.config              "config"
+          paths.config.environment  "config/environments", :glob => "#{Rails.env}.rb"
+          paths.config.initializers "config/initializers", :glob => "**/*.rb"
+          paths.config.locales      "config/locales",      :glob => "*.{rb,yml}"
+          paths.config.routes       "config/routes.rb"
+          paths
+        end
+      end
+
+      def root=(value)
+        @root = paths.path = Pathname.new(value).expand_path
+      end
+
+      def eager_load_paths
+        @eager_load_paths ||= paths.eager_load
+      end
+
+      def load_once_paths
+        @eager_load_paths ||= paths.load_once
+      end
+
+      def load_paths
+        @load_paths ||= paths.load_paths
+      end
+    end
+  end
+end
\ No newline at end of file