move things around so it works with rails

Mavenfile

@@ -1,2 +1,3 @@
-properties['jruby.versions']='1.6.3,1.6.4,1.5.6,1.6.5'
+properties['jruby.versions']='1.5.6,1.6.3,1.6.4,1.6.5.1,1.6.6,1.6.7'
 properties['jruby.18and19']='true'
+properties['jruby.plugins.version']='0.28.6'

lib/ixtlan/guard/guard_rails.rb

@@ -199,7 +199,7 @@ def self.included(base)
       end
 
       module InstanceMethods #:nodoc:
-        def allowed?(action, resource, reference = nil)
+        def allowed?(resource, action, reference = nil)
           if resource.to_s != controller.class.controller_name || reference
             other = "#{resource}Controller".classify.constantize
             if other.respond_to?(:allowed?)

lib/ixtlan/guard/railtie.rb

@@ -12,6 +12,7 @@ class Railtie < Rails::Railtie
         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|
@@ -25,9 +26,6 @@ class Railtie < Rails::Railtie
 
         controller = ::ApplicationController rescue ::ActionController::Base
         controller.send(:before_filter, :authorize)
-
-        helper = ::ApplicationHelper rescue ::ActionView::Base
-        helper.send(:include, Ixtlan::Guard::Allowed)
 
         app.config.guard = Ixtlan::Guard::Guard.new(options)
       end

spec/guard_rails_spec.rb

@@ -7,7 +7,7 @@ def debug(&block)
   end
 end
 
-class Rails
+module Rails
   def self.application
     self
   end