Changeset 904

Timestamp:

07/20/08 14:38:59 (3 months ago)

Author:

arnoschn

Message:

merging trunk changes in

Files:

• branches/arnoschn/cache/lib/Ak.php (modified) (1 diff)
• branches/arnoschn/cache/lib/AkActiveRecord.php (modified) (2 diffs)
• branches/arnoschn/cache/lib/AkCache.php (modified) (1 diff)
• branches/arnoschn/cache/lib/AkPlugin/AkPluginManager.php (modified) (4 diffs)
• branches/arnoschn/cache/lib/utils/generators/scaffold/sintags_templates/controller.php (modified) (1 diff)
• branches/arnoschn/cache/lib/utils/generators/scaffold/templates/controller.php (modified) (1 diff)
• branches/arnoschn/cache/lib/utils/scripts/plugin.php (modified) (1 diff)
• branches/arnoschn/cache/test/unit/lib/AkActiveRecord/AkValidation.php (modified) (2 diffs)

branches/arnoschn/cache/lib/Ak.php

@@ -1130 +1130 @@
-        foreach ($array as $key => $value) {
-            $key = is_numeric($key) ? $parent : $key;
-xmlFromArray
+Ak::array_to_xml
-            $_tags[$key] = $key;
-            $xml .= sprintf("<%s>%s</%s>\r\n", $key, $value, $key);

branches/arnoschn/cache/lib/AkActiveRecord.php

@@ -1347 +1347 @@
-    function constructFinderSql($options, $select_from_prefix = 'default')
-    {
-
- 
+'.(!empty($options['joins'])?$this->getTableName().'.':'') .'
+
-
-        $this->addConditions($sql, isset($options['conditions']) ? $options['conditions'] : array());
@@ -3993 +3993 @@
-        $attribute_names = Ak::toArray($attribute_names);
-        foreach ($attribute_names as $attribute_name){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $this->addError($attribute_name, $message);
-            }

branches/arnoschn/cache/lib/AkCache.php

@@ -252 +252 @@
-                $this->_driverInstance =& new Cache_Lite($options);
-                break;
-$this->cache_enabled = true;
+
-                require_once(AK_LIB_DIR.'/AkCache/AkAdodbCache.php');
-                $this->_driverInstance =& new AkAdodbCache();

branches/arnoschn/cache/lib/AkPlugin/AkPluginManager.php

@@ -197 +197 @@
-
-        $plugin_name = Ak::sanitize_include($plugin_name, 'high');
-
+
+
+
+
+
+
-
-        if(!$options['force'] && is_dir(AK_PLUGINS_DIR.DS.$plugin_name)){
-            trigger_error(Ak::t('Destination directory is not empty. Use force option to overwrite exiting files.'), E_USER_NOTICE);
-        }else{
-ucfirst($this->guessBestInstallMethod($options)
+AkInflector::camelize($install_method
-            $this->$method($plugin_name, rtrim($repository, '/'), $options['revision'], $options['force']);
-            $this->_runInstaller($plugin_name, 'install', $options);
@@ -211 +216 @@
-    function guessBestInstallMethod($options = array())
-    {
-
+
+
+
-            if(!empty($options['externals']) && $this->_shouldUseSvnExternals()){
-                return 'externals';
@@ -250 +257 @@
-        $plugin_name = Ak::sanitize_include($plugin_name, 'high');
-
-ucfirst
+AkInflector::camelize
-        $this->$method($plugin_name, rtrim($this->getRepositoryForPlugin($plugin_name, $repository), '/'));
-
@@ -538 +545 @@
-        `svn update $plugin_dir`;
-    }
+    
+    function _installUsingLocalDirectory($name, $path, $rev = null)
+    {
+        $source = $path.DS.$name;
+        $plugin_dir = AK_PLUGINS_DIR;
+        $command = AK_OS == 'UNIX' ? 'cp -rf ' : 'xcopy /h /r /k /x /y /S /E ';
+        `$command $source $plugin_dir`;
+    }
+
+    function _updateUsingLocalDirectory($name)
+    {
+        trigger_error(Ak::t('Updating from local targets it\'s not supported yet. Please use install --force instead.'));
+    }
-
-    function _installUsingExport($name, $uri, $rev = null, $force = false)

branches/arnoschn/cache/lib/utils/generators/scaffold/sintags_templates/controller.php

@@ -11 +11 @@
-    function index()
-    {
-perform
+redirectTo
-    }
-

branches/arnoschn/cache/lib/utils/generators/scaffold/templates/controller.php

@@ -11 +11 @@
-    function index()
-    {
-perform
+redirectTo
-    }
-

branches/arnoschn/cache/lib/utils/scripts/plugin.php

@@ -329 +329 @@
-            $repository = preg_replace('/\/?'.$plugin_name.'$/', '', trim($plugin));
-        }
-
-
-
-
+
+
+
+
+
+
-        }
-        echo "\nInstalling $plugin\n";

branches/arnoschn/cache/test/unit/lib/AkActiveRecord/AkValidation.php

@@ -671 +671 @@
-        $Person->validatesNumericalityOf('age');
-        $this->assertFalse($Person->hasErrors());
+        
+        $Person->clearErrors();
+        $Person->age = '18';
+        $Person->validatesNumericalityOf('age','not_valid',true);
+        $this->assertFalse($Person->hasErrors());
-
-        $Person->clearErrors();
@@ -676 +681 @@
-        $Person->validatesNumericalityOf('age', 'not_valid',false, true);
-        $this->assertFalse($Person->hasErrors());
+        
+        $Person->clearErrors();
+        $Person->age = null;
+        $Person->validatesNumericalityOf('age', 'not_valid',false, false);
+        $this->assertTrue($Person->hasErrors());
-
-    }