lib/refinerycms-authentication.rb in refinerycms-authentication-0.9.9.20 vs lib/refinerycms-authentication.rb in refinerycms-authentication-0.9.9.21

@@ -1,36 +1,36 @@
 require 'devise'
 require 'refinerycms-core'
 require 'friendly_id'
-# Attach authenticated system methods to the ::Refinery::ApplicationController
-require File.expand_path('../authenticated_system', __FILE__)
-[::Refinery::ApplicationController, ::Refinery::ApplicationHelper].each do |c|
-  c.class_eval {
-    include AuthenticatedSystem
-  }
-end
 
 module Refinery
   module Authentication
 
     class Engine < ::Rails::Engine
 
-      initializer "serve static assets" do |app|
+      initializer 'serve static assets' do |app|
         app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
       end
 
       config.autoload_paths += %W( #{config.root}/lib )
 
       config.after_initialize do
         ::Refinery::Plugin.register do |plugin|
-          plugin.name = "refinery_users"
-          plugin.version = %q{0.9.9.17}
+          plugin.name = 'refinery_users'
+          plugin.version = %q{0.9.9.21}
           plugin.menu_match = /(refinery|admin)\/users$/
           plugin.activity = {
             :class => User,
             :title => 'username'
           }
-          plugin.url = {:controller => "/admin/users"}
+          plugin.url = {:controller => '/admin/users'}
+        end
+      end
+
+      refinery.before_inclusion do
+        [::Refinery::ApplicationController, ::Refinery::ApplicationHelper].each do |c|
+          c.send :require, File.expand_path('../authenticated_system', __FILE__)
+          c.send :include, AuthenticatedSystem
         end
       end
     end
 
     class << self