Merge pull request #115 from erikaxel/fix-after-filter-deprecation

Fix rails 5 after_filter deprecation
nathanl · Dec 20, 2016 · 537107b · 537107b
2 parents d0079fa + d7ea3b0
commit 537107b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/authority/controller.rb b/lib/authority/controller.rb
@@ -77,9 +77,15 @@ def authority_action(action_map)
 
       # Convenience wrapper for instance method
       def ensure_authorization_performed(options = {})
-        after_filter(options.slice(:only, :except)) do |controller_instance|
-          controller_instance.ensure_authorization_performed(options)
-        end
+        if respond_to? :after_action
+          after_action(options.slice(:only, :except)) do |controller_instance|
+             controller_instance.ensure_authorization_performed(options)
+          end
+        else
+          after_filter(options.slice(:only, :except)) do |controller_instance|
+             controller_instance.ensure_authorization_performed(options)
+          end
+        end        
       end
 
       # The controller action to authority action map used for determining