diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2018-04-22 03:23:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 03:23:46 -0500 |
| commit | 7316f3696a9a595382c4bf278ac4019a978cce30 (patch) | |
| tree | 70fd026480d5dc649b98c5735dc51a875f4e603a /railties/lib | |
| parent | e4a0a048836512432b43c7fb623d32de2496a346 (diff) | |
| parent | 6df0bd156af8e9229dd3069260a469c29a1e0fe3 (diff) | |
| download | rails-7316f3696a9a595382c4bf278ac4019a978cce30.tar.gz rails-7316f3696a9a595382c4bf278ac4019a978cce30.tar.bz2 rails-7316f3696a9a595382c4bf278ac4019a978cce30.zip | |
Merge pull request #31554 from fatkodima/controller_generator_suffix
Gracefully handle extra "controller" when generating controller
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/controller/controller_generator.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb index 6e2495d45f..eb75e7e661 100644 --- a/railties/lib/rails/generators/rails/controller/controller_generator.rb +++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb @@ -20,10 +20,20 @@ module Rails route generate_routing_code end - hook_for :template_engine, :test_framework, :helper, :assets + hook_for :template_engine, :test_framework, :helper, :assets do |generator| + invoke generator, [ remove_possible_suffix(name), actions ] + end private + def file_name + @_file_name ||= remove_possible_suffix(super) + end + + def remove_possible_suffix(name) + name.sub(/_?controller$/i, "") + end + # This method creates nested route entry for namespaced resources. # For eg. rails g controller foo/bar/baz index show # Will generate - |