Changeset 5942

Timestamp:

01/18/12 02:34:26 (4 months ago)

Author:

vain

Message:

• fixes for router buildURL() + unittest
• improved function array_unequal_combine()

Location:

trunk

Files:

• core/functions.core.php (modified) (1 diff)
• core/router.core.php (modified) (5 diffs)
• core/targetroute.core.php (modified) (1 diff)
• tests/runAllTests.php (modified) (1 diff)
• tests/unittests/core/router.core.php (modified) (1 diff)
• tests/unittests/core/viewhelper/form/form.core.php (modified) (1 diff)

trunk/core/functions.core.php

@@ -484 +484 @@
         $index = 0;
 
+        # more keys than values, reduce keys array
+        while(count($keyArray) > count($valueArray))
+        {
+            array_pop($keyArray);
+        }
+
+        # @todo more values than keys ?
+        # add pseudo keys a la "key-0"
+
         foreach($keyArray as $key)
         {
-            if(isset($valueArray[$index]) === true)
-            {
+            if(isset($valueArray[$index]))
+            {
+                # index is used, then incremented for the next turn in foreach (post-increment-operator)
                 $returnArray[$key] = $valueArray[$index++];
             }

trunk/core/router.core.php

@@ -224 +224 @@
     {
         # if urlstring is already a qualified url (http://...)
-        if(false !== strpos($urlstring, WWW_ROOT . 'index.php?mod='))
+        if(false !== strpos($urlstring, WWW_ROOT . 'index.php?'))
         {
             # there is no need to rebuild it, just return
             return $urlstring;
+        }
+        elseif(false !== strpos($urlstring, 'index.php?'))
+        {
+            # there is no need to rebuild it, just the http prefix is missing
+            # add that and return
+            return WWW_ROOT . $urlstring;
         }
         # e.g. ROOT/news/admin
@@ -237 +243 @@
         else # ROOT/index.php?mod=abc&action=123&etc...
         {
+            # get only the part after "index.php=?"
+            if(false !== strpos($urlstring, 'index.php?'))
+            {
+                $urlstring = strstr($urlstring, 'index.php?');
+            }
+
             # remove all double slahes
             while (false !== strpos($urlstring, '//'))
             {
-                $url = str_replace('//', '/', $urlstring);
-            }
-
-            # get only the part after "index.php=?"
-            if(false !== strpos($urlstring, 'index.php?'))
-            {
-                $urlstring = strstr($urlstring, 'index.php?');
-            }
-
-            # and explode the string into an indexed array
-            $urlstring = ltrim($urlstring, '/');
+                $urlstring = str_replace('//', '/', $urlstring);
+            }
+
+            # remove space and slashes from begin and end of string
+            $urlstring = trim($urlstring, ' /');
+
+            # so something like "news/show/2" is left
+            # explode the string into an indexed array
             $url_params_idx_array = explode('/', $urlstring);
-
-            var_dump($url_params_idx_array);
 
             /**
@@ -259 +266 @@
              * [0]=> "news"  to  [mod]    => "news"
              * [1]=> "show"  to  [action] => "show"
+             * [2]=> "2"     to  [id]     => "2"
              *
              * It also a static whitelist for url parameter keys.
@@ -266 +274 @@
              * Then a reverse lookup in the routes table. For now this is static.
              */
-            if($url_params_idx_array[1] === 'admin')
+            if(isset($url_params_idx_array[1]) and $url_params_idx_array[1] === 'admin')
             {
                 # module admin whitelist
@@ -278 +286 @@
 
             $url_data = Clansuite_Functions::array_unequal_combine($url_keys, $url_params_idx_array);
-            $url = '';
 
             # Defaults to & for internal usage in html documents.
-            #  = ROOT/index.php?mod=abc&action=123&etc...
-            if($internal_url === true)
-            {
-                $url = http_build_query($url_data, '', '&');
-            }
-            # external link / redirect etc.
-            #  = ROOT/index.php?mod=abc&action=123&etc...
-            elseif($internal_url === false)
-            {
-                $url = http_build_query($url_data, '', '&');
-            }
+            $arg_separator = ($internal_url === true) ? '&' : '&';
+
+            $url = http_build_query($url_data, '', $arg_separator);
 
             #Clansuite_Debug::printR(WWW_ROOT . 'index.php?' . $url);

trunk/core/targetroute.core.php

@@ -367 +367 @@
         );
 
-        self::$parameters = array_merge(self::$parameters, $reset_params);
+        #self::$parameters = array_merge(self::$parameters, $reset_params);
+        self::$parameters = $reset_params;
     }
 

trunk/tests/runAllTests.php

@@ -38 +38 @@
 require_once 'simpletest/reporter.php';
 # hmm, we need to load this, to get rid of the "No runnable test cases in runAlltest" error
-require_once 'simpletest/autorun.php';
+#require_once 'simpletest/autorun.php';
 
 # setup our testsuite and reporter

trunk/tests/unittests/core/router.core.php

@@ -100 +100 @@
         $this->assertEqual(WWW_ROOT . 'index.php?mod=news&action=show', $url);
 
+        $urlstring = '/news/admin/edit/1';
+        $internal_url = true;
+        $url = $this->router->buildURL($urlstring, $internal_url);
+        $this->assertEqual(WWW_ROOT . 'index.php?mod=news&sub=admin&action=edit&id=1', $url);
+
         /*$urlstring = '';
         $internal_url = false;

trunk/tests/unittests/core/viewhelper/form/form.core.php

@@ -63 +63 @@
     {
         # set internal url - rebuilds the external url via router
-        $this->form->setAction('/module/action');
-        $this->assertEqual( WWW_ROOT . 'index.php?mod=module&sub=action', $this->form->getAction());
+        $this->form->setAction('/news/show');
+        $this->assertEqual( WWW_ROOT . 'index.php?mod=news&action=show', $this->form->getAction());
 
         # set external url
+        $this->form->setAction(WWW_ROOT .'index.php?mod=news&action=show');
+        $this->assertEqual( WWW_ROOT . 'index.php?mod=news&action=show', $this->form->getAction());
+
+        # set external url withput www_root (http root)
         $this->form->setAction('index.php?mod=news&action=show');
-        $this->assertEqual( WWW_ROOT . 'index.php?mod%3Dnews%26action%3Dshow', $this->form->getAction());
+        $this->assertEqual( WWW_ROOT . 'index.php?mod=news&action=show', $this->form->getAction());
     }
 
     public function testGetAction()
     {
-        $this->form->setAction('index.php?mod=news&action=show');
-
         # via getter - qualified url
-        $this->assertEqual( WWW_ROOT . 'index.php?mod%3Dnews%26action%3Dshow', $this->form->getAction());
+        $url = WWW_ROOT . 'index.php?mod=news&action=show';
+        $this->form->setAction( $url );
+        $this->assertEqual( $url, $this->form->getAction());
     }