diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-10-23 19:22:01 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-10-23 19:22:01 +0000 |
| commit | 18e2188f5d4453e551fc0ed1e1603205e69e51bb (patch) | |
| tree | 1a079c6605893c2d01b9e13cad3d6c1fb7b8a28d | |
| parent | 284921a200d3f6e3afcb92d7455d842907ee4bca (diff) | |
| download | rails-18e2188f5d4453e551fc0ed1e1603205e69e51bb.tar.gz rails-18e2188f5d4453e551fc0ed1e1603205e69e51bb.tar.bz2 rails-18e2188f5d4453e551fc0ed1e1603205e69e51bb.zip | |
Plugin generator: check for class collisions. Closes #4833.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5342 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index a5c1963047..4b0d8fc98a 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Plugin generator: check for class collisions. #4833 [vinbarnes@gmail.com] + * Mailer generator: handle mailers in modules, set mime_version in unit test. [Jeremy Kemper] * Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. [Koz] diff --git a/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb b/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb index 8a55952ffe..915176ce18 100644 --- a/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb +++ b/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb @@ -9,6 +9,9 @@ class PluginGenerator < Rails::Generator::NamedBase def manifest record do |m| + # Check for class naming collisions. + m.class_collisions class_path, class_name + m.directory "#{plugin_path}/lib" m.directory "#{plugin_path}/tasks" m.directory "#{plugin_path}/test" |