port skel, todos, leaderboard to new data API

app/meteor/skel/client/~name~.js

@@ -1,5 +1,3 @@
-Meteor.subscribe('clicks');
-
 Template.button_demo.events = {
   'click input': function () {
     Clicks.insert({time: (new Date()).getTime()});

app/meteor/skel/model.js

@@ -1,5 +1 @@
-Clicks = Meteor.Collection('clicks');
-
-if (Meteor.is_server) {
-  Meteor.publish('clicks', {});
-}
+Clicks = new Meteor.Collection('clicks');

docs/client/api.html

@@ -417,7 +417,7 @@ <h2 id="collection"><span>Collection</span></h2>
 // after that, it will be synchronized down to any other clients
 // that are subscribed to a query that includes it (see
 // Meteor.subscribe)
-Posts = Meteor.Collection("posts");
+Posts = new Meteor.Collection("posts");
 Posts.insert({title: "Hello world", body: "First post"});
 
 // Changes are visible immediately -- no waiting for a round trip to
@@ -427,7 +427,7 @@ <h2 id="collection"><span>Collection</span></h2>
 // Create a temporary, local collection. It works just any other
 // collection, but it doesn't send changes to the server, and it
 // can't receive any data from subscriptions.
-Scratchpad = Meteor.Collection();
+Scratchpad = new Meteor.Collection;
 for (var i = 0; i < 10; i++)
   Scratchpad.insert({number: i * 2});
 assert(Scratchpad.find({number: {$lt: 9}}).count() === 5);

docs/client/api.js

@@ -136,7 +136,7 @@ Template.api.reconnect = {
 
 Template.api.collection = {
   id: "create_collection",
-  name: "Meteor.Collection([name])",
+  name: "new Meteor.Collection([name])",
   locus: "Anywhere",
   descr: ["Create a MongoDB-style collection that can be used to store data."],
   args: [

examples/leaderboard/leaderboard.js

@@ -1,6 +1,6 @@
 // Set up a collection to contain player information. On the server,
 // it is backed by a MongoDB collection named "players."
-Players = Meteor.Collection("players");
+Players = new Meteor.Collection("players");
 
 /*** Client ***/
 

examples/todos/model.js

@@ -1,6 +1,6 @@
-Lists = Meteor.Collection("lists");
+Lists = new Meteor.Collection("lists");
 
-Todos = Meteor.Collection("todos");
+Todos = new Meteor.Collection("todos");
 
 /* Schema support coming soon!
 
@@ -11,9 +11,11 @@ Todos.schema({text: String,
               tags: [String]});
 */
 
-Meteor.publish('lists');
-Meteor.publish('todos', {
-  selector: function (params) {
-    return {list_id: params.list};
-  }
-});
+if (Meteor.is_server) {
+  Meteor.publish('lists');
+  Meteor.publish('todos', {
+    selector: function (params) {
+      return {list_id: params.list};
+    }
+  });
+}

examples/unfinished/azrael/model.js

@@ -1,9 +1,9 @@
 // XXX it is actually very dangerous to store times as Number. use
 // Date type once it's implemented in minimongo
-Rooms = Meteor.Collection("rooms");
+Rooms = new Meteor.Collection("rooms");
 //Rooms.schema({name: String, created: Number});
 
-Chat = Meteor.Collection("chat");
+Chat = new Meteor.Collection("chat");
 /*
 Chat.schema({room: String, message: String,
              username: String, created: Number});

examples/unfinished/coffeeless/model.coffee

@@ -1,4 +1,4 @@
 root = exports ? this # export Presses globally.
-root.Presses = Meteor.Collection 'presses'
+root.Presses = new Meteor.Collection 'presses'
 
 Meteor.publish 'presses'

examples/unfinished/todos-backbone/common.js

@@ -1,4 +1,6 @@
-Todos = Meteor.Collection("todos");
-Todos.schema({text: String, done: Boolean, order: Number});
+Todos = new Meteor.Collection("todos");
+//Todos.schema({text: String, done: Boolean, order: Number});
 
-Meteor.publish('todos');
+if (Meteor.is_server) {
+  Meteor.publish('todos');
+}

examples/unfinished/todos-underscore/client/client.js

@@ -174,7 +174,7 @@ $(function () {
   // support aggregate queries, construct a local collection to serve
   // the same purpose, and drive the renderList() off of it.
 
-  var LocalTags = Meteor.Collection();
+  var LocalTags = new Meteor.Collection;
   (function () {
     function updateLocalTags() {
       var real = _(Todos.find()).chain().pluck('tags').compact().flatten().uniq().value();

examples/unfinished/todos-underscore/common.js

@@ -1,6 +1,6 @@
-Lists = Meteor.Collection("lists");
+Lists = new Meteor.Collection("lists");
 
-Todos = Meteor.Collection("todos");
+Todos = new Meteor.Collection("todos");
 
 /* Schema support coming soon!
 
@@ -11,5 +11,7 @@ Todos.schema({text: String,
               tags: [String]});
 */
 
-Meteor.publish('lists');
-Meteor.publish('todos');
+if (Meteor.is_server) {
+  Meteor.publish('lists');
+  Meteor.publish('todos');
+}

packages/autopublish/autopublish.js

@@ -1 +1 @@
-App._enable_autopublish();
+App.autopublish();

packages/livedata/livedata_connection.js

@@ -275,7 +275,7 @@ _.extend(Meteor._LivedataConnection.prototype, {
 
     _.each(self.pending_data, function (msg) {
       if (msg.collection && msg.id) {
-        var store = stores[msg.collection];
+        var store = self.stores[msg.collection];
 
         if (!store) {
           // Nobody's listening for this data. Queue it up until

packages/livedata/livedata_server.js

@@ -241,7 +241,7 @@ _.extend(Meteor._LivedataServer.prototype, {
                   reason: "Internal server error"}}));
         // XXX prettyprint exception in the log
         Meteor._debug("Exception in method '" + msg.method + "': " +
-                      JSON.stringify(err));
+                      JSON.stringify(err.stack));
       }
 
       if (msg.id)

packages/livedata/package.js

@@ -7,6 +7,11 @@ Package.on_use(function (api) {
   api.use(['stream', 'uuid']);
   api.use(['json', 'underscore', 'deps', 'logging'], ['client', 'server']);
 
+  // livedata_connection.js uses a Minimongo collection internally to
+  // manage the current set of subscriptions.
+  api.use('minimongo', ['client', 'server']);
+
+
   api.add_files('livedata_connection.js', 'client');
   api.add_files('livedata_server.js', 'server');
 

packages/mongo-livedata/collection.js

@@ -73,6 +73,7 @@ Meteor.Collection = function (name, manager, driver) {
       throw new Error("There is already a collection named '" + name + "'");
   }
 
+  // mutation methods
   if (manager) {
     var m = {};
     // XXX what if name has illegal characters in it?
@@ -96,10 +97,18 @@ Meteor.Collection = function (name, manager, driver) {
   }
 
   // XXX temporary hack to provide sugar in LivedataServer.publish()
-  if (name && manager && manager._hack_collections)
+  if (name && manager && manager._hack_collections) {
+    if (name in manager._hack_collections)
+      throw new Error("There is already a collection named '" + name + "'");
     manager._hack_collections[name] = self;
-};
+  }
 
+  // autopublish
+  if (name && manager.onAutopublish)
+    manager.onAutopublish(function () {
+      manager.publish(name, {is_auto: true});
+    });
+};
 
 _.extend(Meteor.Collection.prototype, {
   find: function (/* selector, options */) {
@@ -117,7 +126,7 @@ _.extend(Meteor.Collection.prototype, {
 
   _maybe_snapshot: function () {
     var self = this;
-    if (!self._was_snapshot) {
+    if (self.manager && self.manager.registerStore && !self._was_snapshot) {
       self._collection.snapshot();
       self._was_snapshot = true;
     }

packages/mongo-livedata/local_collection_driver.js

@@ -8,6 +8,7 @@ Meteor._LocalCollectionDriver = function () {
 
 _.extend(Meteor._LocalCollectionDriver.prototype, {
   open: function (name) {
+    var self = this;
     if (!name)
       return new LocalCollection;
     if (!(name in self.collections))

packages/mongo-livedata/remote_collection_driver.js

@@ -8,6 +8,7 @@ Meteor._RemoteCollectionDriver = function (mongo_url) {
 
 _.extend(Meteor._RemoteCollectionDriver.prototype, {
   open: function (name) {
+    var self = this;
     var ret = {};
     _.each(['find', 'findOne', 'insert', 'update', 'remove'], function (m) {
       ret[m] = _.bind(self.mongo[m], self.mongo, name);