Allowing multiple suffixes in one Route::group

pcockwell · Jul 17, 2013 · 8641879 · 8641879
1 parent 479325a
commit 8641879
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/app/lib/autodo/src/Autodo/Routing/RouteCompiler.php b/app/lib/autodo/src/Autodo/Routing/RouteCompiler.php
@@ -146,7 +146,15 @@ private static function compilePattern(Route $route, $pattern, $isHost)
             $regexp .= self::computeRegexp($tokens, $i, $firstOptional);
         }
 
-        $regexp .= $route->getOption('_suffix') ?: '';
+        $suffix = $route->getOption('_suffix') ?: '';
+        if (!is_array($suffix))
+        {
+            $regexp .= $suffix;
+        }
+        else
+        {
+            $regexp .= '('.implode('|', $suffix).')';
+        }
 
         return array(
             'staticPrefix' => 'text' === $tokens[0][0] ? $tokens[0][1] : '',

diff --git a/app/lib/autodo/src/Autodo/Routing/Router.php b/app/lib/autodo/src/Autodo/Routing/Router.php
@@ -120,8 +120,6 @@ protected function getGroupSuffix()
 
             if (isset($group['suffix']))
             {
-                if (is_array($group['suffix'])) return implode('/', $group['suffix']);
-
                 return $group['suffix'];
             }
         }
@@ -139,6 +137,20 @@ protected function mergeGroupSuffix($action)
     {
         $suffix = isset($action['suffix']) ? $action['suffix'] : '';
 
-        return trim($suffix.'/'.$this->getGroupSuffix(), '/');
+        $groupSuffix = $this->getGroupSuffix();
+        if (!is_array($groupSuffix))
+        {
+            return trim($suffix.'/'.$groupSuffix, '/');
+        }
+        else
+        {
+            $mergedSuffixes = array();
+            foreach($groupSuffix as $currentSuffix)
+            {
+                $mergedSuffixes[] = trim($suffix.'/'.$currentSuffix, '/');
+            }
+            return $mergedSuffixes;
+        }
+
     }
 }
diff --git a/app/routes.php b/app/routes.php
@@ -55,8 +55,6 @@
                 $new_input[$key] = $content;
             }
         }
-        //$new_path = str_replace('.json', '', Request::path());
-        //return Redirect::to($new_path)->withInput($new_input);
         Input::replace($new_input);
     }
     else
@@ -76,7 +74,7 @@
     return View::make('users')->with('users', $users);
 });
 
-Route::group(array('suffix' => '.json'), function()
+Route::group(array('suffix' => array('.json', '.xml')), function()
 {
     // Controller to handle user accounts.
     Route::controller('user', 'UserController');