From f25c40280d1f647ef05ab41676641eef3eaac16f Mon Sep 17 00:00:00 2001
From: thosakwe <thosakwe@gmail.com>
Date: Wed, 21 Dec 2016 16:33:07 -0500
Subject: [PATCH] 9

---
 lib/src/commands/service.dart | 32 ++++++--------------------------
 pubspec.yaml                  |  2 +-
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/lib/src/commands/service.dart b/lib/src/commands/service.dart
index 7fd9cae4..7e76d97d 100644
--- a/lib/src/commands/service.dart
+++ b/lib/src/commands/service.dart
@@ -124,7 +124,7 @@ class $name extends MemoryModel {
   factory $name.fromJson(String json) => new $name.fromMap(JSON.decode(json));
 
   factory $name.fromMap(Map data) => new $name(
-      id: data['id']
+      id: data['id'],
       name: data['name'],
       desc: data['desc']);
 
@@ -141,33 +141,13 @@ class $name extends MemoryModel {
   }
 
   _generateMemoryService(String name) {
+    var lower = _snake(name);
+
     return '''
 import 'package:angel_framework/defs.dart';
 import 'package:angel_framework/angel_framework.dart';
-
-/// Store in-memory instances of this class.
-class $name extends MemoryModel {
-  String name, desc;
-
-  $name({String id, this.name, this.desc}) {
-    this.id = id;
-  }
-
-  factory $name.fromJson(String json) => new $name.fromMap(JSON.decode(json));
-
-  factory $name.fromMap(Map data) => new $name(
-      id: data['id']
-      name: data['name'],
-      desc: data['desc']);
-
-  Map toJson() {
-    return {
-      'id': id,
-      'name': name,
-      'desc': desc
-    };
-  }
-}
+import '../models/$lower.dart';
+export '../models/$lower.dart';
 
 /// Manages [$name] in-memory.
 class ${name}Service extends MemoryService<$name> {
@@ -201,7 +181,7 @@ class $name extends Model {
   factory $name.fromJson(String json) => new $name.fromMap(JSON.decode(json));
 
   factory $name.fromMap(Map data) => new $name(
-      id: data['id']
+      id: data['id'],
       name: data['name'],
       desc: data['desc']);
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 1ec8a3c1..0b55f7d3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_cli
-version: 1.0.0-dev+8
+version: 1.0.0-dev+9
 description: Command-line tools for the Angel framework.
 environment:
   sdk: ">=1.19.0"