Merged with master

Author: jacobawenger

dist/angularfire.js

@@ -610,7 +610,7 @@
           }
         };
 
-        self.$id = $firebase.$ref().name();
+        self.$id = $firebase.$ref().ref().name();
         self.$priority = null;
       }
 
@@ -768,7 +768,6 @@
         $$updated: function (snap) {
           // applies new data to this object
           var changed = $firebaseUtils.updateRec(this, snap);
-          this.$id = snap.name();
           if( changed ) {
             // notifies $watch listeners and
             // updates $scope if bound to a variable

dist/angularfire.min.js

@@ -110,7 +110,7 @@
               .then(function(ref) {
                 self._notify('child_changed', key);
                 return ref;
-              })
+              });
           }
           else {
             return $firebaseUtils.reject('Invalid record; could determine its key: '+indexOrItem);

src/FirebaseArray.js

@@ -64,7 +64,7 @@
           }
         };
 
-        self.$id = $firebase.$ref().name();
+        self.$id = $firebase.$ref().ref().name();
         self.$priority = null;
       }
 
@@ -222,7 +222,6 @@
         $$updated: function (snap) {
           // applies new data to this object
           var changed = $firebaseUtils.updateRec(this, snap);
-          this.$id = snap.name();
           if( changed ) {
             // notifies $watch listeners and
             // updates $scope if bound to a variable

src/FirebaseObject.js

@@ -671,6 +671,7 @@ describe('$FirebaseArray', function () {
     }
   })();
 
+  //todo abstract into testutils
   function stubFb() {
     var ref = testutils.ref();
     var fb = {};

tests/unit/FirebaseArray.spec.js

@@ -28,6 +28,19 @@ describe('$FirebaseObject', function() {
     });
   });
 
+  describe('constructor', function() {
+    it('should set the record id', function() {
+      expect(obj.$id).toEqual($fb.$ref().name());
+    });
+
+    it('should accept a query', function() {
+      var obj = makeObject(FIXTURE_DATA, $fb.$ref().limit(1).startAt(null));
+      obj.$$updated(testutils.snap({foo: 'bar'}));
+      flushAll();
+      expect(obj).toEqual(jasmine.objectContaining({foo: 'bar'}));
+    });
+  });
+
   describe('$save', function () {
     it('should call $firebase.$set', function () {
       obj.foo = 'bar';
@@ -417,9 +430,9 @@ describe('$FirebaseObject', function() {
     });
 
     it('should preserve the id', function() {
-      var oldId = obj.$id;
+      obj.$id = 'change_id_for_test';
       obj.$$updated(fakeSnap(true));
-      expect(obj.$id).toBe(oldId);
+      expect(obj.$id).toBe('change_id_for_test');
     });
 
     it('should set the priority', function() {
@@ -463,8 +476,9 @@ describe('$FirebaseObject', function() {
     return testutils.refSnap(testutils.ref('data/a'), data, pri);
   }
 
-  function stubFb() {
-    var ref = testutils.ref('data/a');
+  //todo abstract into testutils
+  function stubFb(ref) {
+    if( !ref ) { ref = testutils.ref('data/a'); }
     var fb = {};
     [
       '$set', '$update', '$remove', '$transaction', '$asArray', '$asObject', '$ref', '$push'
@@ -497,10 +511,10 @@ describe('$FirebaseObject', function() {
 
   function noop() {}
 
-  function makeObject(initialData) {
+  function makeObject(initialData, ref) {
     var readyFuture = $utils.defer();
     var destroyFn = jasmine.createSpy('destroyFn');
-    var fb = stubFb();
+    var fb = stubFb(ref);
     var obj = new $FirebaseObject(fb, destroyFn, readyFuture.promise);
     obj.$$$readyFuture = readyFuture;
     obj.$$$destroyFn = destroyFn;