Merge pull request #1328 from flippingbits/cleanup_engine_generator

Cleanup engine generator

railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

@@ -258,7 +258,7 @@ def valid_const?
         elsif RESERVED_NAMES.include?(name)
           raise Error, "Invalid plugin name #{name}. Please give a name which does not match one of the reserved rails words."
         elsif Object.const_defined?(camelized)
-          raise Error, "Invalid plugin name #{name}, constant #{camelized} is already in use. Please choose another application name."
+          raise Error, "Invalid plugin name #{name}, constant #{camelized} is already in use. Please choose another plugin name."
         end
       end
 

railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb

 module <%= camelized %>
-  class Engine < Rails::Engine
+  class Engine < ::Rails::Engine
 <% if mountable? -%>
     isolate_namespace <%= camelized %>
 <% end -%>

railties/test/generators/plugin_new_generator_test.rb

@@ -148,7 +148,7 @@ def test_creating_engine_in_full_mode
     assert_file "app/views"
     assert_file "app/helpers"
     assert_file "config/routes.rb", /Rails.application.routes.draw do/
-    assert_file "lib/bukkits/engine.rb", /module Bukkits\n  class Engine < Rails::Engine\n  end\nend/
+    assert_file "lib/bukkits/engine.rb", /module Bukkits\n  class Engine < ::Rails::Engine\n  end\nend/
     assert_file "lib/bukkits.rb", /require "bukkits\/engine"/
   end