Switching testing framework to mocha from vows

dynajoe · dynajoe · commit 05654889edda · 2012-02-29T21:55:20.000-06:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 #Stalkqr
 
-[![Build Status](https://secure.travis-ci.org/joeandaverde/stalkqr.png?branch=master)](http://travis-ci.org/joeandaverde/stalkqr)
+[![Build Status](https://secure.travis-ci.org/adunkman/stalkqr.png?branch=master)](http://travis-ci.org/adunkman/stalkqr)
 
 An open source project by the NodeKC group. 
 
diff --git a/collections/tags.coffee b/collections/tags.coffee
@@ -0,0 +1,10 @@
+StoredCollection = require '../data/storedCollection'
+
+class Tags extends StoredCollection
+  constructor: () -> super
+
+  find: (criteria, callback) ->
+    super(Tags._collectionName, criteria, callback)
+
+Tags._collectionName = 'tags'
+module.exports = Tags
diff --git a/collections/users.coffee b/collections/users.coffee
@@ -0,0 +1,20 @@
+StoredCollection = require '../data/storedCollection'
+
+class Users extends StoredCollection
+  constructor: () -> super
+
+  find: () ->
+    if arguments.length is 1
+      criteria = {}
+      [callback] = arguments
+
+    if arguments.length is 2
+      [criteria, callback] = arguments
+      
+    super(Users._collectionName, criteria, callback)
+
+  all: (callback) -> 
+    @find(callback)
+
+Users._collectionName = 'users'
+module.exports = Users
diff --git a/data/adapters/inMemory.coffee b/data/adapters/inMemory.coffee
@@ -7,13 +7,13 @@ class InMemoryDataAdapter
     if attributes._id? then @update(collection, attributes, callback)
     else @insert(collection, attributes, callback)
 
-  find: (collection, parameters, callback) =>
+  find: (collection, critera, callback) =>
     results = []
 
     for item in @items[collection] || []
       allTrue = true
 
-      for name, value of parameters
+      for name, value of critera
         if item[name] isnt value
           allTrue = false
       
diff --git a/data/storedCollection.coffee b/data/storedCollection.coffee
@@ -0,0 +1,16 @@
+InMemoryDataAdapter = require './adapters/inMemory'
+
+class StoredCollection
+  constructor: () ->
+    @_adapter = new InMemoryDataAdapter()
+
+  find: () ->
+    if arguments.length is 2
+      criteria = {}
+      [collection, callback] = arguments
+
+    if arguments.length is 3
+      [collection, criteria, callback] = arguments
+    @_adapter.find(collection, criteria, callback)
+
+module.exports = StoredCollection
diff --git a/data/storedObject.coffee b/data/storedObject.coffee
@@ -1,7 +1,8 @@
 InMemoryDataAdapter = require './adapters/inMemory'
 
 class StoredObject
-  _adapter: new InMemoryDataAdapter()
+  constructor: () ->
+    @_adapter = new InMemoryDataAdapter()
 
   save: (collection, attributes, callback) ->
     @_adapter.save(collection, attributes, callback)
diff --git a/models/model.coffee b/models/model.coffee
@@ -3,10 +3,14 @@ StoredObject = require '../data/storedObject'
 
 class Model extends StoredObject
   constructor: (attributes) ->
+    super
     @attributes = clone(attributes) || {}
 
   save: (collection, callback) ->
-    super @collection, @toJSON(), callback
+    super(collection, @toJSON(), (err, attributes) =>
+      @attributes = attributes if not err?
+      callback(err, attributes) if callback?
+    )
 
   toJSON: () ->
     clone(@attributes)
diff --git a/models/tag.coffee b/models/tag.coffee
@@ -0,0 +1,17 @@
+Model = require './model'
+Code = require './codes'
+Tags = require '../collections/tags'
+
+class Tag extends Model
+  constructor: (attributes = {}) ->
+    super 
+    @attributes._id or= undefined
+    @attributes.user or= undefined
+    @attributes.event or= undefined
+    @attributes.generatedOn or= new Date()
+    @attributes.code or= Code.generate()
+
+  save: (callback) -> 
+    super(Tags._collectionName, callback)
+
+module.exports = Tag
diff --git a/models/user.coffee b/models/user.coffee
@@ -1,4 +1,5 @@
 Model = require './model'
+Users = require '../collections/users'
 
 defaults =
   slugs: []
@@ -7,19 +8,26 @@ defaults =
 
 class User extends Model
   constructor: (attributes = defaults) ->
-    super attributes
-  
-  setCredential: (provider, id) ->
+    super
+    @attributes._id or= undefined
+    @attributes.name or= undefined
+    @attributes.userSince or= undefined
+    @attributes.slugs or= []
+    @attributes.handles or= []
     @attributes.credentials or= []
-    
+
+  setCredential: (provider, id) ->
     existingAttributes = @attributes.credentials.filter (c) ->
       c.provider.toLowerCase().trim() == provider.toLowerCase().trim()
-
+    
     if existingAttributes.length > 0
       existingAttributes[0].id = id
     else
       @attributes.credentials.push 
         provider: provider 
         id: id
+        
+  save: (callback) -> 
+    super(Users._collectionName, callback)
       
 module.exports = User
diff --git a/test/collections/tags_test.coffee b/test/collections/tags_test.coffee
@@ -0,0 +1,28 @@
+vows = require 'vows'
+should = require 'should'
+Tags = require '../../collections/tags'
+
+vows.describe('Tags (collections/tags)').addBatch(
+  'when find() is called with criteria and a callback': {
+    topic: () -> getTags('test1').find({ 'one': true }, @callback)
+
+    'it should call find() in \'tags\' collection on base': (err, items) ->
+      callsToFind.test1.should.have.length(1)
+      callsToFind.test1[0].should.have.length(3)
+      callsToFind.test1[0][0].should.equal('tags')
+
+    'it should call find() with criteria on base': (err, items) ->
+      callsToFind.test1[0][1].should.eql({ 'one': true })
+  }
+).export(module)
+
+callsToFind = {}
+
+getTags = (key) ->
+  callsToFind[key] = []
+  tags = new Tags()
+  tags._adapter =
+    find: (collection, criteria, callback) ->
+      callsToFind[key].push([collection, criteria, callback])
+      callback(null, [])
+  return tags
diff --git a/test/collections/users_test.coffee b/test/collections/users_test.coffee
@@ -0,0 +1,53 @@
+vows = require 'vows'
+should = require 'should'
+Users = require '../../collections/users'
+
+vows.describe('Users (collections/users)').addBatch(
+  'when find() is called with just a callback': {
+    topic: () -> getUsers('test1').find(@callback)
+
+    'it should call find() in \'users\' collection on base': (err, items) ->
+      callsToFind.test1.should.have.length(1)
+      callsToFind.test1[0].should.have.length(3)
+      callsToFind.test1[0][0].should.equal('users')
+
+    'it should call find() with empty criteria on base': (err, items) ->
+      callsToFind.test1[0][1].should.eql({})
+  }
+
+  'when find() is called with criteria and a callback': {
+    topic: (users) -> getUsers('test2').find({ 'one': true }, @callback)
+
+    'it should call find() in \'users\' collection on base': (err, items) ->
+      callsToFind.test2.should.have.length(1)
+      callsToFind.test2[0].should.have.length(3)
+      callsToFind.test2[0][0].should.equal('users')
+
+    'it should call find() with criteria on base': (err, items) ->
+      callsToFind.test2[0][1].should.eql({ 'one': true })
+  }
+
+  'when all() is called': {
+    topic: () -> getUsers('test3').all(@callback)
+
+    'it should call find() in \'users\' collection on base': (err, items) ->
+      callsToFind.test3.should.have.length(1)
+      callsToFind.test3[0].should.have.length(3)
+      callsToFind.test3[0][0].should.equal('users')
+
+    'it should call find() with empty criteria on base': (err, items) ->
+      callsToFind.test3[0][1].should.eql({})
+  }
+
+).export(module)
+
+callsToFind = {}
+
+getUsers = (key) ->
+  callsToFind[key] = []
+  users = new Users()
+  users._adapter =
+    find: (collection, criteria, callback) ->
+      callsToFind[key].push([collection, criteria, callback])
+      callback(null, [])
+  return users
diff --git a/test/data/adapters/inMemory_test.coffee b/test/data/adapters/inMemory_test.coffee
@@ -1,24 +1,20 @@
 vows = require 'vows'
 should = require 'should'
 InMemoryDataAdapter = require '../../../data/adapters/inMemory'
-sampleObjects = [
-  { 'test': true, 'numeric': 52, 'items': ['one', 'two'] },
-  { 'one': true, 'two': false }
-]
 
 vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
   '': {
     topic: () -> new InMemoryDataAdapter(),
 
-    'it should require no constructor arguments': (instance) ->
-      should.exist(instance)
+    'it should require no constructor arguments': (adapter) ->
+      should.exist(adapter)
     
-    'it should be empty when nothing has been added': (instance) ->
-      instance.items.should.eql({})
+    'it should be empty when nothing has been added': (adapter) ->
+      adapter.items.should.eql({})
     
     'when saving a new item': {
-      topic: (instance) ->
-        instance.save('testObjects', sampleObjects[0], @callback)
+      topic: (adapter) ->
+        adapter.save('testObjects', sampleObjects[0], @callback)
       
       'it should pass back the original attributes': (err, attributes) ->
         should.not.exist(err)
@@ -27,7 +23,7 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
         attributes.items.should.eql(['one', 'two'])
 
       'it should not simply use the same object in memory': (err, attributes) ->
-        # strict equal compares memory addresses
+        # standard equal compares memory addresses
         attributes.should.not.equal(sampleObjects[0]) 
 
       'it should add an _id attribute': (err, attributes) ->
@@ -36,8 +32,8 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
     }
     
     'when updating an existing item': {
-      topic: (instance) ->
-        instance.save('testObjects', {
+      topic: (adapter) ->
+        adapter.save('testObjects', {
           '_id': 0
           'newObject': sampleObjects[1]
         }, @callback)
@@ -50,8 +46,8 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
     }
 
     'when finding an object by real id': {
-      topic: (instance) ->
-        instance.find('testObjects', {
+      topic: (adapter) ->
+        adapter.find('testObjects', {
           '_id': 0
         }, @callback)
 
@@ -64,8 +60,8 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
     }
 
     'when finding an object by a fake id': {
-      topic: (instance) ->
-        instance.find('testObjects', {
+      topic: (adapter) ->
+        adapter.find('testObjects', {
           '_id': 1
         }, @callback)
 
@@ -76,8 +72,8 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
     }
 
     'when finding an object in a non-existent collection': {
-      topic: (instance) ->
-        instance.find('noTestObjects', {
+      topic: (adapter) ->
+        adapter.find('noTestObjects', {
           '_id': 0
         }, @callback)
       
@@ -88,8 +84,8 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
     }
 
     'when searching with no parameters': {
-      topic: (instance) ->
-        instance.find('testObjects', {}, @callback)
+      topic: (adapter) ->
+        adapter.find('testObjects', {}, @callback)
       
       'it should return all items in the collection': (err, items) ->
         should.not.exist(err)
@@ -99,4 +95,9 @@ vows.describe('In-memory store (data/adapters/inMemory)').addBatch(
         items[0].newObject.should.eql(sampleObjects[1])
     }
   }
-).export(module)
+).export(module)
+
+sampleObjects = [
+  { 'test': true, 'numeric': 52, 'items': ['one', 'two'] },
+  { 'one': true, 'two': false }
+]
diff --git a/test/data/storedCollection_test.coffee b/test/data/storedCollection_test.coffee
@@ -0,0 +1,35 @@
+vows = require 'vows'
+should = require 'should'
+StoredCollection = require '../../data/storedCollection'
+
+vows.describe('Base stored collection (data/storedCollection)').addBatch(
+  '': {
+    topic: () -> getStoredCollection()
+
+    'when find() is called': {
+      topic: (storedCollection) -> 
+        storedCollection.find('testCollection', {
+          'one': true
+        }, @callback)
+      
+      'it should call the adapter\'s find() method': (err, attributes) ->
+        callsToFind.should.have.length(1)
+      
+      'it should pass collection and attributes to the adapter': (err, attributes) ->
+        callsToFind[0].should.have.length(3)
+        callsToFind[0][0].should.equal('testCollection')
+        callsToFind[0][1].should.eql({ 'one': true })
+        callsToFind[0][2].should.equal(@callback)
+    }
+  }
+).export(module)
+
+callsToFind = []
+
+getStoredCollection = () ->
+  storedCollection = new StoredCollection()
+  storedCollection._adapter = 
+    find: (collection, criteria, callback) ->
+      callsToFind.push([collection, criteria, callback])
+      callback(null, criteria)
+  return storedCollection
diff --git a/test/data/storedObject_test.coffee b/test/data/storedObject_test.coffee
diff --git a/test/models/model.spec.coffee b/test/models/model.spec.coffee
diff --git a/test/models/model_test.coffee b/test/models/model_test.coffee
diff --git a/test/models/tag.spec.coffee b/test/models/tag.spec.coffee
diff --git a/test/models/user.spec.coffee b/test/models/user.spec.coffee
