removed collection2, more sensible sorting

ndxbxrme · Jul 8, 2015 · e935990 · e935990
1 parent e29759c
commit e935990
Show file tree

Hide file tree

Showing 19 changed files with 132 additions and 323 deletions.
diff --git a/app/index.coffee b/app/index.coffee
@@ -244,7 +244,6 @@ module.exports = yeoman.generators.Base.extend(
       meteorToAdd.push 'mquandalle:bower'
     if @filters.pagination
       meteorToAdd.push 'tmeasday:publish-counts'
-      meteorToAdd.push 'aldeed:collection2'
       meteorToAdd.push 'angularutils:pagination'
       angularModules.push 'angularUtils.directives.dirPagination'
     if @filters.auth

diff --git a/app/index.js b/app/index.js
diff --git a/app/templates/bootstrap/model/things(coffee).coffee b/app/templates/bootstrap/model/things(coffee).coffee
@@ -2,22 +2,12 @@
 
 Things.allow
   insert: (userId, thing) ->
+    thing.createdAt = new Date()
+    thing.name_sort = thing.name.toLowerCase()
     true
   update: (userId, thing, fields, modifier) ->
+    thing.updatedAt = new Date()
+    thing.name_sort = thing.name.toLowerCase()
     true
   remove: (userId, thing) ->
-    true
-<% if(pagination) { %>    
-Things.attachSchema new SimpleSchema
-  name:
-    type: String
-    label: 'name'
-  name_sort:
-    type: String
-    optional: true
-    autoValue: () ->
-      name = this.field('name')
-      if name.isSet
-        name.value.toLowerCase()
-      else
-        @unset()<% } %>
+    true
diff --git a/app/templates/bootstrap/model/things(js).js b/app/templates/bootstrap/model/things(js).js
@@ -2,32 +2,16 @@ Things = new Mongo.Collection('things');
 
 Things.allow({
   insert: function(userId, thing) {
+    thing.createdAt = new Date();
+    thing.name_sort = thing.name.toLowerCase();
     return true;
   },
   update: function(userId, thing, fields, modifier) {
+    thing.createdAt = new Date();
+    thing.name_sort = thing.name.toLowerCase();
     return true;
   },
   remove: function(userId, thing) {
     return true;
   }
-});
-<% if(pagination) { %>    
-Things.attachSchema(new SimpleSchema({
-  name: {
-    type: String,
-    label: 'name'
-  },
-  name_sort: {
-    type: String,
-    optional: true,
-    autoValue: function() {
-      var name = this.field('name');
-      if(name.isSet) {
-        return name.value.toLowerCase();
-      }
-      else {
-        return this.unset();
-      }
-    }
-  }
-}));<% } %>
+});
diff --git a/app/templates/bootstrap/server/startup/things.load(coffee).coffee b/app/templates/bootstrap/server/startup/things.load(coffee).coffee
@@ -1,27 +1,16 @@
 Meteor.startup ->
   if Things.find().count() == 0
     things = [
-      {
-        name: 'Data on the Wire'
-      }
-      {
-        name: 'One Language'
-      }
-      {
-        name: 'Database Everywhere'
-      }
-      {
-        name: 'Latency Compensation'
-      }
-      {
-        name: 'Full Stack Reactivity'
-      }
-      {
-        name: 'Embrace the Ecosystem'
-      }
-      {
-        name: 'Simplicity Equals Productivity'
-      }
+      'Data on the Wire'
+      'One Language'
+      'Database Everywhere'
+      'Latency Compensation'
+      'Full Stack Reactivity'
+      'Embrace the Ecosystem'
+      'Simplicity Equals Productivity'
     ]
     things.forEach (thing) ->
-      Things.insert thing
+      Things.insert 
+        name: thing
+        name_sort: thing.toLowerCase()
+        createdAt: new Date()
diff --git a/app/templates/bootstrap/server/startup/things.load(js).js b/app/templates/bootstrap/server/startup/things.load(js).js
@@ -1,30 +1,20 @@
 Meteor.startup(function() {
   if(Things.find().count() === 0) {
     var things = [
-      {
-        name: 'Data on the Wire'
-      },
-      {
-        name: 'One Language'
-      },
-      {
-        name: 'Database Everywhere'
-      },
-      {
-        name: 'Latency Compensation'
-      },
-      {
-        name: 'Full Stack Reactivity'
-      },
-      {
-        name: 'Embrace the Ecosystem'
-      },
-      {
-        name: 'Simplicity Equals Productivity'
-      }
+      'Data on the Wire',
+      'One Language',
+      'Database Everywhere',
+      'Latency Compensation',
+      'Full Stack Reactivity',
+      'Embrace the Ecosystem',
+      'Simplicity Equals Productivity'
     ];
     things.forEach(function(thing) {
-      Things.insert(thing);
+      Things.insert({
+        name: thing,
+        name_sort: thing.toLowerCase(),
+        createdAt: new Date()
+      });
     });
   }
 });
diff --git a/app/templates/material/model/things(coffee).coffee b/app/templates/material/model/things(coffee).coffee
@@ -2,22 +2,12 @@
 
 Things.allow
   insert: (userId, thing) ->
+    thing.createdAt = new Date()
+    thing.name_sort = thing.name.toLowerCase()
     true
   update: (userId, thing, fields, modifier) ->
+    thing.updatedAt = new Date()
+    thing.name_sort = thing.name.toLowerCase()
     true
   remove: (userId, thing) ->
-    true
-<% if(pagination) { %>    
-Things.attachSchema new SimpleSchema
-  name:
-    type: String
-    label: 'name'
-  name_sort:
-    type: String
-    optional: true
-    autoValue: () ->
-      name = this.field('name')
-      if name.isSet
-        name.value.toLowerCase()
-      else
-        @unset()<% } %>
+    true
diff --git a/app/templates/material/model/things(js).js b/app/templates/material/model/things(js).js
@@ -2,32 +2,16 @@ Things = new Mongo.Collection('things');
 
 Things.allow({
   insert: function(userId, thing) {
+    thing.createdAt = new Date();
+    thing.name_sort = thing.name.toLowerCase();
     return true;
   },
   update: function(userId, thing, fields, modifier) {
+    thing.createdAt = new Date();
+    thing.name_sort = thing.name.toLowerCase();
     return true;
   },
   remove: function(userId, thing) {
     return true;
   }
-});
-<% if(pagination) { %>    
-Things.attachSchema(new SimpleSchema({
-  name: {
-    type: String,
-    label: 'name'
-  },
-  name_sort: {
-    type: String,
-    optional: true,
-    autoValue: function() {
-      var name = this.field('name');
-      if(name.isSet) {
-        return name.value.toLowerCase();
-      }
-      else {
-        return this.unset();
-      }
-    }
-  }
-}));<% } %>
+});
diff --git a/app/templates/material/server/startup/things.load(coffee).coffee b/app/templates/material/server/startup/things.load(coffee).coffee
@@ -1,27 +1,16 @@
 Meteor.startup ->
   if Things.find().count() == 0
     things = [
-      {
-        name: 'Data on the Wire'
-      }
-      {
-        name: 'One Language'
-      }
-      {
-        name: 'Database Everywhere'
-      }
-      {
-        name: 'Latency Compensation'
-      }
-      {
-        name: 'Full Stack Reactivity'
-      }
-      {
-        name: 'Embrace the Ecosystem'
-      }
-      {
-        name: 'Simplicity Equals Productivity'
-      }
+      'Data on the Wire'
+      'One Language'
+      'Database Everywhere'
+      'Latency Compensation'
+      'Full Stack Reactivity'
+      'Embrace the Ecosystem'
+      'Simplicity Equals Productivity'
     ]
     things.forEach (thing) ->
-      Things.insert thing
+      Things.insert 
+        name: thing
+        name_sort: thing.toLowerCase()
+        createdAt: new Date()
diff --git a/app/templates/material/server/startup/things.load(js).js b/app/templates/material/server/startup/things.load(js).js
@@ -1,30 +1,20 @@
 Meteor.startup(function() {
   if(Things.find().count() === 0) {
     var things = [
-      {
-        name: 'Data on the Wire'
-      },
-      {
-        name: 'One Language'
-      },
-      {
-        name: 'Database Everywhere'
-      },
-      {
-        name: 'Latency Compensation'
-      },
-      {
-        name: 'Full Stack Reactivity'
-      },
-      {
-        name: 'Embrace the Ecosystem'
-      },
-      {
-        name: 'Simplicity Equals Productivity'
-      }
+      'Data on the Wire',
+      'One Language',
+      'Database Everywhere',
+      'Latency Compensation',
+      'Full Stack Reactivity',
+      'Embrace the Ecosystem',
+      'Simplicity Equals Productivity'
     ];
     things.forEach(function(thing) {
-      Things.insert(thing);
+      Things.insert({
+        name: thing,
+        name_sort: thing.toLowerCase(),
+        createdAt: new Date()
+      });
     });
   }
 });
diff --git a/app/templates/none/model/things(coffee).coffee b/app/templates/none/model/things(coffee).coffee
@@ -2,22 +2,12 @@
 
 Things.allow
   insert: (userId, thing) ->
+    thing.createdAt = new Date()
+    thing.name_sort = thing.name.toLowerCase()
     true
   update: (userId, thing, fields, modifier) ->
+    thing.updatedAt = new Date()
+    thing.name_sort = thing.name.toLowerCase()
     true
   remove: (userId, thing) ->
-    true
-<% if(pagination) { %>    
-Things.attachSchema new SimpleSchema
-  name:
-    type: String
-    label: 'name'
-  name_sort:
-    type: String
-    optional: true
-    autoValue: () ->
-      name = this.field('name')
-      if name.isSet
-        name.value.toLowerCase()
-      else
-        @unset()<% } %>
+    true
diff --git a/app/templates/none/model/things(js).js b/app/templates/none/model/things(js).js
@@ -2,32 +2,16 @@ Things = new Mongo.Collection('things');
 
 Things.allow({
   insert: function(userId, thing) {
+    thing.createdAt = new Date();
+    thing.name_sort = thing.name.toLowerCase();
     return true;
   },
   update: function(userId, thing, fields, modifier) {
+    thing.createdAt = new Date();
+    thing.name_sort = thing.name.toLowerCase();
     return true;
   },
   remove: function(userId, thing) {
     return true;
   }
-});
-<% if(pagination) { %>    
-Things.attachSchema(new SimpleSchema({
-  name: {
-    type: String,
-    label: 'name'
-  },
-  name_sort: {
-    type: String,
-    optional: true,
-    autoValue: function() {
-      var name = this.field('name');
-      if(name.isSet) {
-        return name.value.toLowerCase();
-      }
-      else {
-        return this.unset();
-      }
-    }
-  }
-}));<% } %>
+});