lib/cantango/ability/cache.rb in cantango-0.9.3.2 vs lib/cantango/ability/cache.rb in cantango-0.9.4

@@ -1,26 +1,43 @@
 module CanTango
   class Ability
     class Cache
       autoload_modules :BaseCache, :SessionCache, :Reader, :Writer, :RulesCache, :Key
 
+      include CanTango::Helpers::Debug
+      include CanTango::Helpers::RoleMethods
+
       attr_reader :rules_cached, :ability
+      attr_writer :key_method_names, :cache_key
 
-      def initialize ability
+      delegate :session, :cached?, :to => :ability
+
+      def initialize ability, options = {}
         @ability = ability
+        @cache_key = options[:cache_key]
+        @key_method_names = options[:key_method_names]
+        debug "Creating cache with key: #{cache_key.inspect} on #{key_method_names.inspect}"
       end
 
-      def session
-        ability.session
+      def empty?
+        cached_rules.blank?
       end
 
+      def key_method_names
+        @key_method_names ||= [roles_list_meth, role_groups_list_meth]
+      end
+
+      def cache_key
+        @cache_key ||= :cache
+      end
+
       def cache_rules!
-        writer.save key, reader.prepared_rules
+        writer.save(key, reader.prepared_rules) if cached?
       end
 
       def cached_rules
-        @rules ||= reader.prepared_rules
+        @rules ||= reader.prepared_rules if cached?
       end
 
       def compiler
         @compiler ||= Kompiler.new
       end
@@ -32,23 +49,23 @@
       def writer
         @writer ||= Writer.new(self)
       end
 
       def cached_rules?
-        key.same? session
+        key.same?(session) && cached?
       end
 
       def key
-        @key ||= Key.new ability.user, ability.subject
+        @key ||= Key.new ability.user, ability.subject, key_method_names
       end
 
       def rules_cache
         @rules_cache ||= RulesCache.new(session).instance
       end
 
       def invalidate!
         raise "no session" if !session
-        rules_cache.invalidate! session[:cache_key]
+        rules_cache.invalidate! session[cache_key]
       end
 
       def compile_on?
         return false if !compile_adapter?
         CanTango.config.cache_engine.compile?