Merge pull request #28 from daffl/master

Fix for can.Model.model to accomodate custom ids

model/model.js

@@ -725,9 +725,9 @@ steal('can/observe',function(){
 			if ( attributes instanceof this ) {
 				attributes = attributes.serialize();
 			}
-			var model = this.store[attributes.id] || new this( attributes );
+			var model = this.store[attributes[this.id]] || new this( attributes );
 			if(this._reqs){
-				this.store[attributes.id] = model;
+				this.store[attributes[this.id]] = model;
 			}
 			return model;
 		}

model/model_test.js

@@ -176,6 +176,24 @@ test("models", function(){
 	equals(people[0].prettyName(),"Mr. Justin","wraps wrapping works")
 });
 
+test(".models with custom id", function() {
+	can.Model("CustomId", {
+		findAll : steal.root.join("can/model/test") + "/customids.json",
+		id : '_id'
+	}, {
+		getName : function() {
+			return this.name;
+		}
+	});
+	stop();
+	CustomId.findAll().done(function(results) {
+		equals(results.length, 2, 'Got two items back');
+		equals(results[0].name, 'Justin', 'First name right');
+		equals(results[1].name, 'Brian', 'Second name right');
+		start();
+	});
+});
+
 
 /*
 test("async setters", function(){

model/test/customids.json

@@ -0,0 +1,7 @@
+[{
+	"_id" : 1,
+	"name" : "Justin"
+}, {
+	"_id" : 2,
+	"name" : "Brian"
+}]