Changeset 2230

Timestamp:

03/07/2008 06:00:29 PM (9 months ago)

Author:

PugFish

Message:

Changed Cache library to use config groups, works the same as Database

Location:

trunk/system

Files:

• config/cache.php (modified) (1 diff)
• i18n/en_US/cache.php (modified) (1 diff)
• libraries/Cache.php (modified) (1 diff)

trunk/system/config/cache.php

@@ -3 +3 @@
  * @package  Cache
  *
- * Cache backend driver. Kohana comes with file, database, and memcache drivers.
- * - File cache is fast and reliable, but requires many filesystem lookups.
- * - Database cache can be used to cache items remotely, but is slower.
- * - Memcache is very high performance, but prevents cache tags from being used.
+ * Cache settings, defined as arrays, or "groups". If no group name is
+ * used when loading the cache library, the group named "default" will be used.
+ *
+ * Each group can be used independently, and multiple groups can be used at once.
+ *
+ * Group Options:
+ *  driver   - Cache backend driver. Kohana comes with file, database, and memcache drivers.
+ *              > File cache is fast and reliable, but requires many filesystem lookups.
+ *              > Database cache can be used to cache items remotely, but is slower.
+ *              > Memcache is very high performance, but prevents cache tags from being used.
+ *
+ *  params   - Driver parameters, specific to each driver.
+ *
+ *  lifetime - Default lifetime to of caches, seconds. By default, caches are stored for
+ *             thirty minutes. Specific lifetime can also be set when creating a new cache.
+ *             Setting this to 0 will never automatically delete caches.
+ *
+ *  requests - Average number of cache requests that will processed before all expired
+ *             caches are deleted. This is commonly referred to as "garbage collection".
+ *             Setting this to a negative number will disable automatic garbage collection.
  */
-$config['driver'] = 'file';
-
-/**
- * Driver parameters, specific to each driver.
- */
-$config['params'] = 'application/cache';
-
-/**
- * Default lifetime to of caches, seconds. By default, caches are stored for
- * thirty minutes. Specific lifetime can also be set when creating a new cache.
- *
- * Setting this to 0 will never automatically delete caches.
- */
-$config['lifetime'] = 1800;
-
-/**
- * Average number of cache requests that will processed before all expired
- * caches are deleted. This is commonly referred to as "garbage collection".
- * Setting this to a negative number will disable automatic garbage collection.
- */
-$config['requests'] = 1000;
+$config['default'] = array
+(
+        'driver'   => 'file',
+        'params'   => 'application/cache',
+        'lifetime' => 1800,
+        'requests' => 1000
+);

trunk/system/i18n/en_US/cache.php

@@ -3 +3 @@
 $lang = array
 (
+        'undefined_group'      => 'The %s group is not defined in your configuration.',
         'driver_not_supported' => 'The requested Cache driver, %s, was not found.',
         'extension_not_loaded' => 'The %s PHP extension must be loaded to use this driver.',

trunk/system/libraries/Cache.php

@@ -47 +47 @@
         public function __construct($config = array())
         {
+                if (empty($config))
+                {
+                        // Load the default group
+                        $config = Config::item('cache.default');
+                }
+                elseif (is_string($config))
+                {
+                        $name = $config;
+
+                        // Test the config group name
+                        if (($config = Config::item('cache.'.$config)) === NULL)
+                                throw new Kohana_Exception('cache.undefined_group', $name);
+                }
+
                 // Load configuration
                 $this->config = (array) $config + Config::item('cache');