Refactored events into collection and model objects.

Andrew Dunkman · Andrew Dunkman · commit 989571038c3f · 2012-03-06T22:33:21.000-06:00
diff --git a/collections/events.coffee b/collections/events.coffee
@@ -0,0 +1,14 @@
+StoredCollection = require '../data/storedCollection'
+
+class Events extends StoredCollection
+  constructor: () -> super
+
+  find: (criteria, callback) ->
+    super(Events._collectionName, criteria, callback)
+
+  findByUser: (user, callback) ->
+    userId = if user.attributes?._id? then user.attributes._id else user
+    @find({ user: userId }, callback)
+
+Events._collectionName = 'events'
+module.exports = Events
diff --git a/models/event.coffee b/models/event.coffee
@@ -1,37 +1,14 @@
-event_store = {}
+Model = require './model'
+Events = require '../collections/events'
 
-findEventsByUserId = (user_id) ->
-  event_store[user_id] or []
+class Event extends Model
+  constructor: (attributes = {}) ->
+    super
+    @attributes._id or= undefined
+    @attributes.name or= undefined
+    @attributes.codes or= []
 
-Event = (id, name) ->      
-  this.name = name
-  this.id = id
-  this.codes = []
-  return
+  save: (callback) ->
+    super(Events._collectionName, callback)
 
-Event.prototype.addCodes = (new_codes, callback) ->
-  this.codes = this.codes.concat new_codes
-  callback null, this
-
-createEvent = (user_id, event_name, callback) ->
-  events = findEventsByUserId user_id
-  event = new Event events.length, event_name
-  events.push event
-  event_store[user_id] = events
-  callback null, event
-
-findFirst = (user_id, filter) ->
-  result = findEventsByUserId(user_id).filter filter
-  result[0] || null
-
-findByName = (user_id, event_name, callback) ->
-  callback null, findFirst user_id, (e) ->
-    e.name == event_name
-
-list = (user_id, callback) ->
-  callback null, findEventsByUserId user_id
-
-module.exports = 
-  list: list
-  findByName: findByName
-  create: createEvent
+module.exports = Event
diff --git a/test/collections/events.spec.coffee b/test/collections/events.spec.coffee
@@ -0,0 +1,55 @@
+should = require 'should'
+User = require '../../models/user'
+Events = require '../../collections/events'
+
+callsToFind = {}
+
+getEvents = (key) ->
+  callsToFind[key] = []
+  events = new Events()
+  events._adapter =
+    find: (collection, criteria, callback) ->
+      callsToFind[key].push([collection, criteria, callback])
+      callback(null, [])
+  return events
+
+describe('Events (collections/events)', ->
+  describe('calling find() with criteria and a callback', ->
+    getEvents('test1').find({ 'one': true }, ->)
+
+    it 'should call find() in \'events\' collection on base', ->
+      callsToFind.test1.should.have.length(1)
+      callsToFind.test1[0].should.have.length(3)
+      callsToFind.test1[0][0].should.equal('events')
+
+    it 'should call find() with criteria on base', ->
+      callsToFind.test1[0][1].should.eql({ 'one': true })
+  )
+
+  describe('calling findByUser() with a user object', ->
+    beforeEach ->
+      user = new User({ _id: 33 });
+      getEvents('test2').findByUser(user, ->)
+
+    it 'should call find() in \'events\' collection on base', ->
+      callsToFind.test2.should.have.length(1)
+      callsToFind.test2[0].should.have.length(3)
+      callsToFind.test2[0][0].should.equal('events')
+
+    it 'should call find() with user id on base', ->
+      callsToFind.test2[0][1].should.eql({ 'user': 33 })
+  )
+
+  describe('calling findByUser() with a user id', ->
+    beforeEach ->
+      getEvents('test2').findByUser(37, ->)
+
+    it 'should call find() in \'events\' collection on base', ->
+      callsToFind.test2.should.have.length(1)
+      callsToFind.test2[0].should.have.length(3)
+      callsToFind.test2[0][0].should.equal('events')
+
+    it 'should call find() with user id on base', ->
+      callsToFind.test2[0][1].should.eql({ 'user': 37 })
+  )
+)
diff --git a/test/models/event.spec.coffee b/test/models/event.spec.coffee
@@ -0,0 +1,15 @@
+should = require 'should'
+Event = require '../../models/event.coffee'
+
+describe('Events (models/event)', ->
+  describe('creating an event', ->
+    beforeEach ->
+      @event = new Event()
+
+    it 'should have no name', ->
+      should.not.exist(@event.attributes.name)
+
+    it 'should have zero codes', ->
+      @event.attributes.codes.length.should.equal(0)
+  )
+)
diff --git a/test/models/events.spec.coffee b/test/models/events.spec.coffee
