Changeset 383

Timestamp:

10/05/07 16:42:09 (1 year ago)

Author:

bermiferrer

Message:

Implementing experimental controller "Modules".

Right now all controllers live in 'app/controllers/', which can become a messy place if the application grows.

This new functionality allows you to group, for example administration controllers into app/controllers/admin and the administration views into app/views/admin

The controller generator supports generating modular controllers doing like this:

./script/generate controller Admin::User

generated controller will be at app/controllers/admin/user_controller.php and the class name for the controller will be Admin_UserController

You'll need to edit your config/routes.php file to make your application aware of this new module by adding

$Map->connect('/admin/:controller/:action/:id', array('action' => 'index', 'module' => 'admin'));

before other routes.

Files:

• trunk/config/locales/en.php (modified) (1 diff)
• trunk/config/locales/es.php (modified) (1 diff)
• trunk/lib/Ak.php (modified) (1 diff)
• trunk/lib/AkActionController.php (modified) (4 diffs)
• trunk/lib/AkRequest.php (modified) (6 diffs)
• trunk/lib/utils/generators/controller/controller_generator.php (modified) (5 diffs)

trunk/config/locales/en.php

@@ -148 +148 @@
-$dictionary['Could not find the file /app/controllers/<i>%controller_file_name</i> for the controller %controller_class_name'] = 'Could not find the file /app/controllers/<i>%controller_file_name</i> for the controller %controller_class_name';
-
+$dictionary['No controller was specified.'] = 'No controller was specified.';
+
+// 2007-10-05 23:28:22
+
+
+$dictionary['Please add force=true to the argument list in order to overwrite existing files.'] = 'Please add force=true to the argument list in order to overwrite existing files.';
+
+
-?>

trunk/config/locales/es.php

@@ -142 +142 @@
-$dictionary['Could not find the file /app/controllers/<i>%controller_file_name</i> for the controller %controller_class_name'] = 'No se ha encontrado el fichero /app/controllers/<i>%controller_file_name</i> del controlador %controller_class_name';
-
+$dictionary['No controller was specified.'] = 'No se ha especificado ningún controlador.';
+
+// 2007-10-05 23:28:22
+
+
+$dictionary['Please add force=true to the argument list in order to overwrite existing files.'] = 'Please add force=true to the argument list in order to overwrite existing files.';
+
+
-?>

trunk/lib/Ak.php

@@ -1777 +1777 @@
-        $rules = array(
-        'paranoid' => '/([^A-Z^a-z^0-9^_^-^ ]+)/',
+        'high' => '/([^A-Z^a-z^0-9^_^-^ ^\/^\\\^:]+)/',
-        'normal' => '/([^A-Z^a-z^0-9^_^-^ ^\.^\/^\\\]+)/'
-        );

trunk/lib/AkActionController.php

@@ -123 +123 @@
-    var $web_service_api;
-    var $web_service_apis = array();
+    
+    var $module_name;
-
-    /**
@@ -208 +210 @@
-            require_once(AK_LIB_DIR.DS.'AkActionView.php');
-            require_once(AK_LIB_DIR.DS.'AkActionView'.DS.'AkPhpTemplateHandler.php');
-AK_APP_DIR.DS.'views'.DS.$this->Request->getController
+$this->_getTemplateBasePath
-            $this->Request->getParameters(),$this->Request->getController());
-        
@@ -760 +762 @@
-    {
-        $defaults = $this->defaultUrlOptions($options);
+        if(!empty($this->module_name)){
+            $defaults['module'] = $this->getModuleName();
+        }
+        if(!empty($options['controller']) && strstr($options['controller'], '/')){
+            $defaults['module'] = substr($options['controller'], 0, strrpos($options['controller'], '/'));
+            $options['controller'] = substr($options['controller'], strrpos($options['controller'], '/') + 1);
+        }
-        $options = !empty($defaults) ? array_merge($defaults, $options) : $options;
-        $options['controller'] = empty($options['controller']) ? AkInflector::underscore($this->getControllerName()) : $options['controller'];
@@ -765 +774 @@
-    }
-
-&
+
-    {
-
-        if(!isset($this->controller_name)){
-            $current_class_name = get_class($this);
+
-            $included_controllers = $this->_getIncludedControllerNames();
-            $lowercase_included_controllers = array_filter($included_controllers, 'strtolower');
-$lowercase_included_controllers,
-0,
+ $lowercase_included_controllers, 
+ 0, 
-            $this->controller_name = $found_controller;
+            $this->_removeModuleNameFromControllerName();
-        }
-
-        return $this->controller_name;
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
-     */
+    function _removeModuleNameFromControllerName()
+    {
+        if(strstr($this->controller_name, '::')){
+            $module_parts = substr($this->controller_name, 0, strrpos($this->controller_name, '::'));
+            $this->module_name = join('/', array_map(array('AkInflector','underscore'), strstr($module_parts, '::') ? explode('::', $module_parts) : array($module_parts)));
+            $this->controller_name = substr($this->controller_name, strrpos($this->controller_name, '::')+2);
+        }
+    }
+    
+    function _getTemplateBasePath()
+    {
+        return AK_APP_DIR.DS.'views'.DS.(empty($this->_module_path)?'':$this->_module_path).$this->Request->getController();
+    }
+    
-    function _getIncludedControllerNames()
-    {

trunk/lib/AkRequest.php

@@ -207 +207 @@
-        if($found = $Router->toParams($ak_request)){
-            if(!isset($found['controller'])){
-
+ 
-            }
-            if(!isset($found['action'])){
-
+ 
-            }
-
@@ -223 +223 @@
-                }
-            }
-
+
+
+
+
+
+
-            foreach ($found as $k=>$v){
-                if($this->_addParam($k,$v)){
@@ -241 +246 @@
-    {
-        return $this->_validateTechName($action_name);
+    }
+
+    function isValidModuleName($module_name)
+    {
+        return preg_match('/^[A-Za-z]{1,}[A-Za-z0-9_\/]*$/', $module_name);
-    }
-
@@ -658 +668 @@
-    {
-        if($variable[0] != '_'){
-
+
+
+
+
-                return false;
-            }
@@ -729 +742 @@
-        
-        $params = $this->getParams();
+
+        $module_path = $module_class_peffix = '';
+        if(!empty($params['module'])){
+            $module_path = trim(str_replace(array('/','\\'), DS, Ak::sanitize_include($params['module'], 'high')), DS).DS;
+            $module_class_peffix = str_replace(' ','_',AkInflector::titleize(str_replace(DS,' ', trim($module_path, DS)))).'_';
+        }
+        
-        $controller_file_name = AkInflector::underscore($params['controller']).'_controller.php';
-
-
+$module_class_peffix.
+module_path.$
-        include_once(AK_APP_DIR.DS.'application_controller.php');
-        if(@!include_once($controller_path)){
@@ -744 +764 @@
-        }
-        $Controller =& new $controller_class_name(array('controller'=>true));
+        $Controller->_module_path = $module_path;
-        isset($_SESSION) ? $Controller->session =& $_SESSION : null;
-        return $Controller;

trunk/lib/utils/generators/controller/controller_generator.php

@@ -25 +25 @@
-    function _preloadPaths()
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $this->assignVarToTemplate('class_name', $this->class_name);
-
-
+
-    }
-
+
-    function hasCollisions()
-    {
@@ -36 +57 @@
-        $this->_preloadPaths();
-        $this->actions = empty($this->actions) ? array() : (array)$this->actions;
-
+
-        $files = array(
-        AK_APP_DIR.DS.$this->controller_path,
@@ -46 +67 @@
-        
-        foreach ($this->actions as $action){
-AkInflector::underscore($this->class
+$this->module_path.AkInflector::underscore($this->controller
-        }
-
+
-        foreach ($files as $file_name){
-            if(file_exists($file_name)){
@@ -60 +81 @@
-    {
-        $this->_preloadPaths();
-
+
-        $this->save(AK_APP_DIR.DS.$this->controller_path, $this->render('controller'));
-        $this->save(AK_HELPERS_DIR.DS.$this->underscored_controller_name."_helper.php", $this->render('helper'));
@@ -66 +87 @@
-        $this->save(AK_TEST_DIR.DS.'fixtures'.DS.'app'.DS.$this->controller_path, $this->render('fixture'));
-        $this->save(AK_TEST_DIR.DS.'fixtures'.DS.'app'.DS.'helpers'.DS.$this->underscored_controller_name."_helper.php", $this->render('helper_fixture'));
-
-AkInflector::underscore($this->class
-
+
+$this->module_path.AkInflector::underscore($this->controller
+
-        foreach ($this->actions as $action){
-            //$this->action = $action;
-            $this->assignVarToTemplate('action',$action);
-AkInflector::underscore($this->class
-AkInflector::underscore($this->class
+$this->module_path.AkInflector::underscore($this->controller
+$this->module_path.AkInflector::underscore($this->controller
-        }
-    }