Mudanças

src/Routes/Route.php

@@ -144,6 +144,8 @@ class Route {
                     $before = explode('@', $before);
                     $class = new $before[0]();
                     $class->{$before[1]}();
+                }else if(is_array($before)){
+                    call_user_func($before['callback'], $before['params']);
                 }else{
                     call_user_func($before);
                 }
@@ -195,8 +197,10 @@ class Route {
                 $this->_regex .= "\/[0-9]+";
             } else if (strpos($segment, 'h:') > -1) {
                 $this->_regex .= "\/[A-z]+";
-            } else if (strpos($segment, ':') > -1) {
+            } else if (strpos($segment, 'd:') > -1) {
                 $this->_regex .= "\/[A-z0-9]+";
+            } else if (strpos($segment, 'r:') > -1) {
+                $this->_regex .= "\/[ -~]+";
             } else {
                 $this->_regex .= "\/" . $segment;
             }
@@ -249,8 +253,8 @@ class Route {
         return $this;
     }
 
-    function middlewareAdd($name = '') {
-        $this->_before[$name] = $function;
+    function middlewareAdd($name = '', $params) {
+        $this->_before[$name] = $params;
         return $this;
     }
 

src/Routes/RouteCollection.php

@@ -65,7 +65,8 @@ class RouteCollection {
 
         foreach (new \RecursiveIteratorIterator($rdi) as $file) {
             foreach ($filenames as $filename) {
-                if (strpos($file, $filename)) {
+                // if (strpos($file, $filename) && $file[0] != '.') {
+                if (strpos($file, $filename) && !strpos($file, '.swp') ) {
                     $instance->_loadedFiles[] = $file;
                 }
             }
@@ -148,7 +149,13 @@ class RouteCollection {
 
                 $ROUTE = $route;
 
-                $route->_before = $this->_defaultMiddlewares;
+                foreach ($route->_before as $key => $requestedMiddleware){
+                    $route->_before[$key] = Array(
+                        'callback' => $this->_middlewareSet[$key],
+                        'params' => $requestedMiddleware);
+                }
+
+                $route->_before = array_merge($this->_defaultMiddlewares, $route->_before);
 
                 $route->execute();
 
@@ -294,6 +301,7 @@ class RouteCollection {
      */
     static function addDefaultMiddleware($name = '', $function) {
         self::getInstance()->_defaultMiddlewares[$name] = $function;
+        return self::getInstance();
     }
 
     /**
@@ -301,16 +309,15 @@ class RouteCollection {
      * @ctag RouteCollection::addDefaultMiddleware('name',function(){})
      */
     static function registerMiddleware($name = '', $function) {
-        self::getInstance()->_middlewareSet[$name] = $function;
+        return self::getInstance()->_middlewareSet[$name] = $function;
     }
 
     /**
      *
      * @ctag RouteCollection::onHttpError(function(){})
      */
-    static function onHttpError($function) {
+    static function onHttpError($code, $function) {
         $instance = self::getInstance();
-        $instance->_errors[] = $function;
     }
 
     /**