drop support for InheritedResource

CHANGELOG.rdoc

@@ -5,6 +5,7 @@ Unreleased
 2.0.0 (TBD)
 
 * Drop support for Rails < 4.2 (oliverklee)
+* Drop support for InheritedResource (coorasse)
 
 1.15.0 (June 13th, 2016)
 

lib/cancan.rb

@@ -5,7 +5,6 @@
 require 'cancan/controller_additions'
 require 'cancan/model_additions'
 require 'cancan/exceptions'
-require 'cancan/inherited_resource'
 
 require 'cancan/model_adapters/abstract_adapter'
 require 'cancan/model_adapters/default_adapter'

lib/cancan/controller_additions.rb

@@ -284,11 +284,7 @@ def skip_authorization(*args)
       end
 
       def cancan_resource_class
-        if ancestors.map(&:to_s).include? "InheritedResources::Actions"
-          InheritedResource
-        else
-          ControllerResource
-        end
+        ControllerResource
       end
 
       def cancan_skipper

spec/cancan/controller_additions_spec.rb

@@ -104,11 +104,6 @@
     expect(@controller.class.cancan_resource_class).to eq(CanCan::ControllerResource)
   end
 
-  it "cancan_resource_class is InheritedResource when class includes InheritedResources::Actions" do
-    allow(@controller.class).to receive(:ancestors) { ["InheritedResources::Actions"] }
-    expect(@controller.class.cancan_resource_class).to eq(CanCan::InheritedResource)
-  end
-
   it "cancan_skipper is an empty hash with :authorize and :load options and remember changes" do
     expect(@controller_class.cancan_skipper).to eq({:authorize => {}, :load => {}})
     @controller_class.cancan_skipper[:load] = true