Merge pull request dart-archive#112 from chalin/patch-0403-ch7-sync-with-ch6

Sync chap 7 code with most recent chap 6 updates

Author: kwalrath

Chapter_07/lib/component/search_recipe_component.dart

@@ -7,16 +7,23 @@ import 'package:angular/angular.dart';
     templateUrl: 'packages/angular_dart_demo/component/search_recipe_component.html',
     publishAs: 'cmp')
 class SearchRecipeComponent {
+  Map<String, bool> _categoryFilterMap;
+  List<String> _categories;
+
   @NgTwoWay('name-filter-string')
   String nameFilterString = "";
 
   @NgTwoWay('category-filter-map')
-  Map<String, bool> categoryFilterMap;
+  Map<String, bool> get categoryFilterMap => _categoryFilterMap;
+  void set categoryFilterMap(values) {
+    _categoryFilterMap = values;
+    _categories = categoryFilterMap.keys.toList();
+  }
 
-  List<String> get categories => categoryFilterMap.keys.toList();
+  List<String> get categories => _categories;
 
   void clearFilters() {
-    categoryFilterMap.keys.forEach((f) => categoryFilterMap[f] = false);
+    _categoryFilterMap.keys.forEach((f) => _categoryFilterMap[f] = false);
     nameFilterString = "";
   }
 }

Chapter_07/lib/filter/category_filter.dart

@@ -9,7 +9,7 @@ class CategoryFilter {
       // If there is nothing checked, treat it as "everything is checked"
       bool nothingChecked = filterMap.values.every((isChecked) => !isChecked);
       return nothingChecked
-          ? recipeList.toList()
+          ? recipeList
           : recipeList.where((i) => filterMap[i.category] == true).toList();
     }
     return const [];

Chapter_07/lib/recipe_book.dart

@@ -12,12 +12,11 @@ import 'service/query_service.dart';
 class RecipeBookController {
 
   static const String LOADING_MESSAGE = "Loading recipe book...";
-  static const String ERROR_MESSAGE = """Sorry! The cook stepped out of the 
-kitchen and took the recipe book with him!""";
+  static const String ERROR_MESSAGE = "Sorry! The cook stepped out of the"
+      "kitchen and took the recipe book with him!";
 
-  Http _http;
-  QueryService _queryService;
-  QueryService get queryService => _queryService;
+  final Http _http;
+  final QueryService queryService;
 
   // Determine the initial load state of the app
   String message = LOADING_MESSAGE;
@@ -27,15 +26,18 @@ kitchen and took the recipe book with him!""";
   // Data objects that are loaded from the server side via json
   List<String> _categories = [];
   List<String> get categories => _categories;
+
   Map<String, Recipe> _recipeMap = {};
   Map<String, Recipe> get recipeMap => _recipeMap;
-  List<Recipe> get allRecipes => _recipeMap.values.toList();
+  List<Recipe> _allRecipes = [];
+
+  List<Recipe> get allRecipes => _allRecipes;
 
   // Filter box
-  Map<String, bool> categoryFilterMap = {};
+  final categoryFilterMap = <String, bool>{};
   String nameFilter = "";
 
-  RecipeBookController(Http this._http, QueryService this._queryService) {
+  RecipeBookController(this._http, this.queryService) {
     _loadData();
   }
 
@@ -58,9 +60,10 @@ kitchen and took the recipe book with him!""";
   }
 
   void _loadData() {
-    _queryService.getAllRecipes()
+    queryService.getAllRecipes()
       .then((Map<String, Recipe> allRecipes) {
         _recipeMap = allRecipes;
+        _allRecipes = _recipeMap.values.toList();
         recipesLoaded = true;
       })
       .catchError((e) {
@@ -69,7 +72,7 @@ kitchen and took the recipe book with him!""";
         message = ERROR_MESSAGE;
       });
 
-    _queryService.getAllCategories()
+    queryService.getAllCategories()
       .then((List<String> allCategories) {
         _categories = allCategories;
         for (String category in _categories) {
@@ -83,4 +86,4 @@ kitchen and took the recipe book with him!""";
         message = ERROR_MESSAGE;
       });
   }
-}
+}

Chapter_07/lib/service/query_service.dart

@@ -14,7 +14,7 @@ class QueryService {
   Map<String, Recipe> _recipesCache;
   List<String> _categoriesCache;
 
-  Http _http;
+  final Http _http;
 
   QueryService(Http this._http) {
     _loaded = Future.wait([_loadRecipes(), _loadCategories()]);
@@ -32,12 +32,8 @@ class QueryService {
   }
 
   Future _loadCategories() {
-    return _http.get(_categoriesUrl)
-        .then((HttpResponse response) {
-          _categoriesCache = new List<String>();
-          for (String category in response.data) {
-            _categoriesCache.add(category);
-          }
+    return _http.get(_categoriesUrl).then((HttpResponse response) {
+      _categoriesCache = response.data;
     });
   }
 

Chapter_07/pubspec.yaml

@@ -5,6 +5,5 @@ dependencies:
   browser: any
   js: any
   shadow_dom: any
-
 dev_dependencies:
   unittest: any

Chapter_07/web/main.dart

@@ -1,12 +1,6 @@
 @Injectables(const[Profiler])
 library recipe_book;
 
-// Temporary, please follow https://github.com/angular/angular.dart/issues/476
-@MirrorsUsed(
-  targets: const ['recipe', 'query_service', 'recipe_book_routing'],
-  override: '*')
-import 'dart:mirrors';
-
 import 'package:angular/angular.dart';
 import 'package:logging/logging.dart';
 
@@ -19,6 +13,11 @@ import 'package:angular_dart_demo/routing/recipe_book_router.dart';
 import 'package:angular_dart_demo/component/view_recipe_component.dart';
 import 'package:angular_dart_demo/component/search_recipe_component.dart';
 
+// Temporary, please follow https://github.com/angular/angular.dart/issues/476
+@MirrorsUsed(
+  targets: const ['recipe', 'query_service', 'recipe_book_routing'],
+  override: '*')
+import 'dart:mirrors';
 
 // During development it's easier to use dynamic parser and injector, so use
 // initializer-dev.dart instead. Before using initializer-prod.dart make sure

Chapter_07/web/style.css

@@ -1,15 +1,15 @@
-[ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
-   display: none !important;
-}
-
-ul {
-  list-style-type: none;
-}
-
 a {
   text-decoration: none;
 }
 
 .extra-space {
   padding-left: 10px;
 }
+
+[ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+   display: none !important;
+}
+
+ul {
+  list-style-type: none;
+}

Chapter_07/web/view/addRecipe.html

@@ -1,4 +1,4 @@
 <div>
   <h3>Add recipe</h3>
-  Now it's your turn. Write some code to add a new recipe
+  Now it's your turn. Write some code to add a new recipe.
 </div>

Chapter_07/web/view/editRecipe.html

@@ -1,4 +1,4 @@
 <div>
   <h3>Edit recipe</h3>
-  Now it's your turn. Write some code to edit the recipe
+  Now it's your turn. Write some code to edit the recipe.
 </div>