Merge pull request dart-archive#79 from pavelgj/master

Use new routing syntax

Author: kwalrath

Chapter_06/lib/routing/recipe_book_router.dart

@@ -2,31 +2,25 @@ library recipe_book_routing;
 
 import 'package:angular/angular.dart';
 
-class RecipeBookRouteInitializer implements RouteInitializer {
-
-  init(Router router, ViewFactory view) {
-    router.root
-      ..addRoute(
-          name: 'add',
+recipeBookRouteInitializer(Router router, ViewFactory views) =>
+    views.configure({
+      'add': ngRoute(
           path: '/add',
-          enter: view('view/addRecipe.html'))
-      ..addRoute(
-          name: 'recipe',
+          view: 'view/addRecipe.html'),
+      'recipe': ngRoute(
           path: '/recipe/:recipeId',
-          mount: (Route route) => route
-              ..addRoute(
-                  name: 'view',
-                  path: '/view',
-                  enter: view('view/viewRecipe.html'))
-              ..addRoute(
-                  name: 'edit',
-                  path: '/edit',
-                  enter: view('view/editRecipe.html'))
-              ..addRoute(
-                  name: 'view_default',
-                  defaultRoute: true,
-                  enter: (_) =>
-                      router.go('view', {'recipeId': ':recipeId'},
-                          startingFrom: route, replace:true)));
-  }
-}
+          mount: {
+            'view': ngRoute(
+                path: '/view',
+                view: 'view/viewRecipe.html'),
+            'edit': ngRoute(
+                path: '/edit',
+                view: 'view/editRecipe.html'),
+            'view_default': ngRoute(
+                defaultRoute: true,
+                enter: (RouteEnterEvent e) =>
+                    router.go('view', {},
+                        startingFrom: router.root.getRoute('recipe'),
+                        replace: true))
+          })
+    });

Chapter_06/web/main.dart

@@ -1,6 +1,5 @@
 library recipe_book;
 
-import 'dart:async';
 import 'package:angular/angular.dart';
 import 'package:angular/routing/module.dart';
 import 'package:di/di.dart';
@@ -30,7 +29,7 @@ class MyAppModule extends Module {
     type(SearchRecipeComponent);
     type(ViewRecipeComponent);
     type(QueryService);
-    type(RouteInitializer, implementedBy: RecipeBookRouteInitializer);
+    value(RouteInitializerFn, recipeBookRouteInitializer);
     factory(NgRoutingUsePushState,
         (_) => new NgRoutingUsePushState.value(false));
   }

Chapter_07/lib/routing/recipe_book_router.dart

@@ -1,34 +1,26 @@
 library recipe_book_routing;
 
 import 'package:angular/angular.dart';
-import '../injectable.dart';
 
-@InjectableService()
-class RecipeBookRouteInitializer implements RouteInitializer {
-
-  init(Router router, ViewFactory view) {
-    router.root
-      ..addRoute(
-          name: 'add',
+recipeBookRouteInitializer(Router router, ViewFactory views) =>
+    views.configure({
+      'add': ngRoute(
           path: '/add',
-          enter: view('view/addRecipe.html'))
-      ..addRoute(
-          name: 'recipe',
+          view: 'view/addRecipe.html'),
+      'recipe': ngRoute(
           path: '/recipe/:recipeId',
-          mount: (Route route) => route
-              ..addRoute(
-                  name: 'view',
-                  path: '/view',
-                  enter: view('view/viewRecipe.html'))
-              ..addRoute(
-                  name: 'edit',
-                  path: '/edit',
-                  enter: view('view/editRecipe.html'))
-              ..addRoute(
-                  name: 'view_default',
-                  defaultRoute: true,
-                  enter: (_) =>
-                      router.go('view', {'recipeId': ':recipeId'},
-                          startingFrom: route, replace:true)));
-  }
-}
+          mount: {
+            'view': ngRoute(
+                path: '/view',
+                view: 'view/viewRecipe.html'),
+            'edit': ngRoute(
+                path: '/edit',
+                view: 'view/editRecipe.html'),
+            'view_default': ngRoute(
+                defaultRoute: true,
+                enter: (RouteEnterEvent e) =>
+                    router.go('view', {},
+                        startingFrom: router.root.getRoute('recipe'),
+                        replace: true))
+          })
+    });

Chapter_07/web/main.dart

@@ -1,3 +1,4 @@
+@Injectables(const[Profiler])
 library recipe_book;
 
 // Temporary, please follow https://github.com/angular/angular.dart/issues/476
@@ -6,10 +7,10 @@ library recipe_book;
   override: '*')
 import 'dart:mirrors';
 
-import 'dart:async';
 import 'package:angular/angular.dart';
 import 'package:angular/routing/module.dart';
 import 'package:di/di.dart';
+import 'package:perf_api/perf_api.dart';
 import 'package:di/annotations.dart';
 import 'package:logging/logging.dart';
 
@@ -38,7 +39,7 @@ class MyAppModule extends Module {
     type(SearchRecipeComponent);
     type(ViewRecipeComponent);
     type(QueryService);
-    type(RouteInitializer, implementedBy: RecipeBookRouteInitializer);
+    value(RouteInitializerFn, recipeBookRouteInitializer);
     factory(NgRoutingUsePushState,
         (_) => new NgRoutingUsePushState.value(false));