From ffd588c528b8097c6359f14ef52513f31b4e0f90 Mon Sep 17 00:00:00 2001
From: Hugo Peixoto <hugo.peixoto@gmail.com>
Date: Sun, 9 Aug 2009 11:24:40 +0100
Subject: [PATCH] added tests for namespaced models generation and fixed a bug related to it. Also fixed a pluralization=false issue.

---
 .../active_record/model/model_generator.rb         |    4 +-
 railties/lib/generators/named_base.rb              |    3 +-
 railties/test/generators/model_generator_test.rb   |   44 ++++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/railties/lib/generators/active_record/model/model_generator.rb b/railties/lib/generators/active_record/model/model_generator.rb
index 54187ae..5c60336 100644
--- a/railties/lib/generators/active_record/model/model_generator.rb
+++ b/railties/lib/generators/active_record/model/model_generator.rb
@@ -13,7 +13,9 @@ module ActiveRecord
 
       def create_migration_file
         if options[:migration] && options[:parent].nil?
-          file_name = "create_#{file_path.gsub(/\//, '_').pluralize}"
+          klass_name = file_path.gsub(/\//, '_')
+          klass_name = klass_name.pluralize if ActiveRecord::Base.pluralize_table_names
+          file_name = "create_#{klass_name}"
           migration_template "migration.rb", "db/migrate/#{file_name}.rb"
         end
       end
diff --git a/railties/lib/generators/named_base.rb b/railties/lib/generators/named_base.rb
index 9632e68..c2b958e 100644
--- a/railties/lib/generators/named_base.rb
+++ b/railties/lib/generators/named_base.rb
@@ -28,7 +28,6 @@ module Rails
           else
             singular_name
           end
-          @table_name.gsub! '/', '_'
 
           if class_nesting.empty?
             @class_name = class_name_without_nesting
@@ -36,6 +35,8 @@ module Rails
             @table_name = class_nesting.underscore << "_" << @table_name
             @class_name = "#{class_nesting}::#{class_name_without_nesting}"
           end
+
+          @table_name.gsub! '/', '_'
         end
 
         # Convert attributes hash into an array with GeneratedAttribute objects.
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index a9b772d..0c1749c 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -31,6 +31,50 @@ class ModelGeneratorTest < GeneratorsTestCase
     assert_migration "db/migrate/create_accounts.rb", /class CreateAccounts < ActiveRecord::Migration/
   end
 
+  def test_migration_with_namespace
+    run_generator ["Gallery::Image"]
+    assert_migration "db/migrate/create_gallery_images", /class CreateGalleryImages < ActiveRecord::Migration/
+    assert_no_migration "db/migrate/create_images"
+  end
+
+  def test_migration_with_nested_namespace
+    run_generator ["Admin::Gallery::Image"]
+    assert_no_migration "db/migrate/create_images"
+    assert_no_migration "db/migrate/create_gallery_images"
+    assert_migration "db/migrate/create_admin_gallery_images", /class CreateAdminGalleryImages < ActiveRecord::Migration/
+    assert_migration "db/migrate/create_admin_gallery_images", /create_table :admin_gallery_images/
+  end
+
+  def test_migration_with_nested_namespace_without_pluralization
+    ActiveRecord::Base.pluralize_table_names = false
+    run_generator ["Admin::Gallery::Image"]
+    assert_no_migration "db/migrate/create_images"
+    assert_no_migration "db/migrate/create_gallery_images"
+    assert_no_migration "db/migrate/create_admin_gallery_images"
+    assert_migration "db/migrate/create_admin_gallery_image", /class CreateAdminGalleryImage < ActiveRecord::Migration/
+    assert_migration "db/migrate/create_admin_gallery_image", /create_table :admin_gallery_image/
+  ensure
+    ActiveRecord::Base.pluralize_table_names = true
+  end
+  
+  def test_migration_with_namespaces_in_model_name_without_plurization
+    ActiveRecord::Base.pluralize_table_names = false
+    run_generator ["Gallery::Image"]
+    assert_migration "db/migrate/create_gallery_image", /class CreateGalleryImage < ActiveRecord::Migration/
+    assert_no_migration "db/migrate/create_gallery_images"
+  ensure
+    ActiveRecord::Base.pluralize_table_names = true
+  end
+
+  def test_migration_without_pluralization
+    ActiveRecord::Base.pluralize_table_names = false
+    run_generator
+    assert_migration "db/migrate/create_account", /class CreateAccount < ActiveRecord::Migration/
+    assert_no_migration "db/migrate/create_accounts"
+  ensure
+    ActiveRecord::Base.pluralize_table_names = true
+  end
+
   def test_migration_is_skipped
     run_generator ["account", "--no-migration"]
     assert_no_migration "db/migrate/create_accounts.rb"
-- 
1.6.3.3