Merge branch 'master' of https://github.com/joshschumacher/angularFire into joshschumacher-master

Author: anantn

.gitignore

@@ -0,0 +1 @@
+node_modules/

.jshintrc

@@ -0,0 +1,22 @@
+{
+  "bitwise" : true,
+  "boss"    : true,
+  "browser" : true,
+  "curly"   : true,
+  "devel"   : true,
+  "eqnull"  : true,
+  "globals" : {
+		"angular"             : false,
+		"Firebase"            : false,
+		"FirebaseSimpleLogin" : false
+  },
+  "globalstrict" : true,
+  "indent"       : 2,
+  "latedef"      : true,
+  "maxlen"       : 115,
+  "noempty"      : true,
+  "nonstandard"  : true,
+  "undef"        : true,
+  "unused"       : true,
+  "trailing"     : true
+}

.travis.yml

@@ -1,15 +1,16 @@
 language: node_js
 node_js:
-  - 0.8
+  - 0.10
 branches:
   only:
     - master
-before_install:
+install:
   - git clone git://github.com/n1k0/casperjs.git ~/casperjs
   - export PATH=$PATH:~/casperjs/bin
-  - npm install -g uglify-js
+  - npm install -g grunt-cli
+  - npm install
 before_script:
   - phantomjs --version
   - casperjs --version
 script:
-  - make test
+  - grunt

Gruntfile.js

@@ -0,0 +1,78 @@
+/* global module */
+
+module.exports = function(grunt) {
+  'use strict';
+
+  grunt.initConfig({
+    exec: {
+      casperjs : {
+        command : 'casperjs test tests/'
+      }
+    },
+
+    uglify : {
+      app : {
+        files : {
+          'angularfire.min.js' : ['angularFire.js']
+        }
+      }
+    },
+
+    jshint : {
+      options : {
+        'bitwise' : true,
+        'boss'    : true,
+        'browser' : true,
+        'curly'   : true,
+        'devel'   : true,
+        'eqnull'  : true,
+        'globals' : {
+          'angular'             : false,
+          'Firebase'            : false,
+          'FirebaseSimpleLogin' : false
+        },
+        'globalstrict' : true,
+        'indent'       : 2,
+        'latedef'      : true,
+        'maxlen'       : 115,
+        'noempty'      : true,
+        'nonstandard'  : true,
+        'undef'        : true,
+        'unused'       : true,
+        'trailing'     : true
+      },
+      all : ['angularFire.js']
+    },
+
+    watch : {
+      scripts : {
+        files : 'angularFire.js',
+        tasks : ['default', 'notify:watch'],
+        options : {
+          interrupt : true
+        }
+      }
+    },
+
+    notify: {
+      watch: {
+        options: {
+          title: 'Grunt Watch',
+          message: 'Build Finished'
+        }
+      }
+    }
+
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-uglify');
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+  grunt.loadNpmTasks('grunt-exec');
+  grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-notify');
+
+  grunt.registerTask('build', ['jshint', 'uglify']);
+  grunt.registerTask('test', ['exec:casperjs']);
+
+  grunt.registerTask('default', ['build', 'test']);
+};

Makefile

@@ -14,21 +14,28 @@ Development
 [![Build Status](https://travis-ci.org/firebase/angularFire.png)](https://travis-ci.org/firebase/angularFire)
 
 If you'd like to hack on AngularFire itself, you'll need
-[UglifyJS](https://github.com/mishoo/UglifyJS2) and
+[node.js](http://nodejs.org/download/) and
 [CasperJS](https://github.com/n1k0/casperjs):
 
 ```bash
-npm install uglify-js -g
 brew install casperjs
+npm install
 ```
 
-A Makefile is included for your convenience:
+Use grunt to build and test the code:
 
 ```bash
+# Default task - validates with jshint, minifies source and then runs unit tests
+grunt
+
+# Watch for changes and run unit test after each change
+grunt watch
+
 # Run tests
-make test
+grunt test
+
 # Minify source
-make minify
+grunt build
 ```
 
 License

README.md

@@ -11,6 +11,8 @@
 
 "use strict";
 
+var AngularFire;
+
 // Define the `firebase` module under which all AngularFire services will live.
 angular.module("firebase", []).value("Firebase", Firebase);
 
@@ -33,7 +35,7 @@ angular.module("firebase").factory("angularFire", ["$q", "$parse", "$timeout",
 ]);
 
 // The `AngularFire` object that implements implicit synchronization.
-function AngularFire($q, $parse, $timeout, ref) {
+AngularFire = function($q, $parse, $timeout, ref) {
   this._q = $q;
   this._parse = $parse;
   this._timeout = $timeout;
@@ -45,7 +47,8 @@ function AngularFire($q, $parse, $timeout, ref) {
       "of a URL, eg: new Firebase(url)");
   }
   this._fRef = ref;
-}
+};
+
 AngularFire.prototype = {
   // This function is called by the factory to create a new 2-way binding
   // between a particular model in a `$scope` and a particular Firebase
@@ -102,7 +105,7 @@ AngularFire.prototype = {
 
       // Update the local model to reflect remote changes.
       self._timeout(function() {
-        self._resolve($scope, name, resolve, remote)
+        self._resolve($scope, name, resolve, remote);
       });
     });
     return promise;
@@ -202,12 +205,12 @@ angular.module("firebase").factory("angularFireCollection", ["$timeout",
       }
 
       // An internal representation of a model present in the collection.
-      function angularFireItem(ref, index) {
+      var AngularFireItem = function(ref, index) {
         this.$ref = ref.ref();
         this.$id = ref.name();
         this.$index = index;
         angular.extend(this, {$priority: ref.getPriority()}, ref.val());
-      }
+      };
 
       // Implementation of firebase priority ordering:
       // https://www.firebase.com/docs/javascript/firebase/setpriority.html
@@ -290,7 +293,7 @@ angular.module("firebase").factory("angularFireCollection", ["$timeout",
       collectionRef.on("child_added", function(data, prevId) {
         $timeout(function() {
           var index = getIndex(prevId);
-          addChild(index, new angularFireItem(data, index));
+          addChild(index, new AngularFireItem(data, index));
           updateIndexes(index);
         });
       });
@@ -308,7 +311,7 @@ angular.module("firebase").factory("angularFireCollection", ["$timeout",
         $timeout(function() {
           var index = indexes[data.name()];
           var newIndex = getIndex(prevId);
-          var item = new angularFireItem(data, index);
+          var item = new AngularFireItem(data, index);
 
           updateChild(index, item);
           if (newIndex !== index) {
@@ -386,15 +389,15 @@ angular.module("firebase").factory("angularFireCollection", ["$timeout",
 
       collection.order = firebaseOrder;
       return collection;
-    }
+    };
   }
 ]);
 
 // Defines the `angularFireAuth` service that provides authentication support
 // for AngularFire.
 angular.module("firebase").factory("angularFireAuth", [
-   "$rootScope", "$parse", "$timeout", "$location", "$route", "$q",
-   function($rootScope, $parse, $timeout, $location, $route, $q) {
+  "$rootScope", "$parse", "$timeout", "$location", "$route", "$q",
+  function($rootScope, $parse, $timeout, $location, $route, $q) {
 
     // Helper function to extract claims from a JWT. Does *not* verify the
     // validity of the token.
@@ -509,7 +512,7 @@ angular.module("firebase").factory("angularFireAuth", [
           if (err) {
             $rootScope.$broadcast("angularFireAuth:error", err);
           } else if (user) {
-            self._loggedIn(user)
+            self._loggedIn(user);
           } else {
             self._loggedOut();
           }
@@ -549,7 +552,7 @@ angular.module("firebase").factory("angularFireAuth", [
               }
             });
           } catch(e) {
-            $rootScope.$broadcast("angularFireAuth:error", e)
+            $rootScope.$broadcast("angularFireAuth:error", e);
           }
         }
         return promise;
@@ -638,6 +641,6 @@ angular.module("firebase").factory("angularFireAuth", [
         }));
         return def.promise;
       }
-    }
+    };
   }
 ]);