Merge pull request #9 from florianbepunkt/master

Salakar · web-flow · commit a80360b5fa89 · 2016-12-12T11:02:51.000Z
fix presence() syntax
diff --git a/android/src/main/java/io/fullstack/firestack/database/FirestackDatabase.java b/android/src/main/java/io/fullstack/firestack/database/FirestackDatabase.java
@@ -286,6 +286,16 @@ public void onComplete(DatabaseError error, DatabaseReference ref) {
     });
   }
 
+  @ReactMethod
+  public void goOnline() {
+    mFirebaseDatabase.goOnline();
+  }
+
+  @ReactMethod
+  public void goOffline() {
+    mFirebaseDatabase.goOffline();
+  }
+
   private void handleCallback(
           final String methodName,
           final Callback callback,
diff --git a/ios/Firestack/FirestackDatabase.m b/ios/Firestack/FirestackDatabase.m
@@ -56,12 +56,10 @@ - (void) addEventHandler:(NSString *) eventName
                                  @"snapshot": props
                                  }];
         };
-        
         id errorBlock = ^(NSError * _Nonnull error) {
             NSLog(@"Error onDBEvent: %@", [error debugDescription]);
             [self getAndSendDatabaseError:error withPath: _path];
         };
-        
         int eventType = [self eventTypeFromName:eventName];
         FIRDatabaseHandle handle = [_query observeEventType:eventType
                                                   withBlock:withBlock
@@ -139,7 +137,6 @@ - (NSDictionary *) snapshotToDict:(FIRDataSnapshot *) snapshot
     [dict setValue:snapshot.key forKey:@"key"];
     NSDictionary *val = snapshot.value;
     [dict setObject:val forKey:@"value"];
-    
     // Snapshot ordering
     NSMutableArray *childKeys = [NSMutableArray array];
     if (snapshot.childrenCount > 0) {
@@ -152,13 +149,11 @@ - (NSDictionary *) snapshotToDict:(FIRDataSnapshot *) snapshot
             [childKeys addObject:child.key];
         }
     }
-    
     [dict setObject:childKeys forKey:@"childKeys"];
     [dict setValue:@(snapshot.hasChildren) forKey:@"hasChildren"];
     [dict setValue:@(snapshot.exists) forKey:@"exists"];
     [dict setValue:@(snapshot.childrenCount) forKey:@"childrenCount"];
     [dict setValue:snapshot.priority forKey:@"priority"];
-    
     return dict;
 }
 
@@ -171,7 +166,6 @@ - (NSDictionary *) getAndSendDatabaseError:(NSError *) error
                           @"msg": [error debugDescription]
                           };
     [self sendJSEvent:DATABASE_ERROR_EVENT title:DATABASE_ERROR_EVENT props: evt];
-    
     return evt;
 }
 
@@ -471,7 +465,6 @@ - (id) init
 {
     FirestackDBReference *ref = [self getDBHandle:path modifiers:modifiers modifiersString:modifiersString];
     [ref addEventHandler:eventName];
-    
     callback(@[[NSNull null], @{
                    @"status": @"success",
                    @"handle": path
@@ -495,7 +488,6 @@ - (id) init
 {
     NSString *key = [self getDBListenerKey:path withModifiers:modifiersString];
     FirestackDBReference *ref = [_dbReferences objectForKey:key];
-    
     if (ref != nil) {
         if (eventName == nil || [eventName isEqualToString:@""]) {
             [ref cleanup];
@@ -507,7 +499,6 @@ - (id) init
             }
         }
     }
-    
     callback(@[[NSNull null], @{
                    @"result": @"success",
                    @"handle": path,
@@ -559,6 +550,16 @@ - (id) init
     }];
 }
 
+RCT_EXPORT_METHOD(goOffline)
+{
+    [FIRDatabase database].goOffline;
+}
+
+RCT_EXPORT_METHOD(goOnline)
+{
+    [FIRDatabase database].goOnline;
+}
+
 - (FIRDatabaseReference *) getPathRef:(NSString *) path
 {
     return [[[FIRDatabase database] reference] child:path];
@@ -612,4 +613,5 @@ - (NSString *) getDBListenerKey:(NSString *) path
     return @[DATABASE_DATA_EVENT, DATABASE_ERROR_EVENT];
 }
 
+
 @end
diff --git a/lib/modules/database/index.js b/lib/modules/database/index.js
@@ -203,6 +203,14 @@ export default class Database extends Base {
     return path.join('-');
   }
 
+  goOnline() {
+    FirestackDatabase.goOnline();
+  }
+
+  goOffline() {
+    FirestackDatabase.goOffline();
+  }
+
   get namespace(): string {
     return 'firestack:database';
   }
diff --git a/lib/modules/presence.js b/lib/modules/presence.js
@@ -7,7 +7,7 @@ class PresenceRef extends ReferenceBase {
     super(presence.firestack);
 
     this.presence = presence;
-    const db = this.firestack.database;
+    const db = this.firestack.database();
     this.ref = ref;
     this.lastOnlineRef = this.ref.child('lastOnline');
 
@@ -84,7 +84,7 @@ export default class Presence extends Base {
     const path = this.path.concat(key);
     const pathKey = this._presenceKey(path);
     if (!this.instances[pathKey]) {
-      const _ref = this.firestack.database.ref(pathKey);
+      const _ref = this.firestack.database().ref(pathKey);
       this.log.debug('Created new presence object for ', pathKey);
       const inst = new PresenceRef(this, _ref, path);
 
diff --git a/package.json b/package.json
@@ -1,22 +1,98 @@
 {
-  "name": "react-native-firestack",
-  "version": "2.3.3",
-  "author": "Ari Lerner <ari@fullstack.io> (https://fullstackreact.com)",
-  "description": "A firebase v3 adapter",
-  "main": "index",
-  "scripts": {
-    "start": "node node_modules/react-native/local-cli/cli.js start",
-    "build": "./node_modules/.bin/babel --source-maps=true --out-dir=dist .",
-    "dev": "npm run compile -- --watch",
-    "lint": "eslint ./src",
-    "publish_pages": "gh-pages -d public/",
-    "test": "./node_modules/.bin/mocha",
-    "watchcpx": "node ./bin/watchCopy"
+  "_args": [
+    [
+      {
+        "raw": "https://github.com/Salakar/react-native-firestack",
+        "scope": null,
+        "escapedName": null,
+        "name": null,
+        "rawSpec": "https://github.com/Salakar/react-native-firestack",
+        "spec": "git+https://github.com/Salakar/react-native-firestack.git",
+        "type": "hosted",
+        "hosted": {
+          "type": "github",
+          "ssh": "git@github.com:Salakar/react-native-firestack.git",
+          "sshUrl": "git+ssh://git@github.com/Salakar/react-native-firestack.git",
+          "httpsUrl": "git+https://github.com/Salakar/react-native-firestack.git",
+          "gitUrl": "git://github.com/Salakar/react-native-firestack.git",
+          "shortcut": "github:Salakar/react-native-firestack",
+          "directUrl": "https://raw.githubusercontent.com/Salakar/react-native-firestack/master/package.json"
+        }
+      },
+      "/Users/floriannorbertbepunkt/Dropbox/Dropbox Arbeit/Mister Bishop Studios/Roomary/roomary"
+    ]
+  ],
+  "_from": "git+https://github.com/Salakar/react-native-firestack.git",
+  "_id": "react-native-firestack@2.3.3",
+  "_inCache": true,
+  "_location": "/react-native-firestack",
+  "_phantomChildren": {},
+  "_requested": {
+    "raw": "https://github.com/Salakar/react-native-firestack",
+    "scope": null,
+    "escapedName": null,
+    "name": null,
+    "rawSpec": "https://github.com/Salakar/react-native-firestack",
+    "spec": "git+https://github.com/Salakar/react-native-firestack.git",
+    "type": "hosted",
+    "hosted": {
+      "type": "github",
+      "ssh": "git@github.com:Salakar/react-native-firestack.git",
+      "sshUrl": "git+ssh://git@github.com/Salakar/react-native-firestack.git",
+      "httpsUrl": "git+https://github.com/Salakar/react-native-firestack.git",
+      "gitUrl": "git://github.com/Salakar/react-native-firestack.git",
+      "shortcut": "github:Salakar/react-native-firestack",
+      "directUrl": "https://raw.githubusercontent.com/Salakar/react-native-firestack/master/package.json"
+    }
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/fullstackreact/react-native-firestack.git"
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "git+https://github.com/Salakar/react-native-firestack.git#50b709f91cf4e9fd141ef94964405f88d4d2779d",
+  "_shasum": "05959e918292eeb9d6a3c39d9afb493ad11d5348",
+  "_shrinkwrap": null,
+  "_spec": "https://github.com/Salakar/react-native-firestack",
+  "_where": "/Users/floriannorbertbepunkt/Dropbox/Dropbox Arbeit/Mister Bishop Studios/Roomary/roomary",
+  "author": {
+    "name": "Ari Lerner",
+    "email": "ari@fullstack.io",
+    "url": "https://fullstackreact.com"
+  },
+  "bugs": {
+    "url": "https://github.com/fullstackreact/react-native-firestack/issues"
+  },
+  "dependencies": {
+    "bows": "^1.6.0",
+    "es6-symbol": "^3.1.0"
+  },
+  "description": "A firebase v3 adapter",
+  "devDependencies": {
+    "babel-eslint": "^7.0.0",
+    "babel-jest": "^14.1.0",
+    "babel-preset-react-native": "^1.9.0",
+    "cpx": "^1.5.0",
+    "debug": "^2.2.0",
+    "enzyme": "^2.4.1",
+    "eslint": "^3.8.1",
+    "eslint-config-airbnb": "^12.0.0",
+    "eslint-plugin-flowtype": "^2.20.0",
+    "eslint-plugin-import": "^2.0.1",
+    "eslint-plugin-jsx-a11y": "^2.2.3",
+    "eslint-plugin-react": "^6.4.1",
+    "flow-bin": "^0.35.0",
+    "jest": "^14.1.0",
+    "jest-react-native": "^14.1.3",
+    "mocha": "^3.0.2",
+    "react": "^15.3.0",
+    "react-dom": "^15.3.0",
+    "react-native-mock": "^0.2.6",
+    "react-test-renderer": "^15.3.0",
+    "should": "^11.1.0",
+    "sinon": "^2.0.0-pre.2"
   },
+  "gitHead": "50b709f91cf4e9fd141ef94964405f88d4d2779d",
+  "homepage": "https://github.com/fullstackreact/react-native-firestack#readme",
   "jest": {
     "preset": "jest-react-native",
     "setupFiles": [],
@@ -27,18 +103,27 @@
       "./node_modules/react-addons-test-utils"
     ]
   },
-  "license": "ISC",
   "keywords": [
     "react",
     "react-native",
     "react-native-firestack",
     "firestack",
     "firebase"
   ],
+  "license": "ISC",
+  "main": "index",
+  "name": "react-native-firestack",
+  "optionalDependencies": {},
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
   },
+  "readme": "# Firestack\n\nFirestack makes using the latest [Firebase](http://firebase.com) with React Native straight-forward.\n\n```\nnpm i react-native-firestack --save\n```\n\n[![Gitter](https://badges.gitter.im/fullstackreact/react-native-firestack.svg)](https://gitter.im/fullstackreact/react-native-firestack?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)\n[![npm version](https://img.shields.io/npm/v/react-native-firestack.svg)](https://www.npmjs.com/package/react-native-firestack)\n[![License](https://img.shields.io/npm/l/react-native-firestack.svg)](/LICENSE)\n\nFirestack is a _light-weight_ layer sitting on-top of the native Firebase libraries for both iOS and Android which mirrors the React Native JS api as closely as possible.\n\nFeaturing; authentication, storage, real-time database, presence, analytics, cloud messaging, remote configuration, redux support and more!\n\n## Firestack vs Firebase JS lib\n\nAlthough the [Firebase](https://www.npmjs.com/package/firebase) JavaScript library will work with React Native, it is mainly designed for the web. \n\nThe native SDK's are much better for performance compared to the web SDK. The web SDK will run on the same thread as your apps ([JS thread](https://facebook.github.io/react-native/docs/performance.html#javascript-frame-rate)) therefore limiting your JS framerate, potentially affecting things touch events and transitions/animations.\n\nThe native SDK's also contains functionality that the web SDK's do not, for example [Analytics](/docs/api/analytics.md) and [Remote Config](/docs/api/remote-config.md).\n\n## Example app\n\nWe have a working application example available in at [fullstackreact/FirestackApp](https://github.com/fullstackreact/FirestackApp). Check it out for more details about how to use Firestack.\n\n## Documentation\n\n* Installation\n  * [iOS](docs/installation.ios.md)\n  * [Android](docs/installation.android.md)\n* [Firebase Setup](docs/firebase-setup.md)\n* API\n  * [Authentication](docs/api/authentication.md)\n  * [Analytics](docs/api/analytics.md)\n  * [Storage](docs/api/storage.md)\n  * [Realtime Database](docs/api/database.md)\n  * [Presence](docs/api/presence.md)\n  * [ServerValue](docs/api/server-value.md)\n  * [Cloud Messaging](docs/api/cloud-messaging.md)\n  * [Remote Config](docs/api/remote-config.md)\n  * [Events](docs/api/events.md)\n* [Redux](docs/redux.md)\n\n## Contributing\n\nFor a detailed discussion of how Firestack works as well as how to contribute, check out our [contribution guide](https://github.com/fullstackreact/react-native-firestack/blob/master/Contributing.md).\n",
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/fullstackreact/react-native-firestack.git"
+  },
   "rnpm": {
     "commands": {
       "prelink": "node_modules/react-native-firestack/bin/prepare.sh",
@@ -51,32 +136,14 @@
       "packageInstance": "new FirestackPackage()"
     }
   },
-  "devDependencies": {
-    "babel-eslint": "^7.0.0",
-    "babel-jest": "^14.1.0",
-    "babel-preset-react-native": "^1.9.0",
-    "cpx": "^1.5.0",
-    "debug": "^2.2.0",
-    "enzyme": "^2.4.1",
-    "eslint": "^3.8.1",
-    "eslint-config-airbnb": "^12.0.0",
-    "eslint-plugin-flowtype": "^2.20.0",
-    "eslint-plugin-import": "^2.0.1",
-    "eslint-plugin-jsx-a11y": "^2.2.3",
-    "eslint-plugin-react": "^6.4.1",
-    "flow-bin": "^0.35.0",
-    "jest": "^14.1.0",
-    "jest-react-native": "^14.1.3",
-    "mocha": "^3.0.2",
-    "react": "^15.3.0",
-    "react-dom": "^15.3.0",
-    "react-native-mock": "^0.2.6",
-    "react-test-renderer": "^15.3.0",
-    "should": "^11.1.0",
-    "sinon": "^2.0.0-pre.2"
+  "scripts": {
+    "build": "babel --source-maps=true --out-dir=dist .",
+    "dev": "npm run compile -- --watch",
+    "lint": "eslint ./src",
+    "publish_pages": "gh-pages -d public/",
+    "start": "node node_modules/react-native/local-cli/cli.js start",
+    "test": "mocha",
+    "watchcpx": "node ./bin/watchCopy"
   },
-  "dependencies": {
-    "bows": "^1.6.0",
-    "es6-symbol": "^3.1.0"
-  }
+  "version": "2.3.3"
 }

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,14 @@ export default class Database extends Base {`
`203`	`203`	`return path.join('-');`
`204`	`204`	`}`
`205`	`205`
	`206`	`+ goOnline() {`
	`207`	`+ FirestackDatabase.goOnline();`
	`208`	`+ }`
	`209`	`+`
	`210`	`+ goOffline() {`
	`211`	`+ FirestackDatabase.goOffline();`
	`212`	`+ }`
	`213`	`+`
`206`	`214`	`get namespace(): string {`
`207`	`215`	`return 'firestack:database';`
`208`	`216`	`}`