various commits

classes/cache/cache_AbstractHandler.php

@@ -17,6 +17,8 @@
  */
 abstract class cache_AbstractHandler implements cache_HandlerInterface {
 
+	const DEFAULT_TTL = 0;
+
 	/**
 	 * Weather or not cache system should throw exceptions
 	 * @var bool
@@ -60,7 +62,10 @@ final public function get($key, $default = null, $namespace = 'default') {
 	 * @param string $namespace The namespace under which the variable is stored [optional, default: 'default']
 	 * @return boolen True on success or, False on failure
 	 */
-	final public function set($key, $data, $ttl = 0, $namespace = 'default') {
+	final public function set($key, $data, $ttl = null, $namespace = 'default') {
+
+		if (is_null($ttl)) $ttl = static::DEFAULT_TTL;
+
 		try {
 			return $this->_set($key, $data, $ttl, $namespace);
 		} catch (Exception $e) {

classes/cache/cache_ApcHandler.php

@@ -17,6 +17,9 @@
  */
 class cache_ApcHandler extends cache_AbstractHandler {
 	/* CONSTANTS */
+
+	const DEFAULT_TTL	= 0;
+
 	/* PROPERTIES */
 	/* CONSTRUCTOR & DESTRUCTOR */
 

classes/cache/cache_HandlerInterface.php

@@ -18,6 +18,7 @@
  */
 interface cache_HandlerInterface {
 	/* CONSTRUCTOR & DESTRUCTOR */
+
 	/* GET METHODS */
 
 	/**

classes/cache/cache_MemcacheHandler.php

@@ -19,6 +19,8 @@
 class cache_MemcacheHandler extends cache_AbstractHandler {
 	/* CONSTANTS */
 
+	const DEFAULT_TTL	= 0;
+
 	/**
 	 * Constant defining a minite storage duration
 	 * @var integer
@@ -46,10 +48,17 @@ public function __construct($host, $port, $useExceptions = false) {
 		$this->useExceptions = $useExceptions;
 		$this->memcache = new Memcache;
 
+		if (is_null($host)) return;
+
 		if(!$this->memcache->connect($host, $port))
 			throw new cache_CouldNotConnectException('Could not connect to Memcache server');
 	}
-
+
+	// adds a memcached server to the connection pool
+	public function addServer ($host, $port = 11211) {
+		$this->memcache->addServer($host, $port);
+	}
+
 	/* GET METHODS */
 
 	/**
@@ -65,7 +74,7 @@ protected function _get($key, $default = null, $namespace = 'default') {
 
 		if(!is_array($return)) {
 			if($this->useExceptions)
-				throw new cache_NotFoundException(sf('Could not fine \'%s\' variable', $key));
+				throw new cache_NotFoundException(sf('Could not find \'%s\' variable', $key));
 
 			$return = array($default);
 		}

classes/cache/cache_TemporaryStorageHandler.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: jimmyff
+ * Date: 30/04/2014
+ * Time: 14:42
+ * Description: Storage for settings that need to be passed around but has no persistent back end
+ * This can be used as a portable settings store that expires at end of the request if not saved elsewhere
+ */
+
+class cache_TemporaryStorageHandler extends cache_AbstractHandler {
+
+	// null ttl: doesn't expire
+	const DEFAULT_TTL	= null;
+
+	private $store 		= array();
+
+	public function __construct() {
+
+	}
+
+	protected function _get($key, $default = null, $namespace = 'default'){
+
+		if (isset($this->store[$namespace][$key]) &&
+			(is_null($this->store[$namespace][$key]['expires']) || $this->store[$namespace][$key]['expires'] > time()))
+				return $this->store[$namespace][$key]['value'];
+
+		else return $default;
+
+	}
+	protected function _set($key, $data, $ttl = null, $namespace = 'default') {
+
+		if (!isset($this->store[$namespace])) {
+			$this->store[$namespace] = array();
+		}
+
+		$this->store[$namespace][$key] = array(
+			'value'		=> $data,
+			'expires'	=> is_null($ttl)?null:(time() + $ttl)
+		);
+
+	}
+	protected function _delete($key, $namespace = 'default') {
+
+		if (isset($this->store[$namespace][$key]));
+			unset($this->store[$namespace][$key]);
+
+	}
+	protected function _exists($key, $namespace = 'default'){
+
+		return isset($this->store[$namespace][$key]) &&
+			(is_null($this->store[$namespace][$key]['expires']) || $this->store[$namespace][$key]['expires'] > time());
+	}
+
+	protected function _flush() {
+		$this->store 	= array();
+	}
+
+}
+
+?>

classes/caster/caster_Abstract.php

@@ -32,12 +32,17 @@ abstract class caster_Abstract  {
 	/* MAGIC METHODS */
 	/* METHODS */
 
+	static public function getSpec() {
+		$caster = new static;
+		return $caster->spec;
+	}
+
 	/**
 	 * Checks the given string for the number of caster characters.
 	 * @param string $s The string to parse
 	 */
 	protected function numberOfPercents($s) {
-		if(!is_string($s)) throw new caster_Exception('Parameter $s should be of type string');
+		if(!is_string($s)) throw new caster_Exception('Caster expecting format string, received '.gettype($s).': '.$s);
 		$pos = 0;
 		$count = 0;
 		while(true) {
@@ -79,6 +84,46 @@ public function castString($string, $args = null, $_ = null) {
 		}
 		return implode('', $ret);
 	}
+	/**
+	 * Casts args into a given string/object by the class held caster spec
+	 * @param string $string The string to cast
+	 * @param mixed $args The args to be parsed into the string
+	 * @return string The casted string
+	 */
+	public function castObject($string, $args = null, $_ = null) {
+		// Get args
+		$args = func_get_args();
+		if (count($args[0]) !== 2) throw new caster_Exception('Cast object expects two parameters');
+
+		$ch = substr($args[0][0], 1);
+
+		if(array_key_exists($ch, $this->spec) && method_exists($this,$this->spec[$ch])) {
+			$methodName = $this->spec[$ch];
+			return $this->$methodName($args[0][1]);
+		} elseif($ch == '%') {
+			return '%';
+		} else {
+			throw new caster_Exception("Caster received unexpected format character: %".$ch);
+		}
+
+	}
+
+	public function castArray ($params) {
+		$format = array_shift ($params);
+		return $this->castReal ($format, $params);
+	}
+
+	public function castArraySets ($args) {
+		$ret = array ();
+		for ($i = 0; $i < count ($args); ) {
+			$format = $args [$i++];
+			$params = array_slice ($args, $i, $this->numberOfPercents($format));
+			$i += count ($params);
+			array_unshift ($params, $format);
+			$ret[] =$this->castArray ($params);
+		}
+		return $ret;
+	}
 
 	/**
 	 * Casts args into a given string by the class held caster spec
@@ -108,10 +153,14 @@ protected function castReal($format, $args) {
 			if(array_key_exists($ch, $this->spec) && method_exists($this,$this->spec[$ch])) {
 				$methodName = $this->spec[$ch];
 				$ret .= $this->$methodName($args[$i++]);
+
+			} elseif(array_key_exists($ch, $this->spec) && method_exists($this,'cast_'.$this->spec[$ch])) {
+				$methodName = 'cast_'.$this->spec[$ch];
+				$ret .= $this->$methodName($args[$i++]);
 			} elseif($ch == '%') {
 				$ret .= '%';
 			} else {
-				throw new caster_Exception("Invalid format string");
+				throw new caster_Exception("Caster received unexpected format character: %".$ch);
 			}
 			$pos0 = $pos1 + 2;
 		}
@@ -151,6 +200,14 @@ function formatNewLines($str) {
 		return $ret;
 	}
 
+	static function getCastName($format) {
+		$caster = new static;
+		return $caster->getCastNameReal($format);
+	}
+	function getCastNameReal ($format) {
+		return $this->spec[$format];
+	}
+
 	/* DEPRECATED METHODS */
 }
 

classes/caster/caster_Json.php

@@ -0,0 +1,57 @@
+<?php
+
+/* generic caster for an web project */
+class caster_Json extends caster_Abstract {
+
+	protected $spec = array (
+			's' => 'string',
+			'n'	=> 'number',
+
+			/* these aren't real JSON types, but can validate on them */
+			'i'	=> 'integer',
+			'f'	=> 'float',
+
+			'b'	=> 'boolean',
+			'a'	=> 'array',
+			'o'	=> 'object',
+
+			't'	=> 'timestamp'
+		);
+
+	/* annoyance due to PHP scope issue */
+	static function cast ($args) {
+		$parser =  new self();
+		return  (string) $parser->castString(func_get_args());
+	}
+
+	static function cast_string ($in) {
+		return sf("'%j'",$in);
+	}
+
+	static function cast_integer ($in) {
+		return intval($in);
+	}
+	static function cast_float ($in) {
+		return floatval($in);
+	}
+	static function cast_number ($in) {
+		return ($in);
+	}
+	static function cast_boolean ($in) {
+		return boolval($in);
+	}
+
+	static function cast_array ($in) {
+		return json_encode($in);
+	}
+	static function cast_timestamp ($in) {
+		return intval($in);
+	}
+
+	static function cast_object ($in) {
+		return json_encode($in);
+	}
+
+}
+
+?>

classes/caster/caster_Php.php

@@ -0,0 +1,63 @@
+<?php
+
+/* generic caster for an web project */
+class caster_Php extends caster_Abstract {
+
+	protected $spec = array (
+			's' => 'string',
+			'n'	=> 'number',
+
+			/* these aren't real JSON types, but can validate on them */
+			'i'	=> 'integer',
+			'f'	=> 'float',
+
+			'b'	=> 'boolean',
+
+			't'	=> 'timestamp',
+
+			'a'	=> 'array',
+			'o'	=> 'object'
+		);
+
+
+	/* returns a value */
+	static function value ($format, $value) {
+
+		$parser = new self();
+
+		$methodName = 'cast_'.$parser->spec[$format];
+		return $parser->$methodName($value);
+
+	}
+
+	static function cast_string ($in) {
+		return strval($in);
+	}
+
+	static function cast_integer ($in) {
+		return intval($in);
+	}
+	static function cast_float ($in) {
+		return floatval($in);
+	}
+	static function cast_number ($in) {
+		return ($in);
+	}
+	static function cast_boolean ($in) {
+		return boolval($in);
+	}
+	static function cast_timestamp ($in) {
+		return intval($in);
+	}
+
+	static function cast_array ($in) {
+		return $in;
+	}
+
+	static function cast_object ($in) {
+		return $in;
+	}
+
+}
+
+?>