merge from master

Author: katowulf

.travis.yml

@@ -18,6 +18,8 @@ before_script:
 - phantomjs --version
 script:
 - sh ./tests/travis.sh
+after_script:
+- cat ./tests/coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
 env:
   global:
   - secure: mGHp1rQI11OvbBQn3PnBT5kuyo26gFl8U+nNq0Ot4opgSBX9JaHqS8Dx63uALWWU9qjy08/Mn68t/sKhayH1+XrPDIenOy/XEkkSAG60qAAowD9dRo3WaIMSOcWWYDeqdZOAWZ3LiXvjLO4Swagz5ejz7UtY/ws4CcTi2n/fp7c=

Gruntfile.js

@@ -72,7 +72,7 @@ module.exports = function(grunt) {
     jshint : {
       options : {
         jshintrc: '.jshintrc',
-        ignores: ['src/polyfills.js'],
+        ignores: ['src/lib/polyfills.js']
       },
       all : ['src/**/*.js']
     },

README.md

@@ -2,6 +2,7 @@
 # AngularFire
 
 [![Build Status](https://travis-ci.org/firebase/angularfire.svg?branch=master)](https://travis-ci.org/firebase/angularfire)
+[![Coverage Status](https://img.shields.io/coveralls/firebase/angularfire.svg)](https://coveralls.io/r/firebase/angularfire)
 [![Version](https://badge.fury.io/gh/firebase%2Fangularfire.svg)](http://badge.fury.io/gh/firebase%2Fangularfire)
 
 AngularFire is the officially supported [AngularJS](http://angularjs.org/) binding for

package.json

@@ -34,6 +34,7 @@
     "firebase": "1.0.x"
   },
   "devDependencies": {
+    "coveralls": "^2.11.1",
     "grunt": "~0.4.1",
     "grunt-cli": "^0.1.13",
     "grunt-contrib-concat": "^0.4.0",
@@ -45,16 +46,16 @@
     "grunt-notify": "~0.2.7",
     "grunt-protractor-runner": "^1.0.0",
     "grunt-shell-spawn": "^0.3.0",
+    "jasmine-spec-reporter": "^0.4.0",
     "karma": "~0.12.0",
+    "karma-chrome-launcher": "^0.1.4",
+    "karma-coverage": "^0.2.4",
+    "karma-failed-reporter": "0.0.2",
     "karma-jasmine": "~0.2.0",
     "karma-phantomjs-launcher": "~0.1.0",
     "karma-sauce-launcher": "~0.2.9",
-    "load-grunt-tasks": "~0.2.0",
-    "protractor": "^1.0.0",
-    "karma-coverage": "^0.2.4",
-    "karma-failed-reporter": "0.0.2",
-    "jasmine-spec-reporter": "^0.4.0",
     "karma-spec-reporter": "0.0.13",
-    "karma-chrome-launcher": "^0.1.4"
+    "load-grunt-tasks": "~0.2.0",
+    "protractor": "^1.0.0"
   }
 }

src/FirebaseArray.js

@@ -265,6 +265,7 @@
             }
             rec.$id = snap.name();
             rec.$priority = snap.getPriority();
+            $firebaseUtils.applyDefaults(rec, this.$$defaults);
 
             // add it to array and send notifications
             this._process('child_added', rec, prevChild);
@@ -295,6 +296,7 @@
           if( angular.isObject(rec) ) {
             // apply changes to the record
             var changed = $firebaseUtils.updateRec(rec, snap);
+            $firebaseUtils.applyDefaults(rec, this.$$defaults);
             if( changed ) {
               this._process('child_changed', rec);
             }

src/FirebaseObject.js

@@ -48,8 +48,17 @@
           listeners: []
         };
 
+        // this bit of magic makes $$conf non-enumerable and non-configurable
+        // and non-writable (its properties are still writable but the ref cannot be replaced)
+        // we declare it above so the IDE can relax
+        Object.defineProperty(this, '$$conf', {
+          value: this.$$conf
+        });
+
         this.$id = $firebase.$ref().ref().name();
         this.$priority = null;
+
+        $firebaseUtils.applyDefaults(this, this.$$defaults);
       }
 
       FirebaseObject.prototype = {
@@ -168,6 +177,7 @@
         $$updated: function (snap) {
           // applies new data to this object
           var changed = $firebaseUtils.updateRec(this, snap);
+          $firebaseUtils.applyDefaults(this, this.$$defaults);
           if( changed ) {
             // notifies $watch listeners and
             // updates $scope if bound to a variable
@@ -208,6 +218,15 @@
           angular.forEach(list, function (parts) {
             parts[0].call(parts[1], {event: 'value', key: self.$id});
           });
+        },
+
+        /**
+         * Overrides how Angular.forEach iterates records on this object so that only
+         * fields stored in Firebase are part of the iteration. To include meta fields like
+         * $id and $priority in the iteration, utilize for(key in obj) instead.
+         */
+        forEach: function(iterator, context) {
+          return $firebaseUtils.each(this, iterator, context);
         }
       };
 

src/firebase.js

@@ -170,7 +170,7 @@
               throw new Error('config.arrayFactory must be a valid function');
             }
             if (!angular.isFunction(cnf.objectFactory)) {
-              throw new Error('config.arrayFactory must be a valid function');
+              throw new Error('config.objectFactory must be a valid function');
             }
           }
         };

src/firebaseSimpleLogin.js

@@ -1,3 +1,4 @@
+/* istanbul ignore next */
 (function() {
   'use strict';
   var AngularFireAuth;

src/polyfills.js src/lib/polyfills.jssrc/polyfills.js renamed to src/lib/polyfills.js

@@ -238,7 +238,7 @@
           },
 
           compile: function(fn) {
-            return $timeout(fn||function() {}, wait||0);
+            return $timeout(fn||function() {});
           },
 
           deepCopy: function(obj) {
@@ -298,17 +298,20 @@
             angular.extend(rec, data);
             rec.$priority = snap.getPriority();
 
-            if( angular.isObject(rec.$$defaults) ) {
-              angular.forEach(rec.$$defaults, function(v,k) {
+            return !angular.equals(oldData, rec) ||
+              oldData.$value !== rec.$value ||
+              oldData.$priority !== rec.$priority;
+          },
+
+          applyDefaults: function(rec, defaults) {
+            if( angular.isObject(defaults) ) {
+              angular.forEach(defaults, function(v,k) {
                 if( !rec.hasOwnProperty(k) ) {
                   rec[k] = v;
                 }
               });
             }
-
-            return !angular.equals(oldData, rec) ||
-              oldData.$value !== rec.$value ||
-              oldData.$priority !== rec.$priority;
+            return rec;
           },
 
           dataKeys: function(obj) {
@@ -320,13 +323,22 @@
           },
 
           each: function(obj, iterator, context) {
-            angular.forEach(obj, function(v,k) {
-              var c = k.charAt(0);
-              //todo does _ belong here? it's a valid char in firebase keys
-              if( c !== '_' && c !== '$' && c !== '.' ) {
-                iterator.call(context, v, k, obj);
+            if(angular.isObject(obj)) {
+              for (var k in obj) {
+                if (obj.hasOwnProperty(k)) {
+                  var c = k.charAt(0);
+                  if( c !== '_' && c !== '$' && c !== '.' ) {
+                    iterator.call(context, obj[k], k, obj);
+                  }
+                }
               }
-            });
+            }
+            else if(angular.isArray(obj)) {
+              for(var i = 0, len = obj.length; i < len; i++) {
+                iterator.call(context, obj[i], i, obj);
+              }
+            }
+            return obj;
           },
 
           /**