0
@@ -1,5 +1,5 @@
0
 class ScaffoldGenerator < Rails::Generator::NamedBase
0
-  default_options :skip_timestamps => false, :skip_migration => false
0
+  default_options :skip_timestamps => false, :skip_migration => false, :force_plural => false
0
 
0
   attr_reader   :controller_name,
0
                 :controller_class_path,
0
@@ -16,6 +16,11 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
0
   def initialize(runtime_args, runtime_options = {})
0
     super
0
 
0
+    if @name == @name.pluralize && !options[:force_plural]
0
+      logger.warning "Plural version of the model detected, using singularized version.  Override with --force-plural."
0
+      @name = @name.singularize
0
+    end
0
+
0
     @controller_name = @name.pluralize
0
 
0
     base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
0
@@ -81,6 +86,8 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
0
              "Don't add timestamps to the migration file for this model") { |v| options[:skip_timestamps] = v }
0
       opt.on("--skip-migration",
0
              "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
0
+      opt.on("--force-plural",
0
+             "Forces the generation of a plural ModelName") { |v| options[:force_plural] = v }
0
     end
0
 
0
     def scaffold_views

0
@@ -1,4 +1,5 @@
0
 require 'generators/generator_test_helper'
0
+require 'abstract_unit'
0
 
0
 class RailsScaffoldGeneratorTest < GeneratorTestCase
0
   
0
@@ -104,4 +105,45 @@ class RailsScaffoldGeneratorTest < GeneratorTestCase
0
     assert_added_route_for :products
0
   end
0
 
0
+  uses_mocha("scaffold_force_plural_names") do
0
+    def test_scaffolded_plural_names
0
+      Rails::Generator::Base.logger.expects(:warning)
0
+      g = Rails::Generator::Base.instance('scaffold', %w(ProductLines))
0
+      assert_equal "ProductLines", g.controller_name
0
+      assert_equal "ProductLines", g.controller_class_name
0
+      assert_equal "ProductLine", g.controller_singular_name
0
+      assert_equal "product_lines", g.controller_plural_name
0
+      assert_equal "product_lines", g.controller_file_name
0
+      assert_equal "product_lines", g.controller_table_name
0
+    end
0
+  end
0
+
0
+  def test_scaffold_plural_model_name_without_force_plural_generates_singular_model
0
+    run_generator('scaffold', %w(Products name:string))
0
+
0
+    assert_generated_model_for :product
0
+    assert_generated_functional_test_for :products
0
+    assert_generated_unit_test_for :product
0
+    assert_generated_fixtures_for :products
0
+    assert_generated_helper_for :products
0
+    assert_generated_stylesheet :scaffold
0
+    assert_generated_views_for :products, "index.html.erb","new.html.erb","edit.html.erb","show.html.erb"
0
+    assert_skipped_migration :create_products
0
+    assert_added_route_for :products
0
+  end
0
+
0
+  def test_scaffold_plural_model_name_with_force_plural_forces_plural_model
0
+    run_generator('scaffold', %w(Products name:string --force-plural))
0
+
0
+    assert_generated_model_for :products
0
+    assert_generated_functional_test_for :products
0
+    assert_generated_unit_test_for :products
0
+    assert_generated_fixtures_for :products
0
+    assert_generated_helper_for :products
0
+    assert_generated_stylesheet :scaffold
0
+    assert_generated_views_for :products, "index.html.erb","new.html.erb","edit.html.erb","show.html.erb"
0
+    assert_skipped_migration :create_products
0
+    assert_added_route_for :products
0
+  end
0
+
0
 end