Changeset 308

Timestamp:

03/19/09 10:40:34 (3 years ago)

Author:

john

Message:

features and bug fixes from gocoffeego project

Location:

trunk/trax/vendor/trax

Files:

• action_controller.php (modified) (16 diffs)
• action_view/helpers.php (modified) (1 diff)
• action_view/helpers/active_record_helper.php (modified) (8 diffs)
• action_view/helpers/form_helper.php (modified) (9 diffs)
• action_view/helpers/form_options_helper.php (modified) (1 diff)
• action_view/helpers/javascript_helper.php (modified) (1 diff)
• active_record.php (modified) (64 diffs)
• inflections.php (modified) (5 diffs)
• inflector.php (modified) (8 diffs)
• php_shell.php (modified) (1 diff)
• templates/error.phtml (modified) (2 diffs)

trunk/trax/vendor/trax/action_controller.php

@@ -56 +56 @@
      *  @var string
      */
-    private $controller;
+    protected $controller;
 
     /**
@@ -64 +64 @@
      *  @var string
      */
-    private $action;
-
-    /**
-     *  Value of :id parsed from URL then forced to lower case
+    protected $action;
+
+    /**
+     *  Path to add to other filesystem paths
      *
      *  Set by {@link recognize_route()}
      *  @var string
      */
-    private $id;
-
-    /**
-     *  Path to add to other filesystem paths
-     *
-     *  Set by {@link recognize_route()}
-     *  @var string
-     */
     private $added_path = '';
-     
-    /**
-     *  Parameters for the action routine
-     *
-     *  Set by {@link recognize_route()}, passed as arguments to the
-     *  controller's action routine.
-     *  @var string[]
-     */
-    private $action_params = array();
 
     /**
@@ -201 +184 @@
      *  @var string[]
      */
-    private $before_filters = array();
+    public $before_filters = array();
+
+    public $before_filter_options = array();
 
     /**
@@ -211 +196 @@
     private $after_filters = array();     
 
+    private $after_filter_options = array();
+
     /**
      *  @todo Document this attribute
@@ -224 +211 @@
      *  @todo Document this attribute
      */
-    protected $before_filter = null;
+    #protected $before_filter = null;
 
     /**
      *  @todo Document this attribute
      */
-    protected $after_filter = null;
+    #protected $after_filter = null;
 
     /**
@@ -318 +305 @@
      */
     function __set($key, $value) {
-        //error_log("__set($key, $value)");
+        #if(is_string($value) || is_array($value)) {
+            #error_log("__set($key, $value)");
+        #}
         if($key == "before_filter") {
             $this->add_before_filter($value);
+            unset($this->$key);
         } elseif($key == "after_filter") {
             $this->add_after_filter($value);
@@ -396 +386 @@
      *  @uses load_router()
      *  @uses $action
-     *  @uses $action_params
      *  @uses $application_controller_file
      *  @uses $controller
@@ -513 +502 @@
 
                     //  ':id' in route params overrides URL
-                    $this->id = $route_params[':id'];
-                } elseif(@in_array(":id",$route_path)
-                   && array_key_exists(@array_search(":id", $route_path),
-                                       $this->url_path)) {
-                    $this->id = strtolower($this->url_path[@array_search(":id", $route_path)]);
-                    //  Parameters for the action routine.
-                    //  FIXME: make more general than just id
-                    if($this->id != "") {
-                        $this->action_params['id'] = $this->id;
-                    }
+                    $id = $route_params[':id'];
+                } elseif(@in_array(":id",$route_path)) {
+                    #print_r($this->url_path);
+                    #print_r($route_path);
+                    if(count($this->extra_path)) {
+                        foreach(array_reverse($this->extra_path) as $extra_path) {
+                            #array_unshift($this->url_path, $extra_path);
+                        }
+                    }
+                    #print_r($this->url_path);
+
+                    $id = strtolower($this->url_path[@array_search(":id", $route_path)]);
                 }
                 //  For historical reasons, continue to pass id
                 //  in $_REQUEST
-                if($this->id != "") {
-                    $_REQUEST['id'] = $this->id;
+                if($id != "") {
+                    $_REQUEST['id'] = $id;
                 }
-                //error_log('id='.$this->id);
+                //error_log('id='.$id);
 
                 $this->views_path .= "/" . $this->controller;
@@ -551 +542 @@
      *
      *  @uses $action
-     *  @uses $action_params
      *  @uses $application_controller_file
      *  @uses $application_helper_file
@@ -584 +574 @@
         }
         //error_log('process_route(): controller="'.$this->controller
-        //          .'"  action="'.$this->action.'"  id="'.$this->id.'"');
+        //          .'"  action="'.$this->action.'"');
 
         # Include main application controller file
@@ -662 +652 @@
                 # Call the controller method based on the URL
                 if($this->controller_object->execute_before_filters()) {
-                    $controller_layout = null;
+                    $controller_layout = null;
                     if(isset($this->controller_object->layout)) {
                         $controller_layout = $this->controller_object->layout;       
                     }
-                    if(method_exists($this->controller_object, $this->action)) {
-                        //error_log('method '.$this->action.' exists, calling it');
-                        $action = $this->action;
-                        //error_log('calling action routine '
-                        //          . get_class($this->controller_object)
-                        //          .'::'.$action.'() with params '
-                        //          .var_export($this->action_params,true));
-                        $this->controller_object->$action($this->action_params);
+
+                    #Get PUBLIC methods from controller object
+                    $all_methods = get_class_methods($this->controller_object); 
+
+                    # Get Inherited methods from active_controller 
+                    $inherited_methods = array_merge(
+                        get_class_methods(__CLASS__),
+                        $this->controller_object->before_filters,
+                        $this->controller_object->after_filters
+                    );
+
+                    # Get non-inherited methods 
+                    $action_methods = array_diff($all_methods, $inherited_methods);
+                    #error_log("available methods:".print_r($action_methods, true));
+
+                    if(in_array($this->action, $action_methods)) {
+                        #error_log('method '.$this->action.' exists, calling it');
+                        $action = $this->controller_object->called_action = $this->action;
+                        #error_log('calling action routine '
+                        #          . get_class($this->controller_object)
+                        #          .'::'.$action.'()');
+                        $this->controller_object->$action();
                     } elseif(file_exists($this->views_path . "/" . $this->action . "." . Trax::$views_extension)) {
-                        //error_log('views file "'.$this->action.'"');
-                        $action = $this->action;
+                        #error_log('views file "'.$this->action.'"');
+                        $action = $this->controller_object->called_action = $this->action;
                     } elseif(method_exists($this->controller_object, "index")) {
-                        //error_log('calling action routine '
-                        //          . get_class($this->controller_object)
-                        //          .'::index() with params '
-                        //          .var_export($this->action_params,true));
-                        $action = "index";
-                        $this->controller_object->index($this->action_params);
+                        #error_log('calling action routine '
+                        #          . get_class($this->controller_object)
+                        #          .'::index()');
+                        $action = $this->controller_object->called_action = "index";
+                        $this->controller_object->index();
                     } else {
                         //error_log('no action');
@@ -799 +802 @@
             }
             if(isset($extra_path) && is_array($extra_path)) {
+                $this->extra_path = $extra_path;
                 $extra_path = implode("/", $extra_path);
                 $this->added_path = $extra_path;
@@ -818 +822 @@
      */
     function execute_before_filters() {
+    
+        #if(isset($this->before_filter)) {
+            #$this->add_before_filter($this->before_filter);
+        #}
+        #error_log("before_filters:".print_r($this->before_filters, true));
+        #error_log("before_filter_options:".print_r($this->before_filter_options, true));       
         $return = true;
         if(count($this->before_filters) > 0) { 
+            $action = $this->action ? $this->action : "index";
             foreach($this->before_filters as $filter_function) {
+                if(array_key_exists($filter_function, $this->before_filter_options)) {
+                    if(is_array($options = $this->before_filter_options[$filter_function])) {
+                        if(array_key_exists('except', $options)) {
+                            if(preg_match("/\b$action\b/", $options['except'])) {
+                                #error_log("before filter except match: action:{$action} == ".$options['except']);
+                                continue;      
+                            }                       
+                        }
+                        if(array_key_exists('only', $options)) {
+                            if(!preg_match("/\b$action\b/", $options['only'])) {
+                                #error_log("before filter only non match: action:{$action} == ".$options['only']);
+                                continue;      
+                            }                       
+                        }                       
+                    }
+                }
                 if(method_exists($this, $filter_function)) {
                     if(false === $this->$filter_function()) {
@@ -840 +867 @@
      *  @uses $before_filters
      */
-    function add_before_filter($filter_function_name) {
+    function add_before_filter($filter_function_name, $options = array(), $prepend = false) {
         //error_log("adding before filter: $filter_function_name");
         if(is_string($filter_function_name) && !empty($filter_function_name)) {
             if(!in_array($filter_function_name, $this->before_filters)) {
-                $this->before_filters[] = $filter_function_name;
+                if($prepend) {
+                    array_unshift($this->before_filters, $filter_function_name);
+                } else {
+                    array_push($this->before_filters, $filter_function_name);
+                }
+                if(count($options)) {
+                    if(count($this->before_filter_options[$filter_function_name])) {
+                        $this->before_filter_options[$filter_function_name] = array_merge($this->before_filter_options[$filter_function_name], $options);
+                    } else {
+                        $this->before_filter_options[$filter_function_name] = $options;
+                    }                                       
+                }
             }                        
         } elseif(is_array($filter_function_name)) {
-            if(count($this->before_filters) > 0) {
-                $this->before_filters = array_merge($this->before_filters, $filter_function_name);
-            } else {
-                $this->before_filters = $filter_function_name;
-            }
-        }
-    }
+            foreach($filter_function_name as $filter_name => $options) {
+                if(!in_array($filter_name, $this->before_filters)) {
+                    if($prepend) {
+                        array_unshift($this->before_filters, $filter_name);
+                    } else {
+                        array_push($this->before_filters, $filter_name);
+                    }   
+                    if(count($options)) {
+                        if(count($this->before_filter_options[$filter_name])) {
+                            $this->before_filter_options[$filter_name] = array_merge($this->before_filter_options[$filter_name], $options);
+                        } else {
+                            $this->before_filter_options[$filter_name] = $options;
+                        }                                       
+                    }
+                }               
+            }
+        }
+    }
+
+    function prepend_before_filter($filter_function_name, $options = array()) {
+        $this->add_before_filter($filter_function_name, $options, true);
+    }
 
     /**
@@ -860 +913 @@
      */
     function execute_after_filters() {
-        if(count($this->after_filters) > 0) {
+    
+        #if(isset($this->after_filter)) {
+            #$this->add_after_filter($this->after_filter);
+        #}
+        #error_log("after_filters:".print_r($this->after_filters, true));
+        #error_log("after_filter_options:".print_r($this->after_filter_options, true));     
+        $return = true;
+        if(count($this->after_filters) > 0) { 
+            $action = $this->action ? $this->action : "index";
             foreach($this->after_filters as $filter_function) {
+                if(array_key_exists($filter_function, $this->after_filter_options)) {
+                    if(is_array($options = $this->after_filter_options[$filter_function])) {
+                        if(array_key_exists('except', $options)) {
+                            if(preg_match("/\b$action\b/", $options['except'])) {
+                                #error_log("after filter except match: action:{$action} == ".$options['except']);
+                                continue;      
+                            }                       
+                        }
+                        if(array_key_exists('only', $options)) {
+                            if(!preg_match("/\b$action\b/", $options['only'])) {
+                                #error_log("after filter only non match: action:{$action} == ".$options['only']);
+                                continue;      
+                            }                       
+                        }                       
+                    }
+                }
                 if(method_exists($this, $filter_function)) {
-                    $this->$filter_function();
+                    if(false === $this->$filter_function()) {
+                        //error_log("execute_after_filters(): returning false");
+                        $return = false;    
+                    }
                 }
             }
         }
-    }
-
+        return $return;
+    }
 
     /**
@@ -878 +958 @@
      *  @uses $after_filters
      */
-    function add_after_filter($filter_function_name) {
+    function add_after_filter($filter_function_name, $options = array(), $prepend = false) {
+        //error_log("adding after filter: $filter_function_name");
         if(is_string($filter_function_name) && !empty($filter_function_name)) {
             if(!in_array($filter_function_name, $this->after_filters)) {
-                $this->after_filters[] = $filter_function_name;
-            }
+                if($prepend) {
+                    array_unshift($this->after_filters, $filter_function_name);
+                } else {
+                    array_push($this->after_filters, $filter_function_name);
+                }
+                if(count($options)) {
+                    if(count($this->after_filter_options[$filter_function_name])) {
+                        $this->after_filter_options[$filter_function_name] = array_merge($this->after_filter_options[$filter_function_name], $options);
+                    } else {
+                        $this->after_filter_options[$filter_function_name] = $options;
+                    }                                       
+                }
+            }                        
         } elseif(is_array($filter_function_name)) {
-            if(count($this->after_filters) > 0) {
-                $this->after_filters = array_merge($this->after_filters, $filter_function_name);
-            } else {
-                $this->after_filters = $filter_function_name;
-            }
-        }
-    }
+            foreach($filter_function_name as $filter_name => $options) {
+                if(!in_array($filter_name, $this->after_filters)) {
+                    if($prepend) {
+                        array_unshift($this->after_filters, $filter_name);
+                    } else {
+                        array_push($this->after_filters, $filter_name);
+                    }   
+                    if(count($options)) {
+                        if(count($this->after_filter_options[$filter_name])) {
+                            $this->after_filter_options[$filter_name] = array_merge($this->after_filter_options[$filter_name], $options);
+                        } else {
+                            $this->after_filter_options[$filter_name] = $options;
+                        }                                       
+                    }
+                }               
+            }
+        }
+    }
+
+    function prepend_after_filter($filter_function_name, $options = array()) {
+        $this->add_after_filter($filter_function_name, $options, true);
+    }
 
     /**

trunk/trax/vendor/trax/action_view/helpers.php

@@ -134 +134 @@
      */
     protected function value() {
-        if (array_key_exists($this->object_name, $_REQUEST)
+        if (array_key_exists($this->object_name, (array)$_REQUEST)
             && array_key_exists($this->attribute_name,
-                                 $_REQUEST[$this->object_name])) {
+                                 (array)$_REQUEST[$this->object_name])) {
             $value = $_REQUEST[$this->object_name][$this->attribute_name];
         } else {
-
             //  Attribute value not found in $_REQUEST.  Find the
             //  ActiveRecord subclass instance and query it.

trunk/trax/vendor/trax/action_view/helpers/active_record_helper.php

@@ -138 +138 @@
         $this->object_name = $object_name;
         $this->attribute_name = $attribute_name;
-        $object = $this->controller_object->$object_name;
-        if($errors = $object->errors[$attribute_name]) {
+        $object = $this->object($object_name);
+        if(is_object($object) && $errors = $object->errors_on($attribute_name)) {
             return $this->content_tag("div", $prepend_text . (is_array($errors) ? current($errors) : $errors) . $append_text, array('class' => $css_class));
         }
@@ -164 +164 @@
         }
         $this->object_name = $object_name;
-        $object = $this->controller_object->$object_name;
-        if(!empty($object->errors)) {
+        $object = $this->object($object_name);
+        if(is_object($object) && $errors = $object->errors_full_messages()) {
             $id = isset($options['id']) ? $options['id'] : "ErrorExplanation";
             $class = isset($options['class']) ? $options['class'] : "ErrorExplanation";
@@ -173 +173 @@
             $header_sub_message = isset($options['header_sub_message']) ?
                 $options['header_sub_message'] : "There were problems with the following fields:";
-               
+                
             return $this->content_tag("div",
                 $this->content_tag(
                     $header_tag,
-                    sprintf($header_message, Inflector::pluralize("error", count($object->errors)), Inflector::humanize($object_name))
+                    sprintf($header_message, Inflector::pluralize("error", count($errors)), Inflector::humanize($object_name))
                 ) .
                 $this->content_tag("p", $header_sub_message) .
-                $this->content_tag("ul", array_reduce($object->errors, create_function('$v,$w', 'return ($v ? $v : "") . content_tag("li", $w);'), '')),
+                $this->content_tag("ul", array_reduce($errors, create_function('$v,$w', 'return ($v ? $v : "") . content_tag("li", $w);'), '')),
                 array("id" => $id, "class" => $class)
             );
@@ -482 +482 @@
      *  @todo Document this API
      */
-    function pagination_limit_select($object_name_or_object, $default_text = "per page:") {
+    function pagination_limit_select($object_name_or_object, $options = array()) {
 
         if(is_object($object_name_or_object)) {
@@ -495 +495 @@
 
         if($object->pages > 0) {
+            $base_url = isset($options['base_url']) ? $options['base_url'] : '';
+            $update = isset($options['update']) ? $options['update'] : '';
+            $extra_params = isset($options['extra_params']) ? "&".$options['extra_params'] : 
+                ($object->paging_extra_params ? "&".$object->paging_extra_params : '');
+            $default_text = isset($options['default_text']) ? $options['default_text'] : "per page:";
+            if($update && $base_url) {
+                $on_change = remote_function(array(
+                    "update" => $update, 
+                    "url" => "{$base_url}?per_page=' + this.options[this.selectedIndex].value + '".escape_javascript($extra_params)."'"
+                ));
+            } else {
+                $on_change = "document.location = '{$base_url}?per_page=' + this.options[this.selectedIndex].value + '".escape_javascript($extra_params)."'";                
+            }           
             $html .= "
-                <select name=\"per_page\" onChange=\"document.location = '?".escape_javascript($object->paging_extra_params)."&per_page=' + this.options[this.selectedIndex].value;\">
+                <select name=\"per_page\" onChange=\"{$on_change}\">
                     <option value=\"$object->rows_per_page\" selected>$default_text</option>
                     <option value=10>10</option>
@@ -519 +532 @@
      *  @uses rows_per_page
      */
-    function pagination_links($object_name_or_object) {
+    function pagination_links($object_name_or_object, $options = array()) {
         
         if(is_object($object_name_or_object)) {
@@ -530 +543 @@
             return null;    
         }
+
+        $first_text = isset($options['first_text']) ? $options['first_text'] : "<<";
+        $last_text = isset($options['last_text']) ? $options['last_text'] : ">>";
+        $prev_text = isset($options['prev_text']) ? $options['prev_text'] : "<";
+        $next_text = isset($options['next_text']) ? $options['next_text'] : ">";
+        $link_class = isset($options['link_class']) ? $options['link_class'] : "pagingLink";
+        $selected_class = isset($options['selected_class']) ? $options['selected_class'] : "pagingSelected";
+        $base_url = isset($options['base_url']) ? $options['base_url'] : '';
+        $update = isset($options['update']) ? $options['update'] : '';
+        $extra_params = isset($options['extra_params']) ? "&".$options['extra_params'] : 
+            ($object->paging_extra_params ? "&".$object->paging_extra_params : ''); 
+        
+        $first_width = "width:".(isset($options['first_width']) ? $options['first_width'] : '20')."px;"; # size in pixels
+        $first_width = ( 
+            (  isset($options['first_text']) &&  isset($options['first_width']) ) || 
+            ( !isset($options['first_text']) && !isset($options['first_width']) )  
+        ) ? $first_width : '';
+        $last_width = "width:".(isset($options['last_width']) ? $options['last_width'] : '20')."px;"; # size in pixels
+        $last_width = ( 
+            (  isset($options['last_text']) &&  isset($options['last_width']) ) || 
+            ( !isset($options['last_text']) && !isset($options['last_width']) )  
+        ) ? $last_width : '';
+        $prev_width = "width:".(isset($options['prev_width']) ? $options['prev_width'] : '10')."px;"; # size in pixels
+        $prev_width = ( 
+            (  isset($options['prev_text']) &&  isset($options['prev_width']) ) || 
+            ( !isset($options['prev_text']) && !isset($options['prev_width']) )  
+        ) ? $prev_width : '';
+        $next_width = "width:".(isset($options['next_width']) ? $options['next_width'] : '10')."px;"; # size in pixels
+        $next_width = ( 
+            (  isset($options['next_text']) &&  isset($options['next_width']) ) || 
+            ( !isset($options['next_text']) && !isset($options['next_width']) )  
+        ) ? $next_width : '';
+        $pages_width = isset($options['fixed_pages']) ? "width:".$options['fixed_pages']."px;" : ''; # size in pixels
            
-        //$html  = "<pre>".print_r($object,1);
+
+        $html .= "<div class=\"pagingContaniner\" style=\"display:inline\">";
+        $html .= "<div class=\"pagingFirst\" style=\"{$first_width}text-align:left;display:inline;float:left\">";
         /* Print the first and previous page links if necessary */
-        if(($object->page != 1) && ($object->page)) {
-            $html .= link_to("<<", 
-                                  "?$object->paging_extra_params&page=1&per_page=$object->rows_per_page",
-                                  array(
-                                    "class" => "pageList",
-                                    "title" => "First page"
-                                  ))." ";
-        }
-        if(($object->page-1) > 0) {
-            $html .= link_to("<", 
-                                  "?$object->paging_extra_params&page=".($object->page-1)."&per_page=$object->rows_per_page",
-                                  array(
-                                    "class" => "pageList",
-                                    "title" => "Previous Page"                                    
-                                  ));
-        }
-        
+        if(($object->page != 1) && ($object->page) && $first_text) {
+            if($update && $base_url) {
+                $html .= link_to_remote($first_text, array(
+                    "update" => $update, 
+                    "url" => "{$base_url}?page=1&per_page={$object->rows_per_page}{$extra_params}"
+                ), array(
+                    "class" => $link_class,
+                    "title" => "First page"                
+                ))." ";
+            } else {
+                $html .= link_to($first_text, "{$base_url}?page=1&per_page={$object->rows_per_page}{$extra_params}", array(
+                    "class" => $link_class,
+                    "title" => "First page"
+                ))." ";                
+            }
+        } else {
+            $html .= "&nbsp;";
+        }
+        $html .= "</div>";
+        $html .= "<div class=\"pagingPrev\" style=\"{$prev_width}text-align:left;display:inline;float:left\">";
+        if(($object->page-1) > 0 && $prev_text) {
+            if($update && $base_url) {
+                $html .= link_to_remote($prev_text, array(
+                    "update" => $update, 
+                    "url" => "{$base_url}?page=".($object->page-1)."&per_page={$object->rows_per_page}{$extra_params}"
+                ), array(
+                    "class" => $link_class,
+                    "title" => "Previous page"                    
+                ));
+            } else {
+                $html .= link_to($prev_text, "{$base_url}?page=".($object->page-1)."&per_page={$object->rows_per_page}{$extra_params}", array(
+                    "class" => $link_class,
+                    "title" => "Previous page"
+                ));                
+            }            
+        } else {
+            $html .= "&nbsp;";
+        }
+        $html .= "</div>";
         if($object->pages < $object->display) {
             $object->display = $object->pages;
@@ -574 +644 @@
             $end = $object->pages;
         }
-                
-        /* Print the numeric page list; make the current page unlinked and bold */
+        
+        $html .= "<div class=\"pagingPages\" style=\"{$pages_width}text-align:center;display:inline;float:left;padding:0px 5px\">";
+        # Print the numeric page list; make the current page unlinked and bold
         if($end != 1) {
+            $selected_class = $selected_class ? $link_class." ".$selected_class : $selected_class;
             for($i=$start; $i<=$end; $i++) {
                 if($i == $object->page) {
-                    $html .= "<span class=\"pageList\"><b>".$i."</b></span>";
+                    $html .= "<span class=\"{$selected_class}\">".$i."</span>";
                 } else {
-                    $html .= link_to($i,
-                                          "?$object->paging_extra_params&page=$i&per_page=$object->rows_per_page",
-                                          array(
-                                            "class" => "pageList",
-                                            "title" => "Page $i"                                           
-                                          ));
+                    if($update && $base_url) {
+                        $html .= link_to_remote($i, array(
+                            "update" => $update, 
+                            "url" => "{$base_url}?page={$i}&per_page={$object->rows_per_page}{$extra_params}"
+                        ), array(
+                            "class" => $link_class,
+                            "title" => "Page $i"                    
+                        ));
+                    } else {
+                        $html .= link_to($i, "{$base_url}?page={$i}&per_page={$object->rows_per_page}{$extra_params}", array(
+                            "class" => $link_class,
+                            "title" => "Page $i"
+                        ));                
+                    }                    
                 }
                 $html .= " ";
             }
         }
-
-        /* Print the Next and Last page links if necessary */
-        if(($object->page+1) <= $object->pages) {
-            $html .= link_to(">",
-                                  "?$object->paging_extra_params&page=".($object->page+1)."&per_page=$object->rows_per_page",
-                                  array(
-                                    "class" => "pageList",
-                                    "title" => "Next Page"                                    
-                                  ));
-        }
-        if(($object->page != $object->pages) && ($object->pages != 0)) {
-            $html .= link_to(">>",
-                                  "?$object->paging_extra_params&page=".$object->pages."&per_page=$object->rows_per_page",
-                                  array(
-                                    "class" => "pageList",
-                                    "title" => "Last Page"                                    
-                                  ));
-        }
-        $html .= "\n";
+        $html .= "</div>";
+        $html .= "<div class=\"pagingNext\" style=\"{$next_width}text-align:right;display:inline;float:left\">";
+        # Print the Next and Last page links if necessary
+        if(($object->page+1) <= $object->pages && $next_text) {
+            if($update && $base_url) {
+                $html .= link_to_remote($next_text, array(
+                    "update" => $update, 
+                    "url" => "{$base_url}?page=".($object->page+1)."&per_page={$object->rows_per_page}{$extra_params}"
+                ), array(
+                    "class" => $link_class,
+                    "title" => "Next Page"                    
+                ));
+            } else {
+                $html .= link_to($next_text, "{$base_url}?page=".($object->page+1)."&per_page={$object->rows_per_page}{$extra_params}", array(
+                    "class" => $link_class,
+                    "title" => "Next Page"                                    
+                ));          
+            }                   
+        } else {
+            $html .= "&nbsp;";
+        }
+        $html .= "</div>";
+        $html .= "<div class=\"pagingLast\" style=\"{$last_width}text-align:right;display:inline;float:left\">";
+        if(($object->page != $object->pages) && ($object->pages != 0) && $last_text) {
+            if($update && $base_url) {
+                $html .= link_to_remote($last_text, array(
+                    "update" => $update, 
+                    "url" => "{$base_url}?page=".$object->pages."&per_page={$object->rows_per_page}{$extra_params}"
+                ), array(
+                    "class" => $link_class,
+                    "title" => "Last Page"                    
+                ));
+            } else {
+                $html .= link_to($last_text, "{$base_url}?page=".$object->pages."&per_page={$object->rows_per_page}{$extra_params}", array(
+                    "class" => $link_class,
+                    "title" => "Last Page"                                    
+                ));    
+            }            
+        } else {
+            $html .= "&nbsp;";
+        }
+        $html .= "</div>";
+        $html .= "</div>\n";
 
         return $html;

trunk/trax/vendor/trax/action_view/helpers/form_helper.php

@@ -131 +131 @@
      */
     function add_default_name_and_id($options) {  
-        $name_option_exists = array_key_exists('name', $options);   
-        if(array_key_exists("index", $options)) {
+        $name_option_exists = array_key_exists('name', (array)$options);    
+        if(array_key_exists("index", (array)$options)) {
             $options['name'] = $name_option_exists
                 ? $options['name']
                 : $this->tag_name_with_index($options['index']);
-            $options['id'] = array_key_exists('id', $options)
+            $options['id'] = array_key_exists('id', (array)$options)
                 ? $options['id']
                 : $this->tag_id_with_index($options['index']);
@@ -144 +144 @@
                 ? $options['name']
                 : $this->tag_name_with_index($this->auto_index);
-            $options['id'] = array_key_exists('id', $options)
+            $options['id'] = array_key_exists('id', (array)$options)
                 ? $options['id']
                 : $this->tag_id_with_index($this->auto_index);
@@ -151 +151 @@
                 ? $options['name']
                 : $this->tag_name();
-            $options['id'] = array_key_exists('id', $options)
+            $options['id'] = array_key_exists('id', (array)$options)
                 ? $options['id']
                 : $this->tag_id();
         }
-        if(array_key_exists('multiple', $options) && !$name_option_exists) {
+        if(array_key_exists('multiple', (array)$options) && !$name_option_exists) {
             $options['name'] .= "[]";           
         }
@@ -181 +181 @@
      */
     function to_input_field_tag($field_type, $options = array()) {
-        $default_size = array_key_exists("maxlength", $options)
+        $default_size = array_key_exists("maxlength", (array)$options)
             ? $options["maxlength"] : $this->default_field_options['size'];
-        $options["size"] = array_key_exists("size", $options)
+        $options["size"] = array_key_exists("size", (array)$options)
             ? $options["size"]: $default_size;
-        $options = array_merge($this->default_field_options, $options);
+        $options = array_merge($this->default_field_options, (array)$options);
         if($field_type == "hidden") {
             unset($options["size"]);
@@ -191 +191 @@
         $options["type"] = $field_type;
         if($field_type != "file") {
-            $options["value"] = array_key_exists("value", $options)
+            $options["value"] = array_key_exists("value", (array)$options)
                 ? $options["value"] : $this->value();
         }
@@ -198 +198 @@
                      $this->tag("input", $options),
                      @array_key_exists($this->attribute_name,
-                                      $this->object()->errors)
+                                      (array)$this->object()->errors)
                      ? true : false);
     }
@@ -226 +226 @@
      */
     function to_text_area_tag($options = array()) {
-        if (array_key_exists("size", $options)) {
+        if (array_key_exists("size", (array)$options)) {
             $size = explode('x', $options["size"]);
             $options["cols"] = reset($size);
@@ -232 +232 @@
             unset($options["size"]);
         }
-        $options = array_merge($this->default_text_area_options, $options);
+        $options = array_merge($this->default_text_area_options, (array)$options);
         $options = $this->add_default_name_and_id($options);
         return $this->error_wrapping(
@@ -238 +238 @@
                               htmlspecialchars($this->value(), ENT_COMPAT),
                               $options),
-           array_key_exists($this->attribute_name,$this->object()->errors)
+           array_key_exists($this->attribute_name, (array)$this->object()->errors)
            ? $this->object()->errors[$this->attribute_name] : false);
     }

trunk/trax/vendor/trax/action_view/helpers/form_options_helper.php

@@ -226 +226 @@
                                       $html_options) {
         $html_options = $this->add_default_name_and_id($html_options);
-        $value = $this->value();
+        $value = isset($options['selected']) ? $options['selected'] : $this->value();
         return $this->error_wrapping(
             $this->content_tag(

trunk/trax/vendor/trax/action_view/helpers/javascript_helper.php

@@ -516 +516 @@
             $options['with'] = "Sortable.serialize('{$element_id}')";
         }
-        if(!$options['onUpdate']) {
-            $options['onUpdate'] = "function(){" . $this->remote_function($options) . "}";
+        if(!$options['onDrop']) {
+            $options['onDrop'] = "function(){" . $this->remote_function($options) . "}";
         }
         $options = $this->remove_ajax_options($options);

trunk/trax/vendor/trax/active_record.php

@@ -147 +147 @@
     
     /**
-     *  Index into the $active_connections array
+     *  Index into the $connection_pool array
      *
      *  Name of the index to use to return or set the current db connection
@@ -156 +156 @@
     public $connection_name = null;
 
+    /**
+     *  Index into the $connection_pool_read_only array
+     *
+     *  Name of the index to use to return or set the current db connection
+     *  Mainly used if you want to force all reads(SELECT's) to goto a
+     *  specific database server.
+     *  @var string
+     */    
+    public $read_only_connection_name = null;
+
+    /**
+     *  Index into the $connection_pool_read_only array
+     *
+     *  Same as $read_only_connection_name but set for all models globally.
+     *  @var string
+     */    
+    public static $global_read_only_connection_name = null;
+
     /**
      * What environment to run in.
@@ -167 +185 @@
     
     /**
-     * Stores the active connections. Indexed on $connection_name.
+     * Stores the active read/write connections. Indexed on $connection_name.
      */
-    public static $active_connections = array();
+    public static $connection_pool = array();
+
+    /**
+     * Stores the active read only connections. Indexed on $connection_name.
+     */ 
+    public static $connection_pool_read_only = array();
 
     /**
@@ -344 +367 @@
      *  @var integer
      */
-    public $rows_per_page_default = 20;
+    public static $rows_per_page_default = 20;
 
     /**
@@ -355 +378 @@
      */    
     public $pagination_count = 0;
+
+    /**
+     *  @todo Document this variable
+     */
+    public $page = 0;
+
+    /**
+     * Sets the default options for the model.
+     *
+     * class Person extends ActiveRecord {
+     *     public $default_scope = array(
+     *         'order' => 'last_name, first_name'
+     *     ));
+     * } 
+     *
+     */     
+    public $default_scope = array();
+    
+    /**
+     * Adds a class method for retrieving and querying objects. 
+     * A scope represents a narrowing of a database query, such as 
+     * 'conditions' => "first_name = 'John'"
+     *
+     * class Person extends ActiveRecord {
+     *     public $named_scope = array(
+     *         'people_named_john' => array(
+     *             'conditions' => "first_name = 'John'",     
+     *             'order' => 'last_name, first_name'
+     *     ));
+     * } 
+     *
+     * $person = new Person;
+     * $person->people_named_john; # an array of AR objects people first_name = 'John'
+     *
+     */
+    public $named_scope = array();
+    
 
     /**
@@ -430 +490 @@
      *  This is for transactions only to let query() know that a 'BEGIN' has been executed
      */
-    private static $begin_executed = false;
+    private static $in_transaction = false;
 
     /**
@@ -436 +496 @@
      *  This will issue a rollback command if any sql fails.
      */
-    public static $use_transactions = false; 
+    public static $auto_rollback = false; 
     
     /**
@@ -460 +520 @@
      */
     function __construct($attributes = null) { 
-        # Open the database connection
-        $this->establish_connection();
+        # Open the database connection for reads / writes
+        self::$db = $this->establish_connection();
+        if($this->read_only_connection_name) {
+            # Open database connection for all reads
+            $this->establish_connection($this->read_only_connection_name, true);
+        } elseif(self::$global_read_only_connection_name) {
+            # Open database connection for all reads
+            $this->establish_connection(self::$global_read_only_connection_name, true);            
+        }
 
         # Set $table_name
@@ -522 +589 @@
                     break;            
             }        
+        } elseif(array_key_exists($key, $this->named_scope) && is_array($this->named_scope[$key])) {
+            $this->$key = $this->find_all($this->named_scope[$key]);
         } elseif($this->is_composite($key)) {            
             $composite_object = $this->get_composite_object($key);
@@ -598 +667 @@
             switch($association_type) {
                 case "has_many":
+                    $parameters = is_array($this->has_many) && @array_key_exists($method_name, $this->has_many) ? 
+                        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) ? 
+                        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) ? 
+                        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) ? 
+                        array_merge($this->has_and_belongs_to_many[$method_name], $parameters) : $parameters;
                     $result = $this->find_all_habtm($method_name, $parameters); 
                     break;            
@@ -649 +726 @@
      */
     private function find_all_habtm($other_table_name, $parameters = null) {
-        $additional_conditions = null;
+        $additional_conditions = $additional_joins = null;
+        $options = array();
         # Use any passed-in parameters
-        if(!is_null($parameters)) {
+        if(!is_null($parameters)) {  
             if(@array_key_exists("conditions", $parameters)) {
                 $additional_conditions = " AND (".$parameters['conditions'].")";
@@ -658 +736 @@
             }
             if(@array_key_exists("order", $parameters)) {
-                $order = $parameters['order'];
+                $options['order'] = $parameters['order'];
             } elseif($parameters[1] != "") {
-                $order = $parameters[1];
+                $options['order'] = $parameters[1];
             }
             if(@array_key_exists("limit", $parameters)) {
-                $limit = $parameters['limit'];
+                $options['limit'] = $parameters['limit'];
             } elseif($parameters[2] != "") {
-                $limit = $parameters[2];
-            }    
+                $options['limit'] = $parameters[2];
+            }
+            if(@array_key_exists("joins", $parameters)) {
+                $additional_joins = $parameters['joins'];
+            } elseif($parameters[3] != "") {
+                $additional_joins = $parameters[3];
+            }
+            if(@array_key_exists("page", $parameters)) {
+                $options['page'] = $parameters['page'];
+            }
+            if(@array_key_exists("per_page", $parameters)) {
+                $options['per_page'] = $parameters['per_page'];
+            }
             if(@array_key_exists("class_name", $parameters)) {
                 $other_object_name = $parameters['class_name'];
@@ -697 +786 @@
         if(!is_null($finder_sql)) {
             $conditions = $finder_sql;    
-            $order = null;
-            $limit = null;
-            $joins = null;
         } else {
             # Prepare the join table name primary keys (fields) to do the join on
@@ -729 +815 @@
             }
 
+            if($this->habtm_sort_field) {
+                $options['order'] = (isset($options['order']) ? $options['order'].',':'')."{$join_table}.{$this->habtm_sort_field}";
+            } 
+            
             # Set up the SQL segments
             $conditions = "{$join_table}.{$this_foreign_key} = {$this_primary_key_value}".$additional_conditions;
-            $joins = "LEFT JOIN {$join_table} ON {$other_table_name}.{$other_primary_key} = {$join_table}.{$other_foreign_key}";
-        }
+            $options['joins'] = "LEFT JOIN {$join_table} ON {$other_table_name}.{$other_primary_key} = {$join_table}.{$other_foreign_key}".$additional_joins;
+        }
+        $options['conditions'] = $conditions;
         
         # Get the list of other_class_name objects
-        return $other_class_object->find_all($conditions, $order, $limit, $joins);
+        return $other_class_object->find_all($options);
     }
 
@@ -747 +838 @@
      */
     private function find_all_has_many($other_table_name, $parameters = null) {
-        $additional_conditions = null;
+        $additional_conditions = $order = $limit = null;
         # Use any passed-in parameters
         if(is_array($parameters)) {
@@ -756 +847 @@
             }
             if(@array_key_exists("order", $parameters)) {
-                $order = $parameters['order'];
+                $options['order'] = $parameters['order'];
             } elseif($parameters[1] != "") {
-                $order = $parameters[1];
+                $options['order'] = $parameters[1];
             }
             if(@array_key_exists("limit", $parameters)) {
-                $limit = $parameters['limit'];
+                $options['limit'] = $parameters['limit'];
             } elseif($parameters[2] != "") {
-                $limit = $parameters[2];
-            }
+                $options['limit'] = $parameters[2];
+            }
+            if(@array_key_exists("joins", $parameters)) {
+                $options['joins'] = $parameters['joins'];
+            } elseif($parameters[3] != "") {
+                $options['joins'] = $parameters[3];
+            }
+            if(@array_key_exists("page", $parameters)) {
+                $options['page'] = $parameters['page'];
+            }
+            if(@array_key_exists("per_page", $parameters)) {
+                $options['per_page'] = $parameters['per_page'];
+            }
             if(@array_key_exists("foreign_key", $parameters)) {
                 $foreign_key = $parameters['foreign_key'];
@@ -773 +875 @@
             if(@array_key_exists("finder_sql", $parameters)) {
                 $finder_sql = $parameters['finder_sql'];
-            }
+            }           
         }
 
@@ -788 +890 @@
         if(!is_null($finder_sql)) {
             $conditions = $finder_sql;  
-            $order = null;
-            $limit = null;
-            $joins = null; 
         } else {          
             # This class primary key
@@ -813 +912 @@
             $conditions .= $additional_conditions; 
         }
-                         
+        $options['conditions'] = $conditions;
+        #error_log("has_many:".print_r($options, true));
         # Get the list of other_class_name objects
-        return $other_class_object->find_all($conditions, $order, $limit, $joins);
+        return $other_class_object->find_all($options);
     }
 
@@ -857 +957 @@
         $this_primary_key = $this->primary_keys[0];
         
-        if(!$foreign_key){
+        if(!$foreign_key) {
             $foreign_key = Inflector::singularize($this->table_name)."_".$this_primary_key;
         }
@@ -979 +1079 @@
 
         # echo "$aggregate_type sql:$sql<br>";
-        if($this->is_error($rs = $this->query($sql))) {
+        //print_r($parameters[0]);
+        //echo $sql;
+        if($this->is_error($rs = $this->query($sql, true))) {
             $this->raise($rs->getMessage());
         } else {
@@ -1078 +1180 @@
         if($this->column_attribute_exists($column) && ($conditions = $this->get_primary_key_conditions())) {
             # Run the query to grab a specific columns value.
-            $sql = "SELECT {$column} FROM {$this->table_prefix}{$this->table_name} WHERE {$conditions}";
+            $sql = "SELECT {$column} FROM {$this->table_prefix}{$this->table_name} WHERE {$conditions} LIMIT 1";
             $this->log_query($sql);
-            $result = self::$db->queryOne($sql);
+            $db = $this->get_connection(true);
+            $result = $db->queryOne($sql);
             if($this->is_error($result)) {
                 $this->raise($result->getMessage());
@@ -1094 +1197 @@
      *  @todo Document this API
      */
-    function begin() {
-        self::$db->query("BEGIN");
-        $this->begin_executed = true;
+    function begin($save_point = null) {
+        # check if transaction are supported by this driver
+        if(self::$db->supports('transactions')) {        
+            $rs = self::$db->beginTransaction();
+            if($this->is_error($rs)) {
+                $this->raise($rs->getMessage());
+            }      
+            self::$in_transaction = true;
+        }
+    }
+
+    /**
+     * Only used if you want to do transactions and your db supports transactions
+     *
+     *  @uses $db
+     *  @todo Document this API
+     */    
+    function save_point($save_point) {
+        if(!is_null($save_point)) {
+            # check if transaction are supported by this driver
+            if(self::$db->supports('transactions')) {            
+                # check if we are inside a transaction and if savepoints are supported
+                if(self::$db->inTransaction() && self::$db->supports('savepoints')) {
+                    # Set a savepoint
+                    $rs = self::$db->beginTransaction($save_point); 
+                    if($this->is_error($rs)) {
+                        $this->raise($rs->getMessage());
+                    }                
+                } 
+            }          
+        }        
     }
 
@@ -1105 +1236 @@
      *  @todo Document this API
      */
-    function commit() {
-        self::$db->query("COMMIT"); 
-        $this->begin_executed = false;
+    function commit() {      
+        # check if transaction are supported by this driver
+        if(self::$db->supports('transactions')) {
+            # check if we are inside a transaction
+            if(self::$db->inTransaction()) {
+                $rs = self::$db->commit(); 
+                if($this->is_error($rs)) {
+                    $this->raise($rs->getMessage());
+                }        
+                self::$in_transaction = false;
+            }
+        }
     }
 
@@ -1115 +1255 @@
      *  @uses $db
      *  @todo Document this API
-     */
+     */    
     function rollback() {
-        self::$db->query("ROLLBACK");
+        # check if transaction are supported by this driver
+        if(self::$db->supports('transactions')) {
+            $rs = self::$db->rollback(); 
+            if($this->is_error($rs)) {
+                $this->raise($rs->getMessage());
+            }
+            self::$in_transaction = false;
+        }               
     }
 
@@ -1131 +1278 @@
      *  @throws {@link ActiveRecordError}
      */
-    function query($sql) {
+    function query($sql, $read_only = false) {
         # Run the query
         $this->log_query($sql);
-        $rs =& self::$db->query($sql);
+        $db = $this->get_connection($read_only);
+        $rs =& $db->query($sql);
         if ($this->is_error($rs)) {
-            if(self::$use_transactions && self::$begin_executed) {
+            if(self::$auto_rollback && self::$in_transaction) {
                 $this->rollback();
             }
@@ -1241 +1389 @@
         
         $offset = null;
+        $page = null;
         $per_page = null;
         $select = null;
+        $paginate = false;
 
         # this is if they passed in an associative array to emulate
@@ -1280 +1430 @@
             # If conditions specified, include them
             if(!is_null($conditions)) {
+                if(array_key_exists('conditions', $this->default_scope) 
+                   && !is_null($this->default_scope['conditions'])) {
+                    $conditions = " ({$conditions}) AND (".$this->default_scope['conditions'].") ";
+                }
                 $sql .= "WHERE $conditions ";
+            } elseif(array_key_exists('conditions', $this->default_scope) 
+                     && !is_null($this->default_scope['conditions'])) {
+                $sql .= "WHERE ".$this->default_scope['conditions']." ";
             }
 
             # If ordering specified, include it
             if(!is_null($order)) {
+                if(array_key_exists('order', $this->default_scope) 
+                   && !is_null($this->default_scope['order'])) {
+                    $order = " {$order},".$this->default_scope['order']." ";
+                }                
                 $sql .= "ORDER BY $order ";
+            } elseif(array_key_exists('order', $this->default_scope) 
+                     && !is_null($this->default_scope['order'])) {
+                $sql .= "ORDER BY ".$this->default_scope['order']." ";
             }
 
             # Is output to be generated in pages?
-            if(is_numeric($limit) || is_numeric($offset) || is_numeric($per_page)) {
+            if(is_numeric($limit) || is_numeric($offset) || is_numeric($per_page) || is_numeric($page)) {
+                #error_log("limit:$limit offset:$offset per_page:$per_page page:$page");
 
                 if(is_numeric($limit)) {    
-                    $this->rows_per_page = $limit;        
+                    $this->rows_per_page = (int)$limit;        
                 }
                 if(is_numeric($per_page)) {
-                    $this->rows_per_page = $per_page;            
+                    $this->rows_per_page = (int)$per_page; 
+                    $paginate = true;
                 }
                 # Default for rows_per_page:
                 if ($this->rows_per_page <= 0) {
-                    $this->rows_per_page = $this->rows_per_page_default;
+                    $this->rows_per_page = (int)self::$rows_per_page_default;
                 }
                 
                 # Only use request's page if you are calling from find_all_with_pagination() and if it is int
-                if(strval(intval($_REQUEST['page'])) == $_REQUEST['page']) {
-                    $this->page = $_REQUEST['page'];
+                #if(isset($_REQUEST['page']) && strval(intval($_REQUEST['page'])) == $_REQUEST['page']) {
+                    #$this->page = $_REQUEST['page'];
+                #}
+                if(!is_null($page)) {
+                    $this->page = (int)$page;
+                    $paginate = true;
                 }
                 
@@ -1319 +1489 @@
                 # $sql .= "LIMIT $offset, $this->rows_per_page";
                 
-                # Set number of total pages in result set
-                if($count = $this->count_all($this->primary_keys[0], $conditions, $joins)) {
-                    $this->pagination_count = $count;
-                    $this->pages = (($count % $this->rows_per_page) == 0)
-                        ? $count / $this->rows_per_page
-                        : floor($count / $this->rows_per_page) + 1; 
+                if($paginate) {
+                    #error_log("I am going to paginate.");
+                    # Set number of total pages in result set
+                    if($count = $this->count_all($this->primary_keys[0], $conditions, $joins)) {
+                        $this->pagination_count = $count;
+                        $this->pages = (($count % $this->rows_per_page) == 0)
+                            ? $count / $this->rows_per_page
+                            : floor($count / $this->rows_per_page) + 1; 
+                    }
                 }
             }
@@ -1331 +1504 @@
         return $sql;
     }
+    
+    /**
+     *  Returns same as find_all
+     *
+     */
+    function paginate($page = 1, $per_page = 0, $options = array()) {
+        if(is_array($page)) {
+            $options = $page;
+        } else {
+            $options['page'] = (int)($page > 0 ? $page : 1);
+            $options['per_page'] = (int)($per_page > 0 ? $per_page : self::$rows_per_page_default);
+        }
+        $options['paginate'] = true;
+        return $this->find_all($options);
+    }   
 
     /**
@@ -1372 +1560 @@
         # echo "query: $sql\n";
         # error_log("ActiveRecord::find_all -> $sql");
-        if($this->is_error($rs = $this->query($sql))) {
+        if($this->is_error($rs = $this->query($sql, true))) {
             $this->raise($rs->getMessage());
         }
 
         $objects = array();
-        while($row = $rs->fetchRow()) {
-            $class_name = $this->get_class_name();
+        $class_name = $this->get_class_name();
+        while($row = $rs->fetchRow()) {    
             $object = new $class_name();
             $object->new_record = false;
@@ -1386 +1574 @@
                 if($field == $this->index_on) {
                     $objects_key = $value;
-                } 
-            }
-            if(is_null($objects_key)) {
-                $objects[] = $object;
+                }
+            }
+            if(is_null($objects_key)) {
+                $objects[] = $object;
             } else {
-                $objects[$objects_key] = $object;
+                $objects[$objects_key] = $object;   
             }
             # If callback is defined in model run it.
@@ -1711 +1899 @@
         
         if($this->is_error($result)) {
-            $this->raise($results->getMessage());
+            $this->raise($result->getMessage());
         } else {
             $habtm_result = true;
@@ -1762 +1950 @@
         $result = $this->query($sql);
         if($this->is_error($result)) {
-            $this->raise($results->getMessage());
+            $this->raise($result->getMessage());
         } else {
             $habtm_result = true;
@@ -1946 +2134 @@
 
         if(is_null($conditions)) {
-            $this->errors[] = "No conditions specified to delete on.";
+            $this->add_error("No conditions specified to delete on.");
             return false;
         }
 
-        $this->before_delete(); 
-        if($result = $this->delete_all($conditions)) {
-            foreach($deleted_ids as $id) {
-                if($this->auto_delete_habtm && $id != '') {
-                    if(is_string($this->has_and_belongs_to_many)) {
-                        $habtms = explode(",", $this->has_and_belongs_to_many);
-                        foreach($habtms as $other_table_name) {
-                            $this->delete_all_habtm_records(trim($other_table_name), $id);                             
-                        }
-                    } elseif(is_array($this->has_and_belongs_to_many)) {
-                        foreach($this->has_and_belongs_to_many as $other_table_name => $values) {
-                            $this->delete_all_habtm_records($other_table_name, $id);                             
-                        }
-                    } 
+        if($this->before_delete()) {
+            if($result = $this->delete_all($conditions)) {
+                foreach($deleted_ids as $id) {
+                    if($this->auto_delete_habtm && $id != '') {
+                        if(is_string($this->has_and_belongs_to_many)) {
+                            $habtms = explode(",", $this->has_and_belongs_to_many);
+                            foreach($habtms as $other_table_name) {
+                                $this->delete_all_habtm_records(trim($other_table_name), $id);                             
+                            }
+                        } elseif(is_array($this->has_and_belongs_to_many)) {
+                            foreach($this->has_and_belongs_to_many as $other_table_name => $values) {
+                                $this->delete_all_habtm_records($other_table_name, $id);                             
+                            }
+                        } 
+                    }
                 }
-            }
-            $this->after_delete();
-        }
-        
+                $this->after_delete();
+            }            
+        }        
         return $result;
     }
@@ -1991 +2179 @@
     function delete_all($conditions = null) {
         if(is_null($conditions)) {
-            $this->errors[] = "No conditions specified to delete on.";
+            $this->add_error("No conditions specified to delete on.");
             return false;
         }
@@ -2046 +2234 @@
             if($this->delete_habtm_records($this_foreign_value)) {
                 reset($this->habtm_attributes);
+                if($this->habtm_sort_field) {
+                    $sort_field = $this->habtm_sort_field;
+                    $sort_value = 0;
+                }
                 foreach($this->habtm_attributes as $other_table_name => $other_foreign_values) {
                     $table_name = $this->get_join_table_name($this->table_name,$other_table_name);
@@ -2054 +2246 @@
                         $attributes[$this_foreign_key] = $this_foreign_value;
                         $attributes[$other_foreign_key] = $other_foreign_value;
+                        if($sort_field) {
+                            $attributes[$sort_field] = $sort_value;
+                            $sort_value++;
+                        }
                         $attributes = $this->quoted_attributes($attributes);
                         $fields = @implode(', ', array_keys($attributes));
                         $values = @implode(', ', array_values($attributes));
                         $sql = "INSERT INTO $table_name ($fields) VALUES ($values)";
-                        //echo "add_habtm_records: SQL: $sql<br>";
+                        error_log("add_habtm_records: SQL: $sql");
                         $result = $this->query($sql);
                         if ($this->is_error($result)) {
@@ -2193 +2389 @@
                 }
             }
-    
+
             //  If any date/time fields were found, assign the
             //  accumulated values to corresponding attributes
+            //  1i = Year, 2i = Month, 3i = Day, 4i = Hour, 5i = Minute
             if(count($datetime_fields)) {
                 foreach($datetime_fields as $datetime_field) {
                     $datetime_format = '';
                     $datetime_value = '';
+                    # Date Year / Month / Day
                     if($attributes[$datetime_field."(1i)"]
                         && $attributes[$datetime_field."(2i)"]
@@ -2207 +2405 @@
                         . "-" . $attributes[$datetime_field."(3i)"];
                         $datetime_format = $this->date_format;
-                    }
+                    } 
+                    # for expiration dates Year & Month
+                    elseif($attributes[$datetime_field."(1i)"]
+                             && $attributes[$datetime_field."(2i)"]) {
+                        $datetime_value = $attributes[$datetime_field."(1i)"]
+                        . "-" . $attributes[$datetime_field."(2i)"];    
+                        $datetime_format = $this->date_format;                  
+                    }
                     $datetime_value .= " ";
+                    # Time Hour & Minutes
                     if($attributes[$datetime_field."(4i)"]
                         && $attributes[$datetime_field."(5i)"]) {
@@ -2405 +2611 @@
     }
 
+    function human_attribute_name($attribute) {
+        return Inflector::humanize($attribute);
+    }
+
     /**
      *  Set {@link $table_name} from the class name of this object
@@ -2439 +2649 @@
      *  @uses $db
      *  @uses $content_columns
-     *  @uses Inflector::humanize()
+     *  @uses human_attribute_name()
      *  @see __set()
      *  @param string $table_name  Name of table to get information about
@@ -2458 +2668 @@
                 $i = 0;
                 foreach($this->content_columns as $column) {
-                    $this->content_columns[$i++]['human_name'] = Inflector::humanize($column['name']);
+                    $this->content_columns[$i++]['human_name'] = $this->human_attribute_name($column['name']);
                 }                
                 self::$table_info[$table_name] = $this->content_columns;
@@ -2496 +2706 @@
      *  
      *  If there is a connection now open, as indicated by the saved
-     *  value of a MDB2 object in $active_connections[$connection_name], and
+     *  value of a MDB2 object in $connection_pool[$connection_name], and
      *  {@link force_reconnect} is not true, then set the database
      *  fetch mode and return.
      *
      *  If there is no connection, open one and save a reference to
-     *  it in $active_connections[$connection_name].
+     *  it in $connection_pool[$connection_name].
      *
      *  @uses $db
      *  @uses $database_name
      *  @uses $force_reconnect
-     *  @uses $active_connections
+     *  @uses $connection_pool
      *  @uses is_error()
      *  @throws {@link ActiveRecordError}
      */
-    function establish_connection() {
-        $this->set_connection_name();
-        $connection =& self::$active_connections[$this->connection_name];
+    function establish_connection($connection_name = null, $read_only = false) {
+        $connection_name = $this->get_connection_name($connection_name);
+        if($read_only) { 
+            $connection =& self::$connection_pool_read_only[$connection_name];
+        } else {
+            $connection =& self::$connection_pool[$connection_name];
+        }
         if(!is_object($connection) || $this->force_reconnect) {
             $connection_settings = array();
             $connection_options = array();
-            if(array_key_exists($this->connection_name, self::$database_settings)) {
+            if(array_key_exists($connection_name, self::$database_settings)) {
                  # Use a different custom sections settings ?
-                if(array_key_exists("use", self::$database_settings[$this->connection_name])) {
-                    $connection_settings = self::$database_settings[self::$database_settings[$this->connection_name]['use']];
+                if(array_key_exists("use", self::$database_settings[$connection_name])) {
+                    $connection_settings = self::$database_settings[self::$database_settings[$connection_name]['use']];
                 } else {
                     # Custom defined db settings in database.ini 
-                    $connection_settings = self::$database_settings[$this->connection_name];
+                    $connection_settings = self::$database_settings[$connection_name];
                 }
             } else {
                 # Just use the current environment's db settings
-                # $this->connection_name's default value is 'development' so
-                # if should never really get here unless you override $this->connection_name
+                # $connection_name's default value is 'development' so
+                # it should never really get here unless you override $this->connection_name
                 # and you define a custom db section in database.ini and it can't find it.
-                $connection_settings = self::$database_settings[$this->connection_name];
+                $connection_settings = self::$database_settings[$connection_name];
             }
             # Override database name if param is set
@@ -2541 +2755 @@
             # Connect to the database and throw an error if the connect fails.
             $connection =& MDB2::Connect($connection_settings, $connection_options);
-            //static $connect_cnt;  $connect_cnt++; error_log("connection #".$connect_cnt);
+            #static $connect_cnt;  $connect_cnt++; error_log("establish_connection($connection_name, $read_only) #".$connect_cnt);
             
             # For Postgres schemas (http://www.postgresql.org/docs/8.0/interactive/ddl-schemas.html)
@@ -2553 +2767 @@
         }
         if(!$this->is_error($connection)) {
-            self::$active_connections[$this->connection_name] =& $connection;
-            self::$db =& $connection;
-            self::$db->setFetchMode($this->fetch_mode);
+            $connection->setFetchMode($this->fetch_mode);
+            if($read_only) {
+                self::$connection_pool_read_only[$connection_name] =& $connection;
+                $this->read_only_connection_name = $connection_name;
+            } else {
+                self::$connection_pool[$connection_name] =& $connection;
+                $this->connection_name = $connection_name;
+            }
         } else {
             $this->raise($connection->getMessage());
         }      
-        return self::$db;
+        return $connection;
     }
 
@@ -2565 +2784 @@
      *  Set the name of the database connection to use. 
      */    
-    function set_connection_name() {
-        $connection_name = null;
-        if(!is_null($this->connection_name)) {
-            $connection_name = $this->connection_name;      
-        } else {
-            $connection_name = self::$environment ? self::$environment : 'development';
-        }  
-        $this->connection_name = $connection_name;
+    function get_connection_name($connection_name = null) {
+        if(is_null($connection_name)) {
+            if(!is_null($this->connection_name)) {
+                $connection_name = $this->connection_name;      
+            } else {
+                $connection_name = self::$environment ? self::$environment : 'development';
+            } 
+        }
+        return $connection_name; 
+    }
+    /**
+     *  Gets the database connection whether its read only or read/write    
+     */    
+    function get_connection($read_only = false) {
+        if($read_only && $this->read_only_connection_name && 
+           array_key_exists($this->read_only_connection_name, self::$connection_pool_read_only)) {
+            $db =& self::$connection_pool_read_only[$this->read_only_connection_name];
+            #error_log("get_connection($read_only) - using read only:".$this->read_only_connection_name);
+        } elseif(array_key_exists($this->connection_name, self::$connection_pool)) {
+            $db =& self::$connection_pool[$this->connection_name];
+            #error_log("get_connection($read_only) - using read/write from pool:".$this->connection_name);
+        } else {
+            $db =& self::$db;
+            #error_log("get_connection($read_only) - using read/write default:".$this->connection_name);
+        }
+        return $db;
     }
 
@@ -2703 +2940 @@
                             # Mark the corresponding entry in the error array by
                             # putting the error message in for the attribute,
-                            #   e.g. $this->errors['name'] = "can't be empty"
+                            #   e.g. $this->add_error("can't be empty", 'name');
                             #   when 'name' was an empty string.
-                            $this->errors[$validate_on_attribute] = $result[1];
+                            $this->add_error($result[1], $validate_on_attribute);
                         }
                     }
@@ -2716 +2953 @@
     /**
      *  Overwrite this method for validation checks on all saves and
-     *  use $this->errors[] = "My error message."; or
-     *  for invalid attributes $this->errors['attribute'] = "Attribute is invalid.";
+     *  use $this->add_error("My error message.", 'attribute');
      *  @todo Document this API
      */
@@ -2810 +3046 @@
      *  @todo Document this API
      */
-    function before_delete() {}
+    function before_delete() { return true; }
 
     /**
@@ -2845 +3081 @@
             if(method_exists($this, $method_name) && is_array($validation_name)) {
                 foreach($validation_name as $attribute_name => $options) {
-                    if(!is_array($options)) {
+                    if(is_string($options)) {
                         $attribute_name = $options;
                         $options = array();
-                    }               
+                    } elseif(!is_array($options)) {
+                        $options = array();
+                    }               
                     $attribute_name = trim($attribute_name);     
                     $parameters = array();
-                    $on = array_key_exists('on', $options) ? 
-                        $options['on'] : 'save';
-                    $message = array_key_exists('message', $options) ? 
-                        $options['message'] : null;                  
+                    $on = array_key_exists('on', $options) ? $options['on'] : 'save';
+                    $message = array_key_exists('message', $options) ? $options['message'] : null;   
                     switch($method_name) {
                         case 'validates_acceptance_of':
@@ -2923 +3159 @@
         foreach((array) $attribute_names as $attribute_name) {                  
             if($this->$attribute_name != $accept) {
-                $attribute_human = Inflector::humanize($attribute_name);
-                $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                #$attribute_human = $this->human_attribute_name($attribute_name);
+                #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                $this->add_error($message, $attribute_name);                
             }
         }
@@ -2941 +3178 @@
             $attribute_confirmation = $attribute_name . '_confirmation';
             if($this->$attribute_confirmation != $this->$attribute_name) {
-                $attribute_human = Inflector::humanize($attribute_name);
-                $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                #$attribute_human = $this->human_attribute_name($attribute_name);
+                #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                $this->add_error($message, $attribute_name);
             }
         }
@@ -2961 +3199 @@
                 list($minimum, $maximum) = explode('..', $in);
                 if($this->$attribute_name >= $minimum && $this->$attribute_name <= $maximum) {
-                    $attribute_human = Inflector::humanize($attribute_name);
-                    $this->add_error("{$attribute_human} {$message}", $attribute_name);        
+                    #$attribute_human = $this->human_attribute_name($attribute_name);
+                    #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    $this->add_error($message, $attribute_name);       
                 }
             } elseif(is_array($in)) {
                 if(in_array($this->$attribute_name, $in)) {
-                    $attribute_human = Inflector::humanize($attribute_name);
-                    $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    #$attribute_human = $this->human_attribute_name($attribute_name);
+                    #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    $this->add_error($message, $attribute_name);
                 }
             }   
@@ -2987 +3227 @@
             # Was there an error?
             if(!preg_match($regex, $value)) {
-                $attribute_human = Inflector::humanize($attribute_name);
-                $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                #$attribute_human = $this->human_attribute_name($attribute_name);
+                #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                $this->add_error($message, $attribute_name);
             }
         }
@@ -3007 +3248 @@
                 list($minimum, $maximum) = explode('..', $in);
                 if(!($this->$attribute_name >= $minimum && $this->$attribute_name <= $maximum)) {
-                    $attribute_human = Inflector::humanize($attribute_name);
-                    $this->add_error("{$attribute_human} {$message}", $attribute_name);        
+                    #$attribute_human = $this->human_attribute_name($attribute_name);
+                    #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    $this->add_error($message, $attribute_name);      
                 }
             } elseif(is_array($in)) {
                 if(!in_array($this->$attribute_name, $in)) {
-                    $attribute_human = Inflector::humanize($attribute_name);
-                    $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    #$attribute_human = $this->human_attribute_name($attribute_name);
+                    #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    $this->add_error($message, $attribute_name);
                 }
             } 
@@ -3042 +3285 @@
             # Attribute string length
             $len = strlen($this->$attribute_name);
-            $attribute_human = Inflector::humanize($attribute_name);
+            #$attribute_human = $this->human_attribute_name($attribute_name);
             
             # If you have set the min length option
@@ -3048 +3291 @@
                 $message = $this->get_error_message_for_validation($options['too_short'], 'too_short', $options['minimum']);
                 if($len < $options['minimum']) {
-                    $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    $this->add_error($message, $attribute_name);                    
                 }
             }
@@ -3056 +3300 @@
                 $message = $this->get_error_message_for_validation($options['too_long'], 'too_long', $options['maximum']);
                 if($len > $options['maximum']) {
-                    $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    $this->add_error($message, $attribute_name);                    
                 }
             }
@@ -3064 +3309 @@
                 $message = $this->get_error_message_for_validation($options['wrong_length'], 'wrong_length', $options['is']);
                 if($len != $options['is']) {
-                    $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    $this->add_error($message, $attribute_name);                    
                 }
             }
@@ -3087 +3333 @@
                 $message = $this->get_error_message_for_validation($message, 'not_an_integer');
                 if(!is_integer($value)) {
-                    $attribute_human = Inflector::humanize($attribute_name);
-                    $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    #$attribute_human = $this->human_attribute_name($attribute_name);
+                    #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    $this->add_error($message, $attribute_name);
                 }
             } else {
                 $message = $this->get_error_message_for_validation($message, 'not_a_number');
                 if(!is_numeric($value)) {
-                    $attribute_human = Inflector::humanize($attribute_name);
-                    $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    #$attribute_human = $this->human_attribute_name($attribute_name);
+                    #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                    $this->add_error($message, $attribute_name);
                 }
             }
@@ -3111 +3359 @@
         foreach((array) $attribute_names as $attribute_name) {              
             if($this->$attribute_name === '' || is_null($this->$attribute_name)) {
-                $attribute_human = Inflector::humanize($attribute_name);
-                $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                #$attribute_human = $this->human_attribute_name($attribute_name);
+                #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                $this->add_error($message, $attribute_name);
             }
         }
@@ -3136 +3385 @@
             }   
             if($this->find_first($conditions)) {
-                $attribute_human = Inflector::humanize($attribute_name);
-                $this->add_error("{$attribute_human} {$message}", $attribute_name);
+                #$attribute_human = $this->human_attribute_name($attribute_name);
+                #$this->add_error("{$attribute_human} {$message}", $attribute_name);
+                $this->add_error($message, $attribute_name);                
             }
         }
@@ -3184 +3434 @@
         throw new ActiveRecordError($error_message, "ActiveRecord Error", "500");
     }
+
+    function errors_full_messages() {
+        $full_messages = array();
+        foreach((array)$this->errors as $attribute => $message) {
+            if(is_null($message)) {
+                continue;
+            }
+            $full_messages[] = $this->human_attribute_name($attribute) . " " . $message;
+        }
+        return $full_messages;
+    }
+    
+    function errors_on($attribute) {
+        $errors = isset($this->errors[$attribute]) ? $this->errors[$attribute] : null;
+        return ((is_array($errors) && count($errors) == 1) ? current($errors) : $errors);
+    }   
 
     /**

trunk/trax/vendor/trax/inflections.php

@@ -81 +81 @@
 Inflections::irregular('sex', 'sexes'); 
 Inflections::irregular('move', 'moves'); 
+Inflections::irregular('cow', 'kine'); 
 
 Inflections::uncountable('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
@@ -94 +95 @@
 class Inflections {
 
-    public static $plurals = array();
-
-    public static $singulars = array();
-
-    public static $uncountables = array();
+    public static 
+        $plurals = array(),
+        $singulars = array(),
+        $uncountables = array(),
+        $humans = array();
 
     # Specifies a new pluralization rule and its replacement. The rule can either be a string or a regular expression. 
@@ -130 +131 @@
     #   Inflections::uncountable(array("money", "information", "rice"))
     function uncountable() {
-        $args = func_get_args();
+        $args = func_get_args();
         if(is_array($args[0])) {
             $args = $args[0];    
@@ -137 +138 @@
             self::$uncountables[] = $word;    
         }     
+    }
+
+    # Specifies a humanized form of a string by a regular expression rule or by a string mapping.
+    # When using a regular expression based replacement, the normal humanize formatting is called after the replacement.
+    # When a string is used, the human form should be specified as desired (example: 'The name', not 'the_name')
+    #
+    # Examples:
+    #   Inflections::human("/_cnt$/i", "\1_count")
+    #   Inflections::human("legacy_col_person_name", "Name")
+    function human($rule, $replacement) {
+        array_unshift(self::$humans, array("rule" => $rule, "replacement" => $replacement));
     }
     
@@ -147 +159 @@
     function clear($scope = "all") {
         if($scope == "all") {
-            self::$plurals = self::$singulars = self::$uncountables = array();
+            self::$plurals = self::$singulars = self::$uncountables = self::$humans = array();
         } else {
             self::$$scope = array();

trunk/trax/vendor/trax/inflector.php

@@ -41 +41 @@
  */
 class Inflector {
+    
+    private static $cache = array(
+        'plural' => array(), 
+        'singular' => array()
+    );
 
     /**
@@ -48 +53 @@
      *  If $count > 0 then prefixes $word with the $count
      *
-     *  @param  string $word  Word to be pluralized
+     *  @param  string $singular_word  Word to be pluralized
      *  @param  int $count How many of these $words are there
-     *  @return string  Plural of $word
-     */
-    function pluralize($word, $count = 0) {
-        if($count == 0 || $count > 1) {          
-            if(!in_array($word, Inflections::$uncountables)) { 
-                $original = $word;   
-                foreach(Inflections::$plurals as $plural_rule) {
-                    $word = preg_replace($plural_rule['rule'], $plural_rule['replacement'], $word);
-                    if($original != $word) break;
-                }
+     *  @return string  Plural of $singular_word
+     */
+    function pluralize($singular_word, $count = 0, $plural_word = null) {
+        if($count != 1) {
+            if(is_null($plural_word)) { 
+                $plural_word = $singular_word;  
+                if(isset(self::$cache['plural'][$singular_word])) {
+                    $plural_word = self::$cache['plural'][$singular_word];
+                } elseif(!in_array($singular_word, Inflections::$uncountables)) {   
+                    foreach(Inflections::$plurals as $plural_rule) {
+                        if(preg_match($plural_rule['rule'], $singular_word)) {
+                            $plural_word = preg_replace($plural_rule['rule'], $plural_rule['replacement'], $plural_word);
+                            self::$cache['plural'][$singular_word] = $plural_word;
+                            break;
+                        }   
+                    }
+                } 
+            }
+        } else {
+            $plural_word = self::singularize($singular_word);
+        }
+        return $plural_word;
+    }
+
+    /**
+     *  Singularize a word according to English rules 
+     *
+     *  @param  string $plural_word  Word to be singularized
+     *  @return string  Singular of $plural_word
+     */
+    function singularize($plural_word) {
+        $singular_word = $plural_word;  
+        if(isset(self::$cache['singular'][$plural_word])) {
+            $singular_word = self::$cache['singular'][$plural_word];
+        } elseif(!in_array($plural_word, Inflections::$uncountables)) {              
+            foreach(Inflections::$singulars as $singular_rule) {
+                if(preg_match($singular_rule['rule'], $plural_word)) {
+                    $singular_word = preg_replace($singular_rule['rule'], $singular_rule['replacement'], $singular_word);
+                    self::$cache['singular'][$plural_word] = $singular_word;
+                    break;
+                }   
             }
         }
-        return ($count >= 1 ? "{$count} {$word}" : $word);
-    }
-
-    /**
-     *  Singularize a word according to English rules 
-     *
-     *  @param  string $word  Word to be singularized
-     *  @return string  Singular of $word
-     */
-    function singularize($word) {
-        if(!in_array($word, Inflections::$uncountables)) { 
-            $original = $word;   
-            foreach(Inflections::$singulars as $singular_rule) {
-                $word = preg_replace($singular_rule['rule'], $singular_rule['replacement'], $word);
-                if($original != $word) break;
-            }
-        }
-        return $word;
-    }
-
-    /**
-     *  Capitalize a word making it all lower case with first letter uppercase 
-     *
-     *  @param  string $word  Word to be capitalized
-     *  @return string Capitalized $word
-     */
-    function capitalize($word) {
-        return ucfirst(strtolower($word));     
+        return $singular_word;
     }
 
@@ -104 +113 @@
     }
 
-    /**
-     *  Convert a phrase from the camel case form to the lower case
-     *  and underscored form
-     *
-     *  @param string $camel_cased_word  Phrase to convert
-     *  @return string Lower case and underscored form of the phrase
-     */
-    function underscore($camel_cased_word) {
-        $camel_cased_word = preg_replace('/([A-Z]+)([A-Z])/','\1_\2',$camel_cased_word);
-        return strtolower(preg_replace('/([a-z])([A-Z])/','\1_\2',$camel_cased_word));
-    }
-
-    /**
-     *  Generate a more human version of a lower case underscored word
-     *
-     *  @param string $lower_case_and_underscored_word  A word or phrase in
-     *                                           lower_case_underscore form
-     *  @return string The input value with underscores replaced by
-     *  blanks and the first letter of each word capitalized
-     */
-    function humanize($lower_case_and_underscored_word) {
-        return ucwords(str_replace("_"," ",$lower_case_and_underscored_word));
-    }
-    
     /**
      *  Convert a word or phrase into a title format "Welcome To My Site"
@@ -135 +120 @@
      */    
     function titleize($word) {
-        return preg_replace('/\b([a-z])/', self::capitalize('$1'), self::humanize(self::underscore($word)));
+        return ucwords(self::humanize(self::underscore($word)));
+    }
+
+    /**
+     *  Convert a phrase from the camel case form to the lower case
+     *  and underscored form
+     *
+     *  Changes '::' to '/' to convert namespaces to paths. (php 5.3)
+     * 
+     *  Examples:
+     *    Inflector::underscore("ActiveRecord") => "active_record"
+     *    Inflector::underscore("ActiveRecord::Errors") => active_record/errors
+     * 
+     *  @param string $camel_cased_word  Phrase to convert
+     *  @return string Lower case and underscored form of the phrase
+     */
+    function underscore($camel_cased_word) {
+        $camel_cased_word = str_replace('::','/',$camel_cased_word);
+        $camel_cased_word = preg_replace('/([A-Z]+)([A-Z])/','\1_\2',$camel_cased_word);
+        return strtolower(preg_replace('/([a-z\d])([A-Z])/','\1_\2',$camel_cased_word));
     }
 
@@ -149 +153 @@
 
     /**
+     *  Generate a more human version of a lower case underscored word
+     *
+     *  @param string $lower_case_and_underscored_word  A word or phrase in
+     *                                           lower_case_underscore form
+     *  @return string The input value with underscores replaced by
+     *  blanks and the first letter of each word capitalized
+     */
+    function humanize($lower_case_and_underscored_word) {
+        if(count(Inflections::$humans) > 0) {
+            $original = $lower_case_and_underscored_word;   
+            foreach(Inflections::$humans as $human_rule) {
+                $lower_case_and_underscored_word = preg_replace($human_rule['rule'], $human_rule['replacement'], $word);
+                if($original != $lower_case_and_underscored_word) break;
+            }   
+        }
+        return self::capitalize(str_replace(array("_","_id"),array(" ",""),$lower_case_and_underscored_word));
+    }
+
+    /** 
+     *  Removes the module part from the expression in the string. (php 5.3)
+     * 
+     *  Examples:
+     *      Inflector::demodulize("ActiveRecord::CoreExtensions::String::Inflections") => "Inflections"
+     *      Inflector::demodulize("Inflections") => "Inflections"
+     * 
+     */
+    function demodulize($class_name_in_module) {
+        return preg_replace("/^.*::/", '', $class_name_in_module);
+    }
+
+    /**
      *  Convert a class name to the corresponding table name
      *
@@ -172 +207 @@
 
     /**
+     *  Capitalize a word making it all lower case with first letter uppercase 
+     *
+     *  @param  string $word  Word to be capitalized
+     *  @return string Capitalized $word
+     */
+    function capitalize($word) {
+        return ucfirst(strtolower($word));     
+    }
+    
+    /**
      *  Get foreign key column corresponding to a table name
      *
-     *  @param string $table_name Name of table referenced by foreign
-     *    key
+     *  @param string $table_name Name of table referenced by foreign key
      *  @return string Column name of the foreign key column
      */
     function foreign_key($class_name) {
-        return self::underscore($class_name) . "_id";
+        return self::underscore(self::demodulize($class_name)) . "_id";
     }
 
@@ -186 +230 @@
      *  Add to a number st, nd, rd, th
      *
-     *  @param integer $number Number to append to
-     *    key
+     *  @param integer $number Number to append to key
      *  @return string Number formatted with correct st, nd, rd, or th
      */    
     function ordinalize($number) {
-        $test = (intval($number) % 100);
-        if($test >= 11 && $test <= 13) {
+        $number = intval($number);
+        if(in_array(($number % 100), range(11, 13))) {
             $number = "{$number}th";
         } else {
-            switch((intval($number) % 10)) {
+            switch(($number % 10)) {
                 case 1:
                     $number = "{$number}st";
@@ -211 +254 @@
         return $number;
     }
+
+    /**
+     *  Clears the cached words for pluralize and singularize
+     *
+     *  @param none
+     *  @return nothing
+     */
+    function clear_cache() {
+        self::$cache = array(
+            'plural' => array(), 
+            'singular' => array()
+        );      
+    }
     
 }

trunk/trax/vendor/trax/php_shell.php

@@ -28 +28 @@
  
 @ob_end_clean();
-error_reporting(E_ALL);
+error_reporting(E_ALL ^ E_NOTICE);
 set_time_limit(0);
 

trunk/trax/vendor/trax/templates/error.phtml

@@ -45 +45 @@
 
 <?php if($trace): ?>
-<a href="#" onclick="expandContract('framework_trace')">Show framework trace</a>
+<a href="#" onclick="expandContract('framework_trace');return false;">Show framework trace</a>
 <pre id="framework_trace" style="display:none"><code><?php echo $trace ?></code></pre>
 <?php endif; ?>
 
 <?php if(count(ActiveRecord::$query_log)): ?>
-<p><a href="#" onclick="expandContract('sql_trace')">Show SQL trace</a>
+<p><a href="#" onclick="expandContract('sql_trace');return false;">Show SQL trace</a>
 <pre id="sql_trace" style="display:none">
 <code style="word-wrap: break-word;">
@@ -61 +61 @@
 <?php endif; ?>
 
-<p><a href="#" onclick="expandContract('session_dump')">Show $_SESSION dump</a></p>
+<p><a href="#" onclick="expandContract('session_dump');return false;">Show $_SESSION dump</a></p>
 <div id="session_dump" style="display:none"><pre class='debug_dump'>
 <?php echo print_r($_SESSION, true) ?>
 </pre></div>
 
-<p><a href="#" onclick="expandContract('get_dump')">Show $_GET dump</a></p>
+<p><a href="#" onclick="expandContract('get_dump');return false;">Show $_GET dump</a></p>
 <div id="get_dump" style="display:none"><pre class='debug_dump'>
 <?php echo print_r($_GET, true) ?>
 </pre></div>
 
-<p><a href="#" onclick="expandContract('post_dump')">Show $_POST dump</a></p>
+<p><a href="#" onclick="expandContract('post_dump');return false;">Show $_POST dump</a></p>
 <div id="post_dump" style="display:none"><pre class='debug_dump'>
 <?php echo print_r($_POST, true) ?>
 </pre></div>
 
-<p><a href="#" onclick="expandContract('cookie_dump')">Show $_COOKIE dump</a></p>
+<p><a href="#" onclick="expandContract('cookie_dump');return false;">Show $_COOKIE dump</a></p>
 <div id="cookie_dump" style="display:none"><pre class='debug_dump'>
 <?php echo print_r($_COOKIE, true) ?>
 </pre></div>
 
-<p><a href="#" onclick="expandContract('file_dump')">Show $_FILES dump</a></p>
+<p><a href="#" onclick="expandContract('file_dump');return false;">Show $_FILES dump</a></p>
 <div id="file_dump" style="display:none"><pre class='debug_dump'>
 <?php echo print_r($_FILES, true) ?>