Changeset 427

Timestamp:

04/27/07 11:55:14 (2 years ago)

Author:

laurentj

Message:

little optimization on jCoordinator

Files:

• trunk/lib/jelix/core/jCoordinator.class.php (modified) (2 diffs)
• trunk/lib/jelix/core/jSelector.class.php (modified) (3 diffs)
• trunk/testapp/modules/unittest/classes/utselectoract.class.php (modified) (1 diff)

trunk/lib/jelix/core/jCoordinator.class.php

@@ -165 +165 @@
-        }
-
-
-        // verification du module
-        if(!in_array($this->moduleName,$gJConfig->_trustedModules)){
@@ -173 +172 @@
-        jContext::push ($this->moduleName);
-        try{
-(
+Fast($this->request->type, $this->moduleName, 
-        }catch(jExceptionSelector $e){
-            if($e->getCode() == 12){

trunk/lib/jelix/core/jSelector.class.php

@@ -173 +173 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    protected $type = 'act';
-    public $request = '';
@@ -189 +186 @@
-    public $method='';
-    protected $_dirname='actions/';
+
+    /**
+     */
+    function __construct($request, $module, $action){
+        $this->module = $module;
+        $r = explode('_',$action);
+        if(count($r) == 1){
+            $this->controller = 'default';
+            $this->method = $r[0]==''?'index':$r[0];
+        }else{
+            $this->controller = $r[0]=='' ? 'default':$r[0];
+            $this->method = $r[1]==''?'index':$r[1];
+        }
+        $this->resource = $this->controller.'_'.$this->method;
+
+        $this->request = $request;
+        $this->_createPath();
+    }
+
+    protected function _createPath(){
+        global $gJConfig;
+        if(!isset($gJConfig->_modulesPathList[$this->module])){
+            throw new jExceptionSelector('jelix~errors.selector.module.unknow', $this->toString());
+        }else{
+            $this->_path = $gJConfig->_modulesPathList[$this->module].'controllers/'.$this->controller.'.'.$this->request.'.php';
+        }
+    }
+
+    protected function _createCachePath(){
+        $this->_cachePath = '';
+    }
+
+    public function toString($full=false){
+        if($full)
+            return $this->type.':'.$this->module.'~'.$this->resource.'@'.$this->request;
+        else
+            return $this->module.'~'.$this->resource.'@'.$this->request;
+    }
+
+    public function getClass(){
+#if ENABLE_OLD_CLASS_NAMING
+        $className = $this->controller.'Ctrl';
+        if($GLOBALS['gJConfig']->enableOldClassNaming && !class_exists($className,false)){
+            if(class_exists('CT'.$this->controller,false))
+                $className = 'CT'.$this->controller;
+        }
+#else
+        $className = $this->controller.'Ctrl';
+#endif
+        return $className;
+    }
+
+}
+
+
+/**
+ * Generic Action selector
+ *
+ * main syntax: "module~action@requestType". module should be a valid module name or # (#=says to get
+ * the module of the current request). action should be an action name (controller_method).
+ * all part are optional, but it should have one part at least.
+ * @package    jelix
+ * @subpackage core_selector
+ */
+class jSelectorAct extends jSelectorActFast {
-
-    /**
@@ -244 +306 @@
-        }
-    }
-
-    protected function _createPath(){
-        global $gJConfig;
-        if(!isset($gJConfig->_modulesPathList[$this->module])){
-            throw new jExceptionSelector('jelix~errors.selector.module.unknow', $this->toString());
-        }else{
-            $this->_path = $gJConfig->_modulesPathList[$this->module].'controllers/'.$this->controller.'.'.$this->request.'.php';
-        }
-    }
-
-    protected function _createCachePath(){
-        $this->_cachePath = '';
-    }
-
-    public function toString($full=false){
-        if($full)
-            return $this->type.':'.$this->module.'~'.$this->resource.'@'.$this->request;
-        else
-            return $this->module.'~'.$this->resource.'@'.$this->request;
-    }
-
-    public function getClass(){
-#if ENABLE_OLD_CLASS_NAMING
-        $className = $this->controller.'Ctrl';
-        if($GLOBALS['gJConfig']->enableOldClassNaming && !class_exists($className,false)){
-            if(class_exists('CT'.$this->controller,false))
-                $className = 'CT'.$this->controller;
-        }
-#else
-        $className = $this->controller.'Ctrl';
-#endif
-        return $className;
-    }
-
-}
-

trunk/testapp/modules/unittest/classes/utselectoract.class.php

@@ -127 +127 @@
-
-    }
+
+
+    function testFastSel() {
+        $list=array(
+
+                array(
+                        array('truc', 'testapp', 'ctrl_meth'),
+                        array('testapp','ctrl','meth','truc'),
+                ),
+                array(
+                        array('truc', 'testapp', '_meth'),
+                        array('testapp','default','meth','truc'),
+                ),
+                array(
+                        array('truc', 'testapp', 'meth'),
+                        array('testapp','default','meth','truc'),
+                ),
+                array(
+                        array('truc', 'testapp', 'ctrl_'),
+                        array('testapp','ctrl','index','truc'),
+                ),
+                array(
+                        array('truc', 'testapp', 'ctrl_'),
+                        array('testapp','ctrl','index','truc'),
+                ),
+        );
+        foreach($list as $test){
+            list($sel, $res) = $test;
+            $valid=true;
+            try{
+                $s = new jSelectorActFast($sel[0], $sel[1], $sel[2]);
+            }catch(jExceptionSelector $e){
+                $valid=false;
+            }
+            $msg='';
+            if($valid){
+                $valid = $valid 
+                && $s->module == $res[0]
+                && $s->controller == $res[1]
+                && $s->method == $res[2]
+                && $s->request == $res[3];
+                if(!$valid)
+                    $msg=' contient ces données inattendues ('.$s->module.', '.$s->controller.', '.$s->method.', '.$s->request.')';
+            }
+
+            $this->assertTrue($valid , ' test de '.$sel. ' (devrait être '.($res === false ? 'invalide':'valide').')');
+            if($msg)
+                $this->sendMessage($msg);
+        }
+
+    }
+
+
-}
-