controller.rb in padrino-gen-0.12.4

- old
+ new

@@ -1,5 +1,7 @@
+require 'padrino-core/application' unless defined?(Padrino::Application)
+
 module Padrino
   module Generators
     ##
     # Responsible for generating route controllers and associated tests within a Padrino application.
     #
@@ -41,26 +43,32 @@
           @project_name = options[:namespace].underscore.camelize
           @project_name = fetch_project_name(app) if @project_name.empty?
           @app_name     = fetch_app_name(app)
           @actions      = controller_actions(fields)
           @controller   = name.to_s.underscore
-          @helper_name  = "#{@controller.camelize}Helper"
           @layout       = options[:layout] if options[:layout] && !options[:layout].empty?
 
           block_opts = []
           block_opts << ":parent => :#{options[:parent]}" if options[:parent] && !options[:parent].empty?
           block_opts << ":provides => [#{options[:provides]}]" if options[:provides] && !options[:provides].empty?
           @block_opts_string = block_opts.join(', ') unless block_opts.empty?
 
           self.behavior = :revoke if options[:destroy]
           template 'templates/controller.rb.tt', destination_root(app, 'controllers', "#{name.to_s.underscore}.rb")
-          template 'templates/helper.rb.tt',     destination_root(app, 'helpers', "#{name.to_s.underscore}_helper.rb") unless options[:'no-helper']
           empty_directory destination_root(app, "/views/#{name.to_s.underscore}")
-          include_component_module_for(:test)
+
           if test?
-            generate_controller_test(name)
-            generate_helper_test(@helper_name, @project_name, @app_name) unless options[:'no-helper']
+            include_component_module_for(:test)
+            path = @controller
+
+            if options[:parent] && !options[:parent].empty?
+              path = Application.process_path_for_parent_params(path, [options[:parent]]).prepend("/")
+            end
+            path.prepend("/") unless path.start_with?("/")
+            generate_controller_test(name, path)
           end
+
+          create_helper_files(app, name) unless options[:'no-helper']
         else
           say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
         end
       end
     end