diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-23 22:42:24 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-05-23 22:42:24 +0000 |
| commit | da7f9f516a8f34303ae08a9b89502757b41a578a (patch) | |
| tree | 84468a301d31233b92ff04e93f6202bc7fef1608 /railties/lib/rails_generator | |
| parent | 4bd3e3aa1b92c75fafbb727820aeacae5e9bcb42 (diff) | |
| download | rails-da7f9f516a8f34303ae08a9b89502757b41a578a.tar.gz rails-da7f9f516a8f34303ae08a9b89502757b41a578a.tar.bz2 rails-da7f9f516a8f34303ae08a9b89502757b41a578a.zip | |
Scaffold generator tests. Closes #8443.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6824 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_generator')
| -rw-r--r-- | railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb index 15eb269d1e..8a331867eb 100644 --- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb +++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb @@ -5,9 +5,10 @@ class ScaffoldGenerator < Rails::Generator::NamedBase :controller_class_nesting, :controller_class_nesting_depth, :controller_class_name, + :controller_underscore_name, :controller_singular_name, :controller_plural_name - alias_method :controller_file_name, :controller_singular_name + alias_method :controller_file_name, :controller_underscore_name alias_method :controller_table_name, :controller_plural_name def initialize(runtime_args, runtime_options = {}) @@ -16,8 +17,8 @@ class ScaffoldGenerator < Rails::Generator::NamedBase @controller_name = @name.pluralize 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) - + @controller_class_name_without_nesting, @controller_underscore_name, @controller_plural_name = inflect_names(base_name) + @controller_singular_name=base_name.singularize if @controller_class_nesting.empty? @controller_class_name = @controller_class_name_without_nesting else |