properly handle Admin::AbilitiesController in params[:controller] - c…

…loses #46

lib/cancan/resource_authorization.rb

@@ -48,7 +48,7 @@ def parent_resource
     end
 
     def model_name
-      params[:controller].split('/').last.singularize
+      params[:controller].sub("Controller", "").underscore.split('/').last.singularize
     end
 
     def collection_actions

spec/cancan/resource_authorization_spec.rb

@@ -20,6 +20,13 @@
     @controller.instance_variable_get(:@ability).should == :some_resource
   end
 
+  it "should properly load resource for namespaced controller when using '::' for namespace" do
+    stub(Ability).find(123) { :some_resource }
+    authorization = CanCan::ResourceAuthorization.new(@controller, :controller => "Admin::AbilitiesController", :action => "show", :id => 123)
+    authorization.load_resource
+    @controller.instance_variable_get(:@ability).should == :some_resource
+  end
+
   it "should build a new resource with hash if params[:id] is not specified" do
     stub(Ability).new(:foo => "bar") { :some_resource }
     authorization = CanCan::ResourceAuthorization.new(@controller, :controller => "abilities", :action => "create", :ability => {:foo => "bar"})