Changeset 313 for trunk/trax/vendor

Timestamp:

07/07/09 21:57:06 (3 years ago)

Author:

john

Message:

updates

Location:

trunk/trax/vendor/trax

Files:

• action_mailer.php (modified) (1 diff)
• active_record.php (modified) (3 diffs)
• php_shell.php (modified) (2 diffs)
• php_shell/shell.php (modified) (8 diffs)

trunk/trax/vendor/trax/action_mailer.php

@@ -221 +221 @@
         $this->headers = $this->headers ? $this->headers : array();
         $this->body = $this->body ? $this->body : array();
-        $this->default_from = "nobody@".$_SERVER['HTTP_HOST'];
+        $this->default_from = "nobody@".($_SERVER['HTTP_HOST'] ? $_SERVER['HTTP_HOST'] : 'domain.com');
         $this->head_charset = $this->head_charset ? $this->head_charset : $this->default_charset;
         $this->html_charset = $this->html_charset ? $this->html_charset : $this->default_charset;

trunk/trax/vendor/trax/active_record.php

@@ -667 +667 @@
             switch($association_type) {
                 case "has_many":
-                    $parameters = is_array($this->has_many) && @array_key_exists($method_name, $this->has_many) ? 
+                    $parameters = is_array($this->has_many) && @array_key_exists($method_name, $this->has_many) && !is_null($this->has_many[$method_name]) ? 
                         array_merge($this->has_many[$method_name], $parameters) : $parameters;
                     $result = $this->find_all_has_many($method_name, $parameters);
                     break;
                 case "has_one":
-                    $parameters = is_array($this->has_one) && @array_key_exists($method_name, $this->has_one) ? 
+                    $parameters = is_array($this->has_one) && @array_key_exists($method_name, $this->has_one) && !is_null($this->has_one[$method_name]) ? 
                         array_merge($this->has_one[$method_name], $parameters) : $parameters;
                     $result = $this->find_one_has_one($method_name, $parameters);
                     break;
                 case "belongs_to":
-                    $parameters = is_array($this->belongs_to) && @array_key_exists($method_name, $this->belongs_to) ? 
+                    $parameters = is_array($this->belongs_to) && @array_key_exists($method_name, $this->belongs_to) && !is_null($this->belongs_to[$method_name]) ? 
                         array_merge($this->belongs_to[$method_name], $parameters) : $parameters;
                     $result = $this->find_one_belongs_to($method_name, $parameters);
                     break;
                 case "has_and_belongs_to_many":  
-                    $parameters = is_array($this->has_and_belongs_to_many) && @array_key_exists($method_name, $this->has_and_belongs_to_many) ? 
+                    $parameters = is_array($this->has_and_belongs_to_many) && @array_key_exists($method_name, $this->has_and_belongs_to_many) && !is_null($this->has_and_belongs_to_many[$method_name]) ? 
                         array_merge($this->has_and_belongs_to_many[$method_name], $parameters) : $parameters;
                     $result = $this->find_all_habtm($method_name, $parameters); 
@@ -760 +760 @@
                 $options['per_page'] = $parameters['per_page'];
             }
+            if(@array_key_exists("group", $parameters)) {
+                $options['group'] = $parameters['group'];
+            }
+            if(@array_key_exists("having", $parameters)) {
+                $options['having'] = $parameters['having'];
+            }                       
             if(@array_key_exists("class_name", $parameters)) {
                 $other_object_name = $parameters['class_name'];
@@ -2248 +2254 @@
                         unset($attributes);
                         $attributes[$this_foreign_key] = $this_foreign_value;
-                        $attributes[$other_foreign_key] = $other_foreign_value;
+                        $attributes[$other_foreign_key] = $other_foreign_value;   
+                        #error_log("HABTM - this_foreign_value:$this_foreign_value other_foreign_value:$other_foreign_value");
+                        if(in_array('', array($this_foreign_value, $other_foreign_value))) {
+                            # this will cause an error so don't insert
+                            continue;
+                        }                         
                         if($sort_field) {
                             $attributes[$sort_field] = $sort_value;

trunk/trax/vendor/trax/php_shell.php

@@ -50 +50 @@
 function __shell_default_error_handler($errno, $errstr, $errfile, $errline, $errctx) {
     ## ... what is this errno again ?
-    if(in_array($errno, array(8,2048))) return;
-    print sprintf("\r\nError No:%d - %s", $errno, $errstr);
-    #throw new Exception(sprintf("%s:%d\r\n%s", $errfile, $errline, $errstr));
+    if ($errno == 2048 || $errno == 8) return;  
+    throw new Exception(sprintf("%s:%d\r\n%s", $errfile, $errline, $errstr));
 }
 
@@ -98 +97 @@
                 if (function_exists("__shell_print_var")) {
                     __shell_print_var($__shell_retval, $__shell->getVerbose());
-                } else {
-                    if(is_object($__shell_retval) && get_parent_class($__shell_retval) == 'ActiveRecord') {
-                        print $__shell_retval;
+                } else {   
+                    if(is_object($__shell_retval) && method_exists($__shell_retval, '__toString')) {
+                        echo "Class:".get_class($__shell_retval)."\n".$__shell_retval->__toString();
                     } else {
                         var_export($__shell_retval);                        

trunk/trax/vendor/trax/php_shell/shell.php

@@ -212 +212 @@
     * @see registerColourScheme
     */
-    protected $colour_scheme;
+    protected $colour_scheme;     
+    
+    protected $virtual_methods = array('find_by', 'find_all_by', 'count_all', 'sum_all', 'avg_all');
 
     # shell colours
@@ -294 +296 @@
             'description' => $help
         );
+    }  
+    
+    public function classMethodExists($object, $method) {
+        if(preg_grep("/^(find|find_all)_by.*$/", $this->virtual_methods) || method_exists($object, $method)) {
+            return true;
+        }               
+        return false;
     }
     
@@ -459 +468 @@
                         /* obj */
                         
-                        if (!method_exists($object, $method)) {
+                        if (!$this->classMethodExists($object, $method)) {
                             throw new Exception(sprintf("Variable %s (Class '%s') doesn't have a method named '%s'", 
                                 $objname, get_class($object), $method));
@@ -491 +500 @@
                         /* obj */
                         
-                        if (!method_exists($object, $method)) {
+                        if (!in_array($method, $this->virtual_methods) && !method_exists($object, $method)) {
                             throw new Exception(sprintf("Variable %s (Class '%s') doesn't have a method named '%s'", 
                                 $objname, get_class($object), $method));
@@ -534 +543 @@
                         /* obj */
                         
-                        if (!method_exists($object, $method)) {
+                        if (!in_array($method, $this->virtual_methods) && !method_exists($object, $method)) {
                             throw new Exception(sprintf("Variable %s (Class '%s') doesn't have a method named '%s'", 
                                 $objname, get_class($object), $method));
@@ -555 +564 @@
                         $method = $ts[$last - 1]['value'];
 
-                        if (!in_array($method, get_class_methods($classname))) {
+                        if (!in_array($method, $this->virtual_methods) && !in_array($method, get_class_methods($classname))) {
                             throw new Exception(sprintf("Class '%s' doesn't have a method named '%s'", 
                                 $classname, $method));
@@ -580 +589 @@
                         $method = $GLOBALS[ltrim($methodname, '$')];
 
-                        if (!in_array($method, get_class_methods($classname))) {
+                        if (!in_array($method, $this->virtual_methods) && !in_array($method, get_class_methods($classname))) {
                             throw new Exception(sprintf("Class '%s' doesn't have a method named '%s'", 
                                 $classname, $method));
@@ -812 +821 @@
                     return false;
                 }
-            }
-            $l = fgets($this->stdin);
+            }  
+                                 
+            $l = fgets($this->stdin); 
         }
         return $l;