lib/access-granted/policy.rb in access-granted-1.0.4 vs lib/access-granted/policy.rb in access-granted-1.1.0

@@ -1,12 +1,14 @@
 module AccessGranted
   module Policy
-    attr_accessor :roles
+    attr_accessor :roles, :cache
+    attr_reader :user
 
-    def initialize(user)
+    def initialize(user, cache_enabled = true)
       @user          = user
       @roles         = []
+      @cache         = {}
       configure
     end
 
     def configure
     end
@@ -15,24 +17,29 @@
       name = name.to_sym
       if roles.select {|r| r.name == name }.any?
         raise DuplicateRole, "Role '#{name}' already defined"
       end
       r = if conditions_or_klass.is_a?(Class) && conditions_or_klass <= AccessGranted::Role
-        conditions_or_klass.new(name, conditions, @user, block)
+        conditions_or_klass.new(name, conditions, user, block)
       else
-        Role.new(name, conditions_or_klass, @user, block)
+        Role.new(name, conditions_or_klass, user, block)
       end
       roles << r
       r
     end
 
     def can?(action, subject = nil)
-      roles.each do |role|
-        next unless role.applies_to?(@user)
+      cache[action] ||= {}
+      cache[action][subject] ||= check_permission(action, subject)
+    end
+
+    def check_permission(action, subject)
+      applicable_roles.each do |role|
         permission = role.find_permission(action, subject)
         return permission.granted if permission
       end
+
       false
     end
 
     def cannot?(*args)
       !can?(*args)
@@ -41,8 +48,16 @@
     def authorize!(action, subject)
       if cannot?(action, subject)
         raise AccessDenied
       end
       subject
+    end
+
+    private
+
+    def applicable_roles
+      @applicable_roles ||= roles.select do |role|
+        role.applies_to?(user)
+      end
     end
   end
 end