Merge pull request #841 from firebase/modulefire

fix(modules): Separate AngularFire services into modules
FirebaseExtended · Aug 16, 2016 · c4127e6 · c4127e6
2 parents 8a32f0c + d399c05
commit c4127e6
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 31 deletions.
diff --git a/src/FirebaseAuth.js → src/auth/FirebaseAuth.js b/src/FirebaseAuth.js → 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.

diff --git a/src/firebaseAuthService.js → src/auth/firebaseAuthService.js b/src/firebaseAuthService.js → src/auth/firebaseAuthService.js
@@ -6,7 +6,7 @@
   }
   FirebaseAuthService.$inject = ['$firebaseAuth'];
 
-  angular.module('firebase')
+  angular.module('firebase.auth')
     .factory('$firebaseAuthService', FirebaseAuthService);
 
 })();
diff --git a/src/FirebaseArray.js → src/database/FirebaseArray.js b/src/FirebaseArray.js → 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

diff --git a/src/FirebaseObject.js → src/database/FirebaseObject.js b/src/FirebaseObject.js → 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) {
       /**

diff --git a/src/firebaseRef.js → src/database/firebaseRef.js b/src/firebaseRef.js → src/database/firebaseRef.js
@@ -40,7 +40,7 @@
     };
   }
 
-  angular.module('firebase')
+  angular.module('firebase.database')
     .provider('$firebaseRef', FirebaseRef);
 
 })();
diff --git a/src/firebase.js b/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');

diff --git a/src/module.js b/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);
diff --git a/src/utils.js → src/utils/utils.js b/src/utils.js → 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) {

diff --git a/tests/initialize-node.js b/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);

diff --git a/tests/protractor/chat/chat.js b/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

diff --git a/tests/protractor/priority/priority.js b/tests/protractor/priority/priority.js
@@ -1,4 +1,4 @@
-var app = angular.module('priority', ['firebase']);
+var app = angular.module('priority', ['firebase.database']);
 app.controller('PriorityCtrl', function Chat($scope, $firebaseArray, $firebaseObject) {
   // Get a reference to the Firebase
   var rootRef = firebase.database().ref();

diff --git a/tests/protractor/tictactoe/tictactoe.js b/tests/protractor/tictactoe/tictactoe.js
@@ -1,4 +1,4 @@
-var app = angular.module('tictactoe', ['firebase']);
+var app = angular.module('tictactoe', ['firebase.database']);
 app.controller('TicTacToeCtrl', function Chat($scope, $firebaseObject) {
   $scope.board = {};
 

diff --git a/tests/protractor/todo/todo.js b/tests/protractor/todo/todo.js
@@ -1,4 +1,4 @@
-var app = angular.module('todo', ['firebase']);
+var app = angular.module('todo', ['firebase.database']);
 app. controller('TodoCtrl', function Todo($scope, $firebaseArray) {
   // Get a reference to the Firebase
   var rootRef = firebase.database().ref();
@@ -8,7 +8,7 @@ app. controller('TodoCtrl', function Todo($scope, $firebaseArray) {
 
   // Put the Firebase URL into the scope so the tests can grab it.
   $scope.url = todosRef.toString()
-  
+
   // Get the todos as an array
   $scope.todos = $firebaseArray(todosRef);
 

diff --git a/tests/unit/FirebaseArray.spec.js b/tests/unit/FirebaseArray.spec.js
@@ -31,7 +31,7 @@ describe('$firebaseArray', function () {
 
   var arr, $firebaseArray, $utils, $timeout, $rootScope, $q, tick, testutils;
   beforeEach(function() {
-    module('firebase');
+    module('firebase.database');
     module('testutils');
     inject(function (_$firebaseArray_, $firebaseUtils, _$timeout_, _$rootScope_, _$q_, _testutils_) {
       testutils = _testutils_;

diff --git a/tests/unit/FirebaseAuth.spec.js b/tests/unit/FirebaseAuth.spec.js
@@ -8,8 +8,9 @@ describe('FirebaseAuth',function(){
     log = {
       warn:[]
     };
-
-    module('firebase',function($provide){
+    // 
+    // module('firebase.utils');
+    module('firebase.auth',function($provide){
       $provide.value('$log',{
         warn:function(){
           log.warn.push(Array.prototype.slice.call(arguments,0));

diff --git a/tests/unit/FirebaseAuthService.spec.js b/tests/unit/FirebaseAuthService.spec.js
@@ -3,10 +3,9 @@ describe('$firebaseAuthService', function () {
   var $firebaseRefProvider;
   var URL = 'https://angularfire-dae2e.firebaseio.com'
 
-  beforeEach(module('firebase', function(_$firebaseRefProvider_) {
-    $firebaseRefProvider = _$firebaseRefProvider_;
-    $firebaseRefProvider.registerUrl(URL);
-  }));
+  beforeEach(function () {
+    module('firebase.auth')
+  });
 
   describe('<constructor>', function() {
 
@@ -18,7 +17,7 @@ describe('$firebaseAuthService', function () {
       });
     });
 
-    it('should exist because we called $firebaseRefProvider.registerUrl()', inject(function() {
+    it('should exist', inject(function() {
       expect($firebaseAuthService).not.toBe(null);
     }));
 

diff --git a/tests/unit/FirebaseObject.spec.js b/tests/unit/FirebaseObject.spec.js
@@ -15,7 +15,7 @@ describe('$firebaseObject', function() {
       error:[]
     };
 
-    module('firebase');
+    module('firebase.database');
     module('testutils',function($provide){
       $provide.value('$log',{
         error:function(){
@@ -759,7 +759,7 @@ describe('$firebaseObject', function() {
       expect(obj.$destroy).toHaveBeenCalledWith(error);
     });
   });
-  
+
   var pushCounter = 1;
 
   function fakeSnap(data, pri) {

diff --git a/tests/unit/firebaseRef.spec.js b/tests/unit/firebaseRef.spec.js
@@ -2,9 +2,10 @@
 describe('firebaseRef', function () {
 
   var $firebaseRefProvider;
+  //TODO: Load this from env
   var MOCK_URL = 'https://angularfire-dae2e.firebaseio.com'
 
-  beforeEach(module('firebase', function(_$firebaseRefProvider_) {
+  beforeEach(module('firebase.database', function(_$firebaseRefProvider_) {
     $firebaseRefProvider = _$firebaseRefProvider_;
   }));
 

diff --git a/tests/unit/utils.spec.js b/tests/unit/utils.spec.js
@@ -30,7 +30,7 @@ describe('$firebaseUtils', function () {
   };
 
   beforeEach(function () {
-    module('firebase');
+    module('firebase.utils');
     module('testutils');
     inject(function (_$firebaseUtils_, _$timeout_, _$rootScope_, _$q_, _testutils_) {
       $utils = _$firebaseUtils_;