From 8203bd9af53ee7c6627b94b17f23ef16eb36773c Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Thu, 7 Jul 2011 23:07:44 -0500
Subject: [PATCH] refactoring cache class.

---
 system/cache.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/system/cache.php b/system/cache.php
index 91bb181f..3bff3599 100644
--- a/system/cache.php
+++ b/system/cache.php
@@ -10,7 +10,10 @@ class Cache {
 	private static $drivers = array();
 
 	/**
-	 * Get a cache driver instance. Cache drivers are singletons.
+	 * Get a cache driver instance. If no driver name is specified, the default
+	 * cache driver will be returned as defined in the cache configuration file.
+	 *
+	 * Note: Cache drivers are managed as singleton instances.
 	 *
 	 * @param  string  $driver
 	 * @return Cache\Driver
@@ -22,12 +25,9 @@ public static function driver($driver = null)
 			$driver = Config::get('cache.driver');
 		}
 
-		if ( ! array_key_exists($driver, static::$drivers))
-		{
-			static::$drivers[$driver] = Cache\Factory::make($driver);
-		}
-
-		return static::$drivers[$driver];
+		return (array_key_exists($driver, static::$drivers))
+                                             ? static::$drivers[$driver] 
+                                             : static::$drivers[$driver] = Cache\Factory::make($driver);
 	}
 
 	/**
@@ -40,9 +40,7 @@ public static function driver($driver = null)
 	 */	
 	public static function get($key, $default = null, $driver = null)
 	{
-		$item = static::driver($driver)->get($key);
-
-		if (is_null($item))
+		if (is_null($item = static::driver($driver)->get($key)))
 		{
 			return is_callable($default) ? call_user_func($default) : $default;
 		}
@@ -51,8 +49,8 @@ public static function get($key, $default = null, $driver = null)
 	}
 
 	/**
-	 * Get an item from the cache. If it doesn't exist, store the default value
-	 * in the cache and return it.
+	 * Get an item from the cache. If the item doesn't exist in the cache, store
+	 * the default value in the cache and return it.
 	 *
 	 * @param  string  $key
 	 * @param  mixed   $default
@@ -60,7 +58,7 @@ public static function get($key, $default = null, $driver = null)
 	 * @param  string  $driver
 	 * @return mixed
 	 */
-	public static function maybe($key, $default, $minutes, $driver = null)
+	public static function remember($key, $default, $minutes, $driver = null)
 	{
 		if ( ! is_null($item = static::get($key)))
 		{