Generate module file for namespaced models [#4230 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>

2 files changed, 23 insertions, 0 deletions

diff --git a/railties/lib/rails/generators/rails/model/USAGE b/railties/lib/rails/generators/rails/model/USAGE
index d97e9ac103..db98a2dd1b 100644
--- a/railties/lib/rails/generators/rails/model/USAGE
+++ b/railties/lib/rails/generators/rails/model/USAGE
@@ -15,6 +15,10 @@ Description:
     Finally, if --parent option is given, it's used as superclass of the
     created model. This allows you create Single Table Inheritance models.
 
+    If you pass a namespaced model name (e.g. admin/account or Admin::Account)
+    then the generator will create a module with a table_name_prefix method
+    to prefix the model's table name with the module name (e.g. admin_account)
+
 Examples:
     `rails generate model account`
 
@@ -28,3 +32,14 @@ Examples:
     `rails generate model post title:string body:text published:boolean`
 
         Creates a Post model with a string title, text body, and published flag.
+
+    `rails generate model admin/account`
+
+        For ActiveRecord and TestUnit it creates:
+
+            Module:     app/models/admin.rb
+            Model:      app/models/admin/account.rb
+            Test:       test/unit/admin/account_test.rb
+            Fixtures:   test/fixtures/admin_accounts.yml
+            Migration:  db/migrate/XXX_add_admin_accounts.rb
+
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index f5cfd8eeca..ef415a4fed 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -27,6 +27,14 @@ class ModelGeneratorTest < Rails::Generators::TestCase
     assert_file "app/models/account.rb", /class Account < Admin::Account/
   end
 
+  def test_model_with_namespace
+    run_generator ["admin/account"]
+    assert_file "app/models/admin.rb", /module Admin/
+    assert_file "app/models/admin.rb", /def self\.table_name_prefix/
+    assert_file "app/models/admin.rb", /'admin_'/
+    assert_file "app/models/admin/account.rb", /class Admin::Account < ActiveRecord::Base/
+  end
+
   def test_migration
     run_generator
     assert_migration "db/migrate/create_accounts.rb", /class CreateAccounts < ActiveRecord::Migration/