infopark_fiona7 1.1.0.0.1 → 1.1.0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f2c3e364d5e39d0844287d7eefd244b83d81260
-  data.tar.gz: 9c5331a3c8b87c467ad2b6226ac68f482bffbf64
+  metadata.gz: 2aa4f95c72dbb1df2df30eb2aecf812eeadfbe0e
+  data.tar.gz: b2b9ba8c7221323adb1aaa6b9cf2dcf4001e8959
 SHA512:
-  metadata.gz: 59c6e931fc61fb8921902ab9c82bdc626762db927346169aa5d9a6de8cee4cd71e8d49387159d2ea795c914f855063ebeb6a81c174ef05f9a3c319695502bfd0
-  data.tar.gz: 6a092b319da7f9a35f4662b8da1935fbb999d4a6300b6c289e3debf79f0c7b4af3e8142da3135449b061ccbc6792e1565dfac65c0db9210f411fe08fa6447c34
+  metadata.gz: aca73230bef220c3bf97df405f9e6d83c4df11860856ac91db5dde5a40dfe4fd269e15253339e8fd68232b06ccb63e66681497c9392d88a05fb15caf5e23e128
+  data.tar.gz: 566f30c2e5dd1a29086b8e36639c9045b7e8886e6b996ef9661f980fcc18c4d1f1725661a4523e5f57bea637474174f86d0a6fbef3f2ff32413f4890e4a175a7

data/app/assets/javascripts/scrivito_patches/models/ajax.js

@@ -32,23 +32,12 @@
     }, options || {})).then(
       function(result, text_status, xhr) {
         return $.Deferred().resolve(result);
-      }, function(xhr, text_status, error) {
-        var error_message;
-        var error_code;
+      }, function(xhr, text_status, xhr_error) {
         try {
-          var error_json = JSON.parse(xhr.responseText);
-          error_message = error_json.error;
-          error_code = error_json.code;
-        } catch (SyntaxError) {}
-
-        if (!error_message) {
-          error_message = error;
+          return $.Deferred().reject(JSON.parse(xhr.responseText));
+        } catch (SyntaxError) {
+          return $.Deferred().reject(xhr_error);
         }
-        return $.Deferred().reject({
-          status: xhr.status,
-          message: error_message,
-          code: error_code
-        });
       }
     );
   };
@@ -59,7 +48,7 @@
       if (is_write_request) {
         options = options || {};
         // HIGHER TIMEOUT HERE!
-        options.timeout = 45000; // miliseconds
+        options.timeout = 60000; // miliseconds
         scrivito.write_monitor.start_write();
       }
 
@@ -87,23 +76,23 @@
     },
 
     display_ajax_error: function(error) {
-      var ajax_error = error.message;
-      var error_message;
-      if (_.contains(['abort', 'parsererror', 'timeout'], ajax_error)) {
-        error_message = scrivito.t('ajax.error.communication');
-      } else if (ajax_error === 'error') {
-        error_message = scrivito.t('ajax.error.unknown');
-      } else if (ajax_error) {
-        error_message = scrivito.t('ajax.error', ajax_error);
+      var message, message_for_editor;
+
+      if (_.isObject(error)) {
+        message = scrivito.t('ajax.error', error.message);
+        message_for_editor = error.message_for_editor;
+      } else if (_.contains(['abort', 'parsererror', 'timeout'], error)) {
+        message = scrivito.t('ajax.error.communication');
       } else {
-        error_message = scrivito.t('ajax.error.unknown');
+        message = scrivito.t('ajax.error', error);
       }
 
       if (scrivito.is_development_mode) {
-        scrivito.alert_dialog(error_message);
+        scrivito.alert_dialog(message);
       } else {
-        scrivito.log_error(error_message);
-        scrivito.info_dialog(scrivito.t('ajax.error.production'));
+        scrivito.log_error(message);
+        scrivito.error_dialog(message_for_editor || scrivito.t('ajax.error.message_for_editor'),
+          [error.timestamp, message]);
       }
     }
   });

data/app/controllers/fiona7/release_controller.rb

@@ -15,6 +15,7 @@ module Fiona7
         end
       end
 
+    ensure
       render json: {}
     end
 

data/lib/fiona7/engine.rb

@@ -32,6 +32,7 @@ require "fiona7/scrivito_patches/layout_tags"
 require "fiona7/scrivito_patches/log_subscriber"
 require "fiona7/scrivito_patches/link_parser"
 require "fiona7/scrivito_patches/migrator"
+require "fiona7/scrivito_patches/obj_params_parser"
 require "fiona7/scrivito_patches/page_config"
 require "fiona7/scrivito_patches/preset_routes"
 require "fiona7/scrivito_patches/routing_extensions"

data/lib/fiona7/scrivito_patches/basic_obj.rb

@@ -86,6 +86,22 @@ module Scrivito
 
       def inherited(subclass,*args)
         super
+        # Under certain condition a circular dependency may arise in rails when
+        # loading classes, especially when eager_load = true
+        # Thusfar it has only been observed in standalone-mode thus far:
+        # Loading Obj < Scrivito::BasicObj triggers this hook
+        # which tries to set RailsConnector::Obj to a reasonable value,
+        # RailsConnector::AbstractObj provided by reactor.
+        # RailsConnector::AbstractObj tries set itself to couple of
+        # values, one of which is ::Obj
+        # If this occurs with eager_load = true Rails may get confused
+        # and trigger circular dependency error. 
+        # We work around this problem by hijacking intelligent initialization
+        # of RailsConnector::AbstractObj in reactor and set it to a
+        # desired value ourselves.
+        if subclass.name == 'Obj' && !::RailsConnector.const_defined?('AbstractObj', false)
+          ::RailsConnector.const_set('AbstractObj', ::RailsConnector::BasicObj)
+        end
         if subclass.name == 'Obj' && !::RailsConnector.const_defined?('Obj', false)
           ::RailsConnector.const_set('Obj', ::RailsConnector::AbstractObj)
         end

data/lib/fiona7/scrivito_patches/cms_routing.rb

@@ -46,9 +46,13 @@ module Scrivito
         # use fiona connector routes when possible
         if Fiona7.mode == :legacy
           if binary = obj.binary
-            obj_id = obj.id
+            params = {
+              id: obj.id,
+              slug: obj.slug,
+              format: obj.file_extension
+            }
 
-            context.public_send("cms_id_#{path_or_url}", {id: obj_id, slug: binary.filename})
+            context.public_send("cms_id_#{path_or_url}", params)
           else
             LINK_TO_EMPTY_BLOB
           end

data/lib/fiona7/scrivito_patches/obj_params_parser.rb

@@ -0,0 +1,20 @@
+require "scrivito/obj_params_parser"
+
+
+module Scrivito
+  class ObjParamsParser
+    private
+    def parse_binary_params(params)
+      return unless params
+
+      if params.kind_of?(Hash) && params[:copy]
+        parse_copy_binary_params(params[:copy])
+      else
+        # Uploaded binary may contain anything at this point
+        # an ID (string) or a File or even UploadedFile
+        # but the backed will sort this out
+        UploadedBinary.new(params)
+      end
+    end
+  end
+end

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.1.0.0.1"
+  VERSION = "1.1.0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0.1
+  version: 1.1.0.0.2
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,6 +234,7 @@ files:
 - lib/fiona7/scrivito_patches/link_parser.rb
 - lib/fiona7/scrivito_patches/log_subscriber.rb
 - lib/fiona7/scrivito_patches/migrator.rb
+- lib/fiona7/scrivito_patches/obj_params_parser.rb
 - lib/fiona7/scrivito_patches/page_config.rb
 - lib/fiona7/scrivito_patches/preset_routes.rb
 - lib/fiona7/scrivito_patches/routing_extensions.rb