Merge pull request #553 from azul/hook-generator-in-controller-generator

hook generator from controller generator

README.md

@@ -131,11 +131,12 @@ end
 
 ### Generators
 
-When you have Draper installed and generate a resource with...
+When you have Draper installed and generate a controller for example with...
 
 ```
 rails generate resource Article
 ```
+
 ...you'll get a decorator for free!
 
 But if the `Article` model already exists, you can run...

lib/draper/railtie.rb

@@ -6,7 +6,7 @@ module ActiveModel
       app ||= Rails.application # Rails 3.0.x does not yield `app`
 
       Rails::Generators.configure! app.config.generators
-      require_relative '../generators/resource_override'
+      require_relative '../generators/controller_override'
     end
   end
 end

lib/generators/controller_override.rb

@@ -0,0 +1,15 @@
+require "rails/generators"
+require "rails/generators/rails/controller/controller_generator"
+require "rails/generators/rails/scaffold_controller/scaffold_controller_generator"
+
+module Rails
+  module Generators
+    class ControllerGenerator
+      hook_for :decorator, default: true
+    end
+
+    class ScaffoldControllerGenerator
+      hook_for :decorator, default: true
+    end
+  end
+end

lib/generators/resource_override.rb

@@ -1,12 +0,0 @@
-require "rails/generators"
-require "rails/generators/rails/resource/resource_generator"
-
-module Rails
-  module Generators
-    ResourceGenerator.class_eval do
-      def add_decorator
-        invoke "decorator"
-      end
-    end
-  end
-end

spec/generators/decorator/decorator_generator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rails'
 require 'ammeter/init'
-require 'generators/decorator/decorator_generator'
+require 'generators/rails/decorator_generator'
 
 describe Rails::Generators::DecoratorGenerator do
   destination File.expand_path("../tmp", __FILE__)