Merge pull request #675 from bukalapak/master

porting #668 to master branch
2013-05-03 16:15:31 -07:00
parent ff2b632f15 ce7d3fecdb
commit 60cf6a67ef
2 changed files with 11 additions and 1 deletions
--- a/lib/cancan/controller_resource.rb
+++ b/lib/cancan/controller_resource.rb
@@ -227,7 +227,7 @@ module CanCan
    end

    def namespace
-      @params[:controller].split("::")[0..-2]
+      @params[:controller].split(/::|\//)[0..-2]
    end

    def namespaced_name