Fixed generating a namespaced model with table pluralization turned off. Add tests for namespaced model generation.

[#767 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>

2 files changed, 5 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 54187aede0..5c6033629f 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 9632e6806c..c2b958e311 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.