lib/ixtlan/guard/railtie.rb in ixtlan-guard-0.7.2 vs lib/ixtlan/guard/railtie.rb in ixtlan-guard-0.8.0

@@ -1,31 +1,34 @@
 require 'rails'
-require 'ixtlan/guard/guard_ng'
+require 'ixtlan/guard/guard'
 require 'ixtlan/guard/guard_rails'
 require 'logger'
 require 'fileutils'
 
 module Ixtlan
   module Guard
     class Railtie < Rails::Railtie
 
       config.before_configuration do |app|
         app.config.guards_dir = File.join(Rails.root, "app", "guards")
+        # needs to be here ?!?
+        ::ActionController::Base.send(:include, Ixtlan::Guard::ActionController)
+        ::ActionView::Base.send(:include, Ixtlan::Guard::Allowed)
       end
       
       config.after_initialize do |app|
         logger = app.config.logger || Rails.logger || Logger.new(STDERR)
         options = {
           :guards_dir => app.config.guards_dir,
           :cache => app.config.cache_classes
         }
         options[:logger] = logger unless defined?(Slf4r)
         FileUtils.mkdir_p(app.config.guards_dir)
-        app.config.guard = Ixtlan::Guard::GuardNG.new(options)
 
-        ::ActionController::Base.send(:include, Ixtlan::ActionController::Guard)
-        ::ActionController::Base.send(:before_filter, :authorize)
-        ::ActionView::Base.send(:include, Ixtlan::Allowed)
+        controller = ::ApplicationController rescue ::ActionController::Base
+        controller.send(:before_filter, :authorize)
+
+        app.config.guard = Ixtlan::Guard::Guard.new(options)
       end
       
       config.generators do
         require 'rails/generators'
         require 'rails/generators/rails/controller/controller_generator'