Prepare to Firebase 3 Upgrade

.gitignore

@@ -1,6 +1,61 @@
-dist/
-test/coverage/
-node_modules/
-bower_components/
+# Logs
+*.log
+logs
+npm-debug.log*
+
+# Runtime data
+*.pid
+*.pid.lock
+*.seed
+pids
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+bower_components
+jspm_packages
+node_modules
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Directory used by test tools like Coverage and Grump
+dist
 test/coverage
-.idea
+
+# Emacs
+*~
+.*~
+.\#*
+\#*
+
+# JetBrains WebStorm
+.idea
+
+# Microsoft Visual Studio Code
+.vscode

.travis.yml

@@ -3,6 +3,9 @@ node_js:
 - '0.10'
 - '0.12'
 - stable
+before_install:
+  - npm install -g npm
+  - npm install -g karma-cli
 sudo: false
 install:
 - npm install -g bower

Gruntfile.js

@@ -96,18 +96,17 @@ module.exports = function(grunt) {
   });
 
   grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-notify');
   grunt.loadNpmTasks('grunt-karma');
-  grunt.loadNpmTasks('grunt-copy');
-  grunt.loadNpmTasks('grunt-serve');
 
   // Unit tests
   grunt.registerTask('test', ['karma:unit']);
 
   grunt.registerTask('build', ['jshint', 'concat', 'uglify']);
   grunt.registerTask('default', ['build', 'test']);
-  grunt.registerTask('todo', ['build', 'serve']);
+  grunt.registerTask('todo', ['build', 'connect']);
 };

LICENSE

@@ -1,19 +1,21 @@
-Copyright 2015 Firebase, https://www.firebase.com/
+The MIT License (MIT)
+
+Copyright (c) 2016 Firebase
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the “Software”), to deal
+of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -4,7 +4,7 @@
 [![Coverage Status](https://img.shields.io/coveralls/firebase/backbonefire.svg?branch=master&style=flat)](https://coveralls.io/r/firebase/backbonefire?branch=master)
 [![Version](https://badge.fury.io/gh/firebase%2Fbackbonefire.svg?branch=master)](http://badge.fury.io/gh/firebase%2Fbackbonefire)
 
-BackboneFire is the officially supported [Backbone](http://backbonejs.org) binding for Firebasem data. The bindings let you use special model and collection types that allow for synchronizing data with [Firebase](http://www.firebase.com/?utm_medium=web&utm_source=backbonefire).
+BackboneFire is the officially supported [Backbone](http://backbonejs.org) binding for Firebase data. The bindings let you use special model and collection types that allow for synchronizing data with [Firebase](http://www.firebase.com/?utm_medium=web&utm_source=backbonefire).
 
 ## Live Demo
 

bower.json

@@ -1,9 +1,9 @@
 {
   "name": "backbonefire",
   "description": "The officially supported Backbone binding for Firebase",
-  "version": "0.0.0",
+  "version": "0.5.1",
   "authors": [
-    "Firebase <[email protected]> (https://www.firebase.com/)"
+    "Firebase (https://firebase.google.com/)"
   ],
   "homepage": "https://github.com/firebase/backbonefire/",
   "repository": {
@@ -32,9 +32,9 @@
     "index.html"
   ],
   "dependencies": {
-    "firebase": "2.0.x",
     "backbone": "<=1.1.0",
-    "underscore": "~1.5.2"
+    "firebase": "2.0.x",
+    "underscore": "~1.8.3"
   },
   "devDependencies": {
     "mockfirebase": "~0.3.0"

examples/todos/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "todomvc-backbonefire",
-  "version": "0.0.0",
+  "version": "0.5.1",
   "private": true,
   "dependencies": {
     "backbone": "~1.1.0",

examples/todos/js/backbonefire.js

@@ -9,7 +9,7 @@ define([
    * bindings let you use special model and collection types that allow for
    * synchronizing data with Firebase.
    *
-   * BackboneFire 0.0.0
+   * BackboneFire 0.5.1
    * https://github.com/firebase/backbonefire/
    * License: MIT
    */

examples/todos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backbone-fire-todo",
-  "version": "0.0.0",
+  "version": "0.5.1",
   "description": "Todo example using Backbone Fire.",
   "main": "index.html",
   "scripts": {

package.json

@@ -1,8 +1,8 @@
 {
   "name": "backbonefire",
   "description": "The officially supported Backbone binding for Firebase",
-  "version": "0.0.0",
-  "author": "Firebase <[email protected]> (https://www.firebase.com/)",
+  "version": "0.5.1",
+  "author": "Firebase (https://firebase.google.com/)",
   "homepage": "https://github.com/firebase/backbonefire/",
   "repository": {
     "type": "git",
@@ -33,32 +33,33 @@
     "firebase": "2.0.x"
   },
   "devDependencies": {
-    "chai-backbone": "~0.9.2",
-    "coveralls": "^2.11.1",
-    "grunt": "~0.4.1",
-    "grunt-cli": "0.1.13",
-    "grunt-contrib-concat": "^0.5.0",
-    "grunt-contrib-jshint": "~0.6.2",
-    "grunt-contrib-uglify": "~0.2.2",
-    "grunt-contrib-watch": "~0.5.1",
-    "grunt-karma": "^0.8.3",
-    "grunt-notify": "~0.2.7",
-    "istanbul": "^0.3.2",
-    "karma": "~0.12.8",
-    "karma-chai": "0.0.2",
-    "karma-coverage": "^0.2.6",
-    "karma-failed-reporter": "0.0.2",
-    "karma-mocha": "~0.1.0",
-    "karma-phantomjs-launcher": "~0.1.0",
-    "karma-requirejs": "~0.2.0",
-    "karma-sinon": "~1.0.0",
-    "karma-spec-reporter": "0.0.13",
-    "mocha": "~1.14.0",
-    "requirejs": "~2.1.9",
-    "karma-chrome-launcher": "^0.1.4",
-    "grunt-copy": "^0.1.0",
-    "grunt-contrib-connect": "^0.9.0",
-    "grunt-serve": "^0.1.6"
+    "chai": "~3.5.0",
+    "chai-backbone": "~0.9.4",
+    "coveralls": "^2.11.14",
+    "grunt": "~1.0.1",
+    "grunt-cli": "1.2.0",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-connect": "^1.0.2",
+    "grunt-contrib-copy": "~1.0.0",
+    "grunt-contrib-jshint": "~1.0.0",
+    "grunt-contrib-uglify": "~2.0.0",
+    "grunt-contrib-watch": "~1.0.0",
+    "grunt-karma": "^2.0.0",
+    "grunt-notify": "~0.4.5",
+    "istanbul": "^0.4.5",
+    "karma": "~1.3.0",
+    "karma-chai": "0.1.0",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-coverage": "^1.1.1",
+    "karma-failed-reporter": "0.0.3",
+    "karma-mocha": "~1.2.0",
+    "karma-phantomjs-launcher": "~1.0.2",
+    "karma-requirejs": "~1.1.0",
+    "karma-sinon": "~1.0.5",
+    "karma-spec-reporter": "0.0.26",
+    "mocha": "~3.1.2",
+    "requirejs": "~2.3.2",
+    "sinon" : "~1.17.6"
   },
   "scripts": {
     "test": "grunt test",

src/backbonefire.js

@@ -3,7 +3,7 @@
  * bindings let you use special model and collection types that allow for
  * synchronizing data with Firebase.
  *
- * BackboneFire 0.0.0
+ * BackboneFire 0.5.1
  * https://github.com/firebase/backbonefire/
  * License: MIT
  */

test/specs/collection_test.js

@@ -395,9 +395,9 @@ describe('Backbone.Firebase.Collection', function() {
         collection.fetch();
         collection.on('sync', function() {
           successCalled = true;
+          expect(successCalled).to.be.ok;
         });
         collection.firebase.flush();
-        expect(successCalled).to.be.ok;
       });
 
     });