Changeset 1064

Timestamp:

08/26/08 12:42:46 (3 months ago)

Author:

laurentj

Message:

added a new url engine, basic_significant, to create and parse urls like module/controller/method?...

Files:

• trunk/build/manifests/jelix-lib.mn (modified) (1 diff)
• trunk/lib/jelix-scripts/templates/var/config/defaultconfig.ini.php.tpl (modified) (2 diffs)
• trunk/lib/jelix/core/defaultconfig.ini.php (modified) (3 diffs)
• trunk/lib/jelix/plugins/urls/basic_significant (added)
• trunk/lib/jelix/plugins/urls/basic_significant/basic_significant.urls.php (added)
• trunk/lib/jelix/plugins/urls/simple/simple.urls.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php (modified) (1 diff)
• trunk/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php (modified) (1 diff)
• trunk/testapp/var/config/defaultconfig.ini.php (modified) (1 diff)

trunk/build/manifests/jelix-lib.mn

@@ -484 +484 @@
-* jSignificantUrlsCompiler.class.php
-* significant.urls.php
+
-cd lib/jelix/plugins/urls/simple
-  simple.urls.php
+
+cd lib/jelix/plugins/urls/basic_significant
+  basic_significant.urls.php
+
-
-cd lib/jelix-www/design

trunk/lib/jelix-scripts/templates/var/config/defaultconfig.ini.php.tpl

@@ -88 +88 @@
-;notfoundAct = "jelix~error:notfound"
-
-
+
+
-simple_urlengine_https =
-
+[simple_urlengine_entrypoints]
+; parameters for the simple url engine. This is the list of entry points
+; with list of actions attached to each entry points
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-index = "@classic"
@@ -109 +108 @@
-
-
+[basic_significant_urlengine_entrypoints]
+; for each entry point, it indicates if the entry point name
+; should be include in the url or not
+index = on
+xmlrpc = on
+jsonrpc = on
+rdf = on
+
-[logfiles]
-default=messages.log
-
-
-[mailer]

trunk/lib/jelix/core/defaultconfig.ini.php

@@ -154 +154 @@
-;notfoundAct = "jelix~error:notfound"
-
-
+
+
-simple_urlengine_https =
-
@@ -160 +161 @@
-
-[simple_urlengine_entrypoints]
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-index = "@classic"
@@ -175 +175 @@
-rdf = "@rdf"
-
+[basic_significant_urlengine_entrypoints]
+; for each entry point, it indicates if the entry point name
+; should be include in the url or not
+index = on
+xmlrpc = on
+jsonrpc = on
+rdf = on
-
-[logfiles]

trunk/lib/jelix/plugins/urls/simple/simple.urls.php

@@ -43 +43 @@
-    */
-    public function create($urlact){
+        global $gJConfig;
+        $m = $urlact->getParam('module');
+        $a = $urlact->getParam('action');
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
+
+    /**
+     * read the configuration and return an url part according of the
+     * of the https configuration
+     * @param string $requestType
+     * @param string $module
+     * @param string  $action
+     */
+    protected function getBasePath($requestType, $module=null, $action=null) {
+        global $gJConfig;
+        if($this->urlhttps == null){
+            $this->urlhttps=array();
+            $selectors = preg_split("/[\s,]+/", $gJConfig->urlengine['simple_urlengine_https']);
+            foreach($selectors as $sel2){
+                $this->urlhttps[$sel2]= true;
+            }
+        }
+
+        $usehttps= false;
+        if (count($this->urlhttps)) {
+          if($action && isset($this->urlhttps[$module.'~'.$action.'@'.$requestType])){
+              $usehttps = true;
+          }elseif($module &&  isset($this->urlhttps[$module.'~*@'.$requestType])){
+              $usehttps = true;
+          }elseif(isset($this->urlhttps['@'.$requestType])){
+              $usehttps = true;
+          }
+        }
+
+        if ($usehttps)
+          return 'https://'.$_SERVER['HTTP_HOST'].$gJConfig->urlengine['basePath'];
+        else
+          return $gJConfig->urlengine['basePath'];
+    }
+
-
-    /**
@@ -66 +110 @@
-
-        $script = $gJConfig->urlengine['defaultEntrypoint'];
-
-        if($this->urlhttps == null){
-            $this->urlhttps=array();
-            $selectors = preg_split("/[\s,]+/", $gJConfig->urlengine['simple_urlengine_https']);
-            foreach($selectors as $sel2){
-                $this->urlhttps[$sel2]= true;
-            }
-        }
-
-        $usehttps= false;
-        if($action && isset($this->urlhttps[$module.'~'.$action.'@'.$requestType])){
-            $usehttps = true;
-        }elseif($module &&  isset($this->urlhttps[$module.'~*@'.$requestType])){
-            $usehttps = true;
-        }elseif(isset($this->urlhttps['@'.$requestType])){
-            $usehttps = true;
-        }
-
-        if(count($gJConfig->simple_urlengine_entrypoints)){
@@ -103 +130 @@
-           }
-        }
-        if(!$gJConfig->urlengine['multiview']){
-            $script.=$gJConfig->urlengine['entrypointExtension'];
-        }
-
-
-
-
-
-
+
-    }
-}

trunk/testapp/modules/jelix_tests/tests/core.urls_generation.html.php

@@ -349 +349 @@
-    }
-
+    function testBasicSignificantEngine() {
+       global $gJConfig, $gJCoord;
+
+       $gJCoord->request->urlScriptPath='/';
+       $gJCoord->request->params=array();
+       //$gJCoord->request->type=;
+       $gJConfig->urlengine = array(
+         'engine'=>'basic_significant',
+         'enableParser'=>true,
+         'multiview'=>false,
+         'basePath'=>'/',
+         'defaultEntrypoint'=>'index',
+         'entrypointExtension'=>'.php',
+         'notfoundAct'=>'jelix~error:notfound',
+         'simple_urlengine_https'=>'jelix_tests~urlsig:url8@classic @xmlrpc',
+         'significantFile'=>'urls.xml',
+       );
+
+      jUrl::getEngine(true); // on recharge le nouveau moteur d'url
+
+      $urlList=array();
+      $urlList[]= array('urlsig:url1', array('mois'=>'10',  'annee'=>'2005', 'id'=>'35'));
+      $urlList[]= array('urlsig:url2', array('mois'=>'05',  'annee'=>'2004'));
+      $urlList[]= array('jelix_tests~urlsig:url3', array('rubrique'=>'actualite',  'id_art'=>'65', 'article'=>'c\'est la fête au village'));
+      $urlList[]= array('jelix_tests~urlsig:url4', array('first'=>'premier',  'second'=>'deuxieme'));
+      // celle ci n'a pas de définition dans urls.xml *exprés*
+      $urlList[]= array('urlsig:url5', array('foo'=>'oof',  'bar'=>'rab'));
+      $urlList[]= array('jelix~bar@xmlrpc', array('aaa'=>'bbb'));
+      $urlList[]= array('jelix_tests~urlsig:url8', array('rubrique'=>'vetements',  'id_article'=>'98'));
+      $urlList[]= array('jelix_tests~default:index', array('rubrique'=>'vetements',  'id_article'=>'98'));
+      $urlList[]= array('jelix_tests~urlsig:index', array('rubrique'=>'vetements',  'id_article'=>'98'));
+
+      $trueResult=array(
+          "/index.php/jelix_tests/urlsig/url1?mois=10&annee=2005&id=35",
+          "/jelix_tests/urlsig/url2?mois=05&annee=2004",
+          "/jelix_tests/urlsig/url3?rubrique=actualite&id_art=65&article=c%27est+la+f%C3%AAte+au+village",
+          "/foo/bar.php/jelix_tests/urlsig/url4?first=premier&second=deuxieme",
+          "/index.php/jelix_tests/urlsig/url5?foo=oof&bar=rab",
+          "/xmlrpc.php",
+          "/index.php/jelix_tests/urlsig/url8?rubrique=vetements&id_article=98",
+          "/index.php/jelix_tests/?rubrique=vetements&id_article=98",
+          "/index.php/jelix_tests/urlsig/?rubrique=vetements&id_article=98",
+       );
+
+
+      $trueResult[5]='https://'.$_SERVER['HTTP_HOST'].$trueResult[5];
+      $trueResult[6]='https://'.$_SERVER['HTTP_HOST'].$trueResult[6];
+      $this->_doCompareUrl("simple, multiview = false", $urlList,$trueResult);
+
+      $gJConfig->urlengine['multiview']=true;
+      jUrl::getEngine(true); // on recharge le nouveau moteur d'url
+      $trueResult=array(
+          "/index/jelix_tests/urlsig/url1?mois=10&annee=2005&id=35",
+          "/jelix_tests/urlsig/url2?mois=05&annee=2004",
+          "/jelix_tests/urlsig/url3?rubrique=actualite&id_art=65&article=c%27est+la+f%C3%AAte+au+village",
+          "/foo/bar/jelix_tests/urlsig/url4?first=premier&second=deuxieme",
+          "/index/jelix_tests/urlsig/url5?foo=oof&bar=rab",
+          "/xmlrpc",
+          "/index/jelix_tests/urlsig/url8?rubrique=vetements&id_article=98",
+          "/index/jelix_tests/?rubrique=vetements&id_article=98",
+          "/index/jelix_tests/urlsig/?rubrique=vetements&id_article=98",
+       );
+      $trueResult[5]='https://'.$_SERVER['HTTP_HOST'].$trueResult[5];
+      $trueResult[6]='https://'.$_SERVER['HTTP_HOST'].$trueResult[6];
+      $this->_doCompareUrl("simple, multiview = true", $urlList,$trueResult);
+    }
+
+
+
+    function testBasciSignificantEngineError(){
+       global $gJConfig, $gJCoord;
+
+       $gJCoord->request->urlScriptPath='/';
+       $gJCoord->request->params=array();
+       //$gJCoord->request->type=;
+       $gJConfig->urlengine = array(
+         'engine'=>'basic_significant',
+         'enableParser'=>true,
+         'multiview'=>false,
+         'basePath'=>'/',
+         'defaultEntrypoint'=>'index',
+         'entrypointExtension'=>'.php',
+         'notfoundAct'=>'jelix~notfound',
+         'simple_urlengine_https'=>'jelix_tests~urlsig:url8@classic @xmlrpc',
+         'significantFile'=>'urls.xml',
+       );
+
+      $urlList=array();
+      $urlList[]= array('foo~bar@xmlrpc', array('aaa'=>'bbb'));
+
+      $trueResult=array(
+          // type exception : 0 Exception, 1 jException, 2 jExceptionSelector
+          // code
+          // local key
+          array(2,11,'jelix~errors.selector.invalid.target'),
+       );
+
+      $this->_doCompareError("simple, errors, multiview = false", $urlList,$trueResult);
+
+      $gJConfig->urlengine['multiview']=true;
+      $trueResult=array(
+          array(2,11,'jelix~errors.selector.invalid.target'),
+       );
+      $this->_doCompareError("simple, errors multiview = true", $urlList,$trueResult);
+    }
+
+
+
+
-}
-?>

trunk/testapp/modules/jelix_tests/tests/core.urls_parsing.html_cli.php

@@ -158 +158 @@
-
-    }
+
+
+    function testBasicSignificantEngine() {
+       global $gJConfig, $gJCoord;
+
+       $gJCoord->request->urlScriptPath='/';
+       $gJCoord->request->params=array();
+       //$gJCoord->request->type=;
+       $gJConfig->urlengine = array(
+         'engine'=>'basic_significant',
+         'enableParser'=>true,
+         'multiview'=>false,
+         'basePath'=>'/',
+         'defaultEntrypoint'=>'index',
+         'entrypointExtension'=>'.php',
+         'notfoundAct'=>'jelix~notfound',
+         'significantFile'=>'urls.xml',
+       );
+
+      jUrl::getEngine(true); // on recharge le nouveau moteur d'url
+
+      $resultList=array();
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig:url1', 'mois'=>'10',  'annee'=>'2005', 'id'=>'35');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig:url2', 'mois'=>'05',  'annee'=>'2004');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig:url3', 'rubrique'=>'actualite',  'id_art'=>'65', 'article'=>'c\'est la fete au village');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig:url4', 'first'=>'premier',  'second'=>'deuxieme');
+      $resultList[]= array();
+      $resultList[]= array('module'=>'news',        'action'=>'main:bar',     'aaa'=>'bbb');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig:url5', 'foo'=>'oof',  'bar'=>'rab');
+
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig:url8', 'rubrique'=>'vetements',  'id_article'=>'98');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'default:index', 'rubrique'=>'vetements',  'id_article'=>'98');
+      $resultList[]= array('module'=>'jelix_tests', 'action'=>'urlsig:index', 'rubrique'=>'vetements',  'id_article'=>'98');
+
+      $request=array(
+          array("index.php","/jelix_tests/urlsig/url1",array('mois'=>'10',  'annee'=>'2005', 'id'=>'35')),
+          array("testnews.php","/jelix_tests/urlsig/url2",array('mois'=>'05',  'annee'=>'2004')),
+          array("testnews.php","/jelix_tests/urlsig/url3",array('rubrique'=>'actualite',  'id_art'=>'65', 'article'=>'c\'est la fete au village')),
+          array("foo/bar.php","/jelix_tests/urlsig/url4",array('first'=>'premier',  'second'=>'deuxieme')),
+          array("xmlrpc.php","",array()),
+          array("news.php","/news/main/bar",array('aaa'=>'bbb')),
+          array("index.php","/jelix_tests/urlsig/url5",array('foo'=>'oof',  'bar'=>'rab')),
+          array("index.php","/jelix_tests/urlsig/url8",array('rubrique'=>'vetements',  'id_article'=>'98')),
+          array("index.php","/jelix_tests/",array('rubrique'=>'vetements',  'id_article'=>'98')),
+          array("index.php","/jelix_tests/urlsig/",array('rubrique'=>'vetements',  'id_article'=>'98')),
+       );
+
+      //$this->sendMessage("significant, multiview = false");
+      foreach($request as $k=>$urldata){
+         $url = jUrl::parse ($urldata[0], $urldata[1], $urldata[2]);
+         $p = $url->params;
+         ksort($p);
+         ksort($resultList[$k]);
+
+         $this->assertTrue( ($p == $resultList[$k]), 'created:'.var_export($p,true).' expected:'.var_export($resultList[$k],true));
+      }
+
+      $gJConfig->urlengine['multiview']=true;
+      $request=array(
+          array("index","/jelix_tests/urlsig/url1",array('mois'=>'10',  'annee'=>'2005', 'id'=>'35')),
+          array("testnews","/jelix_tests/urlsig/url2",array('mois'=>'05',  'annee'=>'2004')),
+          array("testnews","/jelix_tests/urlsig/url3",array('rubrique'=>'actualite',  'id_art'=>'65', 'article'=>'c\'est la fete au village')),
+          array("foo/bar","/jelix_tests/urlsig/url4",array('first'=>'premier',  'second'=>'deuxieme')),
+          array("xmlrpc","",array()),
+          array("news","/news/main/bar",array('aaa'=>'bbb')),
+          array("index","/jelix_tests/urlsig/url5",array('foo'=>'oof',  'bar'=>'rab')),
+          array("index","/jelix_tests/urlsig/url8",array('rubrique'=>'vetements',  'id_article'=>'98')),
+          array("index","/jelix_tests/",array('rubrique'=>'vetements',  'id_article'=>'98')),
+          array("index","/jelix_tests/urlsig/",array('rubrique'=>'vetements',  'id_article'=>'98')),
+       );
+      foreach($request as $k=>$urldata){
+         $url = jUrl::parse ($urldata[0], $urldata[1], $urldata[2]);
+         $p = $url->params;
+         ksort($p);
+         ksort($resultList[$k]);
+
+         $this->assertTrue( ($p == $resultList[$k]), 'created:'.var_export($p,true).' expected:'.var_export($resultList[$k],true));
+      }
+
+    }
+
-}
-

trunk/testapp/var/config/defaultconfig.ini.php

@@ -99 +99 @@
-__https=
-
+[basic_significant_urlengine_entrypoints]
+; for each entry point, it indicates if the entry point name
+; should be include in the url or not
+index = on
+xmlrpc = on
+jsonrpc = on
+testnews = off
+foo/bar = on
+news = on
+
+
-[logfiles]
-default=messages.log