tiny fixes (#15)

codekeyz · Dec 22, 2023 · c05d459 · c05d459
1 parent 4994659
commit c05d459
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/yaroo/lib/src/_router/router.dart b/yaroo/lib/src/_router/router.dart
@@ -61,5 +61,8 @@ abstract interface class Route {
   }
 
   static FunctionalRouteDefinition handler(HTTPMethod method, String path, RequestHandler handler) =>
-      FunctionalRouteDefinition(HTTPMethod.GET, path, handler);
+      FunctionalRouteDefinition(method, path, handler);
+
+  static FunctionalRouteDefinition notFound(RequestHandler handler, [HTTPMethod method = HTTPMethod.ALL]) =>
+      FunctionalRouteDefinition(method, '/*', handler);
 }
diff --git a/yaroo/lib/src/_router/utils.dart b/yaroo/lib/src/_router/utils.dart
@@ -1,7 +1,8 @@
 import 'dart:io';
 
 String cleanRoute(String route) {
-  return route.replaceAll(RegExp(r'/+$'), '').replaceAll(RegExp(r'/+'), '/');
+  final result = route.replaceAll(RegExp(r'/+'), '/').replaceAll(RegExp(r'/$'), '');
+  return result.isEmpty ? '/' : result;
 }
 
 String symbolToString(Symbol symbol) {

diff --git a/yaroo/lib/src/core.dart b/yaroo/lib/src/core.dart
@@ -55,9 +55,9 @@ class AppServiceProvider extends ServiceProvider {
       autoReload: false,
       trimBlocks: true,
       leftStripBlocks: true,
-      loader: FileSystemLoader(paths: ['public']),
+      loader: FileSystemLoader(paths: ['public', 'templates'], extensions: {'j2'}),
     );
-    app.useViewEngine(JinjaViewEngine(environment));
+    app.useViewEngine(JinjaViewEngine(environment, fileExt: 'j2'));
   }
 }
 

diff --git a/yaroo/pubspec.yaml b/yaroo/pubspec.yaml
@@ -17,7 +17,7 @@ dependencies:
     git:
       url: https://github.com/codekeyz/pharaoh.git
       path: packages/pharaoh
-  spanner: ^1.0.1+1
+  spanner: ^1.0.1+2
   spookie: ^1.0.2+1
   meta: ^1.11.0
   collection: ^1.18.0