Use collection extensions

mongo-instances-tests.js

@@ -39,10 +39,21 @@ Tinytest.add('instanceof - matches Mongo.Collection', function (test) {
   test.instanceOf(Test, Mongo.Collection);
 });
 
+Tinytest.add('instanceof - Meteor.Collection matches Mongo.Collection', function (test) {
+  var collectionName = 'foo' + test.id;
+  var Test = new Meteor.Collection(collectionName);
+  test.instanceOf(Test, Mongo.Collection);
+});
+
+Tinytest.add('instanceof - Meteor.users matches (Mongo/Meteor).Collection', function (test) {
+  test.instanceOf(Meteor.users, Mongo.Collection);
+  test.instanceOf(Meteor.users, Meteor.Collection);
+});
+
 Tinytest.add('use New - keep behavior of Mongo.Collection', function (test) {
   var collectionName = 'foo' + test.id;
   function createWithoutNew() {
     var Test = Mongo.Collection(collectionName);
   }
   test.throws(createWithoutNew, 'use "new" to construct a Mongo.Collection');
-});
+});

mongo-instances.js

@@ -1,20 +1,12 @@
 var instances = [];
-var orig = Mongo.Collection;
 
-Mongo.Collection = function(name, options) {
-  orig.call(this, name, options);  // inherit orig
-
+Meteor.addCollectionExtension(function (name, options) {
   instances.push({
     name: name,
     instance: this,
     options: options
   });
-};
-
-Mongo.Collection.prototype = Object.create(orig.prototype);
-Mongo.Collection.prototype.constructor = Mongo.Collection;
-
-_.extend(Mongo.Collection, orig);
+});
 
 Mongo.Collection.get = function(name, options) {
   options = options || {};

package.js

@@ -8,11 +8,13 @@ Package.describe({
 Package.onUse(function(api) {
   api.versionsFrom('1.0');
   api.use(['mongo', 'underscore']);
+  api.use('lai:collection-extensions@0.1.1');
   api.addFiles('mongo-instances.js');
 });
 
 Package.onTest(function(api) {
   api.use('tinytest');
+  api.use('accounts-base');
   api.use('dburles:mongo-collection-instances');
   api.addFiles('mongo-instances-tests.js');
 });