1.0.0-alpha1

Author: lesion

package.json

@@ -1,10 +1,10 @@
 {
   "name": "remotestoragejs",
   "description": "JavaScript library for integrating remoteStorage",
-  "version": "1.0.1-beta",
+  "version": "1.0.0-alpha1",
   "private": false,
   "license": "MIT",
-  "main": "./release/stable/remotestorage.js",
+  "main": "./release/head/remotestorage.js",
   "repository": {
     "type": "git",
     "url": "git://github.com/remotestorage/remotestorage.js.git"

release/head/remotestorage-nocache.min.js

@@ -1,4 +1,4 @@
-/** remotestorage.js 0.14.1-pre, http://remotestorage.io, MIT-licensed **/
+/** remotestorage.js 0.14.0, http://remotestorage.io, MIT-licensed **/
 define([], function() {
 
 /** FILE: src/remotestorage.js **/
@@ -2155,11 +2155,11 @@ define([], function() {
 /* global define */
 /*!
  * webfinger.js
- *   version 2.6.4
+ *   version 2.4.2
  *   http://github.com/silverbucket/webfinger.js
  *
  * Developed and Maintained by:
- *   Nick Jennings <[email protected]> 2012
+ *   Nick Jennings <[email protected]> 2012 - 2016
  *
  * webfinger.js is released under the AGPL (see LICENSE).
  *
@@ -2172,11 +2172,10 @@ define([], function() {
  */
 
 if (typeof XMLHttpRequest === 'undefined') {
-  // XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
-  XMLHttpRequest = require('xhr2');
+  XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
 }
 
-(function (global) {
+(function (undefined) {
 
   // URI to property name map
   var LINK_URI_MAPS = {
@@ -2258,7 +2257,6 @@ if (typeof XMLHttpRequest === 'undefined') {
     var self = this;
 
     var xhr = new XMLHttpRequest();
-    xhr.timeout = this.config.request_timeout;
 
     function __processState() {
       if (xhr.status === 200) {
@@ -2304,18 +2302,9 @@ if (typeof XMLHttpRequest === 'undefined') {
         }
       };
 
-      xhr.onload = function () {
+      xhr.onload = function (a, b) {
         __processState();
-      };
-
-      xhr.ontimeout = function () {
-        return errorHandler(generateErrorObject({
-          message: 'request timed out',
-          url: url,
-          status: xhr.status
-        }));
-      };
-
+      }
       xhr.open('GET', url, true);
       xhr.setRequestHeader('Accept', 'application/jrd+json, application/json');
       xhr.send();
@@ -2352,9 +2341,6 @@ if (typeof XMLHttpRequest === 'undefined') {
     }
 
     var links = parsedJRD.links;
-    if (!Array.isArray(links)) {
-      links = [];
-    }
     var result = {  // webfinger JRD - object, json, and our own indexing
       object: parsedJRD,
       json: JRD,
@@ -2402,7 +2388,7 @@ if (typeof XMLHttpRequest === 'undefined') {
     var host = '';
     if (address.indexOf('://') > -1) {
       // other uri format
-      host = address.replace(/ /g,'').split('/')[2];
+      host = address.replace(/ /g,'').split('://')[1];
     } else {
       // useraddress
       host = address.replace(/ /g,'').split('@')[1];
@@ -2489,24 +2475,17 @@ if (typeof XMLHttpRequest === 'undefined') {
     }
   };
 
-
-
-  // AMD support
-  if (typeof define === 'function' && define.amd) {
-      define([], function () { return WebFinger; });
-  // CommonJS and Node.js module support.
-  } else if (typeof exports !== 'undefined') {
-    // Support Node.js specific `module.exports` (which can be a function)
-    if (typeof module !== 'undefined' && module.exports) {
-        exports = module.exports = WebFinger;
-    }
-    // But always support CommonJS module 1.1.1 spec (`exports` cannot be a function)
-    exports.WebFinger = WebFinger;
+  if (typeof window === 'object') {
+    window.WebFinger = WebFinger;
+  } else if (typeof (define) === 'function' && define.amd) {
+    define([], function () { return WebFinger; });
   } else {
-    // browser <script> support
-    global.WebFinger = WebFinger;
+    try {
+      module.exports = WebFinger;
+    } catch (e) {}
   }
-})(this);
+})();
+
 
 
 /** FILE: src/authorize.js **/
@@ -6667,13 +6646,11 @@ Math.uuid = function (len, radix) {
   var BASE_URL = 'https://www.googleapis.com';
   var AUTH_URL = 'https://accounts.google.com/o/oauth2/auth';
   var AUTH_SCOPE = 'https://www.googleapis.com/auth/drive';
-  var SETTINGS_KEY = 'remotestorage:googledrive';
 
   var GD_DIR_MIME_TYPE = 'application/vnd.google-apps.folder';
   var RS_DIR_MIME_TYPE = 'application/json; charset=UTF-8';
 
   var isFolder = RemoteStorage.util.isFolder;
-  var hasLocalStorage;
 
   function buildQueryString(params) {
     return Object.keys(params).map(function (key) {
@@ -6733,67 +6710,22 @@ Math.uuid = function (len, radix) {
     this.clientId = clientId;
 
     this._fileIdCache = new Cache(60 * 5); // ids expire after 5 minutes (is this a good idea?)
-
-    hasLocalStorage = RemoteStorage.util.localStorageAvailable();
-
-    if (hasLocalStorage){
-      var settings;
-      try {
-        settings = JSON.parse(localStorage.getItem(SETTINGS_KEY));
-      } catch(e){}
-      if (settings) {
-        this.configure(settings);
-      }
-    }
-
   };
 
   RS.GoogleDrive.prototype = {
     connected: false,
     online: true,
 
     configure: function (settings) { // Settings parameter compatible with WireClient
-      // We only update this.userAddress if settings.userAddress is set to a string or to null
-      if (typeof settings.userAddress !== 'undefined') { this.userAddress = settings.userAddress; }
-      // Same for this.token. If only one of these two is set, we leave the other one at its existing value
-      if (typeof settings.token !== 'undefined') { this.token = settings.token; }
-
-      var writeSettingsToCache = function() {
-        if (hasLocalStorage) {
-          localStorage.setItem(SETTINGS_KEY, JSON.stringify({
-            userAddress: this.userAddress,
-            token: this.token
-          }));
-        }
-      };
-
-      var handleError = function() {
-        this.connected = false;
-        delete this.token;
-        if (hasLocalStorage) {
-          localStorage.removeItem(SETTINGS_KEY);
-        }
-      };
-
-      if (this.token) {
+      if (settings.token) {
+        localStorage['remotestorage:googledrive:token'] = settings.token;
+        this.token = settings.token;
         this.connected = true;
-
-        if (this.userAddress) {
-          this._emit('connected');
-          writeSettingsToCache.apply(this);
-        } else {
-          this.info().then(function(info) {
-            this.userAddress = info.user.emailAddress;
-            this.rs.widget.view.setUserAddress(this.userAddress);
-            this._emit('connected');
-            writeSettingsToCache.apply(this);
-          }.bind(this)).catch(function() {
-            handleError.apply(this);
-            this.rs._emit('error', new Error('Could not fetch user info.'));
-          }.bind(this));
-        }
+        this._emit('connected');
       } else {
-        handleError.apply(this);
+        this.connected = false;
+        delete this.token;
+        delete localStorage['remotestorage:googledrive:token'];
       }
     },
 
@@ -6869,28 +6801,6 @@ Math.uuid = function (len, radix) {
       });
     },
 
-    /**
-     * Method: info
-     *
-     * Fetches the user's info from Google and returns a promise for it.
-     *
-     * Returns:
-     *
-     *   A promise to the user's info
-     */
-    info: function () {
-      var url = BASE_URL + '/drive/v2/about?fields=user';
-      // requesting user info(mainly for userAdress)
-      return this._request('GET', url, {}).then(function (resp){
-        try {
-          var info = JSON.parse(resp.responseText);
-          return Promise.resolve(info);
-        } catch (e) {
-          return Promise.reject(e);
-        }
-      });
-    },
-
     _updateFile: function (id, path, body, contentType, options) {
       var self = this;
       var metadata = {
@@ -7382,18 +7292,16 @@ Math.uuid = function (len, radix) {
     this._itemRefs = {};
     this._metadataCache = {};
 
-    hasLocalStorage = RemoteStorage.util.localStorageAvailable();
-
     if (hasLocalStorage){
       var settings;
       try {
-        settings = JSON.parse(localStorage.getItem(SETTINGS_KEY));
+        settings = JSON.parse(localStorage[SETTINGS_KEY]);
       } catch(e){}
       if (settings) {
         this.configure(settings);
       }
       try {
-        this._itemRefs = JSON.parse(localStorage.getItem(SETTINGS_KEY+':shares'));
+        this._itemRefs = JSON.parse(localStorage[ SETTINGS_KEY+':shares' ]);
       } catch(e) {  }
     }
     if (this.connected) {
@@ -7431,40 +7339,23 @@ Math.uuid = function (len, radix) {
       // Same for this.token. If only one of these two is set, we leave the other one at its existing value:
       if (typeof settings.token !== 'undefined') { this.token = settings.token; }
 
-      var writeSettingsToCache = function() {
-        if (hasLocalStorage) {
-          localStorage.setItem(SETTINGS_KEY, JSON.stringify({
-            userAddress: this.userAddress,
-            token: this.token
-          }));
-        }
-      };
-
-      var handleError = function() {
-        this.connected = false;
-        if (hasLocalStorage) {
-          localStorage.removeItem(SETTINGS_KEY);
-        }
-      };
-
       if (this.token) {
         this.connected = true;
-        if (this.userAddress) {
-          this._emit('connected');
-          writeSettingsToCache.apply(this);
-        } else {
+        if ( !this.userAddress ){
           this.info().then(function (info){
-            this.userAddress = info.email;
+            this.userAddress = info.display_name;
             this.rs.widget.view.setUserAddress(this.userAddress);
             this._emit('connected');
-            writeSettingsToCache.apply(this);
-          }.bind(this)).catch(function() {
-            handleError.apply(this);
-            this.rs._emit('error', new Error('Could not fetch user info.'));
           }.bind(this));
         }
       } else {
-        handleError.apply(this);
+        this.connected = false;
+      }
+      if (hasLocalStorage){
+        localStorage[SETTINGS_KEY] = JSON.stringify({
+          userAddress: this.userAddress,
+          token: this.token
+        });
       }
     },
 
@@ -7762,7 +7653,7 @@ Math.uuid = function (len, radix) {
         self._itemRefs[path] = response.url;
 
         if (hasLocalStorage) {
-          localStorage.setItem(SETTINGS_KEY+':shares', JSON.stringify(self._itemRefs));
+          localStorage[SETTINGS_KEY + ':shares'] = JSON.stringify(self._itemRefs);
         }
 
         return Promise.resolve(url);
@@ -8154,6 +8045,7 @@ Math.uuid = function (len, radix) {
   }
 
   RS.Dropbox._rs_init = function (rs) {
+    hasLocalStorage = RemoteStorage.util.localStorageAvailable();
     if ( rs.apiKeys.dropbox ) {
       rs.dropbox = new RS.Dropbox(rs);
     }
@@ -8169,7 +8061,7 @@ Math.uuid = function (len, radix) {
   RS.Dropbox._rs_cleanup = function (rs) {
     unHookIt(rs);
     if (hasLocalStorage){
-      localStorage.removeItem(SETTINGS_KEY);
+      delete localStorage[SETTINGS_KEY];
     }
     rs.removeEventListener('error', onErrorCb);
     rs.setBackend(undefined);