added Ionic RC0 support

Author: Nodonisko

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ionic-cache",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Ionic cache service - cache request, data, promises etc.",
   "main": "ionic-cache.js",
   "scripts": {
@@ -23,18 +23,8 @@
   },
   "homepage": "https://github.com/Nodonisko/ionic-cache#readme",
   "dependencies": {
-    "@angular/common": "^2.0.0-rc.4",
-    "@angular/compiler": "^2.0.0-rc.4",
     "@angular/core": "^2.0.0-rc.4",
-    "@angular/forms": "^0.2.0",
-    "@angular/http": "^2.0.0-rc.4",
-    "@angular/platform-browser": "^2.0.0-rc.4",
-    "@angular/platform-browser-dynamic": "^2.0.0-rc.4",
-    "es6-shim": "^0.35.0",
-    "ionic-angular": "^2.0.0-beta.11",
-    "ionic-native": "^1.3.2",
-    "rxjs": "^5.0.0-beta.6",
-    "zone.js": "^0.6.12"
+    "rxjs": "^5.0.0-beta.6"
   },
   "devDependencies": {
     "tslint": "^3.13.0",

src/cache.service.ts

@@ -1,5 +1,5 @@
 import {Injectable} from '@angular/core';
-import {Storage, SqlStorage} from 'ionic-angular';
+import {SqlStorage} from './storage';
 import {Observable, Subject} from 'rxjs/Rx';
 import {Request, Response, ResponseOptions} from '@angular/http';
 
@@ -8,23 +8,24 @@ const MESSAGES = {
   1: "Cache is not enabled.",
   2: "Cache entry already expired: ",
   3: "No such key: ",
-  4: "No enteries were deleted, because browser is offline.",
+  4: "No enteries were deleted, because browser is offline."
 }
 
 @Injectable()
 export class CacheService {
   private ttl: number = 60 * 60; //one hour
   private tableName: string = 'cache';
   private cacheKeys: string[] = ['key unique', 'value', 'expire INTEGER', 'type', 'groupKey'];
-  private storage: Storage;
+  private storage: SqlStorage;
   private enableCache: boolean = true;
   private invalidateOffline: boolean = false;
   private networkStatusChanges: Observable<boolean>;
   private networkStatus: boolean = true;
 
   constructor() {
+    console.log('constructor');
     try {
-      this.storage = new Storage(SqlStorage);
+      this.storage = new SqlStorage();
       this.watchNetworkInit();
       this.initDatabase();
       this.enableCache = true;
@@ -154,14 +155,12 @@ export class CacheService {
     }
 
     let query = `SELECT * FROM ${this.tableName} WHERE key = '${key}'`;
-
-    return this.storage.query(query).then(data => {
-      let result = data.res.rows.item(0);
-      if (!result) {
+    return this.storage.query(query).then((data: SQLResultSet) => {
+      if (data.rows.length === 0 || !data.rows.item(0)) {
         return Promise.reject(MESSAGES[3] + key);
-      } else {
-        return result;
       }
+      
+      return data.rows.item(0);
     });
   }
 
@@ -216,9 +215,9 @@ export class CacheService {
    * @param {any} observable - Observable with data
    * @param {string} [groupKey] - group key
    * @param {number} [ttl] - TTL in seconds
-   * @return {any} - data from cache or origin observable
+   * @return {Observable<any>} - data from cache or origin observable
    */
-  public loadFromObservable(key: string, observable: any, groupKey?: string, ttl?: number): any {
+  public loadFromObservable(key: string, observable: any, groupKey?: string, ttl?: number): Observable<any> {
     if (!this.enableCache) return observable;
 
     observable = observable.share();
@@ -235,9 +234,9 @@ export class CacheService {
    * @param {any} observable - Observable with data
    * @param {string} [groupKey] - group key
    * @param {number} [ttl] - TTL in seconds
-   * @return {any} - data from cache or origin observable
+   * @return {Observable<any>} - data from cache or origin observable
    */
-  public loadFromDelayedObservable(key: string, observable: any, groupKey?: string, ttl: number = this.ttl, delayType: string = "expired"): any {
+  public loadFromDelayedObservable(key: string, observable: any, groupKey?: string, ttl: number = this.ttl, delayType: string = "expired"): Observable<any> {
     if (!this.enableCache) return observable;
 
     let observableSubject = new Subject();

src/storage.ts

@@ -0,0 +1,20 @@
+export class SqlStorage {
+    private database: Database;
+
+    constructor() {
+        this.database = window.openDatabase('cache', '1.0', 'cache', 5 * 1024 * 1024);
+    }
+
+    public query(query: String): Promise<any> {
+        return new Promise((resolve, reject) => {
+            this.database.transaction((tx) => {
+                tx.executeSql(query, [], (tx, rs) => {
+                   resolve(rs); 
+                }, (tx, err) => {
+                    reject(err);
+                    return false;
+                });
+            });
+        });
+    }
+}

typings.json

@@ -2,6 +2,7 @@
   "dependencies": {},
   "devDependencies": {},
   "globalDependencies": {
-    "es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504"
+    "es6-shim": "registry:dt/es6-shim#0.31.2+20160602141504",
+    "websql": "registry:dt/websql#0.0.0+20160316155526"
   }
 }

typings/globals/websql/typings.json

@@ -0,0 +1,8 @@
+{
+  "resolution": "main",
+  "tree": {
+    "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/56295f5058cac7ae458540423c50ac2dcf9fc711/websql/websql.d.ts",
+    "raw": "registry:dt/websql#0.0.0+20160316155526",
+    "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/56295f5058cac7ae458540423c50ac2dcf9fc711/websql/websql.d.ts"
+  }
+}