Merge pull request #1 from tuned-up/fix_for_multiple_decorations

Fix for multiple decorations
GoodMeasuresLLC · Apr 18, 2016 · 4542718 · 4542718
2 parents a416ecf + 8d660a6
commit 4542718
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/draper/cancancan.rb b/lib/draper/cancancan.rb
@@ -2,13 +2,13 @@
 
 module Draper
   module CanCanCan
-    # actually don't need any code in my gem's namespace .. 
+    # actually don't need any code in my gem's namespace ..
     def can?(action, subject, *extra_args)
-      if subject.is_a?(Draper::Decorator)
-        super(action,subject.model,*extra_args)
-      else
-        super(action,subject,*extra_args)
+      while subject.is_a?(Draper::Decorator)
+        subject = subject.model
       end
+
+      super(action, subject, *extra_args)
     end
 
     def cannot?(*args)

diff --git a/lib/draper/cancancan/version.rb b/lib/draper/cancancan/version.rb
@@ -1,5 +1,5 @@
 module Draper
   module CanCanCan
-    VERSION = "1.0.1"
+    VERSION = "1.1.1"
   end
 end