From 4113eefaf121389ca258dbae1419c3bf8a319135 Mon Sep 17 00:00:00 2001
From: Rob Scanlon <robscanlon@gmail.com>
Date: Wed, 3 Apr 2013 22:51:41 -0400
Subject: [PATCH 1/4] Fixes bug when user attempts to create task with no value
 field

---
 src/server/api.coffee | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 5f7b31e571..5f9fb3f3ff 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -87,9 +87,9 @@ validateTask = (req, res, next) ->
     unless /^(habit|todo|daily|reward)$/.test type
       return res.json 400, err: 'type must be habit, todo, daily, or reward'
 
-  text = sanitize(text).xss()
-  notes = sanitize(notes).xss()
-  value = sanitize(value).toInt()
+  newTask.text = sanitize(text).xss()
+  newTask.notes = sanitize(notes).xss()
+  newTask.value = sanitize(value).toInt()
 
   switch type
     when 'habit'
@@ -98,6 +98,8 @@ validateTask = (req, res, next) ->
     when 'daily', 'todo'
       newTask.completed = false unless typeof completed is 'boolean'
 
+  newTask.value = 0 if isNaN newTask.value
+
   _.extend task, newTask
   req.task = task
   next()

From 3139e51535667e91f24f3da663a2d76acae135c9 Mon Sep 17 00:00:00 2001
From: Rob Scanlon <robscanlon@gmail.com>
Date: Thu, 4 Apr 2013 17:11:27 -0400
Subject: [PATCH 2/4] fix problem when updating task

---
 src/server/api.coffee | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/server/api.coffee b/src/server/api.coffee
index 5f9fb3f3ff..af8b1312ae 100644
--- a/src/server/api.coffee
+++ b/src/server/api.coffee
@@ -84,12 +84,13 @@ validateTask = (req, res, next) ->
     type = undefined
     delete newTask.type
   else if req.method is 'POST'
+    newTask.value = sanitize(value).toInt()
+    newTask.value = 0 if isNaN newTask.value
     unless /^(habit|todo|daily|reward)$/.test type
       return res.json 400, err: 'type must be habit, todo, daily, or reward'
 
-  newTask.text = sanitize(text).xss()
-  newTask.notes = sanitize(notes).xss()
-  newTask.value = sanitize(value).toInt()
+  newTask.text = sanitize(text).xss() if typeof text is "string"
+  newTask.notes = sanitize(notes).xss() if typeof notes is "string"
 
   switch type
     when 'habit'
@@ -98,8 +99,6 @@ validateTask = (req, res, next) ->
     when 'daily', 'todo'
       newTask.completed = false unless typeof completed is 'boolean'
 
-  newTask.value = 0 if isNaN newTask.value
-
   _.extend task, newTask
   req.task = task
   next()

From 4958690bcb44e9dd16058ecb70654a3753b01a9a Mon Sep 17 00:00:00 2001
From: Rob Scanlon <robscanlon@gmail.com>
Date: Thu, 4 Apr 2013 18:09:06 -0400
Subject: [PATCH 3/4] update a test to check for undefined value when making
 new habit

---
 test/api.mocha.coffee | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee
index 929cbfa3cf..0716d099e9 100644
--- a/test/api.mocha.coffee
+++ b/test/api.mocha.coffee
@@ -159,6 +159,8 @@ describe 'API', ->
             expect(res.body.id).not.to.be.empty()
             # Ensure that user owns the newly created object
             expect(user.get().tasks[res.body.id]).to.be.an('object')
+            # Ensure that value gets set to 0 since not otherwise specified
+            expect(user.get().tasks[res.body.id].value).to.be.equal(0)
             done()
 
     it 'PUT /api/v1/user/task/:id', (done) ->

From 4742e4236e0444b03927c1bfc8f88fa5f94076c7 Mon Sep 17 00:00:00 2001
From: Shane Lister <shane@atramentous.com>
Date: Fri, 5 Apr 2013 22:55:34 -0700
Subject: [PATCH 4/4] Update pets.html

Changing the sprinkle button to say pour.
---
 views/app/pets.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/app/pets.html b/views/app/pets.html
index 8bd02bb78c..d68f41ea38 100644
--- a/views/app/pets.html
+++ b/views/app/pets.html
@@ -78,7 +78,7 @@
                     <option>{:hatchingPotion}</option>
                     {/each}
                 </select>
-                <button type=submit>Sprinkle</button>
+                <button type=submit>Pour</button>
             </form>
             {/if}
         </div>
@@ -98,4 +98,4 @@
         </menu>
     {else}
         <p>You don't have any pets yet.</p>
-    {/}
\ No newline at end of file
+    {/}