cancan-permits 0.3.8 → 0.3.9

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.9

data/cancan-permits.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cancan-permits}
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

data/lib/cancan-permits/permit/base_permit.rb

@@ -74,11 +74,11 @@ module Permit
     end
 
     def can(action, subject, conditions = nil, &block)
-      can_definitions << rule_class.new(true, action, subject, conditions, block)
+      rules << rule_class.new(true, action, subject, conditions, block)
     end
         
     def cannot(action, subject, conditions = nil, &block)
-      can_definitions << rule_class.new(false, action, subject, conditions, block)
+      rules << rule_class.new(false, action, subject, conditions, block)
     end
     
     def owns(user, clazz, ownership_relation = :user_id, user_id_attribute = :id, strategy_used = nil)
@@ -122,8 +122,19 @@ module Permit
       user.has_role? permit_name(self.class)
     end
       
-    def can_definitions
-      ability.send :can_definitions
+    def rules
+      return rules_1_5 if rules_1_5
+      return rules_1_4 if rules_1_4
+      raise "CanCan ability.rules could not be found. Possibly due to CanCan API change since 1.5"
     end    
+    
+    def rules_1_5
+      ability.send :rules
+    end
+
+    def rules_1_4
+      ability.send :can_definitions
+    end
+
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Kristian Mandrup