Merge pull request #44 from firebase/jw-geofire-302

Fixed Node.js bug

build/header

@@ -12,9 +12,6 @@
 
 // Include RSVP if this is being run in node
 if (typeof module !== "undefined" && typeof process !== "undefined") {
-  // We need this `Firebase || require("firebase")` hack to get GeoFire to work properly in Node.js
-  // since otherwise, checking for `instanceof Firebase` fails.
-  var Firebase = Firebase || require("firebase");
   var RSVP = require("rsvp");
 }
 

changelog.txt

@@ -0,0 +1 @@
+fixed - Fixed typo in 3.0.1 release which caused it to be unusable.

src/geoFire.js

@@ -99,7 +99,7 @@ var GeoFire = function(firebaseRef) {
   /*****************/
   /*  CONSTRUCTOR  */
   /*****************/
-  if (firebaseRef instanceof Firebase === false) {
+  if (Object.prototype.toString.call(firebaseRef) !== "[object Object]") {
     throw new Error("firebaseRef must be an instance of Firebase");
   }
 

src/geoQuery.js

@@ -489,7 +489,7 @@ var GeoQuery = function (firebaseRef, queryCriteria) {
   /*  CONSTRUCTOR  */
   /*****************/
   // Firebase reference of the GeoFire which created this query
-  if (firebaseRef instanceof Firebase === false) {
+  if (Object.prototype.toString.call(firebaseRef) !== "[object Object]") {
     throw new Error("firebaseRef must be an instance of Firebase");
   }
   var _firebaseRef = firebaseRef;

tests/specs/common.spec.js

@@ -8,7 +8,7 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
 var demoFirebaseUrl = "https://geofire.firebaseio.com";
 
 // Define examples of valid and invalid parameters
-var invalidFirebaseRefs = [null, undefined, NaN, true, false, [], {}, 0, 5, "", "a", {a:1}, ["hi", 1]];
+var invalidFirebaseRefs = [null, undefined, NaN, true, false, [], 0, 5, "", "a", ["hi", 1]];
 var validKeys = ["a", "loc1", "(e@Xi:4t>*E2)hc<5oa:1s6{B0d?u", Array(743).join("a")];
 var invalidKeys = ["", 1, true, false, [], {}, [1, 2], {a: 1}, null, undefined, NaN, "loc.1", "loc$1", "[loc1", "loc1]", "loc#1", "loc/1", "a#i]$da[s", "te/nst", "te/rst", "te/u0000st", "te/u0015st", "te/007Fst", Array(800).join("a")];
 var validLocations = [[0, 0], [-90, 180], [90, -180], [23, 74], [47.235124363, 127.2379654226]];