Merge pull request #841 from firebase/modulefire

fix(modules): Separate AngularFire services into modules

Author: davideast

src/FirebaseAuth.js src/auth/FirebaseAuth.jssrc/FirebaseAuth.js renamed to src/auth/FirebaseAuth.js

@@ -3,7 +3,7 @@
   var FirebaseAuth;
 
   // Define a service which provides user authentication and management.
-  angular.module('firebase').factory('$firebaseAuth', [
+  angular.module('firebase.auth').factory('$firebaseAuth', [
     '$q', '$firebaseUtils', function($q, $firebaseUtils) {
       /**
        * This factory returns an object allowing you to manage the client's authentication state.

src/firebaseAuthService.js src/auth/firebaseAuthService.jssrc/firebaseAuthService.js renamed to src/auth/firebaseAuthService.js

@@ -6,7 +6,7 @@
   }
   FirebaseAuthService.$inject = ['$firebaseAuth'];
 
-  angular.module('firebase')
+  angular.module('firebase.auth')
     .factory('$firebaseAuthService', FirebaseAuthService);
 
 })();

src/FirebaseArray.js src/database/FirebaseArray.jssrc/FirebaseArray.js renamed to src/database/FirebaseArray.js

@@ -47,7 +47,7 @@
    * var list = new ExtendedArray(ref);
    * </code></pre>
    */
-  angular.module('firebase').factory('$firebaseArray', ["$log", "$firebaseUtils", "$q",
+  angular.module('firebase.database').factory('$firebaseArray', ["$log", "$firebaseUtils", "$q",
     function($log, $firebaseUtils, $q) {
       /**
        * This constructor should probably never be called manually. It is used internally by

src/FirebaseObject.js src/database/FirebaseObject.jssrc/FirebaseObject.js renamed to src/database/FirebaseObject.js

@@ -22,7 +22,7 @@
    * var obj = new ExtendedObject(ref);
    * </code></pre>
    */
-  angular.module('firebase').factory('$firebaseObject', [
+  angular.module('firebase.database').factory('$firebaseObject', [
     '$parse', '$firebaseUtils', '$log', '$q',
     function($parse, $firebaseUtils, $log, $q) {
       /**

src/firebaseRef.js src/database/firebaseRef.jssrc/firebaseRef.js renamed to src/database/firebaseRef.js

@@ -40,7 +40,7 @@
     };
   }
 
-  angular.module('firebase')
+  angular.module('firebase.database')
     .provider('$firebaseRef', FirebaseRef);
 
 })();

src/firebase.js

@@ -6,6 +6,7 @@
     /** @deprecated */
     .factory("$firebase", function() {
       return function() {
+        //TODO: Update this error to speak about new module stuff
         throw new Error('$firebase has been removed. You may instantiate $firebaseArray and $firebaseObject ' +
         'directly now. For simple write operations, just use the Firebase ref directly. ' +
         'See the AngularFire 1.0.0 changelog for details: https://github.com/firebase/angularfire/releases/tag/v1.0.0');

src/module.js

@@ -1,10 +1,15 @@
 (function(exports) {
   "use strict";
 
-// Define the `firebase` module under which all AngularFire
-// services will live.
-  angular.module("firebase", [])
-    //todo use $window
-    .value("Firebase", exports.Firebase);
+  angular.module("firebase.utils", []);
+  angular.module("firebase.config", []);
+  angular.module("firebase.auth", ["firebase.utils"]);
+  angular.module("firebase.database", ["firebase.utils"]);
 
-})(window);
+  // Define the `firebase` module under which all AngularFire
+  // services will live.
+  angular.module("firebase", ["firebase.utils", "firebase.config", "firebase.auth", "firebase.database"])
+    //TODO: use $window
+    .value("Firebase", exports.firebase)
+    .value("firebase", exports.firebase);
+})(window);

src/utils.js src/utils/utils.jssrc/utils.js renamed to src/utils/utils.js

@@ -1,7 +1,7 @@
 (function() {
   'use strict';
 
-  angular.module('firebase')
+  angular.module('firebase.utils')
     .factory('$firebaseConfig', ["$firebaseArray", "$firebaseObject", "$injector",
       function($firebaseArray, $firebaseObject, $injector) {
         return function(configOpts) {

tests/initialize-node.js

@@ -7,8 +7,7 @@ if (!process.env.ANGULARFIRE_TEST_DB_URL) {
 
 try {
   firebase.initializeApp({
-    databaseURL: process.env.ANGULARFIRE_TEST_DB_URL,
-    serviceAccount: path.resolve(__dirname, './key.json')
+    databaseURL: process.env.ANGULARFIRE_TEST_DB_URL
   });
 } catch (err) {
   console.log('Failed to initialize the Firebase SDK [Node]:', err);

tests/protractor/chat/chat.js

@@ -1,4 +1,4 @@
-var app = angular.module('chat', ['firebase']);
+var app = angular.module('chat', ['firebase.database']);
 
 app.controller('ChatCtrl', function Chat($scope, $firebaseObject, $firebaseArray) {
   // Get a reference to the Firebase