scrivito_sdk 1.5.0.rc1 → 1.5.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42bbcf2bc4f6fffed0cb6c45334a43754b5f082b
-  data.tar.gz: 09d17580c9e5b72804b14358ef8b515f3494f055
+  metadata.gz: 1e487780450cc2b58e17d2358b89e968741954f7
+  data.tar.gz: d6fad053ac4660830d9e02affb67a50b97a60c04
 SHA512:
-  metadata.gz: ff78ff646b9eb4893a0fa26ddca10f342ca6680bf12367075e33aa91b417824c267fd0976d0bae0cfaae2b096b2ced1e499d898a463fdb47468d34fb2ca4dffe
-  data.tar.gz: 3fc0ee92a64909ec57ad35acda2597e435250558485f4475c67618f43965d6f61272b9835d6277afd256c20a2899ff0a1e79dcdffd5e482a23ed566c49fa67f2
+  metadata.gz: fa7e294a7865b5946acf7eda555030514900431b652982b527fac1cad39668dcfc432ec1aa7c7063f303d9669860294ca1b33b47db2197e172bbcd0cd73fb098
+  data.tar.gz: 056dcdee90b810f9e626d8e32fb655361ec7f8c530859c9322a83329eaaf3f6f44464211e5aa4b78695abd0d416de5985f82d8572ef6ede0498a7e3928d1d1e7

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Mon Jul 11 15:52:09 2016
+## Certificate data from Mozilla as of: Thu Jul 21 09:10:09 2016
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/assets/javascripts/scrivito_ui.js

@@ -42701,22 +42701,38 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 })();
 'use strict';
 
+var _slicedToArray = (function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }; })();
+
+function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i]; return arr2; } else { return Array.from(arr); } }
+
 (function () {
+  var SIZE_PER_CHUNK = 20;
   var resolvedUrlCache = {};
+  var requestCache = {};
 
   scrivito.resolveUrl = function (url) {
     return resolvedUrlCache[url];
   };
 
   scrivito.preloadResolvedUrls = function (unresolvedUrls) {
-    var ajaxRequest = scrivito.ajax('PUT', 'resolve_paths', { data: { paths: unresolvedUrls } });
+    var _classifyUrls = classifyUrls(unresolvedUrls);
 
-    return scrivito.Promise.resolve(ajaxRequest).then(function (resolvedUrls) {
-      unresolvedUrls.forEach(function (unresolvedUrl, index) {
-        resolvedUrlCache[unresolvedUrl] = resolvedUrls[index];
-      });
+    var _classifyUrls2 = _slicedToArray(_classifyUrls, 2);
 
-      return null;
+    var requestsInFlight = _classifyUrls2[0];
+    var missingUrls = _classifyUrls2[1];
+
+    if (!missingUrls.length) {
+      return scrivito.Promise.all(requestsInFlight);
+    }
+
+    var currentChunk = missingUrls.slice(0, SIZE_PER_CHUNK);
+    var remainingUrls = missingUrls.slice(SIZE_PER_CHUNK);
+
+    var chunkRequest = preloadChunk(currentChunk);
+
+    return scrivito.Promise.all([].concat(_toConsumableArray(requestsInFlight), [chunkRequest])).then(function () {
+      return scrivito.preloadResolvedUrls(remainingUrls);
     });
   };
 
@@ -42728,7 +42744,54 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
   // for testing purposes only!
   scrivito.clearResolvedUrlCache = function () {
     resolvedUrlCache = {};
+    requestCache = {};
   };
+
+  // for testing purposes only!
+  scrivito.resolvedUrlRequestCacheIsEmpty = function () {
+    return _.isEmpty(requestCache);
+  };
+
+  function classifyUrls(unresolvedUrls) {
+    var inFlight = [];
+    var missingUrls = [];
+    _.each(unresolvedUrls, function (unresolvedUrl) {
+      var request = requestCache[unresolvedUrl];
+      if (request) {
+        inFlight.push(request);
+      } else {
+        missingUrls.push(unresolvedUrl);
+      }
+    });
+
+    return [inFlight, missingUrls];
+  }
+
+  function cleanupRequestCache(unresolvedUrls) {
+    _.each(unresolvedUrls, function (unresolvedUrl) {
+      return delete requestCache[unresolvedUrl];
+    });
+  }
+
+  function preloadChunk(chunk) {
+    var ajaxRequest = scrivito.silent_ajax('PUT', 'resolve_paths', { data: { paths: chunk } });
+    var promise = scrivito.Promise.resolve(ajaxRequest);
+    _.each(chunk, function (item) {
+      requestCache[item] = promise;
+    });
+
+    return promise.then(function (resolvedUrls) {
+      chunk.forEach(function (unresolvedUrl, index) {
+        resolvedUrlCache[unresolvedUrl] = resolvedUrls[index];
+      });
+      cleanupRequestCache(chunk);
+
+      return null;
+    })['catch'](function (arg) {
+      cleanupRequestCache(chunk);
+      throw arg;
+    });
+  }
 })();
 "use strict";
 
@@ -43219,7 +43282,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         promise.then(function (data) {
           return d.resolve(data);
         }, function (error) {
-          return d.reject(error);
+          d.reject(error);
         });
 
         return d;
@@ -43352,7 +43415,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         return uploadToS3(blob, permission).then(function (uploadedBlob) {
           return activateUpload(objId, uploadedBlob, filename, contentType);
         })['finally'](scrivito.write_monitor.end_write);
-      })['catch'](scrivito.handleAjaxError);
+      });
     },
 
     copy: function copy(copyId, objId, filename, contentType) {
@@ -43369,7 +43432,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
       params.destination_obj_id = objId;
 
-      return scrivito.withAjaxErrorHandling(scrivito.CmsRestApi.put('blobs/' + encodedCopyId + '/copy', params));
+      return scrivito.CmsRestApi.put('blobs/' + encodedCopyId + '/copy', params);
     },
 
     // For testing purpose only.
@@ -44028,7 +44091,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
   function setSession(newSession) {
     session = newSession;
     timeoutId = setTimeout(function () {
-      sessionRenewalPromise = renewSession();
+      sessionRenewalPromise = renewSession()['catch'](function () {
+        // Catch so no unhandled rejection message is logged
+      });
     }, (session.maxage - 10) * 1000);
   }
 
@@ -47419,7 +47484,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
           _.extend(that, {
             preprocess: function preprocess(value) {
-              return bufferedWriter.write(value);
+              return bufferedWriter.write(value)['catch'](function (error) {
+                scrivito.handleAjaxError(error);
+                throw error;
+              });
             }
           });
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 1.5.0.rc1
+  version: 1.5.0.rc2
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable