Custom Primary Keys should not encoded with undefined if not

set a value.
hookercookerman · Feb 15, 2012 · 9b445c8 · 9b445c8 · tdegrunt · Feb 18, 2012
1 parent 99e571c
commit 9b445c8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/batman.coffee b/src/batman.coffee
@@ -2698,7 +2698,7 @@ class Batman.Model extends Batman.Object
             obj[key] = encodedVal
 
     if @constructor.primaryKey isnt 'id'
-      obj[@constructor.primaryKey] = @get('id')
+      obj[@constructor.primaryKey] = @get('id') unless @get('id') is undefined
       delete obj.id
 
     obj

diff --git a/tests/batman/model/encoders_test.coffee b/tests/batman/model/encoders_test.coffee
@@ -82,6 +82,15 @@ test "key ending with ? marked for decoding should be decoded", ->
   p.fromJSON(json)
   ok p.get('broken?'), "Cool Snowboard"
 
+QUnit.module "Batman.Model: encoding/decoding to/from JSON with custom primary Key"
+  setup: ->
+    class @Product extends Batman.Model
+      @primaryKey: '_id'
+
+test "undefined primaryKey shouldn't be encoded", ->
+  p = new @Product
+  deepEqual p.toJSON(), {}
+
 QUnit.module "Batman.Model: encoding: custom encoders/decoders"
   setup: ->
     class @Product extends Batman.Model