From f6bbc3f582bfc16da3acc152c702b04102fcab81 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 18 Dec 2012 16:26:08 +0100
Subject: Add app/models/concerns and app/controllers/concerns to the default
 directory structure and load path

---
 railties/lib/rails/engine/configuration.rb               | 9 +++++++++
 railties/lib/rails/generators/rails/app/app_generator.rb | 4 ++++
 2 files changed, 13 insertions(+)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index 22e885a3a6..10d1821709 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -38,6 +38,7 @@ module Rails
       def paths
         @paths ||= begin
           paths = Rails::Paths::Root.new(@root)
+
           paths.add "app",                 eager_load: true, glob: "*"
           paths.add "app/assets",          glob: "*"
           paths.add "app/controllers",     eager_load: true
@@ -45,19 +46,27 @@ module Rails
           paths.add "app/models",          eager_load: true
           paths.add "app/mailers",         eager_load: true
           paths.add "app/views"
+
+          paths.add "app/controllers/concerns", eager_load: true
+          paths.add "app/models/concerns",      eager_load: true
+
           paths.add "lib",                 load_path: true
           paths.add "lib/assets",          glob: "*"
           paths.add "lib/tasks",           glob: "**/*.rake"
+
           paths.add "config"
           paths.add "config/environments", glob: "#{Rails.env}.rb"
           paths.add "config/initializers", glob: "**/*.rb"
           paths.add "config/locales",      glob: "*.{rb,yml}"
           paths.add "config/routes.rb"
+
           paths.add "db"
           paths.add "db/migrate"
           paths.add "db/seeds.rb"
+
           paths.add "vendor",              load_path: true
           paths.add "vendor/assets",       glob: "*"
+
           paths
         end
       end
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index c98f021cfe..372790df59 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -55,8 +55,12 @@ module Rails
 
     def app
       directory 'app'
+
       keep_file  'app/mailers'
       keep_file  'app/models'
+
+      keep_file  'app/controllers/concerns'
+      keep_file  'app/models/concerns'
     end
 
     def config
-- 
cgit v1.2.3