Add app/models/concerns and app/controllers/concerns to the default d…

…irectory structure and load path
rails · Dec 18, 2012 · f6bbc3f · f6bbc3f · kenn · Dec 19, 2012
1 parent dcb318e
commit f6bbc3f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Add app/models/concerns and app/controllers/concerns to the default directory structure and load path *DHH*
+
+    See http://37signals.com/svn/posts/3372-put-chubby-models-on-a-diet-with-concerns for usage instructions.
+
 *   The `public/index.html` is no longer generated for new projects.
     Page is replaced by internal `welcome_controller` inside of railties.
 

diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
@@ -38,26 +38,35 @@ def generators #:nodoc:
       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
           paths.add "app/helpers",         eager_load: true
           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
@@ -55,8 +55,12 @@ def gitignore
 
     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