Added more tests for user.

Author: dynajoe

models/model.coffee

@@ -1,10 +1,14 @@
+clone = require 'clone'
 StoredObject = require '../data/storedObject'
 
 class Model extends StoredObject
+  constructor: (attributes) ->
+    @attributes = clone(attributes) || {}
+
   save: (collection, callback) ->
     super @collection, @toJSON(), callback
 
   toJSON: () ->
-    {}
+    clone(@attributes)
 
 module.exports = Model

models/user.coffee

@@ -1,26 +1,25 @@
 Model = require './model'
 
-class User extends Model
-  constructor: (attributes = {}) ->
-    @name = attributes.name || undefined
-    @userSince = attributes.userSince || undefined
-    @slugs = attributes.slugs || []
-    @handles = attributes.handles || []
-    @credentials = attributes.credentials || []
-    @_id = attributes._id
-
-  setCredential: (provider, id, callback) =>
-    @credentials.push
-      provider: provider,
-      id: id
-
-    @save('user', callback)
+defaults =
+  slugs: []
+  credentials: []
+  handles: []
 
-  toJSON: () =>
-    name: @name
-    slugs: @slugs
-    handles: @handles
-    credentials: @credentials
-    _id: @_id
+class User extends Model
+  constructor: (attributes = defaults) ->
+    super attributes
+  
+  setCredential: (provider, id) ->
+    @attributes.credentials or= []
 
+    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
+      
 module.exports = User

package.json

@@ -4,6 +4,7 @@
   "dependencies": {
     "express": "~v2.5.6",
     "coffee-script": "~v1.2.0",
+    "clone", "v0.0.4",
     "jade": "~v0.20.0",
     "stylus": "~v0.22.5",
     "passport": "~v0.1.6",

test/models/user_test.coffee

@@ -4,42 +4,138 @@ User = require '../../models/user'
 
 expectedAttributes =
   name: 'Abraham Lincoln'               
-  userSince: new Date()
+  userSince: Date.parse('April 14, 1865')
   slugs: ['abe', 'penniesrock']
   handles: [{type: 'twitter', handle: 'abelincoln'}]
   credentials: [{provider: 'twitter', id: 1234 }]
   _id: 1234
 
 vows.describe('User (models/user)').addBatch(
-  "When creating a user model":
+  'When creating a user model':
     topic: () ->
       new User()
-    "it should have default values": (user) ->
-      assert.isUndefined user.name
-      assert.isUndefined user.userSince
-      assert.isArray user.slugs
-      assert.isArray user.handles
-      assert.isArray user.credentials
-  "Creating a user model from attributes":
+
+    'it should have default values': (user) ->
+      assert.isUndefined user.attributes.name
+      assert.isUndefined user.attributes.userSince
+      assert.isEmpty user.attributes.slugs
+      assert.isEmpty user.attributes.handles
+      assert.isEmpty user.attributes.credentials
+      assert.isUndefined user.attributes._id
+    
+    'and toJSON is called on the new user with a name.':
+      topic: (user) ->
+        user.attributes.name = expectedAttributes.name
+        user.toJSON()
+      
+      'it should have the users name populated.': (jsonResult) ->
+        assert.equal jsonResult.name, expectedAttributes.name
+      
+      'it should not have any slugs': (jsonResult) ->
+        assert.isEmpty jsonResult.slugs
+      
+      'it should not have any handles': (jsonResult) ->
+        assert.isEmpty jsonResult.handles
+      
+      'it should not have any credentials': (jsonResult) ->
+        assert.isEmpty jsonResult.credentials
+
+      'it should not have the user since date set': (jsonResult)->
+        assert.isUndefined jsonResult.userSince
+         
+      'it should not set an id': (jsonResult) ->
+        assert.isUndefined jsonResult._id 
+
+    'and a brand new credential is added':
+      topic: () ->
+        user = new User()
+        user.setCredential 'twitter', 1865
+        user
+      
+      'it should add the credential': (user) ->
+        assert.equal user.attributes.credentials.length, 1
+        assert.equal user.attributes.credentials[0].provider, 'twitter'
+        assert.equal user.attributes.credentials[0].id, 1865
+      
+      'and the same credential is added again with a different id':
+        topic: (user) ->
+          user.setCredential 'twitter', 1234
+          user
+      
+        'it should override the existing value': (user) ->
+          assert.equal user.attributes.credentials.length, 1
+          assert.equal user.attributes.credentials[0].provider, 'twitter'
+          assert.equal user.attributes.credentials[0].id, 1234
+      
+      'and the same credential is added with different casing':
+        topic: (user) ->
+          user.setCredential 'Twitter', 1234
+          user
+
+        'it should override the existing value': (user) ->
+          assert.equal user.attributes.credentials.length, 1
+          assert.equal user.attributes.credentials[0].provider, 'twitter'
+          assert.equal user.attributes.credentials[0].id, 1234
+    
+      'and the same credential is added with different casing and white space':
+        topic: (user) ->
+          user.setCredential ' Twitter ', 1234
+          user
+
+        'it should override the existing value': (user) ->
+          console.log user.attributes.credentials
+          assert.equal user.attributes.credentials.length, 1
+          assert.equal user.attributes.credentials[0].provider, 'twitter'
+          assert.equal user.attributes.credentials[0].id, 1234
+
+      'and a completely different credential is added':
+        topic: (user) ->
+          user.setCredential 'github', 100
+          user
+      
+        'it should be appended to the credentials': (user) ->
+          assert.equal user.attributes.credentials.length, 2
+          assert.equal user.attributes.credentials[1].provider, 'github'
+
+  'Creating a user model from attributes':
     topic: () ->
-      new User expectedAttributes   
+      user = new User expectedAttributes   
+
+    'it should set the correct name': (user) ->
+      assert.equal user.attributes.name, expectedAttributes.name
 
-    "it should set the correct name": (user) ->
-      assert.equal user.name, expectedAttributes.name
+    'it should set the correct user since date': (user) ->
+      assert.equal user.attributes.userSince, expectedAttributes.userSince 
 
-    "it should set the correct user since date": (user) ->
-      assert.equal user.userSince, expectedAttributes.userSince 
+    'it should set the correct slugs': (user) ->
+      assert.deepEqual user.attributes.slugs, expectedAttributes.slugs
 
-    "it should set the correct slugs": (user) ->
-      assert.deepEqual user.slugs, expectedAttributes.slugs
+    'it should set the correct handles': (user) ->
+      assert.deepEqual user.attributes.handles, expectedAttributes.handles 
 
-    "it should set the correct handles": (user) ->
-      assert.deepEqual user.handles, expectedAttributes.handles 
+    'it should set the correct credentials': (user) ->
+      assert.deepEqual user.attributes.credentials, expectedAttributes.credentials
 
-    "it should set the correct credentials": (user) ->
-      assert.deepEqual user.credentials, expectedAttributes.credentials
+    'it should set the correct id': (user) ->    
+      assert.equal user.attributes._id, expectedAttributes._id
 
-    "it should set the correct id": (user) ->    
-      assert.equal user._id, expectedAttributes._id
+    'and toJSON() is called':
+      topic: (user) ->
+        user.toJSON()
 
+      'it should set the correct name': (jsonResult) ->
+        assert.equal jsonResult.name, expectedAttributes.name
+      
+      'it should set the correct slugs': (jsonResult) ->
+        assert.deepEqual jsonResult.slugs, expectedAttributes.slugs
+      
+      'it should set the correct handles': (jsonResult) ->
+        assert.deepEqual jsonResult.handles, expectedAttributes.handles 
+      
+      'it should set the correct credentials': (jsonResult) ->
+        assert.deepEqual jsonResult.credentials, expectedAttributes.credentials
+      
+      'it should set the correct id': (jsonResult) ->    
+        assert.equal jsonResult._id, expectedAttributes._id    
+          
 ).export module