Merge branch 'master' into test-coverage

Conflicts:
	tests/unit/FirebaseObject.spec.js

Author: jamestalmage

README.md

@@ -18,13 +18,13 @@ In order to use AngularFire in your project, you need to include the following f
 
 ```html
 <!-- AngularJS -->
-<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.2/angular.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
 
 <!-- Firebase -->
-<script src="https://cdn.firebase.com/js/client/2.0.4/firebase.js"></script>
+<script src="https://cdn.firebase.com/js/client/2.1.0/firebase.js"></script>
 
 <!-- AngularFire -->
-<script src="https://cdn.firebase.com/libs/angularfire/0.9.0/angularfire.min.js"></script>
+<script src="https://cdn.firebase.com/libs/angularfire/0.9.1/angularfire.min.js"></script>
 ```
 
 Use the URL above to download both the minified and non-minified versions of AngularFire from the

bower.json

@@ -31,11 +31,11 @@
   ],
   "dependencies": {
     "angular": "1.2.x || 1.3.x",
-    "firebase": "2.0.x"
+    "firebase": "2.1.x"
   },
   "devDependencies": {
     "lodash": "~2.4.1",
     "angular-mocks": "~1.2.18",
-    "mockfirebase": "0.5.0"
+    "mockfirebase": "~0.7.0"
   }
 }

changelog.txt

@@ -1,2 +0,0 @@
-deprecated - Passing in credentials to the user management methods of `$firebaseAuth` as individual arguments has been deprecated in favor of a single credentials argument.
-deprecated - Deprecated `$firebaseAuth.$sendPasswordResetEmail()` in favor of the functionally equivalent `$firebaseAuth.$resetPassword()`.

package.json

@@ -32,7 +32,7 @@
   ],
   "dependencies": {
     "angular": "1.3.x",
-    "firebase": "2.0.x"
+    "firebase": "2.1.x"
   },
   "devDependencies": {
     "coveralls": "^2.11.1",
@@ -52,6 +52,7 @@
     "karma-chrome-launcher": "^0.1.4",
     "karma-coverage": "^0.2.4",
     "karma-failed-reporter": "0.0.2",
+    "karma-html2js-preprocessor": "~0.1.0",
     "karma-jasmine": "~0.2.0",
     "karma-phantomjs-launcher": "~0.1.0",
     "karma-sauce-launcher": "~0.2.9",

src/FirebaseAuth.js

@@ -5,13 +5,13 @@
   // Define a service which provides user authentication and management.
   angular.module('firebase').factory('$firebaseAuth', [
     '$q', '$firebaseUtils', '$log', function($q, $firebaseUtils, $log) {
-      // This factory returns an object containing the current authentication state of the client.
-      // This service takes one argument:
-      //
-      //   * `ref`: A Firebase reference.
-      //
-      // The returned object contains methods for authenticating clients, retrieving authentication
-      // state, and managing users.
+      /**
+       * This factory returns an object allowing you to manage the client's authentication state.
+       *
+       * @param {Firebase} ref A Firebase reference to authenticate.
+       * @return {object} An object containing methods for authenticating clients, retrieving
+       * authentication state, and managing users.
+       */
       return function(ref) {
         var auth = new FirebaseAuth($q, $firebaseUtils, $log, ref);
         return auth.construct();
@@ -51,6 +51,7 @@
         // User management methods
         $createUser: this.createUser.bind(this),
         $changePassword: this.changePassword.bind(this),
+        $changeEmail: this.changeEmail.bind(this),
         $removeUser: this.removeUser.bind(this),
         $resetPassword: this.resetPassword.bind(this),
         $sendPasswordResetEmail: this.sendPasswordResetEmail.bind(this)
@@ -77,7 +78,11 @@
     authWithCustomToken: function(authToken, options) {
       var deferred = this._q.defer();
 
-      this._ref.authWithCustomToken(authToken, this._utils.makeNodeResolver(deferred), options);
+      try {
+        this._ref.authWithCustomToken(authToken, this._utils.makeNodeResolver(deferred), options);
+      } catch (error) {
+        deferred.reject(error);
+      }
 
       return deferred.promise;
     },
@@ -92,7 +97,11 @@
     authAnonymously: function(options) {
       var deferred = this._q.defer();
 
-      this._ref.authAnonymously(this._utils.makeNodeResolver(deferred), options);
+      try {
+        this._ref.authAnonymously(this._utils.makeNodeResolver(deferred), options);
+      } catch (error) {
+        deferred.reject(error);
+      }
 
       return deferred.promise;
     },
@@ -109,7 +118,11 @@
     authWithPassword: function(credentials, options) {
       var deferred = this._q.defer();
 
-      this._ref.authWithPassword(credentials, this._utils.makeNodeResolver(deferred), options);
+      try {
+        this._ref.authWithPassword(credentials, this._utils.makeNodeResolver(deferred), options);
+      } catch (error) {
+        deferred.reject(error);
+      }
 
       return deferred.promise;
     },
@@ -126,7 +139,11 @@
     authWithOAuthPopup: function(provider, options) {
       var deferred = this._q.defer();
 
-      this._ref.authWithOAuthPopup(provider, this._utils.makeNodeResolver(deferred), options);
+      try {
+        this._ref.authWithOAuthPopup(provider, this._utils.makeNodeResolver(deferred), options);
+      } catch (error) {
+        deferred.reject(error);
+      }
 
       return deferred.promise;
     },
@@ -143,7 +160,11 @@
     authWithOAuthRedirect: function(provider, options) {
       var deferred = this._q.defer();
 
-      this._ref.authWithOAuthRedirect(provider, this._utils.makeNodeResolver(deferred), options);
+      try {
+        this._ref.authWithOAuthRedirect(provider, this._utils.makeNodeResolver(deferred), options);
+      } catch (error) {
+        deferred.reject(error);
+      }
 
       return deferred.promise;
     },
@@ -162,7 +183,11 @@
     authWithOAuthToken: function(provider, credentials, options) {
       var deferred = this._q.defer();
 
-      this._ref.authWithOAuthToken(provider, credentials, this._utils.makeNodeResolver(deferred), options);
+      try {
+        this._ref.authWithOAuthToken(provider, credentials, this._utils.makeNodeResolver(deferred), options);
+      } catch (error) {
+        deferred.reject(error);
+      }
 
       return deferred.promise;
     },
@@ -195,11 +220,12 @@
     onAuth: function(callback, context) {
       var self = this;
 
-      this._ref.onAuth(callback, context);
+      var fn = this._utils.debounce(callback, context, 0);
+      this._ref.onAuth(fn);
 
       // Return a method to detach the `onAuth()` callback.
       return function() {
-        self._ref.offAuth(callback, context);
+        self._ref.offAuth(fn);
       };
     },
 
@@ -293,7 +319,11 @@
         };
       }
 
-      this._ref.createUser(credentials, this._utils.makeNodeResolver(deferred));
+      try {
+        this._ref.createUser(credentials, this._utils.makeNodeResolver(deferred));
+      } catch (error) {
+        deferred.reject(error);
+      }
 
       return deferred.promise;
     },
@@ -302,7 +332,7 @@
      * Changes the password for an email/password user.
      *
      * @param {Object|string} emailOrCredentials The email of the user whose password is to change
-     * or an objet containing the email, old password, and new password of the user whose password
+     * or an object containing the email, old password, and new password of the user whose password
      * is to change.
      * @param {string} [oldPassword] The current password for the user.
      * @param {string} [newPassword] The new password for the user.
@@ -323,7 +353,34 @@
         };
       }
 
-      this._ref.changePassword(credentials, this._utils.makeNodeResolver(deferred));
+      try {
+        this._ref.changePassword(credentials, this._utils.makeNodeResolver(deferred));
+      } catch (error) {
+        deferred.reject(error);
+      }
+
+      return deferred.promise;
+    },
+
+    /**
+     * Changes the email for an email/password user.
+     *
+     * @param {Object} credentials An object containing the old email, new email, and password of
+     * the user whose email is to change.
+     * @return {Promise<>} An empty promise fulfilled once the email change is complete.
+     */
+    changeEmail: function(credentials) {
+      if (typeof this._ref.changeEmail !== 'function') {
+        throw new Error('$firebaseAuth.$changeEmail() requires Firebase version 2.1.0 or greater.');
+      }
+
+      var deferred = this._q.defer();
+
+      try {
+        this._ref.changeEmail(credentials, this._utils.makeNodeResolver(deferred));
+      } catch (error) {
+        deferred.reject(error);
+      }
 
       return deferred.promise;
     },
@@ -350,7 +407,11 @@
         };
       }
 
-      this._ref.removeUser(credentials, this._utils.makeNodeResolver(deferred));
+      try {
+        this._ref.removeUser(credentials, this._utils.makeNodeResolver(deferred));
+      } catch (error) {
+        deferred.reject(error);
+      }
 
       return deferred.promise;
     },
@@ -365,7 +426,14 @@
      */
     sendPasswordResetEmail: function(emailOrCredentials) {
       this._log.warn("$sendPasswordResetEmail() has been deprecated in favor of the equivalent $resetPassword().");
-      return this.resetPassword(emailOrCredentials);
+
+      try {
+        return this.resetPassword(emailOrCredentials);
+      } catch (error) {
+        return this._q(function(resolve, reject) {
+          return reject(error);
+        });
+      }
     },
 
     /**
@@ -388,7 +456,11 @@
         };
       }
 
-      this._ref.resetPassword(credentials, this._utils.makeNodeResolver(deferred));
+      try {
+        this._ref.resetPassword(credentials, this._utils.makeNodeResolver(deferred));
+      } catch (error) {
+        deferred.reject(error);
+      }
 
       return deferred.promise;
     }

src/FirebaseObject.js

@@ -1,7 +1,7 @@
 (function() {
   'use strict';
   /**
-   * Creates and maintains a synchronized boject. This constructor should not be
+   * Creates and maintains a synchronized object. This constructor should not be
    * manually invoked. Instead, one should create a $firebase object and call $asObject
    * on it:  <code>$firebase( firebaseRef ).$asObject()</code>;
    *

tests/automatic_karma.conf.js

@@ -10,7 +10,8 @@ module.exports = function(config) {
     singleRun: true,
 
     preprocessors: {
-      "../src/*.js": "coverage"
+      "../src/*.js": "coverage",
+      "./fixtures/**/*.json": "html2js"
     },
 
     coverageReporter: {
@@ -35,6 +36,7 @@ module.exports = function(config) {
       '../src/module.js',
       '../src/**/*.js',
       'mocks/**/*.js',
+      "fixtures/**/*.json",
       'unit/**/*.spec.js'
     ]
   });

tests/fixtures/data.json

@@ -0,0 +1,82 @@
+{
+  "data": {
+    "a": {
+      "aString": "alpha",
+      "aNumber": 1,
+      "aBoolean": false
+    },
+    "b": {
+      "aString": "bravo",
+      "aNumber": 2,
+      "aBoolean": true
+    },
+    "c": {
+      "aString": "charlie",
+      "aNumber": 3,
+      "aBoolean": true
+    },
+    "d": {
+      "aString": "delta",
+      "aNumber": 4,
+      "aBoolean": true
+    },
+    "e": {
+      "aString": "echo",
+      "aNumber": 5
+    }
+  },
+  "index": {
+    "b": true,
+    "c": 1,
+    "e": false,
+    "z": true
+  },
+  "ordered": {
+    "null_a": {
+      "aNumber": 0,
+      "aLetter": "a"
+    },
+    "null_b": {
+      "aNumber": 0,
+      "aLetter": "b"
+    },
+    "null_c": {
+      "aNumber": 0,
+      "aLetter": "c"
+    },
+    "num_1_a": {
+      ".priority": 1,
+      "aNumber": 1
+    },
+    "num_1_b": {
+      ".priority": 1,
+      "aNumber": 1
+    },
+    "num_2": {
+      ".priority": 2,
+      "aNumber": 2
+    },
+    "num_3": {
+      ".priority": 3,
+      "aNumber": 3
+    },
+    "char_a_1": {
+      ".priority": "a",
+      "aNumber": 1,
+      "aLetter": "a"
+    },
+    "char_a_2": {
+      ".priority": "a",
+      "aNumber": 2,
+      "aLetter": "a"
+    },
+    "char_b": {
+      ".priority": "b",
+      "aLetter": "b"
+    },
+    "char_c": {
+      ".priority": "c",
+      "aLetter": "c"
+    }
+  }
+}

tests/mocks/mocks.firebase.js

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