Changeset 1084

Timestamp:

11/11/2007 12:59:10 AM (11 months ago)

Author:

Shadowhand

Message:

Small changes:

• Hooks are now loaded *after* system events have been added
  
• Hook loading changed to use Kohana::list_files(), rather than manually finding them (DRY!)
  
• Kohana::auto_load() now uses require_once() instead of require(), to prevent duplicate file loads that will cause E_FATAL errors
  
• Kohana::auto_load() will no longer try to auto-extend classes that end with _Core (eg: "class Special_Router extends Router_Core {}" will no longer try to auto-load "Router_Core_Core")
  
• Kohana::key_string() will handle numerically indexed key strings now (thanks Armen!)
  
• Added Event::add_before() and Event::add_after(), to add events before and after a given event, and supporting private function Event::insert_event()
  
• Cleaned up Event::add() to use empty() instead of == FALSE
  
• View::construct() uses array_merge($this->data, $data) instead of doing a foreach($data) (Duh!)
  
• View::set() will now handle an associative array (Duh!)
  
• Router::setup() split into Router::find_uri() and Router::setup(), for better Event extensibility
  
• Cleaned up Router::setup() to use self::$current_uri instead of self::$segments as the default URI location
  

Phew!

Location:

trunk/system

Files:

• core/Event.php (modified) (1 diff)
• core/Kohana.php (modified) (5 diffs)
• libraries/Router.php (modified) (3 diffs)
• libraries/View.php (modified) (2 diffs)

trunk/system/core/Event.php

@@ -70 +70 @@
         public static function add($name, $callback)
         {
-                if ($name == FALSE OR $callback == FALSE)
-                        return FALSE;
-
-                // Make sure that the event name is defined
+                if (empty($name) OR empty($callback))
+                        return FALSE;
+
                 if ( ! isset(self::$events[$name]))
                 {
+                        // Create an empty event if it is not yet defined
                         self::$events[$name] = array();
                 }
 
-                // Make sure the event is not already in the queue
                 if ( ! in_array($callback, self::$events[$name]))
                 {
+                        // Add the event if it does not already exist in the queue
                         self::$events[$name][] = $callback;
                 }
+        }
+
+        /*
+         * Method: add_before
+         *  Add a callback to an event queue, before a given event.
+         *
+         * Parameters:
+         *  name     - event name
+         *  existing - existing event callback
+         *  callback - event callback
+         */
+        public static function add_before($name, $existing, $callback)
+        {
+                if (empty($name) OR empty($existing) OR empty($callback))
+                        return FALSE;
+
+                if ( ! isset(self::$events[$name]) OR ($key = array_search($existing, self::$events[$name])) === FALSE)
+                {
+                        // Add the event if there are no events or if the exsisting event is not set
+                        self::add($name, $callback);
+                }
+                else
+                {
+                        // Insert the event immediately before the existing event
+                        self::insert_event($name, $key, $callback);
+                }
+
+                return TRUE;
+        }
+
+        /*
+         * Method: add_after
+         *  Add a callback to an event queue, after a given event.
+         *
+         * Parameters:
+         *  name     - event name
+         *  existing - existing event callback
+         *  callback - event callback
+         */
+        public static function add_after($name, $existing, $callback)
+        {
+                if (empty($name) OR empty($existing) OR empty($callback))
+                        return FALSE;
+
+                if ( ! isset(self::$events[$name]) OR ($key = array_search($existing, self::$events[$name])) === FALSE)
+                {
+                        // Add the event if there are no events or if the exsisting event is not set
+                        self::add($name, $callback);
+                }
+                else
+                {
+                        // Insert the event immediately after the existing event
+                        self::insert_event($name, $key + 1, $callback);
+                }
+
+                return TRUE;
+        }
+
+        /*
+         * Method: insert_event
+         *  Inserts a new event at a specfic key location.
+         *
+         * Parameters:
+         *  name     - event name
+         *  key      - key to insert new event at
+         *  callback - event callback
+         */
+        private static function insert_event($name, $key, $callback)
+        {
+                // Add the new event at the given key location
+                self::$events[$name] = array_merge
+                (
+                        // Events before the key
+                        array_slice(self::$events[$name], 0, $key),
+                        // New event callback
+                        array($callback),
+                        // Events after the key
+                        array_slice(self::$events[$name], $key)
+                );
         }
 

trunk/system/core/Kohana.php

@@ -118 +118 @@
                 setlocale(LC_ALL, Config::item('locale.language').'.UTF-8');
 
+                // Enable Kohana routing
+                Event::add('system.routing', array('Router', 'find_uri'));
+                Event::add('system.routing', array('Router', 'setup'));
+
+                // Enable Kohana controller initialization
+                Event::add('system.execute', array('Kohana', 'instance'));
+
+                // Enable Kohana output handling
+                Event::add('system.shutdown', array('Kohana', 'display'));
+
                 if ($hooks = Config::item('hooks.enable'))
                 {
-                        // All hooks are enabled, we must build an array of filenames
                         if ( ! is_array($hooks))
                         {
-                                $hooks = array();
-                                foreach(Config::include_paths() as $path)
-                                {
-                                        // Find all the hooks in each path
-                                        if ($files = glob($path.'hooks/*'.EXT))
-                                        {
-                                                $hooks = array_merge($hooks, $files);
-                                        }
-                                }
+                                // All hooks are enabled, find them
+                                $hooks = Kohana::list_files('hooks');
                         }
 
@@ -143 +145 @@
                         }
                 }
-
-                // Enable Kohana routing
-                Event::add('system.routing', array('Router', 'setup'));
-
-                // Enable Kohana controller initialization
-                Event::add('system.execute', array('Kohana', 'instance'));
-
-                // Enable Kohana output handling
-                Event::add('system.shutdown', array('Kohana', 'display'));
 
                 if (Config::item('log.threshold') > 0)
@@ -491 +484 @@
                 }
 
-                require self::find_file($type, $file, TRUE);
+                require_once self::find_file($type, $file, TRUE);
 
                 if ($type == 'libraries')
@@ -499 +492 @@
                                 require $extension;
                         }
-                        else
+                        elseif (substr($class, -5) !== '_Core')
                         {
                                 eval('class '.$class.' extends '.$class.'_Core { }');
@@ -686 +679 @@
         {
                 // No array to search
-                if (empty($keys) OR empty($array))
+                if ((empty($keys) AND is_array($keys)) OR (empty($array) AND is_array($array)))
                         return;
 

trunk/system/libraries/Router.php

@@ -35 +35 @@
                         throw new Kohana_Exception('core.no_default_route');
 
-                // The follow block of if/else attempts to retrieve the URI segments automagically
-                // Supported methods: CLI, GET, PATH_INFO, ORIG_PATH_INFO, PHP_SELF
-                if (PHP_SAPI === 'cli')
-                {
-                        // Command line requires a bit of hacking
-                        if (isset($_SERVER['argv'][1]))
-                        {
-                                self::$segments = $_SERVER['argv'][1];
-
-                                // Remove GET string from segments
-                                if (($query = strrpos(self::$segments, '?')) !== FALSE)
-                                {
-                                        list (self::$segments, $query) = explode('?', self::$segments);
-
-                                        // Insert query into GET array
-                                        foreach(explode('&', $query) as $pair)
-                                        {
-                                                list ($key, $val) = array_pad(explode('=', $pair), 1, '');
-
-                                                $_GET[utf8::clean($key)] = utf8::clean($val);
-                                        }
-                                }
-                        }
-                }
-                elseif (count($_GET) === 1 AND current($_GET) == '')
-                {
-                        self::$segments = current(array_keys($_GET));
-
-                        // Fixes really stange handling of a suffix in a GET string
-                        if ($suffix = Config::item('core.url_suffix') AND substr(self::$segments, -(strlen($suffix))) === '_'.substr($suffix, 1))
-                        {
-                                self::$segments = substr(self::$segments, 0, -(strlen($suffix)));
-                        }
-
-                        // Destroy GET
-                        $_GET = array();
-                }
-                elseif (isset($_SERVER['PATH_INFO']) AND $_SERVER['PATH_INFO'])
-                {
-                        self::$segments = $_SERVER['PATH_INFO'];
-                }
-                elseif (isset($_SERVER['ORIG_PATH_INFO']) AND $_SERVER['ORIG_PATH_INFO'])
-                {
-                        self::$segments = $_SERVER['ORIG_PATH_INFO'];
-                }
-                elseif (isset($_SERVER['PHP_SELF']) AND $_SERVER['PHP_SELF'])
-                {
-                        self::$segments = $_SERVER['PHP_SELF'];
-                }
-
-                // Find the URI string based on the location of the front controller
-                if (($offset = strpos(self::$segments, KOHANA)) !== FALSE)
-                {
-                        // Add the length of the index file to the offset
-                        $offset += strlen(KOHANA);
-
-                        // Get the segment part of the URL
-                        self::$segments = substr(self::$segments, $offset);
-                        self::$segments = trim(self::$segments, '/');
-                }
-
-
                 // Use the default route when no segments exist
-                if (self::$segments == '' OR self::$segments == '/')
-                {
-                        self::$segments = self::$routes['_default'];
+                if (self::$current_uri == '' OR self::$current_uri == '/')
+                {
+                        self::$current_uri = self::$routes['_default'];
                         $default_route = TRUE;
                 }
@@ -111 +49 @@
                 if ($suffix = Config::item('core.url_suffix'))
                 {
-                        self::$segments = preg_replace('!'.preg_quote($suffix).'$!u', '', self::$segments);
+                        self::$current_uri = preg_replace('!'.preg_quote($suffix).'$!u', '', self::$current_uri);
                 }
 
                 // Remove extra slashes from the segments that could cause fucked up routing
-                self::$segments = preg_replace('!//+!', '/', self::$segments);
+                self::$current_uri = preg_replace('!//+!', '/', self::$current_uri);
 
                 // At this point, set the segments, rsegments, and current URI
                 // In many cases, all of these variables will match
-                self::$segments = self::$rsegments = self::$current_uri = trim(self::$segments, '/');
+                self::$segments = self::$rsegments = self::$current_uri = trim(self::$current_uri, '/');
 
                 (self::$segments === 'L0LEAST3R') and include SYSPATH.'views/kohana_holiday.php';
@@ -243 +181 @@
                 {
                         Kohana::show_404();
+                }
+        }
+
+        /*
+         * Method: find_uri
+         *  Attempts to determine the current URI using CLI, GET, PATH_INFO, ORIG_PATH_INFO, or PHP_SELF.
+         */
+        public static function find_uri()
+        {
+                if (PHP_SAPI === 'cli')
+                {
+                        // Command line requires a bit of hacking
+                        if (isset($_SERVER['argv'][1]))
+                        {
+                                self::$current_uri = $_SERVER['argv'][1];
+
+                                // Remove GET string from segments
+                                if (($query = strpos(self::$current_uri, '?')) !== FALSE)
+                                {
+                                        list (self::$current_uri, $query) = explode('?', self::$segments, 2);
+
+                                        // Insert query into GET array
+                                        foreach(explode('&', $query) as $pair)
+                                        {
+                                                list ($key, $val) = array_pad(explode('=', $pair), 1, '');
+
+                                                $_GET[utf8::clean($key)] = utf8::clean($val);
+                                        }
+                                }
+                        }
+                }
+                elseif (count($_GET) === 1 AND current($_GET) == '')
+                {
+                        self::$current_uri = current(array_keys($_GET));
+
+                        // Fixes really stange handling of a suffix in a GET string
+                        if ($suffix = Config::item('core.url_suffix') AND substr(self::$current_uri, -(strlen($suffix))) === '_'.substr($suffix, 1))
+                        {
+                                self::$current_uri = substr(self::$current_uri, 0, -(strlen($suffix)));
+                        }
+
+                        // Destroy GET
+                        $_GET = array();
+                }
+                elseif (isset($_SERVER['PATH_INFO']) AND $_SERVER['PATH_INFO'])
+                {
+                        self::$current_uri = $_SERVER['PATH_INFO'];
+                }
+                elseif (isset($_SERVER['ORIG_PATH_INFO']) AND $_SERVER['ORIG_PATH_INFO'])
+                {
+                        self::$current_uri = $_SERVER['ORIG_PATH_INFO'];
+                }
+                elseif (isset($_SERVER['PHP_SELF']) AND $_SERVER['PHP_SELF'])
+                {
+                        self::$current_uri = $_SERVER['PHP_SELF'];
+                }
+
+                // Find the URI string based on the location of the front controller
+                if (($offset = strpos(self::$current_uri, KOHANA)) !== FALSE)
+                {
+                        // Add the length of the index file to the offset
+                        $offset += strlen(KOHANA);
+
+                        // Get the segment part of the URL
+                        self::$current_uri = substr(self::$current_uri, $offset);
+                        self::$current_uri = trim(self::$current_uri, '/');
                 }
         }

trunk/system/libraries/View.php

@@ -45 +45 @@
                 if (is_array($data) AND ! empty($data))
                 {
-                        foreach($data as $name => $value)
-                        {
-                                $this->data[$name] = $value;
-                        }
+                        $this->data = $data;
                 }
 
@@ -65 +62 @@
          *  View object
          */
-        public function set($name, $value)
+        public function set($name, $value = NULL)
         {
-                $this->__set($name, $value);
+                if (func_num_args() === 1 AND is_array($name))
+                {
+                        foreach($name as $key => $value)
+                        {
+                                $this->__set($key, $value);
+                        }
+                }
+                else
+                {
+                        $this->__set($name, $value);
+                }
                 return $this;
         }