Moved from blocks to a decorator.

refinery · Jul 11, 2015 · afe258e · afe258e
1 parent 84452b5
commit afe258e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/core/app/decorators/controllers/application_controller_decorator.rb b/core/app/decorators/controllers/application_controller_decorator.rb
@@ -0,0 +1,7 @@
+ApplicationController.class_eval do
+  include Refinery::Pages::InstanceMethods
+  helper Refinery::Pages::ContentPagesHelper
+
+  include Refinery::ApplicationController
+  helper Refinery::Core::Engine.helpers
+end
diff --git a/core/app/decorators/controllers/refinery/admin_controller_decorator.rb b/core/app/decorators/controllers/refinery/admin_controller_decorator.rb
@@ -0,0 +1,4 @@
+Refinery::AdminController.class_eval do
+  include Refinery::Pages::Admin::InstanceMethods
+  helper Refinery::Pages::ContentPagesHelper
+end
diff --git a/core/lib/refinery/core.rb b/core/lib/refinery/core.rb
@@ -2,7 +2,7 @@
 require 'truncate_html'
 require 'will_paginate'
 require 'refinery/i18n'
-# require 'zilch/authorisation'
+require 'zilch/authorisation'
 
 module Refinery
   module Core

diff --git a/core/lib/refinery/core/engine.rb b/core/lib/refinery/core/engine.rb
@@ -19,9 +19,6 @@ def register_decorators!
         def refinery_inclusion!
           before_inclusion_procs.each(&:call).tap{ |c| c.clear if Rails.application.config.cache_classes }
 
-          Refinery.include_once(::ApplicationController, Refinery::ApplicationController)
-          ::ApplicationController.send :helper, Refinery::Core::Engine.helpers
-
           after_inclusion_procs.each(&:call).tap{ |c| c.clear if Rails.application.config.cache_classes }
         end
       end

diff --git a/pages/lib/refinery/pages/engine.rb b/pages/lib/refinery/pages/engine.rb
@@ -8,16 +8,6 @@ class Engine < ::Rails::Engine
 
       config.autoload_paths += %W( #{config.root}/lib )
 
-      before_inclusion do
-        ::ApplicationController.send :helper, Refinery::Pages::ContentPagesHelper
-        Refinery::AdminController.send :helper, Refinery::Pages::ContentPagesHelper
-      end
-
-      after_inclusion do
-        Refinery.include_once(::ApplicationController, Refinery::Pages::InstanceMethods)
-        Refinery.include_once(Refinery::AdminController, Refinery::Pages::Admin::InstanceMethods)
-      end
-
       initializer "refinery.pages register plugin" do
         Refinery::Plugin.register do |plugin|
           plugin.pathname = root