From bcc3c488bb96fe5b2d766f7cfe85426765aac717 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 20 Jul 2012 21:45:53 -0400
Subject: [PATCH] Use racer.uuid() instead of Guid.raw()

---
 lib/app/index.js     | 7 ++-----
 package.json         | 3 +--
 src/app/index.coffee | 4 +---
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/app/index.js b/lib/app/index.js
index b3c1b4a580..afe8dd7d09 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -1,5 +1,5 @@
 // Generated by CoffeeScript 1.3.3
-var Guid, content, derby, get, getHabits, ready, score, view, _ref;
+var content, derby, get, getHabits, ready, score, view, _ref;
 
 derby = require('derby');
 
@@ -11,8 +11,6 @@ derby.use(require('../../ui'));
 
 content = require('./content');
 
-Guid = require('guid');
-
 score = require('./score');
 
 view.fn('taskClasses', function(type, completed, value, hideCompleted) {
@@ -111,8 +109,7 @@ get('/:uidParam?', function(page, model, _arg) {
       _ref1 = content.defaultTasks;
       for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
         task = _ref1[_i];
-        guid = Guid.raw();
-        task.id = guid;
+        guid = task.id = require('derby/node_modules/racer').uuid();
         newUser.tasks[guid] = task;
         switch (task.type) {
           case 'habit':
diff --git a/package.json b/package.json
index 7cb5ac4723..c487d5a1f1 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,7 @@
     "gzippo": ">=0.1.7",
     "racer-db-mongo": ">=0.3.11",
     "connect-mongo": ">=0.1.9",
-    "derby-ui-boot": "*",
-    "guid": "*"
+    "derby-ui-boot": "*"
   },
   "private": true,
   "devDependencies": {
diff --git a/src/app/index.coffee b/src/app/index.coffee
index bc35c3045d..863bb26c6e 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -3,7 +3,6 @@ derby = require('derby')
 derby.use require('derby-ui-boot')
 derby.use(require('../../ui'))
 content = require('./content')
-Guid = require('guid')
 score = require('./score')
 
 ## VIEW HELPERS ##
@@ -67,8 +66,7 @@ get '/:uidParam?', (page, model, {uidParam}) ->
         tasks: {}, habitIds: [], dailyIds: [], todoIds: [], rewardIds: []
       }
       for task in content.defaultTasks
-        guid = Guid.raw()
-        task.id = guid
+        guid = task.id = require('derby/node_modules/racer').uuid()
         newUser.tasks[guid] = task
         switch task.type
           when 'habit' then newUser.habitIds.push guid