infopark_fiona7 0.70.0.3 → 0.71.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b1fc78f3cf18fd7616540dacdafd60cd8029a88
-  data.tar.gz: 8775edf24d77b6b9b1e2f07eb63ea48b5cb1f37a
+  metadata.gz: b01a9b4b8f32420a4dbc9a71b7715e4b435064fe
+  data.tar.gz: 52cd4e1ead233d6687abea23efc30c8356a34fcd
 SHA512:
-  metadata.gz: 7d2850182f8a7602e2bfa9636b7f2151e6bcecf314168d42bb6ce5a35fa6cea4b005b826acffe6f98ea804c9bc10ac1cf176771c00978a5334a9e8bdd2df72af
-  data.tar.gz: 1934ad1d509bf4bc3c21a01317f416f654649491ee5e620a5b41291d237d8044740a676edf3e1495d0f74d2a0ee804398942b50cda52ca26a57bd513638161ee
+  metadata.gz: 43a8472b368e2b0c97215dc78a9695b3b163b20fbda466b5be8661bbbe1ee245ad265b475758c78b1595d43964c34f9d450e4d1faf42272bd33b0e439f973b03
+  data.tar.gz: 7f7076b7cc9d09f4fb082b9a19776ceb98132c78c1d425cc17e021091f229056aee960cf222604ee97895e4ea390f2598e4c85bd36b66f1b5a8be7f5a465f9e4

data/app/assets/javascripts/fiona7_ui.js

@@ -1,114 +1,6 @@
-/* obj.js, patch create & upload */
-(function() {
-  var scrivito = window.scrivito;
-  var _ = window._;
-  var $ = window.$;
-
-  var format_date = function(date) {
-    return date.getUTCFullYear().toString() +
-        format_date_number(date.getUTCMonth() + 1) + // Month numbers are starting at 0.
-        format_date_number(date.getUTCDate()) +
-        format_date_number(date.getUTCHours()) +
-        format_date_number(date.getUTCMinutes()) +
-        format_date_number(date.getUTCSeconds());
-  };
-
-  var format_date_number = function(number) {
-    var string = number.toString();
-    return string.length === 1 ? '0' + string : string;
-  };
-
-  var convert_attributes = function(data) {
-    var collected_promises = _.map(data, function(value, field_name) {
-      if (value instanceof Date) {
-        return $.Deferred().resolve([field_name, format_date(value)]);
-      } else if (value instanceof window.File) {
-        return $.Deferred().resolve([field_name, value]);
-        return scrivito.blob.create(value).then(function(value) {
-          return [field_name, value];
-        });
-      } else {
-        return $.Deferred().resolve([field_name, value]);
-      }
-    });
-
-    return $.when.apply(this, collected_promises).then(function() {
-      return _.object(arguments);
-    });
-  };
-
-  var convert_widget_pool = function(widget_pool) {
-    if(widget_pool) {
-      var conversion_promises = _.map(widget_pool, function(attributes, widget_id) {
-        return convert_attributes(attributes).then(function(attributes) {
-          return [widget_id, attributes];
-        });
-      });
-
-      return $.when.apply(this, conversion_promises).then(function() {
-        return _.object(arguments);
-      });
-    } else {
-      return $.Deferred().resolve(widget_pool);
-    }
-  };
-
-  var prepare_attributes = function(data) {
-    return convert_widget_pool(data._widget_pool).then(function(widget_pool) {
-      return convert_attributes(data).then(function(attributes) {
-        attributes._widget_pool = widget_pool;
-        return attributes;
-      });
-    });
-  };
-
-  scrivito.obj.create_original = scrivito.obj.create;
-  scrivito.obj.create = function (data) {
-    var blob;
-
-    if (data['blob']) {
-      blob = data['blob'];
-      delete data['blob'];
-    }
-    return prepare_attributes(data).then(function(attributes) {
-      var fd, defer, url, base_url = window.location.protocol + '//' + window.location.host + '/__scrivito/';
-      url = base_url + 'objs';
-
-      fd = new FormData();
-
-      $.each(attributes, function (key, value) {
-        if (typeof value !== 'undefined') {
-          fd.append('obj[' + key + ']', value);
-        }
-      });
-
-      if (typeof blob !== 'undefined') {
-        fd.append('obj[blob]', blob);
-      }
-
-      defer = $.Deferred();
-
-      $.ajax({
-        url: url,
-        type: 'POST',
-        data: fd,
-        processData: false,
-        contentType: false
-      })
-      .error(function (xhr, text, error) {
-        scrivito.alert(text);
-        defer.reject(text);
-      })
-      .success(function (new_data) {
-        defer.resolve(scrivito.obj.create_instance(new_data));
-      });
-
-      return defer.promise();
-    });
-  };
-
-}());
-
+//= require scrivito_patches/models/blob
+//= require scrivito_patches/models/obj
+//= require_self
 
 (function() {
   var scrivito = window.scrivito;
@@ -256,6 +148,7 @@
   actions = ["release"];
 
   scrivito.gui.on('document', function(cms_document) {
+    console.log('adding release button');
     var obj = cms_document.page();
 
     _.each(actions, function(action,idx) {
@@ -295,7 +188,7 @@
     menu.push(scrivito.command_separator.create_instance({id: 'fiona7.zz_sparator'}));
     cms_document.set_menu(menu);
 
-    scrivito.configure_menu_order(['fiona7.*', '*']);
+    //scrivito.configure_menu_order(['fiona7.*', '*']);
   });
 
   return;

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

@@ -0,0 +1,29 @@
+(function() {
+  _.extend(scrivito, {
+    blob: {
+      create: function(obj_id, binary) {
+        var uploaded_binary = binary.is_uploaded_binary ? binary : scrivito.blob.upload_binary(binary);
+        return $.Deferred().resolve(uploaded_binary);
+      },
+
+      // For testing purpose only.
+      get_form_data: function() {
+        return new FormData();
+      },
+
+      upload_binary: function(params) {
+        var blob = params.blob || params.file;
+        if (!blob) { $.error('need blob or file'); }
+        if (!params.content_type) { params.content_type = blob.type; }
+        if (!params.filename) {
+          if (params.blob) { $.error('blob needs a filename'); }
+          params.filename = blob.name;
+        }
+        params.filename = params.filename.replace(/[^\w\-_\.$]/g, '-');
+
+        return $.extend(params, {is_uploaded_binary: true});
+      }
+    }
+  });
+
+}());

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

@@ -0,0 +1,369 @@
+(function() {
+  _.extend(scrivito, {
+    obj: {
+      serialize_value: function(value) {
+        if (_.isDate(value)) {
+          return serialize_date(value);
+        } else {
+          return value;
+        }
+      },
+
+      create_instance: function(params) {
+        var that = {
+          id: function() {
+            return params.id;
+          },
+
+          obj_class: function() {
+            return params.obj_class;
+          },
+
+          description_for_editor: function() {
+            return params.description_for_editor;
+          },
+
+          modification: function() {
+            return params.modification;
+          },
+
+          is_new: function() {
+            return that.modification() === 'new';
+          },
+
+          is_edited: function() {
+            return that.modification() === 'edited';
+          },
+
+          is_deleted: function() {
+            return that.modification() === 'deleted';
+          },
+
+          has_children: function() {
+            return !!params.has_children;
+          },
+
+          has_conflict: function() {
+            return !!params.has_conflict;
+          },
+
+          has_restriction : function() {
+            return that.restriction_messages().length > 0;
+          },
+
+          restriction_messages: function() {
+            return params.restriction_messages || [];
+          },
+
+          is_binary: function() {
+            return !!params.is_binary;
+          },
+
+          has_details_view: function() {
+            return !!params.has_details_view;
+          },
+
+          tooltip: function() {
+            if (editing_state()) {
+              return scrivito.t('obj.tooltip.' + editing_state());
+            }
+          },
+
+          last_changed: function() {
+            return params.last_changed;
+          },
+
+          parent_path: function() {
+            return params.parent_path;
+          },
+
+          save: function(attrs) {
+            return prepare_attrs(that.id(), attrs).then(function(prepared_attrs) {
+              return persist_obj_data(prepared_attrs, that.id());
+            });
+          },
+
+          destroy: function() {
+            return scrivito.ajax('DELETE', 'objs/' + that.id()).then(function(result) {
+              return result.redirect_to;
+            });
+          },
+
+          destroy_widget: function(widget_id) {
+            return scrivito.ajax('PUT',
+                'objs/' + that.id() + '/destroy_widget?widget_id=' + widget_id);
+          },
+
+          revert: function() {
+            return scrivito.ajax('PUT', 'objs/' + that.id() + '/revert');
+          },
+
+          revert_widget: function(widget_id) {
+            return scrivito.ajax('PUT', 'objs/'+that.id()+'/revert_widget?widget_id='+widget_id);
+          },
+
+          conflicting_workspaces: function() {
+            return scrivito.ajax('GET', 'objs/' + that.id() + '/conflicting_workspaces').then(
+                function(workspace_datas) {
+              return scrivito.workspace.from_data_collection(workspace_datas);
+            });
+          },
+
+          is_outdated: function() {
+            return scrivito.ajax('GET', 'objs/' + that.id() + '/is_outdated').then(
+                function(result) { return result.is_outdated; });
+          },
+
+          restore: function() {
+            return scrivito.ajax('PUT', 'objs/' + that.id() + '/restore');
+          },
+
+          restore_widget: function(widget_id) {
+            return scrivito.ajax('PUT', 'objs/'+that.id()+'/restore_widget?widget_id='+widget_id);
+          },
+
+          details_src: function() {
+            // TODO unify with ajax url generation
+            return '/__scrivito/page_details/' +  that.id();
+          },
+
+          mark_resolved: function() {
+            return scrivito.ajax('PUT', 'objs/' + that.id() + '/mark_resolved');
+          },
+
+          copy_to: function(path) {
+            var attrs = {data: {parent_path: path}};
+            return scrivito.ajax('POST', 'objs/'+that.id()+'/copy', attrs).then(function(data) {
+              return scrivito.obj.create_instance(data);
+            });
+          },
+
+          duplicate: function() {
+            return scrivito.ajax('POST', 'objs/'+that.id()+'/duplicate').then(function(data) {
+              return scrivito.obj.create_instance(data);
+            });
+          },
+
+          transfer_modifications_to: function(workspace_id) {
+            return scrivito.ajax('PUT', 'objs/'+that.id()+'/transfer_modifications',
+              {data: {workspace_id: workspace_id}});
+          },
+
+          reload: function() {
+            return scrivito.ajax('GET', 'objs/'+that.id()).then(function(data) {
+              params.has_conflict = data.has_conflict;
+              params.modification = data.modification;
+            });
+          },
+
+          reload_widget: function(widget_id) {
+            return scrivito.ajax('GET', 'objs/'+that.id()+'/widget?widget_id='+widget_id);
+          }
+        };
+
+        var editing_state = function() {
+          if (that.is_new()) {
+            return 'is_new';
+          }
+
+          if (that.is_edited()) {
+            return 'is_edited';
+          }
+
+          if (that.is_deleted()) {
+            return 'is_deleted';
+          }
+        };
+
+        return that;
+      },
+
+      fetch_class_selection: function(path, params) {
+        if (params) { path += '?'+$.param(params); }
+        return scrivito.ajax('GET', path).then(function(selection) {
+          var names = _.pluck(selection, 'name');
+          var recent = scrivito.obj_class_selection.recent(names);
+          var popular = _.intersection(scrivito.popular_obj_classes, names);
+          return {
+            all: _.sortBy(selection, 'name'),
+            recent: _.map(recent, function(name) { return _.findWhere(selection, {name: name}); }),
+            popular: _.map(popular, function(name) { return _.findWhere(selection, {name: name}); })
+          };
+        });
+      },
+
+      fetch_page_class_selection: function(params) {
+        return scrivito.obj.fetch_class_selection('objs/page_class_selection', params);
+      },
+
+      create: function(attrs) {
+        return prepare_attrs(scrivito.random_id(), attrs).then(function(prepared_attrs) {
+          return persist_obj_data(prepared_attrs).then(function (data) {
+            scrivito.obj_class_selection.store(prepared_attrs._obj_class);
+            return scrivito.obj.create_instance(data);
+          });
+        });
+      },
+
+      transfer_modifications: function(objs, workspace_id) {
+        return $.when.apply(null, _.map(objs, function(obj) {
+          return obj.transfer_modifications_to(workspace_id).then(function(result) {
+            if (result.status !== 'success') { return {obj: obj, reason: result.reason}; }
+          });
+        })).then(function() { return $.Deferred().resolve(_.compact(arguments)); });
+      }
+    }
+  });
+
+  var obj_url = function (obj_id) {
+    var url = window.location.protocol + '//' + window.location.host + '/__scrivito/objs';
+    if (typeof obj_id !== 'undefined') {
+      url = url + "/" + obj_id;
+    }
+    return url;
+  };
+
+  var persist_obj_data = function (attributes, obj_id) {
+    var has_binary=false;
+    var fd, defer, url, type;
+
+    $.each(attributes, function (key, value) {
+      if (value && value.is_uploaded_binary) {
+        has_binary=true;
+      } else if (instance_of_anywhere(value, 'File')) {
+        has_binary=true
+      }
+    });
+
+    // use standard handling for cases without binary upload
+    if (!has_binary) {
+      if (typeof obj_id !== 'undefined') {
+        return scrivito.ajax('PUT', 'objs/'+obj_id, {data: {obj: attributes}});
+      } else {
+        return scrivito.ajax('POST', 'objs', {data: {obj: attributes}});
+      }
+    }
+
+    // use special handling for uploads
+    fd = new FormData();
+    url = obj_url(obj_id);
+    type = (typeof obj_id !== 'undefined') ? 'PUT' : 'POST';
+
+    $.each(attributes, function (key, value) {
+      if ((typeof value === 'object') && (key == '_widget_pool')) {
+        $.each(value, function (subkey, subval) {
+          if (typeof value !== 'undefined') {
+            fd.append('obj[' + key + ']' + '[' + subkey + ']', subval);
+          }
+        });
+      } else if (value && value.is_uploaded_binary && value.filename) {
+        fd.append('obj[' + key + ']', value.blob || value.file, value.filename);
+      } else if (typeof value !== 'undefined') {
+        fd.append('obj[' + key + ']', value);
+      }
+    });
+
+    defer = $.Deferred();
+
+    $.ajax({
+      url: url,
+      type: type,
+      data: fd,
+      processData: false,
+      contentType: false
+    })
+    .error(function (xhr, text_status, error) {
+      var error_message;
+      var error_code;
+      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;
+      }
+      scrivito.display_ajax_error(error_message);
+      defer.reject(error_message);
+    })
+    .success(function (new_data) {
+      defer.resolve((new_data));
+    });
+
+    return defer.promise();
+  };
+
+  var is_file = function(object) {
+    return object &&
+      _.isFunction(object.slice) &&
+      _.isDate(object.lastModifiedDate) &&
+      _.isString(object.name);
+  };
+
+  var instance_of_anywhere = function (object, ctor_name) {
+    var i, val=false, possible_ctor;
+    for (i=0; i < window.frames.length; ++i) {
+      possible_ctor = window.frames[i][ctor_name];
+      if ((typeof possible_ctor === 'function') && (object instanceof possible_ctor)) {
+        val = true;
+      }
+    }
+    return val;
+  };
+
+  var format_date_number = function(number) {
+    var string = number.toString();
+    return string.length === 1 ? '0' + string : string;
+  };
+
+  var serialize_date = function(date) {
+    return date.getUTCFullYear().toString() +
+      '-' + format_date_number(date.getUTCMonth() + 1) + // Month numbers are starting at 0.
+      '-' + format_date_number(date.getUTCDate()) +
+      'T' + format_date_number(date.getUTCHours()) +
+      ':' + format_date_number(date.getUTCMinutes()) +
+      ':' + format_date_number(date.getUTCSeconds()) +
+      'Z';
+  };
+
+  var convert_attrs = function(obj_id, attrs) {
+    var collected_promises = _.map(attrs, function(value, field_name) {
+      if (is_file(value)) {
+        return $.Deferred().resolve([field_name, value]);
+      } else if (value && value.is_uploaded_binary) {
+        return $.Deferred().resolve([field_name, value]);
+      }
+      return $.Deferred().resolve([field_name, scrivito.obj.serialize_value(value)]);
+    });
+
+    return $.when.apply(this, collected_promises).then(function() {
+      return _.object(arguments);
+    });
+  };
+
+  var convert_widget_pool = function(obj_id, widget_pool) {
+    if (widget_pool) {
+      var conversion_promises = _.map(widget_pool, function(attrs, widget_id) {
+        return convert_attrs(obj_id, attrs).then(function(converted_attrs) {
+          return [widget_id, converted_attrs];
+        });
+      });
+
+      return $.when.apply(this, conversion_promises).then(function() {
+        return _.object(arguments);
+      });
+    } else {
+      return $.Deferred().resolve(widget_pool);
+    }
+  };
+
+  var prepare_attrs = function(obj_id, attrs) {
+    return convert_widget_pool(obj_id, attrs._widget_pool).then(function(widget_pool) {
+      return convert_attrs(obj_id, attrs).then(function(converted_attrs) {
+        converted_attrs._widget_pool = widget_pool;
+        return converted_attrs;
+      });
+    });
+  };
+}());

data/app/controllers/fiona7/release_controller.rb

@@ -5,12 +5,16 @@ module Fiona7
 
       @obj = WriteObj.find(params[:id])
 
+
+      @releasable.merge(referenced_objects(@obj))
       @releasable.merge(widgets(@obj))
       @releasable << @obj
 
       @releasable.each do |obj|
-        obj.take
-        obj.release! if obj.really_edited?
+        if obj.really_edited?
+          obj.take
+          obj.release!
+        end
       end
 
       render json: {}
@@ -21,5 +25,22 @@ module Fiona7
       links = @obj[:X_widget_pool] || []
       WriteObj.where(obj_id: links.map {|l| l.destination_object_id }).to_a
     end
+
+    def referenced_objects(obj)
+      referenced = Set.new
+
+      type_definition = Fiona7::TypeRegister.instance.read_mangled(obj.obj_class)
+      type_definition.attributes.each do |attribute|
+        if attribute.type == :reference || attribute.type == :referencelist
+          (obj[attribute.real_name] || []).each do |link|
+            if link.internal?
+              referenced << link.destination_object
+            end
+          end
+        end
+      end
+
+      referenced
+    end
   end
 end

data/app/controllers/scrivito/cms_dispatch_controller.rb

@@ -3,7 +3,7 @@ module Scrivito
   class CmsDispatchController < ActionController::Metal
     include ActionController::Redirecting
     include Rails.application.routes.url_helpers
-    include Scrivito::RoutingHelper
+    include Scrivito::ControllerHelper
 
     def process(action)
       CmsEnv.new(env).load

data/app/controllers/scrivito/objs_controller.rb

@@ -106,6 +106,10 @@ module Scrivito
       render :obj
     end
 
+    # optimized away
+    def transfer_modifications
+    end
+
     def duplicate
       @obj = copy_obj(current_obj, current_obj.parent_path)
       render :obj

data/infopark_fiona7.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md", "infopark_fiona7.gemspec"]
 
   s.add_dependency "rails", "~> 4.2.2"
-  s.add_dependency "scrivito", "= 0.70.0.rc1"
+  s.add_dependency "scrivito", "= 0.71"
   s.add_dependency "scrivito_sdk"
   s.add_dependency "scrivito_editors"
   s.add_dependency "infopark_fiona_connector", "= 7.0.1.beta2"

data/lib/fiona7/builder/obj_builder.rb

@@ -117,7 +117,7 @@ module Fiona7
           (claimed_type, value) = *possible_pair
           attribute             = type_definition.find_attribute(attribute_name)
           if attribute.nil?
-            debugger
+            #debugger
             raise "Attribute #{attribute_name} not found in #{@obj_class}"
           end
 
@@ -215,7 +215,11 @@ module Fiona7
             @obj.set(attribute_name.to_s, value)
             #end
           when :stringlist
-            @obj.set(attribute_name.to_s, value.to_json)
+            if Fiona7.mode == :legacy && attribute_name.to_s == "channels"
+              @obj.set(:channels, value || [])
+            else
+              @obj.set(attribute_name.to_s, value.to_json)
+            end
           when :html
             converted_links = LinkConverter::ScrivitoToFiona.new(WriteObj, value.to_s).convert
             @obj.set(attribute_name.to_s, converted_links)

data/lib/fiona7/builder/obj_class_builder.rb

@@ -1,3 +1,4 @@
+require 'fiona7/assert'
 
 module Fiona7
   module Builder
@@ -36,6 +37,38 @@ module Fiona7
             raw_attribute.set(:helpText, ::ActiveSupport::JSON.encode({type: attribute[:type]}))
             raw_attribute.set(:values, attribute[:values]) if attribute[:values]
             raw_attribute.save!
+          else
+            cms_attribute = RailsConnector::Attribute.find_by_attribute_name(attribute[:real_name])
+            raw_attribute = Reactor::Cm::Attribute.get(attribute[:real_name].to_s)
+
+            if attribute[:type] == :reference || attribute[:type] == :referencelist
+              if cms_attribute.attribute_type == "linklist"
+                raw_attribute.set(:helpText, ::ActiveSupport::JSON.encode({type: attribute[:type]}))
+                raw_attribute.save!
+              else
+                Assert.constraint(false, "Type #{attribute[:type]} requested for #{attribute[:real_name]}, but is #{cms_attribute.attribute_type}")
+              end
+            elsif attribute[:type] == :enum || attribute[:type] == :multienum
+              if cms_attribute.attribute_type == "multienum" || cms_attribute.attribute_type == "enum"
+                if attribute[:values]
+                  # do not remove values
+                  values = cms_attribute.values + attribute[:values]
+                  raw_attribute.set(:values, values)
+                  raw_attribute.save!
+                end
+              else
+                if !((attribute[:type] == :enum && cms_attribute.attribute_type == "string") ||
+                  (attribute[:type] == :multienum && cms_attribute.attribute_type == "text"))
+                  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
+              Assert.constraint(false, "Type #{attribute[:type]} requested for #{attribute[:real_name]}, but is #{cms_attribute.attribute_type}")
+            end
           end
         end
       end

data/lib/fiona7/controllers/content_service/obj_controller.rb

@@ -96,6 +96,7 @@ module Fiona7
         end
 
         def find_by_path(path)
+          return [] if path.nil?
           return [] if path =~ /^\/_orphaned/
           path = path.gsub('.', '_')
           @klass.where(path: path).limit(1).to_a

data/lib/fiona7/controllers/rest_api/workspace_controller.rb

@@ -20,6 +20,7 @@ module Fiona7
           raise "Unexpected workspace_id: #{id}" unless id.to_s == "rtc"
           WriteObj.where(is_edited: 1).each do |obj|
             begin
+              obj.take
               obj.release!
             rescue => e
               raise "Release impossible of: #{obj.path} because: #{e.message}"

data/lib/fiona7/json/obj_decorator.rb

@@ -89,8 +89,12 @@ module Fiona7
           when :enum, :multienum, :text, :string
             @obj[real_attribute_name]
           when :stringlist
-            # TODO: get rid of this rescue nil
-            ::JSON.parse(@obj[real_attribute_name]) rescue nil 
+            if Fiona7.mode == :legacy && real_attribute_name == "channels"
+              @obj["channels"] || []
+            else
+              # TODO: get rid of this rescue nil
+              ::JSON.parse(@obj[real_attribute_name]) rescue nil 
+            end
           else
             Assert.success(
               false,
@@ -98,6 +102,10 @@ module Fiona7
             )
           end
 
+          # TODO: better handling for attribute types
+          if virtual_attribute_type  == :text
+            virtual_attribute_type = :string
+          end
           attrs[virtual_attribute_name] = [val, virtual_attribute_type]
         end
       end

data/lib/fiona7/naive_search_engine.rb

@@ -126,7 +126,11 @@ module Fiona7
           end
         end
       when :prefix, :prefix_search
-        @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s.start_with?(value) }
+        if !@all.is_a?(Array) && field.to_sym == :_path
+          @all = @all.where("path LIKE ?", "#{value}%")
+        else
+          @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s.start_with?(value) }
+        end
       when :greater_than
         @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s > (value) }
       when :less_than

data/lib/fiona7/scrivito_patches/attribute_content.rb

@@ -10,7 +10,21 @@ module Scrivito
         orig_attribute(name, type, options)
       ensure
         if self.name.present?
-          Fiona7::TypeRegister.instance.add_usr_attr(self.name, name, type, options[:values])
+          # to_s is friendly to shadowclassing
+          Fiona7::TypeRegister.instance.add_usr_attr(self.to_s, name, type, options[:values])
+        end
+      end
+
+      # support shadow classes
+      def description_for_editor
+        to_s
+      end
+
+      def register_attribute_definitions(obj_class)
+        type_register = Fiona7::TypeRegister.instance
+        self.attribute_definitions.each do |attribute_definition|
+          # to_s instead of name for shadowclassing
+          type_register.add_usr_attr(obj_class, attribute_definition.name, attribute_definition.type, attribute_definition.values.presence)
         end
       end
     end

data/lib/fiona7/scrivito_patches/attribute_serializer.rb

@@ -5,6 +5,7 @@ module Scrivito
     def serialize_binary_value(attribute_value, attribute_definition)
       case attribute_value
       when File           then attribute_value
+      when FutureBinary   then attribute_value.file_to_be_uploaded
       when UploadedBinary then attribute_value.params
       else
         raise_validation_error(attribute_definition.name,

data/lib/fiona7/scrivito_patches/basic_obj.rb

@@ -14,10 +14,18 @@ module Scrivito
       id.to_s
     end
 
+    # optimized away
     def outdated?
       false
     end
 
+    # optimized away
+    def transfer_modifications_to(target_workspace)
+      return unless modification
+      raise TransferModificationsModifiedError,
+        "Already modified in workspace #{target_workspace.id}"
+    end
+
     def copy_binaries(attributes)
       # TODO: what to do?
       attributes
@@ -88,13 +96,9 @@ module Scrivito
         end
       ensure
         if subclass.name.present?
-          type_register = Fiona7::TypeRegister.instance
-          subclass.attribute_definitions.each do |attribute_definition|
-            type_register.add_usr_attr(subclass.name, attribute_definition.name, attribute_definition.type, attribute_definition.values.presence)
-          end
+          subclass.register_attribute_definitions(subclass.to_s)
         end
       end
-
     end
   end
 end

data/lib/fiona7/scrivito_patches/binary.rb

@@ -35,9 +35,15 @@ module Fiona7
         protected
         attr_accessor :binary_id, :transformation, :obj
 
+        def cache(key, &block)
+          # TODO: make path this configurable
+          @@cache = ActiveSupport::Cache::FileStore.new(Rails.root + '/tmp/cache') unless defined?(@@cache)
+          @@cache.fetch("#{self.binary_id}-#{key}", &block)
+        end
+
         def load_obj
           if Fiona7.mode == :legacy
-            Fiona7::WriteObj.find(self.binary_id)
+            Fiona7::EditedObj.find(self.binary_id)
           else
             Fiona7::InternalReleasedObj.find(self.binary_id)
           end
@@ -68,19 +74,27 @@ module Fiona7
         end
 
         def width
-          if self.image
-            self.image[:width]
-          else
-            0
+          self.cache("#{self.last_changed}-width") do
+            if self.image
+              self.image[:width]
+            else
+              0
+            end
           end
+        rescue 
+          0
         end
 
         def height
-          if self.image
-            self.image[:height]
-          else
-            0
+          self.cache("#{self.last_changed}-height") do
+            if self.image
+              self.image[:height]
+            else
+              0
+            end
           end
+        rescue 
+          0
         end
 
         def mime_type
@@ -412,7 +426,7 @@ module Fiona7
       attr_writer :blob_id, :access_type, :verb, :transformation
       def blob
         if Fiona7.mode == :legacy
-          @blob ||= Fiona7::WriteObj.find(blob_id.to_i)
+          @blob ||= Fiona7::EditedObj.find(blob_id.to_i)
         else
           @blob ||= Fiona7::InternalReleasedObj.find(blob_id.to_i)
         end
@@ -459,7 +473,7 @@ module Fiona7
       end
 
       def validate_transformation!
-        MetaBinary.new(self.blob_id, self.transformation).valid? || raise(Scrivito::TransformationDefinitionError.new("Invalid transformation", "binary.unprocessable.image.transform.invalid_config"))
+        MetaBinary.new(self.blob_id, self.transformation).valid? || raise(Scrivito::TransformationDefinitionError.new("Invalid transformation", "binary.unprocessable.image.transform.config.invalid"))
       end
     end
   end

data/lib/fiona7/scrivito_patches/cms_rest_api.rb

@@ -2,8 +2,9 @@ require 'scrivito/cms_rest_api.rb'
 
 module Scrivito
   class CmsRestApi
-    # Stub upload_file since the uploads are handled directly in ruby.
-    def self.upload_file(file, obj_id)
+    # Stub upload_future_binary since the uploads are handled directly in ruby.
+    def self.upload_future_binary(future_binary, obj_id)
+      file = future_binary.file_to_be_uploaded
       # TODO: code deduplication with obj builder
       parent = Fiona7::WriteObj.find(obj_id.to_i)
       ext       = ::File.extname(file.path).to_s[1..-1]

data/lib/fiona7/scrivito_patches/type_computer.rb

@@ -5,6 +5,8 @@ module Scrivito
     private
 
     def load_class(obj_class_name)
+      return nil if obj_class_name.nil?
+
       begin
         klass = obj_class_name.constantize
         klass = nil if !inherits_from_base?(klass)

data/lib/fiona7/scrivito_patches/workspace.rb

@@ -11,5 +11,15 @@ module Scrivito
     def outdated?
       false
     end
+
+    # fix silly assumptions 
+    def self.use(id_or_title)
+      self.current = if id_or_title =~ /(published|rtc)/
+        find(id_or_title)
+      else
+        find_by_title(id_or_title) or
+          raise ResourceNotFound, "Could not find #{self} with title #{id_or_title}"
+      end
+    end
   end
 end

data/lib/fiona7/shadow_classes.rb

@@ -45,7 +45,9 @@ module ShadowClasses
           Class.new(scrivito_obj_class) do
             include ::ShadowClassesSupport
           end
-        )
+        ).tap do |klass|
+          klass.register_attribute_definitions(name)
+        end
       end
     elsif type == 'Widget'
       parent_class = 'Widget'.safe_constantize || Scrivito::BasicWidget
@@ -54,7 +56,9 @@ module ShadowClasses
         Class.new(parent_class) do
           include ::ShadowClassesSupport
         end
-      )
+      ).tap do |klass|
+        klass.register_attribute_definitions(name)
+      end
     end
 
   end

data/lib/fiona7/type_loader.rb

@@ -26,11 +26,11 @@ module Fiona7
     end
 
     def load(type_definition)
-      #puts "loading #{obj_class}"
       if Fiona7.mode == :legacy
         type_definition.add_attr('title', :string, 'title', :string)
         type_definition.add_attr('valid_from', :date, 'valid_from', :date)
         type_definition.add_attr('valid_until', :date, 'valid_until', :date)
+        type_definition.add_attr('channels', :stringlist, 'channels', :stringlist)
 
         if self.rc_obj_class.obj_type == 'publication' || self.rc_obj_class.obj_type == 'document'
           type_definition.add_attr('body', :html, 'body', :html)

data/lib/fiona7/type_register.rb

@@ -103,7 +103,6 @@ module Fiona7
 
       def type_definition
         type_definition = TypeDefinition.new(self.obj_class)
-        pp values
         values.each do |name, possible_pair|
           next if name =~ /\A_/ # built-in attribute
           next unless possible_pair.kind_of?(Array) && possible_pair.length == 2
@@ -158,7 +157,7 @@ module Fiona7
     end
 
     def ad_hoc_synchronize(type_definition)
-      puts "Ad hoc synchronize of #{type_definition.name}"
+      #puts "Ad hoc synchronize of #{type_definition.name}"
       obj_class = type_definition.name
 
       existing_definition = self.usr_defs[obj_class]
@@ -187,6 +186,32 @@ module Fiona7
       self.cms_defs[obj_class].present?
     end
 
+    def type_compatible?(attr_name, cms_type, usr_type)
+      if cms_type == usr_type
+        true
+      else
+        case [cms_type, usr_type]
+        when [:multienum, :stringlist]
+          # this case can occur when a multienum
+          # was properly created, but is only ad-hoc written
+          # the API provides stringlist as a valid type
+          true
+        when [:stringlist, :multienum]
+          # this case can occur when a multienum
+          # was initially ad-hoc created, but now
+          # has a proper definition
+          # also: channels in legacy mode
+          true
+        when [:text, :string]
+          true
+        else
+          #raise "Attribute types for #{attr_name} incompatible: CMS uses #{cms_type} but the application provided #{usr_type}"
+          puts "Attribute types for #{attr_name} incompatible: CMS uses #{cms_type} but the application provided #{usr_type}"
+          false
+        end
+      end
+    end
+
     def defs_compatible?(cms_def, usr_def)
       cms_attr_map = {}
       cms_def.attrs.each do |attr|
@@ -195,7 +220,7 @@ module Fiona7
 
       usr_def.attrs.each do |attr|
         return false if !cms_attr_map[attr.name]
-        return false if attr.type != cms_attr_map[attr.name].type
+        return false if !type_compatible?(attr.name, cms_attr_map[attr.name].type, attr.type)
       end
 
       return true

data/lib/fiona7/type_synchronizer.rb

@@ -45,7 +45,7 @@ module Fiona7
 
     def builder_attributes
       self.type_definition.attrs.map do |attribute_definition|
-        next if ['title', 'body'].include?(attribute_definition.real_name)
+        next if ['title', 'body', 'valid_from', 'valid_until', 'channels'].include?(attribute_definition.real_name)
 
         desc = {
           real_name: attribute_definition.real_name,

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "0.70.0.3"
+  VERSION = "0.71.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 0.70.0.3
+  version: 0.71.0.0
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.70.0.rc1
+        version: '0.71'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.70.0.rc1
+        version: '0.71'
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,8 @@ files:
 - app/assets/images/fiona7-marker.png
 - app/assets/javascripts/fiona7.js
 - app/assets/javascripts/fiona7_ui.js
+- app/assets/javascripts/scrivito_patches/models/blob.js
+- app/assets/javascripts/scrivito_patches/models/obj.js
 - app/assets/stylesheets/fiona7-login.css.scss
 - app/assets/stylesheets/fiona7.css.scss
 - app/assets/stylesheets/fiona7_ui.css.scss
@@ -254,3 +256,4 @@ signing_key:
 specification_version: 4
 summary: scrivito-compatible interface for classic Fiona
 test_files: []
+has_rdoc: