Replace references to .name() with .key()

Author: katowulf

bower.json

@@ -36,6 +36,6 @@
   "devDependencies": {
     "lodash": "~2.4.1",
     "angular-mocks": "~1.2.18",
-    "mockfirebase": "~0.4.0"
+    "mockfirebase": "0.5.0"
   }
 }

src/FirebaseArray.js

@@ -34,7 +34,7 @@
    *
    *    // change how records are updated
    *    $$updated: function(snap) {
-   *      return this.$getRecord(snap.name()).update(snap);
+   *      return this.$getRecord(snap.key()).update(snap);
    *    }
    * });
    * </code></pre>

src/firebase.js

@@ -227,7 +227,7 @@
             }
           });
           var updated = batch(function(snap) {
-            var rec = array.$getRecord(snap.name());
+            var rec = array.$getRecord($firebaseUtils.getKey(snap));
             if( rec ) {
               var changed = array.$$updated(snap);
               if( changed ) {
@@ -236,7 +236,7 @@
             }
           });
           var moved   = batch(function(snap, prevChild) {
-            var rec = array.$getRecord(snap.name());
+            var rec = array.$getRecord($firebaseUtils.getKey(snap));
             if( rec ) {
               var confirmed = array.$$moved(snap, prevChild);
               if( confirmed ) {
@@ -245,7 +245,7 @@
             }
           });
           var removed = batch(function(snap) {
-            var rec = array.$getRecord(snap.name());
+            var rec = array.$getRecord($firebaseUtils.getKey(snap));
             if( rec ) {
               var confirmed = array.$$removed(snap);
               if( confirmed ) {

tests/lib/module.testutils.js

@@ -35,8 +35,11 @@ angular.module('testutils', ['firebase'])
           getPriority: function () {
             return angular.isDefined(pri) ? pri : null;
           },
+          key: function() {
+            return ref.ref().key();
+          },
           name: function () {
-            return ref.ref().name();
+            return ref.ref().key();
           },
           child: function (key) {
             var childData = angular.isObject(data) && data.hasOwnProperty(key) ? data[key] : null;

tests/mocks/mocks.firebase.js

@@ -1,9 +1,9 @@
 
 angular.module('mock.firebase', [])
   .run(function($window) {
-    MockFirebase.override();
-    $window.Firebase = MockFirebase;
+    $window.mockfirebase.override();
+    $window.Firebase = $window.MockFirebase;
   })
-  .factory('Firebase', function() {
-    return MockFirebase;
+  .factory('Firebase', function($window) {
+    return $window.MockFirebase;
   });

tests/protractor/priority/priority.spec.js

@@ -127,7 +127,7 @@ describe('Priority App', function () {
         data.makeItChange = true;
         snap.ref().setWithPriority(data, pri, function(err) {
           if( err ) { def.reject(err); }
-          else { def.fulfill(snap.name()); }
+          else { def.fulfill(snap.key()); }
         })
       }, def.reject);
       return def.promise;

tests/unit/FirebaseArray.spec.js

@@ -235,7 +235,7 @@ describe('$FirebaseArray', function () {
       var resRef = whiteSpy.calls.argsFor(0)[0];
       expect(whiteSpy).toHaveBeenCalled();
       expect(resRef).toBeAFirebaseRef();
-      expect(resRef.name()).toBe(expName);
+      expect(resRef.key()).toBe(expName);
       expect(blackSpy).not.toHaveBeenCalled();
     });
 

tests/unit/FirebaseObject.spec.js

@@ -31,7 +31,7 @@ describe('$FirebaseObject', function() {
 
   describe('constructor', function() {
     it('should set the record id', function() {
-      expect(obj.$id).toEqual($fb.$ref().name());
+      expect(obj.$id).toEqual($fb.$ref().key());
     });
 
     it('should accept a query', function() {

tests/unit/firebase.spec.js

@@ -112,7 +112,7 @@ describe('$firebase', function () {
       expect(whiteSpy).toHaveBeenCalled();
       expect(blackSpy).not.toHaveBeenCalled();
       var ref = whiteSpy.calls.argsFor(0)[0];
-      expect(ref.name()).toBe(newId);
+      expect(ref.key()).toBe(newId);
     });
 
     it('should reject if fails', function() {
@@ -127,7 +127,7 @@ describe('$firebase', function () {
 
     it('should save correct data into Firebase', function() {
       var spy = jasmine.createSpy('push callback').and.callFake(function(ref) {
-        expect($fb.$ref().getData()[ref.name()]).toEqual({foo: 'pushtest'});
+        expect($fb.$ref().getData()[ref.key()]).toEqual({foo: 'pushtest'});
       });
       $fb.$push({foo: 'pushtest'}).then(spy);
       flushAll();
@@ -324,7 +324,7 @@ describe('$firebase', function () {
       flushAll();
       var arg = spy.calls.argsFor(0)[0];
       expect(arg).toBeAFirebaseRef();
-      expect(arg.name()).toBe('index');
+      expect(arg.key()).toBe('index');
     });
 
     it('should reject if failed', function() {