scrivito_sdk 1.7.0.rc1 → 1.7.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4c29ade58e6d8b19aec8c00f0828b7d40ce3d26
-  data.tar.gz: 9fd5a9370feaff0841b16528816a0270d896b841
+  metadata.gz: 4016e97128a005af2e498a50cd196bd7b59f3b5e
+  data.tar.gz: e825b47033b48d098da446aa4f8af5a1cd23ae7f
 SHA512:
-  metadata.gz: 8470f64b051cc0822b3d7fd60d99e1f70eedbd958d80933e99b7dc86a0d89e78de68811cb66baae1e9a66c56209c3a5bb3815954cea38356ccd641679731124f
-  data.tar.gz: 72955c9b0731c2a24c8b264ffad9130309def34ead040f73669a6ee357c19b49ee02724f78ac29826884aa4507fe030d281492f418f1f51ae6cd1f55aa4f80a1
+  metadata.gz: bfca683f74cbb3cf1a50224c3eea444edb0a444de6672611485c402c7a50122c2dba0a04d089722f4882ccf167eb90d5a78addc3016d888cbb936deede95499d
+  data.tar.gz: a690ea5857589c751e1bd2bc9c4e7b006ed34b7a774edf90e6fb18fb460f3ada821eef9bff62cb9e88ef3008624daf8d55044165a2cfec0fd639495601d3b1d3

data/app/helpers/scrivito_helper.rb

@@ -452,7 +452,7 @@ module ScrivitoHelper
   #   cache. The options are passed to the +cache+ helper of Rails. See the Rails
   #   {http://api.rubyonrails.org/classes/ActionView/Helpers/CacheHelper.html#method-i-cache documentation}
   #   for details.
-  def scrivito_cache(key, options=nil, &block)
+  def scrivito_cache(key, options={}, &block)
     workspace = Scrivito::Workspace.current
     cache_if(workspace.published? && !scrivito_user, [workspace.cache_key, key], options, &block)
   end

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Mon Dec  5 10:56:44 2016 GMT
+## Certificate data from Mozilla as of: Tue Dec 27 15:46:13 2016 GMT
 ##
 ## 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_with_js_sdk.js

@@ -13628,7 +13628,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     if (error.status === 403) {
       throw new scrivito.AccessDeniedError(specificOutput, error.status, errorBody.code);
     } else if (error.status.toString()[0] === '4' && specificOutput) {
-      throw new scrivito.ClientError(specificOutput, error.status, errorBody.code);
+      throw scrivito.ClientError['for'](specificOutput, error.status, errorBody.code);
     } else if (error.status === 500 && specificOutput) {
       throw new scrivito.BackendError(specificOutput, error.status);
     }
@@ -13679,7 +13679,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
       case 'success':
         return task.result;
       case 'error':
-        throw new scrivito.ClientError(task.message, undefined, task.code);
+        throw scrivito.ClientError['for'](task.message, 412, task.code);
       case 'open':
         return scrivito.wait(2).then(function () {
           return request('GET', 'tasks/' + task.id).then(function (result) {
@@ -13788,6 +13788,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 (function () {
+  var TRANSFORM_SOURCE_TYPE_INVALID = 'binary.unprocessable.image.transform.source.type_invalid';
+  var TRANSFORM_SOURCE_TOO_LARGE = 'binary.unprocessable.image.transform.source.too_large';
+
   // From https://phabricator.babeljs.io/T3083#65595
   function ExtendableError() {
     for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
@@ -13805,7 +13808,7 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
     ExtendableError.__proto__ = Error;
   }
 
-  scrivito.ScrivitoError = (function (_ExtendableError) {
+  var ScrivitoError = (function (_ExtendableError) {
     _inherits(ScrivitoError, _ExtendableError);
 
     function ScrivitoError(message) {
@@ -13836,6 +13839,10 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
       this.message = message;
     }
 
+    /**
+     * An error thrown in case a backend request fails due to an error caused by the client.
+     */
+
     _createClass(ScrivitoError, [{
       key: 'name',
       get: function get() {
@@ -13853,19 +13860,14 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
     return ScrivitoError;
   })(ExtendableError);
 
-  /**
-   * An error thrown in case a backend request fails due to an error caused by the client.
-   */
-  scrivito.ClientError = (function (_scrivito$ScrivitoError) {
-    _inherits(ClientError, _scrivito$ScrivitoError);
+  var ClientError = (function (_ScrivitoError) {
+    _inherits(ClientError, _ScrivitoError);
 
     /**
      * The constructor is not part of the public API and should **not** be used.
      */
 
     function ClientError(message, httpCode, backendCode) {
-      if (httpCode === undefined) httpCode = 412;
-
       _classCallCheck(this, ClientError);
 
       _get(Object.getPrototypeOf(ClientError.prototype), 'constructor', this).call(this, message);
@@ -13873,15 +13875,30 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
       this.backendCode = backendCode;
     }
 
+    /**
+     * An error thrown in case a backend request from the UI
+     * is denied access to a specific resource.
+     */
+
+    _createClass(ClientError, null, [{
+      key: 'for',
+      value: function _for(message, httpCode, backendCode) {
+        switch (backendCode) {
+          case TRANSFORM_SOURCE_TYPE_INVALID:
+            return new scrivito.TransformationSourceTypeInvalidError(message, httpCode, backendCode);
+          case TRANSFORM_SOURCE_TOO_LARGE:
+            return new scrivito.TransformationSourceTooLargeError(message, httpCode, backendCode);
+          default:
+            return new scrivito.ClientError(message, httpCode, backendCode);
+        }
+      }
+    }]);
+
     return ClientError;
-  })(scrivito.ScrivitoError);
+  })(ScrivitoError);
 
-  /**
-   * An error thrown in case a backend request from the UI
-   * is denied access to a specific resource.
-   */
-  scrivito.AccessDeniedError = (function (_scrivito$ClientError) {
-    _inherits(AccessDeniedError, _scrivito$ClientError);
+  var AccessDeniedError = (function (_ClientError) {
+    _inherits(AccessDeniedError, _ClientError);
 
     /**
      * The constructor is not part of the public API and should **not** be used.
@@ -13893,14 +13910,14 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
       _get(Object.getPrototypeOf(AccessDeniedError.prototype), 'constructor', this).call(this, message, httpCode, backendCode);
     }
 
+    /**
+     * An error thrown in case wrong arguments are passed to an SDK function.
+     */
     return AccessDeniedError;
-  })(scrivito.ClientError);
+  })(ClientError);
 
-  /**
-   * An error thrown in case wrong arguments are passed to an SDK function.
-   */
-  scrivito.ArgumentError = (function (_scrivito$ScrivitoError2) {
-    _inherits(ArgumentError, _scrivito$ScrivitoError2);
+  var ArgumentError = (function (_ScrivitoError2) {
+    _inherits(ArgumentError, _ScrivitoError2);
 
     /**
      * The constructor is not part of the public API and should **not** be used.
@@ -13913,10 +13930,10 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
     }
 
     return ArgumentError;
-  })(scrivito.ScrivitoError);
+  })(ScrivitoError);
 
-  scrivito.CommunicationError = (function (_scrivito$ScrivitoError3) {
-    _inherits(CommunicationError, _scrivito$ScrivitoError3);
+  var CommunicationError = (function (_ScrivitoError3) {
+    _inherits(CommunicationError, _ScrivitoError3);
 
     function CommunicationError(message, httpCode) {
       _classCallCheck(this, CommunicationError);
@@ -13925,15 +13942,15 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
       this.httpCode = httpCode;
     }
 
+    /**
+     * An error thrown in case a backend request from the UI
+     * fails due to an internal server error.
+     */
     return CommunicationError;
-  })(scrivito.ScrivitoError);
+  })(ScrivitoError);
 
-  /**
-   * An error thrown in case a backend request from the UI
-   * fails due to an internal server error.
-   */
-  scrivito.BackendError = (function (_scrivito$CommunicationError) {
-    _inherits(BackendError, _scrivito$CommunicationError);
+  var BackendError = (function (_CommunicationError) {
+    _inherits(BackendError, _CommunicationError);
 
     /**
      * The constructor is not part of the public API and should **not** be used.
@@ -13945,15 +13962,15 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
       _get(Object.getPrototypeOf(BackendError.prototype), 'constructor', this).call(this, message, httpCode);
     }
 
+    /**
+     * This error is raised if scrivito detects an internal problem.
+     * These errors should never occur when using the public API of the SDK.
+     */
     return BackendError;
-  })(scrivito.CommunicationError);
+  })(CommunicationError);
 
-  /**
-   * This error is raised if scrivito detects an internal problem.
-   * These errors should never occur when using the public API of the SDK.
-   */
-  scrivito.InternalError = (function (_scrivito$ScrivitoError4) {
-    _inherits(InternalError, _scrivito$ScrivitoError4);
+  var InternalError = (function (_ScrivitoError4) {
+    _inherits(InternalError, _ScrivitoError4);
 
     /**
      * The constructor is not part of the public API and should **not** be used.
@@ -13965,15 +13982,15 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
       _get(Object.getPrototypeOf(InternalError.prototype), 'constructor', this).call(this, message);
     }
 
+    /**
+     * An error thrown in case a backend request from the UI
+     * fails due to network problems.
+     */
     return InternalError;
-  })(scrivito.ScrivitoError);
+  })(ScrivitoError);
 
-  /**
-   * An error thrown in case a backend request from the UI
-   * fails due to network problems.
-   */
-  scrivito.NetworkError = (function (_scrivito$CommunicationError2) {
-    _inherits(NetworkError, _scrivito$CommunicationError2);
+  var NetworkError = (function (_CommunicationError2) {
+    _inherits(NetworkError, _CommunicationError2);
 
     /**
      * The constructor is not part of the public API and should **not** be used.
@@ -13985,15 +14002,15 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
       _get(Object.getPrototypeOf(NetworkError.prototype), 'constructor', this).call(this, message, httpCode);
     }
 
+    /**
+     * An error thrown in case a backend request from the UI
+     * exceeds the rate limit of the backend.
+     */
     return NetworkError;
-  })(scrivito.CommunicationError);
+  })(CommunicationError);
 
-  /**
-   * An error thrown in case a backend request from the UI
-   * exceeds the rate limit of the backend.
-   */
-  scrivito.RateLimitExceededError = (function (_scrivito$CommunicationError3) {
-    _inherits(RateLimitExceededError, _scrivito$CommunicationError3);
+  var RateLimitExceededError = (function (_CommunicationError3) {
+    _inherits(RateLimitExceededError, _CommunicationError3);
 
     /**
      * The constructor is not part of the public API and should **not** be used.
@@ -14005,14 +14022,14 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
       _get(Object.getPrototypeOf(RateLimitExceededError.prototype), 'constructor', this).call(this, message, httpCode);
     }
 
+    /**
+     * An error thrown in case a given Scrivito resource is not found.
+     */
     return RateLimitExceededError;
-  })(scrivito.CommunicationError);
+  })(CommunicationError);
 
-  /**
-   * An error thrown in case a given Scrivito resource is not found.
-   */
-  scrivito.ResourceNotFoundError = (function (_scrivito$ScrivitoError5) {
-    _inherits(ResourceNotFoundError, _scrivito$ScrivitoError5);
+  var ResourceNotFoundError = (function (_ScrivitoError5) {
+    _inherits(ResourceNotFoundError, _ScrivitoError5);
 
     /**
      * The constructor is not part of the public API and should **not** be used.
@@ -14024,14 +14041,14 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
       _get(Object.getPrototypeOf(ResourceNotFoundError.prototype), 'constructor', this).call(this, message);
     }
 
+    /**
+     * An error thrown in case a backend request from the UI is denied access.
+     */
     return ResourceNotFoundError;
-  })(scrivito.ScrivitoError);
+  })(ScrivitoError);
 
-  /**
-   * An error thrown in case a backend request from the UI is denied access.
-   */
-  scrivito.UnauthorizedError = (function (_scrivito$ClientError2) {
-    _inherits(UnauthorizedError, _scrivito$ClientError2);
+  var UnauthorizedError = (function (_ClientError2) {
+    _inherits(UnauthorizedError, _ClientError2);
 
     /**
      * The constructor is not part of the public API and should **not** be used.
@@ -14043,11 +14060,54 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
       _get(Object.getPrototypeOf(UnauthorizedError.prototype), 'constructor', this).call(this, message, httpCode, backendCode);
     }
 
+    /**
+     * An error thrown in case an image to be transformed is of an invalid type.
+     *
+     * Supported types are `jpg`, `png`, and `gif`. In addition, `svg` files are
+     * returned untransformed.
+     */
     return UnauthorizedError;
-  })(scrivito.ClientError);
+  })(ClientError);
+
+  var TransformationSourceTypeInvalidError = (function (_ClientError3) {
+    _inherits(TransformationSourceTypeInvalidError, _ClientError3);
+
+    /**
+     * The constructor is not part of the public API and should **not** be used.
+     */
 
-  scrivito.TranslationError = (function (_scrivito$InternalError) {
-    _inherits(TranslationError, _scrivito$InternalError);
+    function TransformationSourceTypeInvalidError(message, httpCode, backendCode) {
+      _classCallCheck(this, TransformationSourceTypeInvalidError);
+
+      _get(Object.getPrototypeOf(TransformationSourceTypeInvalidError.prototype), 'constructor', this).call(this, message, httpCode, backendCode);
+    }
+
+    /**
+     * An error thrown in case an image to be transformed is too large.
+     *
+     * Images up to 8MB in size are supported for transformation.
+     */
+    return TransformationSourceTypeInvalidError;
+  })(ClientError);
+
+  var TransformationSourceTooLargeError = (function (_ClientError4) {
+    _inherits(TransformationSourceTooLargeError, _ClientError4);
+
+    /**
+     * The constructor is not part of the public API and should **not** be used.
+     */
+
+    function TransformationSourceTooLargeError(message, httpCode, backendCode) {
+      _classCallCheck(this, TransformationSourceTooLargeError);
+
+      _get(Object.getPrototypeOf(TransformationSourceTooLargeError.prototype), 'constructor', this).call(this, message, httpCode, backendCode);
+    }
+
+    return TransformationSourceTooLargeError;
+  })(ClientError);
+
+  var TranslationError = (function (_InternalError) {
+    _inherits(TranslationError, _InternalError);
 
     function TranslationError(message) {
       _classCallCheck(this, TranslationError);
@@ -14056,10 +14116,10 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
     }
 
     return TranslationError;
-  })(scrivito.InternalError);
+  })(InternalError);
 
-  scrivito.InterpolationError = (function (_scrivito$TranslationError) {
-    _inherits(InterpolationError, _scrivito$TranslationError);
+  var InterpolationError = (function (_TranslationError) {
+    _inherits(InterpolationError, _TranslationError);
 
     function InterpolationError(message) {
       _classCallCheck(this, InterpolationError);
@@ -14068,7 +14128,25 @@ function _inherits(subClass, superClass) { if (typeof superClass !== 'function'
     }
 
     return InterpolationError;
-  })(scrivito.TranslationError);
+  })(TranslationError);
+
+  scrivito.ScrivitoError = ScrivitoError;
+  scrivito.ClientError = ClientError;
+  scrivito.AccessDeniedError = AccessDeniedError;
+  scrivito.ArgumentError = ArgumentError;
+  scrivito.CommunicationError = CommunicationError;
+  scrivito.BackendError = BackendError;
+  scrivito.InternalError = InternalError;
+  scrivito.NetworkError = NetworkError;
+  scrivito.RateLimitExceededError = RateLimitExceededError;
+  scrivito.ResourceNotFoundError = ResourceNotFoundError;
+  scrivito.UnauthorizedError = UnauthorizedError;
+
+  scrivito.TransformationSourceTypeInvalidError = TransformationSourceTypeInvalidError;
+  scrivito.TransformationSourceTooLargeError = TransformationSourceTooLargeError;
+
+  scrivito.TranslationError = TranslationError;
+  scrivito.InterpolationError = InterpolationError;
 })();
 'use strict';
 
@@ -14195,7 +14273,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     var request = new XMLHttpRequest();
 
     request.open(method === 'POST' ? 'POST' : 'PUT', url);
-    request.responseType = 'json';
     request.setRequestHeader('Content-type', 'application/json; charset=utf-8');
 
     if (token) {
@@ -14219,17 +14296,18 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     connectionCounter -= 1;
 
     if (request.status >= 200 && request.status < 300) {
-      var responseJSON = request.response;
+      try {
+        return resolve(JSON.parse(request.responseText));
+      } catch (error) {
+        if (error instanceof SyntaxError) {
+          return resolve(request.responseText);
+        }
 
-      if (_.isString(responseJSON)) {
-        // We can't use #response here as IE11 does not handle it correctly
-        responseJSON = JSON.parse(request.responseText);
+        throw error;
       }
-
-      return resolve(responseJSON);
     }
 
-    return reject(request.response);
+    return reject(request);
   }
 
   function onAjaxError(error, reject) {
@@ -17113,6 +17191,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
        * accessible hours or days after they have been generated.
        *
        * @throws {scrivito.NotLoadedError} If the URL is not yet loaded.
+       * @throws {scrivito.TransformationSourceTypeInvalidError}
+       *  If the binary is the result of a transformation and of an invalid type.
+       * @throws {scrivito.TransformationSourceTooLargeError}
+       *  If the binary is the result of a transformation and the file is too large.
        * @type {String}
        */
     }, {

data/lib/scrivito/client_error.rb

@@ -16,7 +16,7 @@ module Scrivito
     end
 
     def as_json
-      {message: message, backend_code: backend_code}
+      {message: message, backendCode: backend_code}
     end
   end
 

metadata

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