lib/can_play/ability.rb in can_play-0.3.1 vs lib/can_play/ability.rb in can_play-0.4.0

@@ -1,12 +1,12 @@
 class Ability
   include CanCan::Ability
-  attr_accessor :user
 
   def initialize(user)
+    clear_aliased_actions
     CanPlay::Config.tap do |i|
-      self.user = user||i.user_class_name.constantize.new
+      user = user||i.user_class_name.constantize.new
       if i.super_roles.is_a?(Array)
         i.super_roles.each do |role_name|
           can(:manage, :all) if user.send(i.role_judge_method, role_name)
         end
       elsif i.super_roles.is_a?(Proc)
@@ -18,18 +18,18 @@
           resource = CanPlay.find_by_name_and_code(role_resource.resource_name, CanPlay.override_code)
           next unless resource
           if resource[:type] == 'collection'
             if resource[:behavior]
               block = resource[:behavior]
-              can(resource[:verb], resource[:object]) if block.call(user)
+              can(resource[:verb], resource[:object]) if block.call
             else
               can resource[:verb], resource[:object]
             end
           elsif resource[:type] == 'member'
             if resource[:behavior]
               block = resource[:behavior]
               can resource[:verb], resource[:object] do |object|
-                block.call(user, object)
+                block.call(object)
               end
             else
               can resource[:verb], resource[:object]
             end
           end
\ No newline at end of file