diff options
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/named_base.rb | 9 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/controller/templates/controller.rb | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb index 63703176de..b060b4330b 100644 --- a/railties/lib/rails/generators/named_base.rb +++ b/railties/lib/rails/generators/named_base.rb @@ -84,10 +84,11 @@ module Rails end def namespaced_class_path - @namespaced_class_path ||= begin - namespace_path = namespace.name.split("::").map {|m| m.underscore } - namespace_path + @class_path - end + @namespaced_class_path ||= [namespace_path] + @class_path + end + + def namespace_path + @namespace_path ||= namespace.name.split("::").map {|m| m.underscore }[0] end def class_name diff --git a/railties/lib/rails/generators/rails/controller/templates/controller.rb b/railties/lib/rails/generators/rails/controller/templates/controller.rb index 4053113b4b..0f15125649 100644 --- a/railties/lib/rails/generators/rails/controller/templates/controller.rb +++ b/railties/lib/rails/generators/rails/controller/templates/controller.rb @@ -1,5 +1,5 @@ <% if namespaced? -%> -require_dependency "<%= namespaced_file_path %>/application_controller" +require_dependency "<%= namespace_path %>/application_controller" <% end -%> <% module_namespacing do -%> |