1 files changed, 28 insertions, 50 deletions
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 43632127fc..b4fd503631 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -1,67 +1,45 @@
 module Rails
-  class Plugin < Railtie
-    def self.all(list, paths)
-      plugins = []
-      paths.each do |path|
-        Dir["#{path}/*"].each do |plugin_path|
-          plugin = new(plugin_path)
-          next unless list.include?(plugin.name) || list.include?(:all)
-          plugins << plugin
-        end
+  class Plugin < Engine
+    class << self
+      def inherited(base)
+        raise "You should not inherit from Rails::Plugin"
       end
 
-      plugins.sort_by do |p|
-        [list.index(p.name) || list.index(:all), p.name.to_s]
+      def config
+        raise "Plugins does not provide configuration at the class level"
       end
-    end
-
-    attr_reader :name, :path
-
-    def initialize(path)
-      @name = File.basename(path).to_sym
-      @path = path
-    end
-
-    def load_paths
-      Dir["#{path}/{lib}", "#{path}/app/{models,controllers,helpers}"]
-    end
-
-    def load_tasks
-      Dir["#{path}/{tasks,lib/tasks,rails/tasks}/**/*.rake"].sort.each { |ext| load ext }
-    end
-
-    initializer :add_to_load_path, :after => :set_autoload_paths do |app|
-      load_paths.each do |path|
-        $LOAD_PATH << path
-        require "active_support/dependencies"
 
-        ActiveSupport::Dependencies.load_paths << path
+      def all(list, paths)
+        plugins = []
+        paths.each do |path|
+          Dir["#{path}/*"].each do |plugin_path|
+            plugin = new(plugin_path)
+            next unless list.include?(plugin.name) || list.include?(:all)
+            plugins << plugin
+          end
+        end
 
-        unless app.config.reload_plugins
-          ActiveSupport::Dependencies.load_once_paths << path
+        plugins.sort_by do |p|
+          [list.index(p.name) || list.index(:all), p.name.to_s]
         end
       end
     end
 
-    initializer :load_init_rb, :before => :load_application_initializers do |app|
-      file   = "#{@path}/init.rb"
-      config = app.config
-      eval File.read(file), binding, file if File.file?(file)
+    attr_reader :name, :path
+
+    def initialize(root)
+      @name = File.basename(root).to_sym
+      config.root = root
     end
 
-    initializer :add_view_paths, :after => :initialize_framework_views do
-      plugin_views = "#{path}/app/views"
-      if File.directory?(plugin_views)
-        ActionController::Base.view_paths.concat([plugin_views]) if defined? ActionController
-        ActionMailer::Base.view_paths.concat([plugin_views])     if defined? ActionMailer
-      end
+    def config
+      @config ||= Engine::Configuration.new
     end
 
-    initializer :add_routing_file, :after => :initialize_routing do |app|
-      routing_file = "#{path}/config/routes.rb"
-      if File.exist?(routing_file)
-        app.config.action_dispatch.route_files.unshift(routing_file)
-      end
+    initializer :load_init_rb do |app|
+      file   = Dir["#{root}/{rails/init,init}.rb"].first
+      config = app.config
+      eval(File.read(file), binding, file) if file && File.file?(file)
     end
   end
 end