feat(storage): wrap reference methods

Author: davideast

src/storage/observable/fromRef.ts

@@ -2,5 +2,4 @@ export * from './ref';
 export * from './storage';
 export * from './task';
 export * from './observable/fromTask';
-export * from './observable/fromRef';
 export * from './storage.module';

src/storage/public_api.ts

@@ -1,8 +1,7 @@
 import { storage } from 'firebase/app';
-import { createPut } from './put';
+import { createUploadTask } from './task';
 import { Observable } from 'rxjs/Observable';
 import { from } from 'rxjs/observable/from';
-import { getDownloadURL, getMetadata } from './observable/fromRef';
 
 /**
  * Create an AngularFire wrapped Storage Reference. This object
@@ -11,10 +10,20 @@ import { getDownloadURL, getMetadata } from './observable/fromRef';
  */
 export function createStorageRef(ref: storage.Reference) {
   return {
-    getDownloadURL() { return getDownloadURL(ref); },
-    getMetadata() { return getMetadata(ref); },
+    getDownloadURL() { return from(ref.getDownloadURL()); },
+    getMetadata() { return from(ref.getMetadata()) },
+    delete() { return from(ref.delete()); },
+    child(path: string) { return createStorageRef(ref.child(path)); },
+    updateMetatdata(meta: storage.SettableMetadata) { 
+      return from(ref.updateMetadata(meta)); 
+    },
     put(data: any, metadata?: storage.UploadMetadata) {
-      return createPut(ref)(data, metadata);
+      const task = ref.put(data, metadata);
+      return createUploadTask(task);
+    },
+    putString(data: string, format?: storage.StringFormat, metadata?: storage.UploadMetadata) {
+      const task = ref.putString(data, format, metadata);
+      return createUploadTask(task);
     }
   }
 }

src/storage/put.ts

@@ -1,9 +1,9 @@
 import * as firebase from 'firebase/app';
 import { Observable } from 'rxjs/Observable'
-import { Subject } from 'rxjs/Subject'
+import { forkJoin } from 'rxjs/observable/forkJoin';
 import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
-import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, AngularFireStorageRef } from 'angularfire2/storage';
+import { AngularFireStorageModule, AngularFireStorage } from 'angularfire2/storage';
 import { COMMON_CONFIG } from './test-config';
 
 console.log(AngularFireStorageModule);
@@ -37,18 +37,36 @@ fdescribe('AngularFireStorage', () => {
     expect(afStorage.storage).toBeDefined();
   });
 
-  describe('AngularFireUploadTask', () => {
+  describe('upload task', () => {
 
-    it('should upload a file', (done) => {
+    it('should upload and delete a file', (done) => {
       const data = { angular: "fire" };
       const blob = new Blob([JSON.stringify(data)], { type : 'application/json' });
-      const task = afStorage.upload('af.json', blob);
+      const ref = afStorage.ref('af.json');
+      const task = ref.put(blob);
       const sub = task.snapshotChanges()
         .subscribe(
-          snap => { console.log(snap); expect(snap).toBeDefined() },
+          snap => { expect(snap).toBeDefined() },
           e => { done.fail(); },
-          done);
+          () => {
+            ref.delete().subscribe(done, done.fail);
+          });
+    });
+
+  });
 
+  describe('reference', () => {
+
+    it('it should upload, download, and delete', (done) => {
+      const data = { angular: "fire" };
+      const blob = new Blob([JSON.stringify(data)], { type : 'application/json' });
+      const ref = afStorage.ref('af.json');
+      const task = ref.put(blob);
+      const sub = forkJoin(task.snapshotChanges())
+        .mergeMap(() => ref.getDownloadURL())
+        .do(url => expect(url).toBeDefined())
+        .mergeMap(url => ref.delete())
+        .subscribe(done, done.fail);
     });
 
   });

src/storage/ref.ts

@@ -23,6 +23,7 @@ const GLOBALS = {
   'rxjs/operator/merge': 'Rx.Observable.prototype',
   'rxjs/operator/map': 'Rx.Observable.prototype',
   'rxjs/observable/of': 'Rx.Observable',
+  'rxjs/observable/forkJoin': 'Rx.Observable',
   'rxjs/operator/auditTime': 'Rx.Observable.prototype',
   'rxjs/operator/switchMap': 'Rx.Observable.prototype',
   'rxjs/operator/do': 'Rx.Observable.prototype',