diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-01 09:49:41 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-02-01 09:49:41 -0800 |
| commit | 6b22889bd8950e6d0cfad29db0e425a731067a46 (patch) | |
| tree | f167a31929b8c849077617c9b801c1b85dd405e1 /railties/lib/rails | |
| parent | d2c64009482d38d4894dd09d2d1e2fb4a165ecac (diff) | |
| parent | 8afa8b0c218fe9c197140ebeeedd758fdf77c0e1 (diff) | |
| download | rails-6b22889bd8950e6d0cfad29db0e425a731067a46.tar.gz rails-6b22889bd8950e6d0cfad29db0e425a731067a46.tar.bz2 rails-6b22889bd8950e6d0cfad29db0e425a731067a46.zip | |
Merge pull request #4826 from kennyj/fix_4737-2
Fix GH #4737. Missing helper file (LoadError) in mountable plugin.
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb index 0e900a34bb..f4263d1b98 100644 --- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb +++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb @@ -285,7 +285,9 @@ task :default => :test end def valid_const? - if camelized =~ /^\d/ + if original_name =~ /[^0-9a-zA-Z_]+/ + raise Error, "Invalid plugin name #{original_name}. Please give a name which use only alphabetic or numeric or \"_\" characters." + elsif camelized =~ /^\d/ raise Error, "Invalid plugin name #{original_name}. Please give a name which does not start with numbers." elsif RESERVED_NAMES.include?(name) raise Error, "Invalid plugin name #{original_name}. Please give a name which does not match one of the reserved rails words." |