From 29f8fba5a00c515ced34ed3ed7280dab80834f72 Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Tue, 27 Oct 2015 15:51:19 -0400
Subject: [PATCH 01/14] Add initial structure of package

---
 .gitignore                       |  2 ++
 CollectionInit.coffee            |  0
 package.js                       | 30 ++++++++++++++++++++++++++++++
 tests/CollectionInitTests.coffee |  0
 4 files changed, 32 insertions(+)
 create mode 100755 .gitignore
 create mode 100755 CollectionInit.coffee
 create mode 100755 package.js
 create mode 100755 tests/CollectionInitTests.coffee

diff --git a/.gitignore b/.gitignore
new file mode 100755
index 0000000..f045556
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# IntelliJ project files
+.idea
diff --git a/CollectionInit.coffee b/CollectionInit.coffee
new file mode 100755
index 0000000..e69de29
diff --git a/package.js b/package.js
new file mode 100755
index 0000000..0c084e6
--- /dev/null
+++ b/package.js
@@ -0,0 +1,30 @@
+Package.describe({
+  name: "practicalmeteor:collection-init",
+  summary: "write package tests with mocha and run them in the browser or from the command line with spacejam.",
+  git: "https://github.com/practicalmeteor/meteor-mocha.git",
+  version: '2.1.0_5'
+});
+
+
+Package.onUse(function(api){
+  // Meteor packages
+  api.use("coffeescript");
+
+  // Practical Meteor packages
+  api.use("practicalmeteor:core");
+
+  // Vendor packages
+
+  // Files
+  api.addFiles("CollectionInit.coffee")
+
+});
+
+Package.onTest(function (api) {
+
+  api.use("coffeescript");
+
+  api.use("practicalmeteor:collection-init");
+
+  api.addFiles("tests/CollectionInitTests.coffee")
+});
\ No newline at end of file
diff --git a/tests/CollectionInitTests.coffee b/tests/CollectionInitTests.coffee
new file mode 100755
index 0000000..e69de29

From 47157b76f799d1d031781f4c5f4dbfdaef1db1e5 Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Tue, 27 Oct 2015 16:14:42 -0400
Subject: [PATCH 02/14] Add script to run tests

---
 bin/test | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100755 bin/test

diff --git a/bin/test b/bin/test
new file mode 100755
index 0000000..e7e1186
--- /dev/null
+++ b/bin/test
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+unset MONGO_URL
+meteor test-packages --driver-package practicalmeteor:mocha ./ --port 3100

From dba667448c9a886c68cba2d2635d16667e118444 Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Tue, 27 Oct 2015 20:20:50 -0400
Subject: [PATCH 03/14] Add 'practical' property to the collection

---
 CollectionInit.coffee            | 13 +++++++++++++
 package.js                       |  5 ++++-
 tests/CollectionInitTests.coffee | 23 +++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/CollectionInit.coffee b/CollectionInit.coffee
index e69de29..df56fb5 100755
--- a/CollectionInit.coffee
+++ b/CollectionInit.coffee
@@ -0,0 +1,13 @@
+log = new ObjectLogger("practical.CollectionInit", "debug")
+
+
+class @CollectionInit
+
+
+  @init: (collection, opts = {})->
+    try
+      log.enter("init", opts)
+      expect(collection, "collection is not a Mongo Collection").to.be.instanceOf(Mongo.Collection)
+      expect(opts, "opts").to.be.an("object")
+
+      collection.practical = {}
diff --git a/package.js b/package.js
index 0c084e6..9e4cc5d 100755
--- a/package.js
+++ b/package.js
@@ -2,13 +2,14 @@ Package.describe({
   name: "practicalmeteor:collection-init",
   summary: "write package tests with mocha and run them in the browser or from the command line with spacejam.",
   git: "https://github.com/practicalmeteor/meteor-mocha.git",
-  version: '2.1.0_5'
+  version: '0.1.0'
 });
 
 
 Package.onUse(function(api){
   // Meteor packages
   api.use("coffeescript");
+  api.use("mongo");
 
   // Practical Meteor packages
   api.use("practicalmeteor:core");
@@ -23,8 +24,10 @@ Package.onUse(function(api){
 Package.onTest(function (api) {
 
   api.use("coffeescript");
+  api.use("mongo");
 
   api.use("practicalmeteor:collection-init");
+  api.use("practicalmeteor:loglevel");
 
   api.addFiles("tests/CollectionInitTests.coffee")
 });
\ No newline at end of file
diff --git a/tests/CollectionInitTests.coffee b/tests/CollectionInitTests.coffee
index e69de29..c02605b 100755
--- a/tests/CollectionInitTests.coffee
+++ b/tests/CollectionInitTests.coffee
@@ -0,0 +1,23 @@
+log = new ObjectLogger("practical.CollectionInitTests")
+
+describe "CollectionInit", ->
+
+  collectionName = "collection"
+  collection = new Mongo.Collection(collectionName)
+
+  beforeEach ->
+
+    delete collection.practical
+
+    spies.create("Meteor.subscribe", Meteor, "subscribe") if Meteor.isClient
+
+    if Meteor.isServer
+      spies.create("Meteor.publish", Meteor, "publish")
+
+    stubs.create("collection.ensureIndex", collection, "_ensureIndex")
+
+
+  it "Add 'practical' property to the collection", ->
+
+    CollectionInit.init(collection)
+    expect(collection.practical).to.be.an("object")

From 83eaf66b5e67ae97fd33fe3b4fe9fc01dd101d4a Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Tue, 27 Oct 2015 20:22:34 -0400
Subject: [PATCH 04/14] Autopublish collection if opts.autopublish

---
 CollectionInit.coffee            | 26 ++++++++++++++++++++++++++
 tests/CollectionInitTests.coffee | 21 +++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/CollectionInit.coffee b/CollectionInit.coffee
index df56fb5..a7f321f 100755
--- a/CollectionInit.coffee
+++ b/CollectionInit.coffee
@@ -11,3 +11,29 @@ class @CollectionInit
       expect(opts, "opts").to.be.an("object")
 
       collection.practical = {}
+
+      if opts.autopublish
+        _autoPublishCollection(collection)
+
+
+
+  _autoPublishCollection = (collection)->
+    try
+      log.enter("_autoPublishCollection")
+      expect(collection).to.be.instanceOf(Mongo.Collection)
+      expect(collection.practical).to.be.an("object")
+
+      if Meteor.isServer
+        Meteor.publish collection._name, ->
+          return collection.find({})
+
+      if Meteor.isClient
+        collection.practical.subHandle = Meteor.subscribe collection._name,{
+          onReady: ->
+          onError: (error)->
+            log.error("Error with subscription [#{collection._name}]", error) if error
+        }
+
+    finally
+      log.return()
+
diff --git a/tests/CollectionInitTests.coffee b/tests/CollectionInitTests.coffee
index c02605b..5866716 100755
--- a/tests/CollectionInitTests.coffee
+++ b/tests/CollectionInitTests.coffee
@@ -21,3 +21,24 @@ describe "CollectionInit", ->
 
     CollectionInit.init(collection)
     expect(collection.practical).to.be.an("object")
+
+
+  it "Create publication and subscription for collection is autopublish is true ", ->
+
+    opts = {
+      autopublish: true
+    }
+
+    CollectionInit.init(collection, opts)
+
+    if Meteor.isClient
+      # Save subscription handle into practical
+      expect(collection.practical.subHandle).to.be.an("object")
+      expect(spies["Meteor.subscribe"]).to.have.been.called
+      expect(spies["Meteor.subscribe"].args[0][0]).to.equals(collectionName)
+
+    if Meteor.isServer
+      expect(spies["Meteor.publish"]).to.have.been.called
+      expect(spies["Meteor.publish"].args[0][0]).to.equals(collectionName)
+
+

From 592c0c15657912a27669f65e9eadaaf6eec24843 Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Tue, 27 Oct 2015 20:23:50 -0400
Subject: [PATCH 05/14] Handle custom subscription and publication

---
 CollectionInit.coffee            | 24 +++++++++++++++++++++++-
 tests/CollectionInitTests.coffee | 30 ++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/CollectionInit.coffee b/CollectionInit.coffee
index a7f321f..7a64134 100755
--- a/CollectionInit.coffee
+++ b/CollectionInit.coffee
@@ -6,7 +6,7 @@ class @CollectionInit
 
   @init: (collection, opts = {})->
     try
-      log.enter("init", opts)
+      log.enter("init", op)
       expect(collection, "collection is not a Mongo Collection").to.be.instanceOf(Mongo.Collection)
       expect(opts, "opts").to.be.an("object")
 
@@ -15,6 +15,13 @@ class @CollectionInit
       if opts.autopublish
         _autoPublishCollection(collection)
 
+      # Custom publish and subscription handlers
+      if opts.sub and opts.pub and not opts.autopublish
+        _customSubAndPub(collection, opts)
+
+
+    finally
+      log.return()
 
 
   _autoPublishCollection = (collection)->
@@ -37,3 +44,18 @@ class @CollectionInit
     finally
       log.return()
 
+
+  _customSubAndPub = (collection, opts)=>
+    try
+      log.enter("_customSubAndPub", opts)
+
+      if Meteor.isServer
+        expect(opts.pub, "custom publication").to.be.a("function")
+        opts.pub()
+
+      if Meteor.isClient
+        expect(opts.sub, "custom subscription").to.be.a("function")
+        opts.sub()
+
+    finally
+      log.return()
diff --git a/tests/CollectionInitTests.coffee b/tests/CollectionInitTests.coffee
index 5866716..a9dc2cc 100755
--- a/tests/CollectionInitTests.coffee
+++ b/tests/CollectionInitTests.coffee
@@ -42,3 +42,33 @@ describe "CollectionInit", ->
       expect(spies["Meteor.publish"].args[0][0]).to.equals(collectionName)
 
 
+  it "Calls custom sub and pub if not autopublish", ->
+
+    opts = {
+      sub: stubs.create("sub")
+      pub: stubs.create("pub")
+    }
+
+    CollectionInit.init(collection, opts)
+    if Meteor.isClient
+      expect(stubs.sub).to.have.been.called
+
+    if Meteor.isServer
+      expect(stubs.pub).to.have.been.called
+
+  it "Don't calls custom sub and pub if not autopublish", ->
+
+    opts = {
+      autopublish: true
+      sub: stubs.create("sub")
+      pub: stubs.create("pub")
+    }
+
+    CollectionInit.init(collection, opts)
+
+    if Meteor.isClient
+      expect(stubs.sub).not.to.have.been.called
+
+    if Meteor.isServer
+      expect(stubs.pub).not.to.have.been.called
+

From a97aa90f07188aec19eb300fa0ad8b696c6122c0 Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Tue, 27 Oct 2015 20:26:30 -0400
Subject: [PATCH 06/14] Populate to collection

---
 CollectionInit.coffee            |  5 +++++
 tests/CollectionInitTests.coffee | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/CollectionInit.coffee b/CollectionInit.coffee
index 7a64134..7057d7b 100755
--- a/CollectionInit.coffee
+++ b/CollectionInit.coffee
@@ -19,6 +19,11 @@ class @CollectionInit
       if opts.sub and opts.pub and not opts.autopublish
         _customSubAndPub(collection, opts)
 
+      if opts.populate? and Meteor.isServer
+        expect(opts.populate, "populate").to.be.a("function")
+        opts.populate()
+
+
 
     finally
       log.return()
diff --git a/tests/CollectionInitTests.coffee b/tests/CollectionInitTests.coffee
index a9dc2cc..a31d748 100755
--- a/tests/CollectionInitTests.coffee
+++ b/tests/CollectionInitTests.coffee
@@ -72,3 +72,14 @@ describe "CollectionInit", ->
     if Meteor.isServer
       expect(stubs.pub).not.to.have.been.called
 
+  it "Calls populate function", ->
+
+    opts = {
+      populate: stubs.create("populate")
+    }
+    CollectionInit.init(collection, opts)
+
+    if Meteor.isServer
+      expect(stubs.populate).to.have.been.called
+    if Meteor.isClient
+      expect(stubs.populate).not.to.have.been.called

From a6e1f006c007aaab514cc7131b680dca2f8ead88 Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Tue, 27 Oct 2015 20:27:14 -0400
Subject: [PATCH 07/14] Create indexes for the collection

---
 CollectionInit.coffee            | 18 +++++++++++++++++-
 tests/CollectionInitTests.coffee | 25 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/CollectionInit.coffee b/CollectionInit.coffee
index 7057d7b..e9d8421 100755
--- a/CollectionInit.coffee
+++ b/CollectionInit.coffee
@@ -6,7 +6,7 @@ class @CollectionInit
 
   @init: (collection, opts = {})->
     try
-      log.enter("init", op)
+      log.enter("init", opts)
       expect(collection, "collection is not a Mongo Collection").to.be.instanceOf(Mongo.Collection)
       expect(opts, "opts").to.be.an("object")
 
@@ -23,6 +23,8 @@ class @CollectionInit
         expect(opts.populate, "populate").to.be.a("function")
         opts.populate()
 
+      if opts.indexes? and  Meteor.isServer
+        _ensureIndexes(collection, opts)
 
 
     finally
@@ -64,3 +66,17 @@ class @CollectionInit
 
     finally
       log.return()
+
+
+  _ensureIndexes = (collection, opts)=>
+    try
+      log.enter("_ensureIndexes", opts)
+      expect(Meteor.isServer).to.be.true
+      expect(opts.indexes).to.be.an("array")
+
+      for index in opts.indexes
+        expect(index.keys).to.be.an("object")
+        expect(index.options).to.be.an("object")
+        collection._ensureIndex(index.keys, index.options)
+    finally
+      log.return()
\ No newline at end of file
diff --git a/tests/CollectionInitTests.coffee b/tests/CollectionInitTests.coffee
index a31d748..81a7b32 100755
--- a/tests/CollectionInitTests.coffee
+++ b/tests/CollectionInitTests.coffee
@@ -83,3 +83,28 @@ describe "CollectionInit", ->
       expect(stubs.populate).to.have.been.called
     if Meteor.isClient
       expect(stubs.populate).not.to.have.been.called
+
+  it "create indexes for the collection", ->
+
+    opts = {
+      indexes:[
+        {
+          keys: {name: 1}
+          options: {unique: true}
+        },
+        {
+          keys: {title: 1}
+          options: {}
+        }
+      ]
+    }
+
+    CollectionInit.init(collection, opts)
+
+    if Meteor.isServer
+      expect(stubs["collection.ensureIndex"]).to.have.been.callCount(opts.indexes.length)
+      for index in opts.indexes
+        expect(stubs["collection.ensureIndex"]).to.have.been.calledWith(index.keys, index.options)
+
+    if Meteor.isClient
+      expect(stubs["collection.ensureIndex"]).not.to.have.been.called

From d8754adf89e89f4c92f3725e642065aa12a9693c Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Wed, 28 Oct 2015 18:46:36 -0400
Subject: [PATCH 08/14] Move functions as properties of CollectionInit class

---
 CollectionInit.coffee | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CollectionInit.coffee b/CollectionInit.coffee
index e9d8421..5698536 100755
--- a/CollectionInit.coffee
+++ b/CollectionInit.coffee
@@ -4,7 +4,7 @@ log = new ObjectLogger("practical.CollectionInit", "debug")
 class @CollectionInit
 
 
-  @init: (collection, opts = {})->
+  @init: (collection, opts = {})=>
     try
       log.enter("init", opts)
       expect(collection, "collection is not a Mongo Collection").to.be.instanceOf(Mongo.Collection)
@@ -13,25 +13,25 @@ class @CollectionInit
       collection.practical = {}
 
       if opts.autopublish
-        _autoPublishCollection(collection)
+        @_autoPublishCollection(collection)
 
       # Custom publish and subscription handlers
       if opts.sub and opts.pub and not opts.autopublish
-        _customSubAndPub(collection, opts)
+        @_customSubAndPub(collection, opts)
 
       if opts.populate? and Meteor.isServer
         expect(opts.populate, "populate").to.be.a("function")
         opts.populate()
 
       if opts.indexes? and  Meteor.isServer
-        _ensureIndexes(collection, opts)
+        @_ensureIndexes(collection, opts)
 
 
     finally
       log.return()
 
 
-  _autoPublishCollection = (collection)->
+  @_autoPublishCollection: (collection)->
     try
       log.enter("_autoPublishCollection")
       expect(collection).to.be.instanceOf(Mongo.Collection)
@@ -52,7 +52,7 @@ class @CollectionInit
       log.return()
 
 
-  _customSubAndPub = (collection, opts)=>
+  @_customSubAndPub: (collection, opts)=>
     try
       log.enter("_customSubAndPub", opts)
 
@@ -68,7 +68,7 @@ class @CollectionInit
       log.return()
 
 
-  _ensureIndexes = (collection, opts)=>
+  @_ensureIndexes: (collection, opts)=>
     try
       log.enter("_ensureIndexes", opts)
       expect(Meteor.isServer).to.be.true

From e104d6a295ce6a23760f155541b1d6e50b03e702 Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Wed, 28 Oct 2015 19:25:02 -0400
Subject: [PATCH 09/14] Attach base schema to collection

---
 BaseSchemaRules.coffee           | 34 ++++++++++++++++++++++++++++++++
 CollectionInit.coffee            | 25 ++++++++++++++++++++++-
 package.js                       | 11 ++++++++++-
 tests/CollectionInitTests.coffee | 16 +++++++++++++++
 4 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100755 BaseSchemaRules.coffee

diff --git a/BaseSchemaRules.coffee b/BaseSchemaRules.coffee
new file mode 100755
index 0000000..74af63a
--- /dev/null
+++ b/BaseSchemaRules.coffee
@@ -0,0 +1,34 @@
+log = new ObjectLogger("practical.BaseSchema", "debug")
+
+
+@practical.BaseSchemaRules = ->
+  return {
+    # https://github.com/aldeed/meteor-collection2#autovalue
+    # Force value to be current date (on server) upon insert
+    # and prevent updates thereafter.
+    createdAt:
+      type: Date
+      index: 1
+      autoValue: ->
+        if @isInsert
+          return lv.util.getCurrentDate()
+        else if @isUpsert
+          return {$setOnInsert: lv.util.getCurrentDate()}
+        else
+          this.unset()
+      denyUpdate: true
+
+    # https://github.com/aldeed/smeteor-collection2#autovalue
+    # Force value to be current date (on server) upon update.
+    # On insert, it will always be set to the insert date.
+    modifiedAt:
+      type: Date
+      index: 1
+      autoValue: ->
+        if @isUpdate
+          return lv.util.getCurrentDate()
+        else if @isUpsert
+          return {$set: lv.util.getCurrentDate()}
+      denyInsert: true
+      optional: true
+    }
diff --git a/CollectionInit.coffee b/CollectionInit.coffee
index 5698536..c94c91e 100755
--- a/CollectionInit.coffee
+++ b/CollectionInit.coffee
@@ -1,5 +1,5 @@
 log = new ObjectLogger("practical.CollectionInit", "debug")
-
+practical = @practical
 
 class @CollectionInit
 
@@ -12,6 +12,8 @@ class @CollectionInit
 
       collection.practical = {}
 
+      @_createSchema(collection, opts)
+
       if opts.autopublish
         @_autoPublishCollection(collection)
 
@@ -27,6 +29,27 @@ class @CollectionInit
         @_ensureIndexes(collection, opts)
 
 
+
+    finally
+      log.return()
+
+
+  @_createSchema: (collection, opts)=>
+    try
+      log.enter("_createSchema", opts)
+      expect(collection).to.be.instanceOf(Mongo.Collection)
+      expect(collection.practical).to.be.an("object")
+
+      schemaRules = practical.BaseSchemaRules()
+
+      if opts.schemaRules?
+        return false
+
+      collection.practical.schemaRules = schemaRules
+      collection.practical.schema = new SimpleSchema(schemaRules)
+      collection.attachSchema(collection.practical.schema)
+
+
     finally
       log.return()
 
diff --git a/package.js b/package.js
index 9e4cc5d..4607513 100755
--- a/package.js
+++ b/package.js
@@ -7,6 +7,8 @@ Package.describe({
 
 
 Package.onUse(function(api){
+
+  // TODO add specific packages versions
   // Meteor packages
   api.use("coffeescript");
   api.use("mongo");
@@ -15,9 +17,15 @@ Package.onUse(function(api){
   api.use("practicalmeteor:core");
 
   // Vendor packages
+  api.use("aldeed:simple-schema");
+  api.use("aldeed:collection2@2.5.0");
+
+  api.imply("aldeed:simple-schema@1.3.3");
+  api.imply("aldeed:collection2@2.5.0");
 
   // Files
   api.addFiles("CollectionInit.coffee")
+  api.addFiles("BaseSchemaRules.coffee")
 
 });
 
@@ -25,9 +33,10 @@ Package.onTest(function (api) {
 
   api.use("coffeescript");
   api.use("mongo");
+  api.use("underscore");
 
   api.use("practicalmeteor:collection-init");
   api.use("practicalmeteor:loglevel");
 
-  api.addFiles("tests/CollectionInitTests.coffee")
+  api.addFiles("tests/CollectionInitTests.coffee");
 });
\ No newline at end of file
diff --git a/tests/CollectionInitTests.coffee b/tests/CollectionInitTests.coffee
index 81a7b32..8f5255e 100755
--- a/tests/CollectionInitTests.coffee
+++ b/tests/CollectionInitTests.coffee
@@ -108,3 +108,19 @@ describe "CollectionInit", ->
 
     if Meteor.isClient
       expect(stubs["collection.ensureIndex"]).not.to.have.been.called
+
+
+  it "Attach base schema to collection", ->
+
+    opts = {
+    }
+
+    CollectionInit.init(collection, opts)
+
+    expect(collection.practical.schema).to.be.instanceOf(SimpleSchema)
+    expect(_.keys(collection.practical.schemaRules)).to.eql(_.keys(practical.BaseSchemaRules()))
+
+    # I'm using a private property to determinate the keys of the schema of the collection,
+    # this can change and made the tests to fail in next releases of the package
+    expect(_.keys(collection.practical.schemaRules)).to.eql(collection.practical.schema._schemaKeys)
+

From bf3a230b745a934d1d6bedaf739538e0d3df0ad2 Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Wed, 28 Oct 2015 19:33:22 -0400
Subject: [PATCH 10/14] Add multiple schema rules to collection

---
 CollectionInit.coffee            |  3 ++-
 package.js                       |  1 +
 tests/CollectionInitTests.coffee | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CollectionInit.coffee b/CollectionInit.coffee
index c94c91e..8233d4f 100755
--- a/CollectionInit.coffee
+++ b/CollectionInit.coffee
@@ -43,7 +43,8 @@ class @CollectionInit
       schemaRules = practical.BaseSchemaRules()
 
       if opts.schemaRules?
-        return false
+        expect(opts.schemaRules).to.be.an("object")
+        schemaRules = _.extend(schemaRules, opts.schemaRules)
 
       collection.practical.schemaRules = schemaRules
       collection.practical.schema = new SimpleSchema(schemaRules)
diff --git a/package.js b/package.js
index 4607513..b7d0ed8 100755
--- a/package.js
+++ b/package.js
@@ -12,6 +12,7 @@ Package.onUse(function(api){
   // Meteor packages
   api.use("coffeescript");
   api.use("mongo");
+  api.use("underscore");
 
   // Practical Meteor packages
   api.use("practicalmeteor:core");
diff --git a/tests/CollectionInitTests.coffee b/tests/CollectionInitTests.coffee
index 8f5255e..b954f95 100755
--- a/tests/CollectionInitTests.coffee
+++ b/tests/CollectionInitTests.coffee
@@ -124,3 +124,25 @@ describe "CollectionInit", ->
     # this can change and made the tests to fail in next releases of the package
     expect(_.keys(collection.practical.schemaRules)).to.eql(collection.practical.schema._schemaKeys)
 
+
+  it "Attach base schema and other schema to the collection", ->
+
+    opts = {
+      schemaRules: {
+        name:
+          type: String
+      }
+    }
+    expectKeys = _.keys(practical.BaseSchemaRules()).concat(_.keys(opts.schemaRules))
+
+
+    CollectionInit.init(collection, opts)
+
+
+    expect(collection.practical.schema).to.be.instanceOf(SimpleSchema)
+    expect(_.keys(collection.practical.schemaRules)).to.eql(expectKeys)
+
+    # I'm using a private property to determinate the keys of the schema of the collection,
+    # this can change and made the tests to fail in next releases of the package
+    expect(_.keys(collection.practical.schemaRules)).to.eql(collection.practical.schema._schemaKeys)
+

From abc3656ecb7eed74b9a39d4de1e359979492649f Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Wed, 28 Oct 2015 21:02:38 -0400
Subject: [PATCH 11/14] Add circle.yml file

---
 bin/ci-test |  2 ++
 circle.yml  | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100755 bin/ci-test
 create mode 100755 circle.yml

diff --git a/bin/ci-test b/bin/ci-test
new file mode 100755
index 0000000..0f580f7
--- /dev/null
+++ b/bin/ci-test
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+spacejam test-packages --driver-package practicalmeteor:mocha-console-reporter ./
diff --git a/circle.yml b/circle.yml
new file mode 100755
index 0000000..e0ca445
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,12 @@
+machine:
+  node:
+    version: 0.10.40
+
+  dependencies:
+    pre:
+      - curl https://install.meteor.com/ | sh
+      - npm install -g spacejam
+
+test:
+  override:
+    - ./bin/test
\ No newline at end of file

From 71a75086ef7b204605d96fd721c2cd5032ea0d14 Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Wed, 28 Oct 2015 21:20:55 -0400
Subject: [PATCH 12/14] Update circle.yml

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index e0ca445..ef3a7a4 100755
--- a/circle.yml
+++ b/circle.yml
@@ -9,4 +9,4 @@ machine:
 
 test:
   override:
-    - ./bin/test
\ No newline at end of file
+    - ./bin/ci-test
\ No newline at end of file

From 193e421b4d17033490587c27752ad1026a9e95db Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Thu, 29 Oct 2015 11:29:04 -0400
Subject: [PATCH 13/14] Fix circle dependencies issue

---
 circle.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/circle.yml b/circle.yml
index ef3a7a4..9d43b36 100755
--- a/circle.yml
+++ b/circle.yml
@@ -2,10 +2,10 @@ machine:
   node:
     version: 0.10.40
 
-  dependencies:
-    pre:
-      - curl https://install.meteor.com/ | sh
-      - npm install -g spacejam
+dependencies:
+  pre:
+    - curl https://install.meteor.com/ | sh
+    - npm install -g spacejam
 
 test:
   override:

From 1d999a22df791146696164a6a2af06bfb8171e89 Mon Sep 17 00:00:00 2001
From: Juan Sepulveda <juan@lavaina.com>
Date: Thu, 3 Dec 2015 14:33:32 -0400
Subject: [PATCH 14/14] Update scripts with mocha-console-runner

---
 bin/ci-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ci-test b/bin/ci-test
index 0f580f7..494eaa1 100755
--- a/bin/ci-test
+++ b/bin/ci-test
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-spacejam test-packages --driver-package practicalmeteor:mocha-console-reporter ./
+spacejam test-packages --driver-package practicalmeteor:mocha-console-runner ./