Permalink
Browse files

Make table_name and controller_name in generators honor AR::Base.plur…

…alize_table_names.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2380 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 0b1abc3 commit 8e78e9335b6b6e86d5a55f9d00ea0ab699268cc5 Marcel Molina committed Sep 28, 2005
View
2 railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make table_name and controller_name in generators honor AR::Base.pluralize_table_names. #2213 [kazuhiko@fdiary.net]
+
* Clearly label functional and unit tests in rake stats output. #2297 [lasse.koskela@gmail.com]
* Make the migration generator only check files ending in *.rb when calculating the next file name #2317 [Chad Fowler]
View
4 railties/lib/rails_generator/base.rb
@@ -144,10 +144,9 @@ def usage_message
#
# See Rails::Generator::Base for a discussion of Manifests and Commands.
class NamedBase < Base
- attr_reader :name, :class_name, :singular_name, :plural_name
+ attr_reader :name, :class_name, :singular_name, :plural_name, :table_name
attr_reader :class_path, :file_path, :class_nesting, :class_nesting_depth
alias_method :file_name, :singular_name
- alias_method :table_name, :plural_name
alias_method :actions, :args
def initialize(runtime_args, runtime_options = {})
@@ -172,6 +171,7 @@ def assign_names!(name)
@name = name
base_name, @class_path, @file_path, @class_nesting, @class_nesting_depth = extract_modules(@name)
@class_name_without_nesting, @singular_name, @plural_name = inflect_names(base_name)
+ @table_name = ActiveRecord::Base.pluralize_table_names ? plural_name : singular_name
if @class_nesting.empty?
@class_name = @class_name_without_nesting
else
View
2 railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
@@ -46,7 +46,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
def initialize(runtime_args, runtime_options = {})
super
- @controller_name = args.shift || @name.pluralize
+ @controller_name = args.shift || ActiveRecord::Base.pluralize_table_names ? @name.pluralize : @name
base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
@controller_class_name_without_nesting, @controller_singular_name, @controller_plural_name = inflect_names(base_name)
if @controller_class_nesting.empty?
View
7 railties/test/rails_generator_test.rb
@@ -74,6 +74,7 @@ def test_generator_spec
end
def test_named_generator_attributes
+ ActiveRecord::Base.pluralize_table_names = true
g = Rails::Generator::Base.instance('working', %w(admin/foo bar baz))
assert_equal 'admin/foo', g.name
assert_equal %w(admin), g.class_path
@@ -85,4 +86,10 @@ def test_named_generator_attributes
assert_equal g.plural_name, g.table_name
assert_equal %w(bar baz), g.args
end
+
+ def test_named_generator_attributes_without_pluralized
+ ActiveRecord::Base.pluralize_table_names = false
+ g = Rails::Generator::Base.instance('working', %w(admin/foo bar baz))
+ assert_equal g.singular_name, g.table_name
+ end
end

0 comments on commit 8e78e93

Please sign in to comment.