infopark_fiona7 1.2.0.1.1 → 1.2.0.1.3

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

@@ -0,0 +1,53 @@
+'use strict';
+
+(function () {
+  // -- PATCH BEGINS HERE --
+  // remove old scrivito.binaryFieldElement
+  var definitions = scrivito.cms_element.definitions;
+  for (var i = 0; i < definitions.length; ++i) {
+    if (definitions[i] === scrivito.binaryFieldElement) {
+      definitions.splice(i, 1);
+      break;
+    }
+  }
+  // -- PATCH ENDS HERE --
+
+  scrivito.binaryFieldElement = {
+    create_instance: function create_instance(cmsElement) {
+      if (cmsElement.dom_element().attr('data-scrivito-field-type') === 'binary') {
+        var that = scrivito.cms_field_element.create_instance(cmsElement);
+        // -- PATCH BEGINS HERE --
+        /*
+        const bufferedWriter = new scrivito.BufferedWriter((value) => {
+          if (scrivito.BinaryUtils.isFile(value)) {
+            return scrivito.Binary.upload(value).into(that.basic_obj());
+          }
+          if (value instanceof scrivito.FutureBinary) {
+            return value.into(that.basic_obj());
+          }
+           return scrivito.Promise.resolve(value);
+        });
+         _.extend(that, {
+          preprocess(value) {
+            return bufferedWriter.write(value).catch((error) => {
+              scrivito.handleAjaxError(error);
+              throw error;
+            });
+          },
+        });
+        */
+
+        _.extend(that, {
+          preprocess: function preprocess(value) {
+            return scrivito.Promise.resolve(value);
+          }
+        });
+        // -- PATCH ENDS HERE --
+
+        return that;
+      }
+    }
+  };
+
+  scrivito.cms_element.definitions.push(scrivito.binaryFieldElement);
+})();

data/app/assets/javascripts/scrivito_patches/obj_serializer.js

@@ -0,0 +1,91 @@
+"use strict";
+
+(function () {
+  scrivito.ObjSerializer = {
+    serialize: function serialize(objId, attrs) {
+      var promise = serializeWidgetPool(objId, attrs._widget_pool).then(function (widgetPool) {
+        return serializeAttrs(objId, attrs).then(function (serializedAttrs) {
+          if (widgetPool) {
+            serializedAttrs._widget_pool = widgetPool;
+          }
+          return serializedAttrs;
+        });
+      });
+
+      return scrivito.promise.wrapInJqueryDeferred(promise);
+    },
+
+    serializeValue: function serializeValue(value) {
+      if (_.isDate(value)) {
+        return moment.utc(value).toISOString();
+      }
+
+      return value;
+    }
+  };
+
+  function serializeWidgetPool(objId, widgetPool) {
+    if (widgetPool) {
+      var promises = _.map(widgetPool, function (attrs, widgetId) {
+        return serializeAttrs(objId, attrs).then(function (serializedAttrs) {
+          return [widgetId, serializedAttrs];
+        });
+      });
+
+      return scrivito.Promise.all(promises).then(function (serializedWidgetPool) {
+        return _.object(serializedWidgetPool);
+      });
+    }
+
+    return scrivito.Promise.resolve(widgetPool);
+  }
+
+  function serializeAttrs(objId, attrs) {
+    var promises = _.map(attrs, function (attrValue, attrName) {
+      return serializeAttr(objId, attrName, attrValue);
+    });
+
+    return scrivito.Promise.all(promises).then(function (serializedAttrs) {
+      return _.object(serializedAttrs);
+    });
+  }
+
+  function serializeAttr(objId, attrName, attrValue) {
+    if (scrivito.BinaryUtils.isFile(attrValue) || scrivito.BinaryUtils.isBlob(attrValue)) {
+      return serializeFile(objId, attrName, attrValue);
+    }
+
+    if (attrValue instanceof scrivito.UploadedBlob) {
+      return serializeUploadedBlob(objId, attrName, attrValue);
+    }
+
+    if (attrValue instanceof scrivito.FutureBinary) {
+      return serializeFutureBinary(objId, attrName, attrValue);
+    }
+
+    return scrivito.Promise.resolve([attrName, scrivito.ObjSerializer.serializeValue(attrValue)]);
+  }
+
+  function serializeFile(objId, attrName, file) {
+    return scrivito.Promise.resolve([attrName, file]); // <-- PATCH HERE
+  }
+
+  function serializeUploadedBlob(objId, attrName, uploadedBlob) {
+    return serializeFutureBinary(objId, attrName, uploadedBlob.copy());
+  }
+
+  function serializeFutureBinary(objId, attrName, futureBinary) {
+    if (futureBinary.idToCopy) {
+      // blob copy/rename
+      var blob = {
+        id_to_copy: futureBinary.idToCopy
+      };
+      if (futureBinary.filename) blob.filename = futureBinary.filename;
+      if (futureBinary.contentType) blob.content_type = futureBinary.contentType;
+      return scrivito.Promise.resolve([attrName, blob]);
+    } else if (futureBinary.source) {
+      // normal upload
+      return scrivito.Promise.resolve([attrName, { blob_to_upload: futureBinary.source, filename: futureBinary.filename }]);
+    }
+  }
+})();

data/infopark_fiona7.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |s|
   s.add_dependency "scrivito_sdk"
   s.add_dependency "scrivito_editors"
   s.add_dependency "infopark_fiona_connector", "= 7.0.1.beta2"
-  s.add_dependency "infopark_reactor", ">= 1.22.4"
+  s.add_dependency "infopark_reactor", ">= 1.23.1"
   s.add_dependency "mini_magick"
+  s.add_dependency "jquery-ui-rails", "< 6.0.0"
   #s.add_development_dependency "ruby-prof"
 end

data/lib/fiona7/builder/obj_class_builder.rb

@@ -1,4 +1,6 @@
 require 'fiona7/assert'
+require 'fiona7/attribute_type_mapper'
+require 'fiona7/obj_class_name_demangler'
 
 module Fiona7
   module Builder
@@ -41,8 +43,13 @@ module Fiona7
             cms_attribute = RailsConnector::Attribute.find_by_attribute_name(attribute[:real_name])
             raw_attribute = Reactor::Cm::Attribute.get(attribute[:real_name].to_s)
 
+            expected_real_type = Fiona7::AttributeTypeMapper.new(
+              Fiona7::ObjClassNameDemangler.new(@values[:name]).demangle
+            ).call(attribute[:name].to_sym, attribute[:type].to_sym)
+
             if attribute[:type] == :reference || attribute[:type] == :referencelist || attribute[:type] == :link || attribute[:type] == :widgetlist
-              if cms_attribute.attribute_type == "linklist"
+              if cms_attribute.attribute_type == expected_real_type.to_s
+                # FIXME: it is not neccessary to write this information for each sync
                 raw_attribute.set(:helpText, ::ActiveSupport::JSON.encode({type: attribute[:type]}))
                 raw_attribute.save!
               else
@@ -69,6 +76,7 @@ module Fiona7
               # Nothing to do.
               Rails.logger.warn("TYPE SYNCHRONIZATION: Type #{attribute[:type]} requested for #{attribute[:real_name]}, but is #{cms_attribute.attribute_type}, this may cause errors.")
             elsif attribute[:type] == :enum || attribute[:type] == :multienum
+              # TODO: AttributeTypeMapper
               if cms_attribute.attribute_type == "multienum" || cms_attribute.attribute_type == "enum"
                 if attribute[:values]
                   # do not remove values
@@ -82,11 +90,7 @@ module Fiona7
                   Assert.constraint(false, "Type #{attribute[:type]} requested for #{attribute[:real_name]}, but is #{cms_attribute.attribute_type}")
                 end
               end
-            elsif cms_attribute.attribute_type == "text"
-              if attribute[:type] != :string && attribute[:type] != :stringlist
-                Assert.constraint(false, "Type #{attribute[:type]} requested for #{attribute[:real_name]}, but is #{cms_attribute.attribute_type}")
-              end
-            elsif attribute[:real_type].to_s != cms_attribute.attribute_type
+            elsif attribute[:real_type].to_s != expected_real_type.to_s
               Assert.constraint(false, "Type #{attribute[:type]} requested for #{attribute[:real_name]}, but is #{cms_attribute.attribute_type}")
             end
           end

data/lib/fiona7/engine.rb

@@ -157,16 +157,21 @@ module Fiona7
           config.editing_auth do |env|
             request  = ActionDispatch::Request.new(env)
             session  = request.session
-            rsession = session[:rsession]
+            rsession = Reactor::SessionHelper::RsessionHelper.from_session(session)
             if rsession && rsession.user?
               Fiona7::ScrivitoUser.define(rsession.user)
             end
           end
 
           config.find_user do |user_id|
-            user = Reactor::Cache::User.instance.get(user_id)
-
-            Fiona7::ScrivitoUser.define(user)
+            begin
+              user = Reactor::Cache::User.instance.get(user_id)
+              Fiona7::ScrivitoUser.define(user)
+            rescue Reactor::Cm::XmlSingleRequestError => e
+              # this is the error code for entry (possibly user) not found
+              # other errors we want to pass on (unauthorized, etc)
+              raise e unless e.message =~ /060001/
+            end
           end
         end
       end
@@ -237,7 +242,7 @@ module Fiona7
           # for the current user (root most likely), which is not
           # really a thing that we want - being root by default
           # should only happen in the root mode
-          if !session[:rsession]
+          if !rsession.user?
             rsession.destroy
           end
         end

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.2.0.1.1"
+  VERSION = "1.2.0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.2.0.1.1
+  version: 1.2.0.1.3
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.4
+        version: 1.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.4
+        version: 1.23.1
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 description: scrivito-compatible interface for classic Fiona
 email:
 - tomasz.przedmojski@infopark.de
@@ -120,10 +134,18 @@ files:
 - app/assets/images/fiona7-logo.png
 - app/assets/images/fiona7-marker.png
 - app/assets/javascripts/fiona7.js
+- app/assets/javascripts/fiona7/templates.js
 - app/assets/javascripts/fiona7_ui.js
+- app/assets/javascripts/scrivito_patches/ajax_error_handling.js
+- app/assets/javascripts/scrivito_patches/attribute_serializer.js
+- app/assets/javascripts/scrivito_patches/binary_utils.js
+- app/assets/javascripts/scrivito_patches/cms_rest_api.js
 - app/assets/javascripts/scrivito_patches/models/ajax.js
+- app/assets/javascripts/scrivito_patches/models/api/basic_obj.js
+- app/assets/javascripts/scrivito_patches/models/binary_field_element.js
 - app/assets/javascripts/scrivito_patches/models/blob.js
 - app/assets/javascripts/scrivito_patches/models/obj.js
+- app/assets/javascripts/scrivito_patches/obj_serializer.js
 - app/assets/stylesheets/fiona7-login.css.scss
 - app/assets/stylesheets/fiona7.css.scss
 - app/assets/stylesheets/fiona7_ui.css.scss
@@ -267,7 +289,6 @@ files:
 - lib/fiona7/scrivito_patches/cms_field_tag.rb
 - lib/fiona7/scrivito_patches/cms_rest_api.rb
 - lib/fiona7/scrivito_patches/cms_routing.rb
-- lib/fiona7/scrivito_patches/date_attribute.rb
 - lib/fiona7/scrivito_patches/layout_tags.rb
 - lib/fiona7/scrivito_patches/link_parser.rb
 - lib/fiona7/scrivito_patches/log_subscriber.rb
@@ -319,4 +340,3 @@ signing_key:
 specification_version: 4
 summary: scrivito-compatible interface for classic Fiona
 test_files: []
-has_rdoc: 

data/lib/fiona7/scrivito_patches/date_attribute.rb

@@ -1,16 +0,0 @@
-require 'scrivito/date_attribute'
-
-module Scrivito
-  module DateAttribute
-    def self.deserialize_from_backend(iso_date_time)
-      return nil unless iso_date_time
-      #return nil if iso_date.to_s.blank?
-
-      if iso_date_time.to_s =~ /^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/
-        Time.utc($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i).in_time_zone
-      else
-        raise "The value is not a valid ISO date time: #{iso_date_time.inspect}"
-      end
-    end
-  end
-end