Fixed TODO of __call method

Author: tersmitten

Model/Datasource/RedisSource.php

@@ -96,14 +96,18 @@ public function __destruct() {
  * @param string $name The name of the method being called
  * @param array $arguments An enumerated array containing the parameters passed to the method
  * @return mixed Method return value
- * @todo Throw exception(s)
+ * @throws RedisSourceException
  */
 	public function __call($name, $arguments) {
 		if (!method_exists($this->_connection, $name)) {
-			return false;
+			throw new RedisSourceException(__d('redis', 'Method (%s) does not exist.', $name));
 		}
 
-		return call_user_func_array(array($this->_connection, $name), $arguments);
+		try {
+			return call_user_func_array(array($this->_connection, $name), $arguments);
+		} catch (RedisException $e) {
+			throw new RedisSourceException(__d('redis', 'Method (%s) failed: %s.', $name, $e->getMessage()));
+		}
 	}
 
 /**
@@ -257,3 +261,10 @@ public function calculate(Model $Model, $func, $params = array()) {
 	}
 
 }
+
+/**
+ * Redis Source Exception class.
+ *
+ */
+class RedisSourceException extends CakeException {
+}

Test/Case/Model/Datasource/RedisSourceTest.php

@@ -253,29 +253,60 @@ public function testConnectTcpPersistent() {
 	}
 
 /**
- * testCall method
+ * testCallExisting method
+ *
+ *  Tests calling of an existing (Redis) method on a connected / configured instance.
  *
  * @return void
  */
-	public function testCall() {
+	public function testCallExisting() {
 		$Source = new TestRedisSource();
 
-		//
-		// Existing method
-		//
-
 		$result = $Source->ping();
 		$expected = '+PONG';
 
 		$this->assertIdentical($result, $expected);
+	}
 
-		//
-		// Non-existing method
-		//
+/**
+ * testCallNonExisting method
+ *
+ *  Tests calling of an non-existing (Redis) method on a connected / configured instance.
+ *
+ * @return void
+ * @expectedException RedisSourceException
+ */
+	public function testCallNonExisting() {
+		$Source = new TestRedisSource();
 
-		$result = $Source->pang();
+		$Source->pang();
+	}
 
-		$this->assertFalse($result);
+/**
+ * testCallExistingFailure method
+ *
+ *  Tests calling of an existing (Redis) method on a disconnected / misconfigured instance.
+ *
+ * @return void
+ * @expectedException RedisSourceException
+ */
+	public function testCallExistingFailure() {
+		$unixSocket = '';
+		$persistent = false;
+		$host = '127.0.0.1';
+		$port = 63790;
+		$timeout = 0;
+
+		$config = array(
+			'unix_socket' => $unixSocket,
+			'persistent' => $persistent,
+			'host' => $host,
+			'port' => $port,
+			'timeout' => $timeout,
+		);
+
+		$Source = new TestRedisSource($config);
+		$Source->ping();
 	}
 
 /**