Changeset 973

Timestamp:

07/25/08 18:19:04 (3 months ago)

Author:

bermiferrer

Message:

Merging changes from trunk

Files:

• branches/action_mailer/lib/Ak.php (modified) (1 diff)
• branches/action_mailer/lib/AkActiveRecord.php (modified) (5 diffs)
• branches/action_mailer/lib/AkActiveRecord/AkAssociatedActiveRecord.php (modified) (1 diff)
• branches/action_mailer/lib/AkPlugin/AkPluginManager.php (modified) (1 diff)
• branches/action_mailer/lib/utils/generators/scaffold/sintags_templates/controller.php (modified) (1 diff)
• branches/action_mailer/lib/utils/generators/scaffold/templates/controller.php (modified) (1 diff)
• branches/action_mailer/test/unit/lib/AkActiveRecord/AkValidation.php (modified) (2 diffs)
• branches/action_mailer/test/unit/lib/AkActiveRecord/_AkActiveRecord_find.php (copied) (copied from trunk/test/unit/lib/AkActiveRecord/_AkActiveRecord_find.php)

branches/action_mailer/lib/Ak.php

@@ -1127 +1127 @@
-        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/action_mailer/lib/AkActiveRecord.php

@@ -957 +957 @@
-    function &_findEvery($options)
-    {
-        $limit = isset($options['limit']) ? $options['limit'] : null;
-        $offset = isset($options['offset']) ? $options['offset'] : null;
-
-        $sql = $this->constructFinderSql($options);
-        if(!empty($options['bind']) && is_array($options['bind']) && strstr($sql,'?')){
-            $sql = array_merge(array($sql),$options['bind']);
-        }
-
-        if((!empty($options['include']) && $this->hasAssociations())){
-            $result =& $this->findWithAssociations($options);
-        }else{
+            $sql = $this->constructFinderSql($options);
+            if(!empty($options['bind']) && is_array($options['bind']) && strstr($sql,'?')){
+                $sql = array_merge(array($sql),$options['bind']);
+            }
+            
-            $result =& $this->findBySql($sql);
-        }
@@ -1031 +1028 @@
-            return false;
-        }
-
+group', '
-        foreach (array_keys($options) as $key){
-            if (!in_array($key,$valid_keys)){
@@ -1095 +1092 @@
-        }
-        
-    }
-
-    function _validateFindOptions(&$options)
-    {
-        $valid_keys = array('conditions', 'include', 'joins', 'limit', 'offset', 'order', 'bind', 'select','select_prefix', 'readonly');
-        foreach (array_keys($options) as $key){
-            if (!in_array($key,$valid_keys)) unset($options[$key]);
-        }
-    }
-
@@ -1357 +1346 @@
-        }
-
-
+
+
-
-        $this->_db->addLimitAndOffset($sql,$options);
@@ -3993 +3983 @@
-        $attribute_names = Ak::toArray($attribute_names);
-        foreach ($attribute_names as $attribute_name){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                $this->addError($attribute_name, $message);
-            }

branches/action_mailer/lib/AkActiveRecord/AkAssociatedActiveRecord.php

@@ -343 +343 @@
-            return $objects;
-        }
+        $result =& $this->_generateObjectGraphFromResultSet($results,$included_associations,$virtual_limit);
+        return $result;
+    }
+    
+    /**
+     * Pass hand-made sql directly to _db->execute and generate the OG with this method.
+     *
+     * @param ADOResultSet $results            a result set from Db->execute
+     * @param array $included_associations     just like in ->find(); $options['include']; but in fact unused
+     * @param mixed $virtual_limit             int or false; unsure if this works                     
+     * @return array                           ObjectGraph as an array
+     */
+    function &_generateObjectGraphFromResultSet($results,$included_associations = array(), $virtual_limit = false)
+    {
+        $objects = array();
-        
-        $i = 0;

branches/action_mailer/lib/AkPlugin/AkPluginManager.php

@@ -215 +215 @@
-    function guessBestInstallMethod($options = array())
-    {
-
+!empty($options['parameters']) && 
-            return 'local directory';
-        }elseif($this->canUseSvn()){

branches/action_mailer/lib/utils/generators/scaffold/sintags_templates/controller.php

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

branches/action_mailer/lib/utils/generators/scaffold/templates/controller.php

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

branches/action_mailer/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();
@@ -677 +682 @@
-        $this->assertFalse($Person->hasErrors());
-
+        $Person->clearErrors();
+        $Person->age = null;
+        $Person->validatesNumericalityOf('age', 'not_valid',false, false);
+        $this->assertTrue($Person->hasErrors());
-    }
-