supporting deeply nested aliases - closes #98

lib/cancan/ability.rb

@@ -212,6 +212,15 @@ module CanCan
     end
 
     private
+    
+    # Accepts a hash of aliased actions and returns an array of actions which match.
+    # This should be called before "matches?" and other checking methods since they
+    # rely on the actions to be expanded.
+    def expand_actions(actions)
+      actions.map do |action|
+        aliased_actions[action] ? [action, *expand_actions(aliased_actions[action])] : action
+      end.flatten
+    end
 
     def can_definitions
       @can_definitions ||= []
@@ -219,7 +228,7 @@ module CanCan
 
     def matching_can_definition(action, subject)
       can_definitions.reverse.detect do |can_definition|
-        can_definition.expand_actions(aliased_actions)
+        can_definition.expanded_actions = expand_actions(can_definition.actions)
         can_definition.matches? action, subject
       end
     end

lib/cancan/can_definition.rb

@@ -5,6 +5,8 @@ module CanCan
   class CanDefinition # :nodoc:
     include ActiveSupport::Inflector
     attr_reader :block
+    attr_reader :actions
+    attr_writer :expanded_actions
     
     # The first argument when initializing is the base_behavior which is a true/false
     # value. True for "can" and false for "cannot". The next two arguments are the action
@@ -18,15 +20,6 @@ module CanCan
       @block = block
     end
 
-    # Accepts a hash of aliased actions and returns an array of actions which match.
-    # This should be called before "matches?" and other checking methods since they
-    # rely on the actions to be expanded.
-    def expand_actions(aliased_actions)
-      @expanded_actions = @actions.map do |action|
-        aliased_actions[action] ? [action, *aliased_actions[action]] : action
-      end.flatten
-    end
-
     def matches?(action, subject)
       matches_action?(action) && matches_subject?(subject)
     end