Merge branch 'master' into anonymous

* master:
  Fixeds #62
  2.3.1
  Allow modular headers to be included
  Change asset upload to use data rather than file
  Bugfix in configuration using google-services.json
  Update README to include info about google-services.json
  Fix Android Storage, allow config via .json file

Author: auser

README.md

@@ -200,10 +200,31 @@ Lastly, due to some dependencies requirements, Firestack supports iOS versions 8
 
 ### Android
 
-There are several ways to setup Firebase on Android. The _easiest_ way is to pass the configuration settings in JavaScript. In that way, there is no setup for the native platform. 
+There are several ways to setup Firebase on Android. The _easiest_ way is to pass the configuration settings in JavaScript. In that way, there is no setup for the native platform.
 
+#### google-services.json setup
 If you prefer to include the default settings in the source of your app, download the `google-services.json` file provided by Firebase in the _Add Firebase to Android_ platform menu in your Firebase configuration console.
 
+Next you'll have to add the google-services gradle plugin in order to parse it.
+
+Add the google-services gradle plugin as a dependency in the *project* level build.gradle
+`android/build.gradle`
+```java
+buildscript {
+  // ...
+  dependencies {
+    // ...
+    classpath 'com.google.gms:google-services:3.0.0'
+  }
+}
+```
+
+In your app build.gradle file, add the gradle plugin at the VERY BOTTOM of the file (below all dependencies)
+`android/app/build.gradle`
+```java
+apply plugin: 'com.google.gms.google-services'
+```
+
 ## Usage
 
 After creating a Firebase project and installing the library, we can use it in our project by importing the library in our JavaScript:

android/src/main/java/io/fullstack/firestack/FirestackModule.java

@@ -66,7 +66,7 @@ public String setKeyOrDefault(
           final String val = params.getString(key);
           Log.d(TAG, "Setting " + key + " from params to: " + val);
           return val;
-        } else if (defaultValue != null && defaultValue != "") {
+        } else if (defaultValue != null && !defaultValue.equals("")) {
           Log.d(TAG, "Setting " + key + " from params to: " + defaultValue);
           return defaultValue;
         } else {

android/src/main/java/io/fullstack/firestack/FirestackStorage.java

@@ -60,14 +60,16 @@ public String getName() {
   }
 
   @ReactMethod
-  public void downloadUrl(final String storageUrl,
+  public void downloadUrl(final String javascriptStorageBucket,
                           final String path,
                           final Callback callback) {
       FirebaseStorage storage = FirebaseStorage.getInstance();
+      String storageBucket = storage.getApp().getOptions().getStorageBucket();
+      String storageUrl = "gs://"+storageBucket;
       StorageReference storageRef = storage.getReferenceFromUrl(storageUrl);
-    StorageReference fileRef = storageRef.child(path);
+      StorageReference fileRef = storageRef.child(path);
 
-      Task<Uri> downloadTask = storageRef.getDownloadUrl();
+      Task<Uri> downloadTask = fileRef.getDownloadUrl();
       downloadTask.addOnSuccessListener(new OnSuccessListener<Uri>() {
         @Override
         public void onSuccess(Uri uri) {

ios/Firestack.xcodeproj/project.pbxproj

@@ -244,6 +244,7 @@
 		58B511F01A9E6C8500147676 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				DEFINES_MODULE = NO;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
 				ENABLE_BITCODE = YES;
@@ -272,6 +273,7 @@
 		58B511F11A9E6C8500147676 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				DEFINES_MODULE = NO;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = NO;
 				ENABLE_BITCODE = YES;

ios/Firestack/FirestackStorage.m

@@ -53,45 +53,36 @@ @implementation FirestackStorage
         return callback(@[err]);
     }
 
+    FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:urlStr];
+    FIRStorageReference *uploadRef = [storageRef child:name];
+    FIRStorageMetadata *firmetadata = [[FIRStorageMetadata alloc] initWithDictionary:metadata];
+    
     if ([path hasPrefix:@"assets-library://"]) {
         NSURL *localFile = [[NSURL alloc] initWithString:path];
         PHFetchResult* assets = [PHAsset fetchAssetsWithALAssetURLs:@[localFile] options:nil];
         PHAsset *asset = [assets firstObject];
-        [asset requestContentEditingInputWithOptions:nil
-                                   completionHandler:^(PHContentEditingInput *contentEditingInput, NSDictionary *info) {
-                                       NSURL *imageFile = contentEditingInput.fullSizeImageURL;
-                                       
-                                       [self performUpload:urlStr
-                                                      name:name
-                                                      file:imageFile
-                                                  metadata:nil
-                                                  callback:callback];
-                                   }];
+        [[PHImageManager defaultManager] requestImageDataForAsset:asset
+                                                    options:nil
+                                                    resultHandler:^(NSData * imageData, NSString * dataUTI, UIImageOrientation orientation, NSDictionary * info) {
+                                                        FIRStorageUploadTask *uploadTask = [uploadRef putData:imageData
+                                                                                                     metadata:firmetadata];
+                                                        [self addUploadObservers:uploadTask
+                                                                        callback:callback];
+                                                    }];
     } else {
-        NSURL *localFile = [NSURL fileURLWithPath:path];
-        FIRStorageMetadata *firmetadata = [[FIRStorageMetadata alloc] initWithDictionary:metadata];
+        NSURL *imageFile = [NSURL fileURLWithPath:path];
+        FIRStorageUploadTask *uploadTask = [uploadRef putFile:imageFile
+                                                     metadata:firmetadata];
 
-        [self performUpload:urlStr
-                       name:name
-                       file:localFile
-                   metadata:firmetadata
-                   callback:callback];
+        [self addUploadObservers:uploadTask
+                        callback:callback];
     }
 
 }
 
-- (void) performUpload:(NSString *) urlStr
-                  name:(NSString *) name
-                  file:(NSURL *) imageFile
-              metadata:(FIRStorageMetadata *) firmetadata
-              callback:(RCTResponseSenderBlock) callback
+- (void) addUploadObservers:(FIRStorageUploadTask *) uploadTask
+                   callback:(RCTResponseSenderBlock) callback
 {
-    FIRStorageReference *storageRef = [[FIRStorage storage] referenceForURL:urlStr];
-    FIRStorageReference *uploadRef = [storageRef child:name];
-    
-    FIRStorageUploadTask *uploadTask = [uploadRef putFile:imageFile
-                                                 metadata:firmetadata];
-    
     // Listen for state changes, errors, and completion of the upload.
     [uploadTask observeStatus:FIRStorageTaskStatusResume handler:^(FIRStorageTaskSnapshot *snapshot) {
         // Upload resumed, also fires when the upload starts

lib/firestack.js

@@ -35,7 +35,9 @@ export class Firestack extends Singleton {
 
     instance.options = options || {};
     instance._debug = instance.options.debug || false;
-    log = instance._log = new Log('firestack', instance._debug);
+
+    Log.enable(instance._debug);
+    log = instance._log = new Log('firestack');
 
     log.info('Creating new firestack instance');
 

lib/modules/database.js

@@ -337,7 +337,7 @@ class DatabaseRef extends ReferenceBase {
   }
 
   get namespace() {
-    return `firestack:dbRef:${this.dbPath()}`
+    return `firestack:dbRef`
   }
 }
 

lib/utils/log.js

@@ -1,58 +1,44 @@
 // document hack
 import root from './window-or-global'
+
+let bows;
 (function (base) {
   window = base || window
-  if (!window.document) {
-    window.document = { documentElement: { style: { WebkitAppearance: true } } }
-  }
   if(!window.localStorage) window.localStorage = {};
 })(root);
 
-let debug = () => {};
+const levels = [
+  'warn', 'info', 'error', 'debug'
+];
 
 export class Log {
-  constructor(namespace, enable) {
+  constructor(namespace) {
     this._namespace = namespace || 'firestack';
-    this.l = null;
     this.loggers = {};
-    this.enabled = false;
-    this.enable(enable);
+    // Add the logging levels for each level
+    levels
+      .forEach(level => this[level] = (...args) => this._log(level)(...args));
   }
 
-  enable(booleanOrStringDebug) {
-    window.localStorage.debug = 
+  static enable(booleanOrStringDebug) {
+    window.localStorage.debug =
       typeof booleanOrStringDebug === 'string' ? 
-        booleanOrStringDebug : 
-        (booleanOrStringDebug ? '*' : booleanOrStringDebug);
-
-    this.enabled = !!window.localStorage.debug;
-  }
-
-  info(...args) {
-    this._logger('info')(...args);
-  }
+        (booleanOrStringDebug === '*' ? true : booleanOrStringDebug) : 
+        (booleanOrStringDebug instanceof RegExp ? booleanOrStringDebug.toString() : booleanOrStringDebug);
 
-  error(...args) {
-    this._logger('error')(...args);
+    window.localStorage.debugColors = !!window.localStorage.debug;
   }
 
-  debug(...args) {
-    this._logger('debug')(...args);
-  }
-
-  _logger(level) {
+  _log(level) {
     if (!this.loggers[level]) {
-      this.loggers[level] = this._debug()(`${this._namespace}:${level}`)
+      (function() {
+        const bows = require('bows');
+        bows.config({ padLength: 20 });
+        this.loggers[level] = bows(this._namespace, `[${level}]`);
+      }.bind(this))();
     }
     return this.loggers[level];
   }
-
-  _debug() {
-    if (!this.l) {
-      this.l = debug = require('debug');
-    }
-    return this.l;
-  }
 }
 
 export default Log;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-firestack",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "author": "Ari Lerner <ari@fullstack.io> (https://fullstackreact.com)",
   "description": "A firebase v3 adapter",
   "main": "index",
@@ -67,6 +67,7 @@
     "sinon": "^2.0.0-pre.2"
   },
   "dependencies": {
+    "bows": "^1.6.0",
     "es6-symbol": "^3.1.0"
   }
 }