Fix CanCanCommunity#115 - specify custom parent authorization action.

CHANGELOG.rdoc

@@ -1,5 +1,8 @@
 Develop
 
+1.10.0 (Auguest 28, 2014)
+
+* Complete cancancan#115 - Specify authorization action for parent resources.
 
 1.9.2 (August 8th, 2014)
 

lib/cancan/controller_resource.rb

@@ -123,7 +123,11 @@ def adapter
     end
 
     def authorization_action
-      parent? ? :show : @params[:action].to_sym
+      parent? ? parent_authorization_action : @params[:action].to_sym
+    end
+
+    def parent_authorization_action
+      @options[:parent_action] || :show
     end
 
     def id_param

lib/cancan/version.rb

@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = "1.9.2"
+  VERSION = "1.10.0"
 end

spec/cancan/controller_resource_spec.rb

@@ -220,6 +220,14 @@ class Model < ::Model; end
       expect { resource.authorize_resource }.to raise_error(CanCan::AccessDenied)
     end
 
+    it "authorizes with :custom_action for parent collection action" do
+      controller.instance_variable_set(:@category, :some_category)
+      allow(controller).to receive(:authorize!).with(:custom_action, :some_category) { raise CanCan::AccessDenied }
+
+      resource = CanCan::ControllerResource.new(controller, :category, :parent => true, :parent_action => :custom_action )
+      expect { resource.authorize_resource }.to raise_error(CanCan::AccessDenied)
+    end
+
     it "has the specified nested resource_class when using / for namespace" do
       module Admin
         class Dashboard; end