Merge pull request #391 from firebase/release_0.8.1_defaults

Fixes #385 - not accepting factory names for arrayFactory and objectFact...

Author: Jacob Wenger

dist/angularfire.js

@@ -1511,13 +1511,23 @@ if ( typeof Object.getPrototypeOf !== "function" ) {
   'use strict';
 
   angular.module('firebase')
-    .factory('$firebaseConfig', ["$FirebaseArray", "$FirebaseObject",
-      function($FirebaseArray, $FirebaseObject) {
+    .factory('$firebaseConfig', ["$FirebaseArray", "$FirebaseObject", "$injector",
+      function($FirebaseArray, $FirebaseObject, $injector) {
         return function(configOpts) {
+          // make a copy we can modify
+          var opts = angular.extend({}, configOpts);
+          // look up factories if passed as string names
+          if( typeof opts.objectFactory === 'string' ) {
+            opts.objectFactory = $injector.get(opts.objectFactory);
+          }
+          if( typeof opts.arrayFactory === 'string' ) {
+            opts.arrayFactory = $injector.get(opts.arrayFactory);
+          }
+          // extend defaults and return
           return angular.extend({
             arrayFactory: $FirebaseArray,
             objectFactory: $FirebaseObject
-          }, configOpts);
+          }, opts);
         };
       }
     ])

dist/angularfire.min.js

@@ -2,13 +2,23 @@
   'use strict';
 
   angular.module('firebase')
-    .factory('$firebaseConfig', ["$FirebaseArray", "$FirebaseObject",
-      function($FirebaseArray, $FirebaseObject) {
+    .factory('$firebaseConfig', ["$FirebaseArray", "$FirebaseObject", "$injector",
+      function($FirebaseArray, $FirebaseObject, $injector) {
         return function(configOpts) {
+          // make a copy we can modify
+          var opts = angular.extend({}, configOpts);
+          // look up factories if passed as string names
+          if( typeof opts.objectFactory === 'string' ) {
+            opts.objectFactory = $injector.get(opts.objectFactory);
+          }
+          if( typeof opts.arrayFactory === 'string' ) {
+            opts.arrayFactory = $injector.get(opts.arrayFactory);
+          }
+          // extend defaults and return
           return angular.extend({
             arrayFactory: $FirebaseArray,
             objectFactory: $FirebaseObject
-          }, configOpts);
+          }, opts);
         };
       }
     ])

src/utils.js

@@ -7,6 +7,17 @@ describe('$firebase', function () {
     module('firebase');
     module('mock.firebase');
     module('mock.utils');
+    // have to create these before the first call to inject
+    // or they will not be registered with the angular mock injector
+    angular.module('firebase').provider('TestArrayFactory', {
+      $get: function() {
+        return function() {}
+      }
+    }).provider('TestObjectFactory', {
+      $get: function() {
+        return function() {};
+      }
+    });
     inject(function (_$firebase_, _$timeout_, _$rootScope_, $firebaseUtils) {
       $firebase = _$firebase_;
       $timeout = _$timeout_;
@@ -32,6 +43,39 @@ describe('$firebase', function () {
         $firebase('hello world');
       }).toThrowError(/valid Firebase reference/);
     });
+
+    it('should accept a factory name for arrayFactory', function() {
+      var ref = new Firebase('Mock://');
+      var app = angular.module('firebase');
+      // if this does not throw an error we are fine
+      expect($firebase(ref, {arrayFactory: 'TestArrayFactory'})).toBeAn('object');
+    });
+
+    it('should accept a factory name for objectFactory', function() {
+      var ref = new Firebase('Mock://');
+      var app = angular.module('firebase');
+      app.provider('TestObjectFactory', {
+        $get: function() {
+          return function() {}
+        }
+      });
+      // if this does not throw an error we are fine
+      expect($firebase(ref, {objectFactory: 'TestObjectFactory'})).toBeAn('object');
+    });
+
+    it('should throw an error if factory name for arrayFactory does not exist', function()  {
+      var ref = new Firebase('Mock://');
+      expect(function() {
+        $firebase(ref, {arrayFactory: 'notarealarrayfactorymethod'})
+      }).toThrowError();
+    });
+
+    it('should throw an error if factory name for objectFactory does not exist', function()  {
+      var ref = new Firebase('Mock://');
+      expect(function() {
+        $firebase(ref, {objectFactory: 'notarealobjectfactorymethod'})
+      }).toThrowError();
+    });
   });
 
   describe('$ref', function() {