Changeset 886

Timestamp:

07/17/08 05:47:13 (2 years ago)

Author:

arnoschn

Message:

#52: unifying parsing of options for cachehandler. adding Ak::parseOptions which works with default options and allowed options array. var $_allowedOptions is of format array('key'=>'type') so setting it to array('myoption'=>'array') will allow array values as the option value and try to convert it using Ak::convert if another type is found. AkObject::setOptions($options) parses $options array and uses var $_defaultOptions and var $_allowedOptions to call Ak::parseOptions. Options parsed by AkObject::setOptions will be set as $this->{'_'.$key} by default. setOptions($options=array(),'_option') will prefix it with _option instead of _.

Files:

• branches/arnoschn/cache/lib/Ak.php (modified) (2 diffs)
• branches/arnoschn/cache/lib/AkActionController/AkCacheHandler.php (modified) (8 diffs)
• branches/arnoschn/cache/lib/AkCache/AkMemcache.php (modified) (3 diffs)
• branches/arnoschn/cache/lib/AkConverters/AkDoubleToString.php (added)
• branches/arnoschn/cache/lib/AkConverters/AkFloatToString.php (added)
• branches/arnoschn/cache/lib/AkConverters/AkIntegerToString.php (added)
• branches/arnoschn/cache/lib/AkConverters/AkStringToArray.php (added)
• branches/arnoschn/cache/lib/AkConverters/AkStringToDouble.php (added)
• branches/arnoschn/cache/lib/AkConverters/AkStringToFloat.php (added)
• branches/arnoschn/cache/lib/AkConverters/AkStringToInteger.php (added)
• branches/arnoschn/cache/lib/AkObject.php (modified) (2 diffs)
• branches/arnoschn/cache/test/unit/lib/Ak.php (modified) (1 diff)
• branches/arnoschn/cache/test/unit/lib/AkCache.php (modified) (1 diff)
• branches/arnoschn/cache/test/unit/lib/AkCache/AkMemcache.php (modified) (2 diffs)
• branches/arnoschn/cache/test/unit/lib/AkObject.php (added)

branches/arnoschn/cache/lib/Ak.php

@@ -1415 +1415 @@
-            $options = $args;
-        }
-
+
+
+
-        $options['class_prefix'] = empty($options['class_prefix']) && empty($options['path']) ? 'Ak' : $options['class_prefix'];
-        $options['path'] = rtrim(empty($options['path']) ? AK_LIB_DIR.DS.'AkConverters' : $options['path'], DS."\t ");
@@ -1873 +1875 @@
-        return $return;
-    }
+    
+    /**
+     *
+     * @param unknown_type $options
+     * @param unknown_type $default_options
+     * @param unknown_type $available_options
+     * @param unknown_type $walk_keys
+     * @return unknown
+     */
+    function parseOptions($options = array(), $default_options = array(), $available_options = array(), $walk_keys=false)
+    {
+        $parsedOptions = array();
+        if ($walk_keys) {
+            foreach ($options as $key=>$value) {
+                if (!is_array($value)) {
+                    $parsedOptions[$value] = $default_options;
+                } else {
+                    $parsedOptions[$key] = Ak::parseOptions($value, $default_options, $available_options);
+                }
+            }
+            return $parsedOptions;
+        }
+        
+        $options = array_merge($default_options, $options);
+        foreach($options as $key => $value) {
+            if((is_array($available_options) && isset($available_options[$key])) || $available_options === true) {
+                $parsedOptions[$key] = Ak::convert(gettype($value),$available_options===true?gettype($value):$available_options[$key],$value);
+            }
+        }
+        return $parsedOptions;
+    }
-}
-

branches/arnoschn/cache/lib/AkActionController/AkCacheHandler.php

@@ -14 +14 @@
-    var $_controller;
-    
+    /** Action Caching **/
+    
+    var $_actionCacheAvailableOptions = array('include_get_parameters'=>'array','cache_path'=>'string');
+    var $_actionCacheDefaultOptions = array('include_get_parameters'=>array(),'cache_path'=>'');
-    
-    /**
@@ -19 +23 @@
-     */
-    
-
+
+
+
-    var $_lastCacheGroup;
-    
@@ -54 +60 @@
-    var $observe = array();
-    
+    var $_sweeperAvailableOptions = array('only'=>'array','except'=>'array');
+    var $_sweeperDefaultOptions = array('only'=>array(),'except'=>array());
+    
-    var $_Sweepers = array();
-    
-    var $__availableObserveEvents = array('create','update','destroy','save');
-    /**
-     * Reads configuration options from AkActionController and the configured
@@ -181 +189 @@
-    function _cacheSweeper($options)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-    }
@@ -203 +202 @@
-    function _initSweeper($sweeper, $params = array())
-    {
-
-
-
-
-
+
+
+
+
-        
-        $sweeper_class = AkInflector::classify($sweeper);
@@ -229 +227 @@
-        if (!$this->_perform_caching) return;
-        
-is_array($options)?$options:Ak::toArray($options
+Ak::parseOptions($options, $this->_pageCacheDefaultOptions, $this->_pageCacheAvailableOptions, true
-        $actionName = $this->_controller->getActionName();
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-            $this->_controller->prependBeforeFilter(array(&$this,'beforePageCache'));
-            $this->_controller->appendAfterFilter(array(&$this,'afterPageCache'));
@@ -493 +484 @@
-        if (!$this->_perform_caching) return;
-        
-
+
+
-        $actionName = $this->_controller->getActionName();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if (!isset($this->_action_cache_host)) {
-                $this->_action_cache_host = $this->_controller->Request->getHost();
@@ -527 +515 @@
-        if (is_array($options)) {
-            $path = $this->_pathFor($options);
-
+ || empty($options)
-            $path = $this->_pathFor();
-        } else {

branches/arnoschn/cache/lib/AkCache/AkMemcache.php

@@ -4 +4 @@
-class AkMemcache extends AkObject
-{
-
+
+
+
+
-    /**
-     * @var MemCachedClient
@@ -25 +28 @@
-    var $_max_size = 1000000;
-    
+    var $_servers = array();
+    
-    function init($options = array())
-    {
-
-
-
+
+
-            trigger_error('Need to provide at least 1 server',E_USER_ERROR);
-            return false;
-        }
-
+this->_
-        $ping = $this->_memcache->get('ping');
-        if (!$ping) {
@@ -44 +48 @@
-        return true;
-    }
+    
-    
-    function _getNamespaceId($group)

branches/arnoschn/cache/lib/AkObject.php

@@ -35 +35 @@
-{
-
+    // ------ OPTION HANDLING ----------//
+    var $_defaultOptions = array();
+    var $_availableOptions = array();
-
-
@@ -71 +74 @@
-        }
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // {{{ toString()
-

branches/arnoschn/cache/test/unit/lib/Ak.php

@@ -119 +119 @@
-        $this->assertEqual($null, $storedValue3);
-    }
+    
+    function test_parse_options()
+    {
+        $defaultOptions = array('test'=>1);
+        $availableOptions = array('test'=>'integer');
+        $result = Ak::parseOptions(array('nada'=>1), $defaultOptions, $availableOptions);
+        $this->assertEqual($defaultOptions, $result);
+    }
+    
+    function test_parse_options_convert_string_to_int()
+    {
+        $defaultOptions = array('test'=>1);
+        $availableOptions = array('test'=>'integer');
+        $result = Ak::parseOptions(array('test'=>'1'), $defaultOptions, $availableOptions);
+        $this->assertEqual($defaultOptions, $result);
+    }
+    
+    function test_parse_options_convert_int_to_string()
+    {
+        $defaultOptions = array('test'=>'1');
+        $availableOptions = array('test'=>'string');
+        $result = Ak::parseOptions(array('test'=>1), $defaultOptions, $availableOptions);
+        $this->assertEqual($defaultOptions, $result);
+    }
+    
+    function test_parse_options_convert_string_to_float()
+    {
+        $defaultOptions = array('test'=>1.5);
+        $availableOptions = array('test'=>'float');
+        $result = Ak::parseOptions(array('test'=>'1.5'), $defaultOptions, $availableOptions);
+        $this->assertEqual($defaultOptions, $result);
+    }
+    
+    function test_parse_options_convert_double_to_string()
+    {
+        $defaultOptions = array('test'=>'1.5');
+        $availableOptions = array('test'=>'string');
+        $result = Ak::parseOptions(array('test'=>1.5), $defaultOptions, $availableOptions);
+        $this->assertEqual($defaultOptions, $result);
+    }
+    
+    function test_parse_options_convert_string_to_array()
+    {
+        $defaultOptions = array('test'=>array(0,1));
+        $availableOptions = array('test'=>'array');
+        $result = Ak::parseOptions(array('test'=>'0,1'), $defaultOptions, $availableOptions);
+        $this->assertEqual($defaultOptions, $result);
+    }
+    
+    function test_parse_options_convert_with_keys()
+    {
+        $defaultOptions = array('test'=>1);
+        $availableOptions = array('test'=>'integer');
+        $result = Ak::parseOptions(array('key1'=>array('test'=>'1','nada'=>1),'key2'), $defaultOptions, $availableOptions,true);
+        $this->assertEqual($defaultOptions, $result['key1']);
+        $this->assertEqual($defaultOptions, $result['key2']);
+    }
-}
+ak_test('Test_Ak');

branches/arnoschn/cache/test/unit/lib/AkCache.php

@@ -93 +93 @@
-        
-        //Cache Lite cache
-1
+2
-        $this->assertFalse(!$this->Cache->save($this->text_to_catch, $this->id, $this->group),'saving the cache (File based)');
-        $this->Cache->init(1,1);

branches/arnoschn/cache/test/unit/lib/AkCache/AkMemcache.php

@@ -18 +18 @@
-    {
-        $this->memcache=new AkMemcache();
-
+$this->memcache->_defaultOptions = array();
-        $res = $this->memcache->init(array());
-        $this->assertFalse($res);
@@ -167 +167 @@
-
-
-,true
+
-?>