infopark_fiona7 1.5.5.3.1 → 1.5.5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0590fa89cace0547e0dbf261e5acf5946c37cc8
-  data.tar.gz: f88431937133bfb08439d6d2ee1f9bc3441e9524
+  metadata.gz: 4e1b268827386ff36463ab06a15afdee261a1273
+  data.tar.gz: edfd0fb11950038b68c440457f7d7a20a5c2afce
 SHA512:
-  metadata.gz: 9883ff71077c343ba7f33c4f6bae47e2c19ef83a2489ec1d8cf28848be9b9a66a409adea54ed110161ba1be73e655db3cdfc7bba9ee5e41b4cb325727284440f
-  data.tar.gz: 07179e47fe6f27c1cc31bc279f4121e6e0e79cfd4413ee7697b69bc51432315fc87dfda28835344f861adb78d41d622cb6cd9f61a38268aa0752eee6a34e7eb2
+  metadata.gz: cf9a981a212c5a2527986e4f6d298d000b243fc883ecc017208fc9e378df22e89de7784aa97c56e65942fbd09cf8d1390bb0601ee90678e7fe7d44dde7d5903c
+  data.tar.gz: bf3d33be89c1d3afafc7b28a5992ff29e5c5a7ff637640615ab522697a8415458082095a11fd35c6a507fd572b347bd923402d39604005f0ce7fba40c4850e68

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

@@ -219,38 +219,16 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
       return result;
     }
 
-    var _iteratorNormalCompletion = true;
-    var _didIteratorError = false;
-    var _iteratorError = undefined;
-
-    try {
-      for (var _iterator = Object.keys(objParams)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var k = _step.value;
-
-        // if params[k] is an array
-        if (objParams[k].pop) {
-          // file uploads require form data
-          result = objParams[k][1] && (scrivito.BinaryUtils.isFile(objParams[k][1]) || scrivito.BinaryUtils.isBlob(objParams[k][1]) || scrivito.BinaryUtils.isBlobWithName(objParams[k][1]));
-          if (result) {
-            return result;
-          }
-        }
-      }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion && _iterator['return']) {
-          _iterator['return']();
-        }
-      } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
+    for (var k in objParams) {
+      // if objParams[k] is an array
+      if (objParams.hasOwnProperty(k) && objParams[k] && typeof objParams[k] === 'object' && objParams[k].pop) {
+        // file uploads require form data
+        result = objParams[k][1] && (scrivito.BinaryUtils.isFile(objParams[k][1]) || scrivito.BinaryUtils.isBlob(objParams[k][1]) || scrivito.BinaryUtils.isBlobWithName(objParams[k][1]));
+        if (result) {
+          return result;
         }
       }
     }
-
     return result;
   }
 
@@ -281,189 +259,92 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     fd.append('verb', verb);
     fd.append('path', path);
 
-    var _iteratorNormalCompletion2 = true;
-    var _didIteratorError2 = false;
-    var _iteratorError2 = undefined;
+    for (var attr in objParams) {
+      // attr is a [type, value] pair
+      if (objParams.hasOwnProperty(attr) && objParams[attr] && typeof objParams[attr] === 'object' && objParams[attr].pop) {
+        var _objParams$attr = _slicedToArray(objParams[attr], 2);
 
-    try {
-      for (var _iterator2 = Object.keys(objParams)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-        var attr = _step2.value;
-
-        // attr is a [type, value] pair
-        if (objParams[attr] && typeof objParams[attr] === 'object' && objParams[attr].pop) {
-          var _objParams$attr = _slicedToArray(objParams[attr], 2);
+        var type = _objParams$attr[0];
+        var value = _objParams$attr[1];
 
-          var type = _objParams$attr[0];
-          var value = _objParams$attr[1];
-
-          if (value.pop) {
-            // multienum / stringlist / widgetlist
-            fd.append('params[obj][' + attr + '[]', type);
-            for (var i = 0; i < value.length; ++i) {
-              fd.append('params[obj][' + attr + '[][formdata$workaround][]', value[i]);
-            }
-          } else if (scrivito.BinaryUtils.isFile(value) || scrivito.BinaryUtils.isBlob(value)) {
-            // upload
-            fd.append('params[obj][' + attr + '][]', type);
-            fd.append('params[obj][' + attr + '][]', value);
-          } else if (scrivito.BinaryUtils.isBlobWithName(value)) {
-            fd.append('params[obj][' + attr + '][]', type);
-            fd.append('params[obj][' + attr + '][]', value.blob_to_upload, value.filename);
-          } else if (value && typeof value === 'object') {
-            // blob/copy rename
-            fd.append('params[obj][' + attr + '[]', type);
-            var _iteratorNormalCompletion3 = true;
-            var _didIteratorError3 = false;
-            var _iteratorError3 = undefined;
-
-            try {
-              for (var _iterator3 = Object.keys(value)[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-                var l = _step3.value;
-
-                fd.append('params[obj][' + attr + '][][' + l + ']', value[l]);
-              }
-            } catch (err) {
-              _didIteratorError3 = true;
-              _iteratorError3 = err;
-            } finally {
-              try {
-                if (!_iteratorNormalCompletion3 && _iterator3['return']) {
-                  _iterator3['return']();
-                }
-              } finally {
-                if (_didIteratorError3) {
-                  throw _iteratorError3;
-                }
-              }
+        if (typeof value === 'object' && value && value.pop) {
+          // multienum / stringlist / widgetlist
+          fd.append('params[obj][' + attr + '[]', type);
+          for (var i = 0; i < value.length; ++i) {
+            fd.append('params[obj][' + attr + '[][formdata$workaround][]', value[i]);
+          }
+        } else if (scrivito.BinaryUtils.isFile(value) || scrivito.BinaryUtils.isBlob(value)) {
+          // upload
+          fd.append('params[obj][' + attr + '][]', type);
+          fd.append('params[obj][' + attr + '][]', value);
+        } else if (scrivito.BinaryUtils.isBlobWithName(value)) {
+          fd.append('params[obj][' + attr + '][]', type);
+          fd.append('params[obj][' + attr + '][]', value.blob_to_upload, value.filename);
+        } else if (value && typeof value === 'object') {
+          // blob/copy rename
+          fd.append('params[obj][' + attr + '[]', type);
+          for (var l in value) {
+            if (value.hasOwnProperty(l)) {
+              fd.append('params[obj][' + attr + '][][' + l + ']', value[l]);
             }
-          } else if (typeof value !== 'undefined') {
-            fd.append('params[obj][' + attr + '][]', type);
-            fd.append('params[obj][' + attr + '][]', value);
           }
-          // special handling for widget pool
-        } else if (attr === '_widget_pool') {
-            var value = objParams[attr];
-            var _iteratorNormalCompletion4 = true;
-            var _didIteratorError4 = false;
-            var _iteratorError4 = undefined;
-
-            try {
-              for (var _iterator4 = Object.keys(value)[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-                var widgetId = _step4.value;
-
-                var widget = value[widgetId];
-                var _iteratorNormalCompletion5 = true;
-                var _didIteratorError5 = false;
-                var _iteratorError5 = undefined;
-
-                try {
-                  for (var _iterator5 = Object.keys(widget)[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-                    var widgetAttr = _step5.value;
-
-                    if (widget[widgetAttr].pop) {
-                      var _widget$widgetAttr = _slicedToArray(widget[widgetAttr], 2);
-
-                      var widgetAttrType = _widget$widgetAttr[0];
-                      var widgetValue = _widget$widgetAttr[1];
-
-                      // FIXME: Duplication
-                      if (widgetValue.pop) {
-                        // multienum / stringlist / widgetlist
-                        fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
-                        for (var i = 0; i < widgetValue.length; ++i) {
-                          fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][][formdata$workaround][]', widgetValue[i]);
-                        }
-                      } else if (scrivito.BinaryUtils.isFile(widgetValue) || scrivito.BinaryUtils.isBlob(widgetValue)) {
-                        // upload
-                        fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
-                        fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetValue);
-                      } else if (scrivito.BinaryUtils.isBlobWithName(widgetValue)) {
-                        fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
-                        fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetValue.blob_to_upload, widgetValue.filename);
-                      } else if (widgetValue && typeof widgetValue === 'object') {
-                        // blob/copy rename
-                        fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
-                        var _iteratorNormalCompletion6 = true;
-                        var _didIteratorError6 = false;
-                        var _iteratorError6 = undefined;
-
-                        try {
-                          for (var _iterator6 = Object.keys(widgetValue)[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
-                            var l = _step6.value;
-
-                            fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][][' + l + ']', widgetValue[l]);
-                          }
-                        } catch (err) {
-                          _didIteratorError6 = true;
-                          _iteratorError6 = err;
-                        } finally {
-                          try {
-                            if (!_iteratorNormalCompletion6 && _iterator6['return']) {
-                              _iterator6['return']();
-                            }
-                          } finally {
-                            if (_didIteratorError6) {
-                              throw _iteratorError6;
-                            }
-                          }
+        } else if (typeof value !== 'undefined') {
+          fd.append('params[obj][' + attr + '][]', type);
+          fd.append('params[obj][' + attr + '][]', value);
+        }
+        // special handling for widget pool
+      } else if (attr === '_widget_pool') {
+          var value = objParams[attr];
+          for (var widgetId in value) {
+            if (value.hasOwnProperty(widgetId)) {
+              var widget = value[widgetId];
+              for (var widgetAttr in widget) {
+                if (widget.hasOwnProperty(widgetAttr)) {
+                  if (widget[widgetAttr] && widget[widgetAttr].pop) {
+                    var _widget$widgetAttr = _slicedToArray(widget[widgetAttr], 2);
+
+                    var widgetAttrType = _widget$widgetAttr[0];
+                    var widgetValue = _widget$widgetAttr[1];
+
+                    // FIXME: Duplication
+                    if (widgetValue && typeof widgetValue === 'object' && widgetValue.pop) {
+                      // multienum / stringlist / widgetlist
+                      fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
+                      for (var i = 0; i < widgetValue.length; ++i) {
+                        fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][][formdata$workaround][]', widgetValue[i]);
+                      }
+                    } else if (scrivito.BinaryUtils.isFile(widgetValue) || scrivito.BinaryUtils.isBlob(widgetValue)) {
+                      // upload
+                      fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
+                      fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetValue);
+                    } else if (scrivito.BinaryUtils.isBlobWithName(widgetValue)) {
+                      fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
+                      fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetValue.blob_to_upload, widgetValue.filename);
+                    } else if (widgetValue && typeof widgetValue === 'object') {
+                      // blob/copy rename
+                      fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
+                      for (var l in widgetValue) {
+                        if (widgetValue.hasOwnProperty(l)) {
+                          fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][][' + l + ']', widgetValue[l]);
                         }
-                      } else {
-                        // normal value
-                        fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
-                        fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetValue);
                       }
                     } else {
-                      // hopefully a built-in attribute :-)
-                      fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + ']', widget[widgetAttr]);
-                    }
-                  }
-                } catch (err) {
-                  _didIteratorError5 = true;
-                  _iteratorError5 = err;
-                } finally {
-                  try {
-                    if (!_iteratorNormalCompletion5 && _iterator5['return']) {
-                      _iterator5['return']();
-                    }
-                  } finally {
-                    if (_didIteratorError5) {
-                      throw _iteratorError5;
+                      // normal value
+                      fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetAttrType);
+                      fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + '][]', widgetValue);
                     }
+                  } else {
+                    // hopefully a built-in attribute :-)
+                    fd.append('params[obj][' + attr + '][' + widgetId + '][' + widgetAttr + ']', widget[widgetAttr]);
                   }
                 }
               }
-            } catch (err) {
-              _didIteratorError4 = true;
-              _iteratorError4 = err;
-            } finally {
-              try {
-                if (!_iteratorNormalCompletion4 && _iterator4['return']) {
-                  _iterator4['return']();
-                }
-              } finally {
-                if (_didIteratorError4) {
-                  throw _iteratorError4;
-                }
-              }
+            } else {
+              // hopefully a built-in attribute :-)
+              fd.append('params[obj][' + attr + ']', objParams[attr]);
             }
-          } else {
-            // hopefully a built-in attribute :-)
-            fd.append('params[obj][' + attr + ']', objParams[attr]);
           }
-      }
-    } catch (err) {
-      _didIteratorError2 = true;
-      _iteratorError2 = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion2 && _iterator2['return']) {
-          _iterator2['return']();
-        }
-      } finally {
-        if (_didIteratorError2) {
-          throw _iteratorError2;
         }
-      }
     }
 
     return fd;

data/app/controllers/fiona7/release_controller.rb

@@ -1,3 +1,5 @@
+require 'fiona7/widget_gc/garbage_collector'
+
 module Fiona7
   class ReleaseController < ActionController::Base
     helper_method :current_locale
@@ -52,6 +54,14 @@ module Fiona7
     end
 
     def carefully_release(errors, obj, comment=nil)
+      # NOTE: widget garbage collection may be required on release
+      # but only for objects which actually contain widgets.
+      #
+      # TODO: refactor this code!
+      if obj.attr_values["X_widget_pool"].present?
+        WidgetGc::GarbageCollector.new(obj.id, :release).gc!
+      end
+
       if obj.really_edited?
         # we don't care much if this fails
         obj.take

data/lib/fiona7/builder/obj_builder.rb

@@ -16,6 +16,8 @@ require 'fiona7/prefetch/obj_prefetch'
 
 require 'fiona7/attribute_writers/factory'
 
+require 'fiona7/widget_gc/garbage_collector'
+
 
 module Fiona7
   module Builder
@@ -79,6 +81,8 @@ module Fiona7
         write_widget_pool
         store_attributes
 
+        widgets_gc
+
         @obj
       end
 
@@ -100,7 +104,7 @@ module Fiona7
         @obj_class         = @values.delete(:_obj_class)
         @real_obj_class    = Fiona7::ObjClassNameMangler.new(@obj_class).mangle
         @widget_pool       = @values.delete(:_widget_pool)
-        @permalink         = @values.delete(:_permalink)
+        @permalink         = @values.key?(:_permalink) ? (@values.delete(:_permalink) || "") : nil
 
         @path = "/#{@path}" unless @path.start_with?('/')
         @name, parent_path = name_and_parent_path_from_path(@path)
@@ -171,9 +175,36 @@ module Fiona7
 
         @obj.save!
 
-        #if !@values.empty? || !@new_widget_pool.nil?
-          @obj.edit! unless @obj.really_edited?
-        #end
+        @obj.edit! unless @obj.really_edited?
+      end
+
+      def widgets_gc
+        if self.trigger_widget_gc?
+          WidgetGc::GarbageCollector.new(@obj.id, :update).gc!
+        end
+      end
+
+      def trigger_widget_gc?
+        # NOTE: there is actually only one case when we need
+        # to trigger widget gc: when a widget has been deleted
+        #
+        # Sadly deleting widgets has been deprecated from the
+        # SDK - now only the references to a widget are 
+        # !implicitely! removed.
+        #
+        # It could be possible to guess which widget was deleted
+        # but its tricky and complicates things.
+        #
+        # Therefore we use a simple heuristic: if a widgetlist
+        # attribute has been provided as an input, then
+        # widgets have been added/rearanged/deleted which
+        # triggers widget garbage collection.
+        #
+        # The overhead of useless widget garbage collection pass
+        # is equal to two database queries, so it isn't too bad.
+        params_contain_widgetlist = @values.present? && @values.any? {|name, pair| pair.is_a?(Array) && pair[0] == "widgetlist" }
+        pool_contains_widgetlist = @widget_pool.present? && @widget_pool.any? {|widget_id, values| values.nil? || values.any? {|name, pair| pair.is_a?(Array) && pair[0] == "widgetlist" } }
+        params_contain_widgetlist || pool_contains_widgetlist
       end
 
 

data/lib/fiona7/builder/obj_updater.rb

@@ -18,7 +18,8 @@ module Fiona7
         @obj         = WriteObj.find(obj_id)
         @path        = @values.delete(:_path)
         @widget_pool = @values.delete(:_widget_pool)
-        @permalink   = @values.delete(:_permalink)
+        @permalink   = @values.key?(:_permalink) ? (@values.delete(:_permalink) || "") : nil
+
 
         # revert command sends this info. which is silly.
         @values.delete(:_last_changed)

data/lib/fiona7/builder/widget_builder.rb

@@ -14,6 +14,14 @@ module Fiona7
         false
       end
 
+      def write_widget_pool
+        true
+      end
+
+      def widgets_gc
+        true
+      end
+
       def prepare_object
         @path              = self.generate_widget_path
         @obj_class         = @values.delete(:_obj_class)

data/lib/fiona7/engine.rb

@@ -128,6 +128,10 @@ module Fiona7
     end
   end
 
+  def self.widget_gc_strategy
+    self.read_config.features.widget_gc_strategy
+  end
+
   def self.workflows_enabled?
     !!self.read_config.features.workflows_enabled
   end
@@ -143,8 +147,8 @@ module Fiona7
     end
   end
 
-  class Features < Struct.new("Features", :workflows_enabled, :facetting_enabled)
-    def initialize(workflows_enabled=true, facetting_enabled=true)
+  class Features < Struct.new("Features", :workflows_enabled, :facetting_enabled, :widget_gc_strategy)
+    def initialize(workflows_enabled=true, facetting_enabled=true, widget_gc_strategy=nil)
       super
     end
   end

data/lib/fiona7/prefetch/widget_resolver_prefetch.rb

@@ -1,5 +1,6 @@
 require 'fiona7/prefetch/obj_prefetch'
 require 'fiona7/widget_resolver'
+require 'fiona7/widget_object_id_collector'
 
 module Fiona7
   module Prefetch
@@ -26,9 +27,7 @@ module Fiona7
 
       def collect_widget_object_ids(objects)
         objects.map do |object|
-          (object.attr_values["X_widget_pool"]||[]).map do |widget_hash|
-            widget_hash["destination"].try(:to_i)
-          end
+          WidgetObjectIdCollector.new(object.attr_values["X_widget_pool"]).call
         end.flatten.compact
       end
     end

data/lib/fiona7/super_object_finder.rb

@@ -17,7 +17,7 @@ module Fiona7
       when :live
         live(obj)
       else
-        raise ArgumentError, "Uknown type #{type.inspect} expected :preview or :ive"
+        raise ArgumentError, "Uknown type #{type.inspect} expected :preview or :live"
       end
     end
 

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.5.5.3.1"
+  VERSION = "1.5.5.4.0"
 end

data/lib/fiona7/widget_gc/garbage_collector.rb

@@ -0,0 +1,32 @@
+require 'fiona7/prefetch/obj_prefetch'
+require 'fiona7/prefetch/widget_resolver_prefetch'
+
+require 'fiona7/widget_gc/sweep_strategies/factory'
+require 'fiona7/widget_gc/marker'
+
+module Fiona7
+  module WidgetGc
+    class GarbageCollector
+      def initialize(object_id, mode)
+        self.object_id = object_id
+        self.mode = mode
+        self.klass = Fiona7::WriteObj
+      end
+
+      def gc!
+        if (sweep_strategy = SweepStrategies::Factory.for(self.mode, Fiona7.widget_gc_strategy))
+          object          = Prefetch::ObjPrefetch.new(self.klass, [self.object_id]).find_one(self.object_id)
+          widget_resolver = Prefetch::WidgetResolverPrefetch.new(self.klass, [object]).widget_resolver(object)
+          marker          = Marker.new(object, widget_resolver)
+
+          if marker.garbage?
+            sweep_strategy.new(object, widget_resolver).sweep!(marker.garbage)
+          end
+        end
+      end
+
+      protected
+      attr_accessor :object_id, :mode, :klass
+    end
+  end
+end

data/lib/fiona7/widget_gc/marker.rb

@@ -0,0 +1,45 @@
+require 'fiona7/widget_object_id_collector'
+require 'fiona7/widgetlist_enumerator'
+
+module Fiona7
+  module WidgetGc
+    class Marker
+      def initialize(object, widget_resolver)
+        self.object = object
+        self.widgets = widget_resolver.all
+
+        self.mark
+      end
+
+      def garbage
+        self.available - self.referenced
+      end
+
+      def garbage?
+        self.garbage.any?
+      end
+
+      attr_reader :object, :widgets, :available, :referenced
+
+      protected
+      attr_writer :object, :widgets, :available, :referenced
+
+
+      def mark
+        ref_from_obj     = self.object_ids_of_widgets(object)
+        ref_from_widgets = widgets.map do |widget_object|
+          # TODO: check if widget_object referenced from object
+          self.object_ids_of_widgets(widget_object)
+        end.flatten
+
+        # TODO: maybe use widgets.map(&:id) instead?
+        self.available   = Set.new(WidgetObjectIdCollector.new(self.object.attr_values["X_widget_pool"]).call).freeze
+        self.referenced  = Set.new(ref_from_obj + ref_from_widgets).freeze
+      end
+
+      def object_ids_of_widgets(object)
+        WidgetlistEnumerator.new(object).to_enum.map {|attr_name, attr_value| WidgetObjectIdCollector.new(attr_value).call }.flatten
+      end
+    end
+  end
+end

data/lib/fiona7/widget_gc/sweep_strategies/archive_sweep.rb

@@ -0,0 +1,42 @@
+module Fiona7
+  module WidgetGc
+    module SweepStrategies
+      # This garbage collection strategy deletes BOTH working
+      # and released versions of garbage widget objects
+      # This effecively nukes the widget object.
+      # NOTE: It normally requires permissionRoot
+      # on all garbage widget objects. But since it is meant
+      # to be used during release process, which only requires
+      # permissionWrite permission elevation is used
+      #
+      # This strategy should be only used shortly
+      # before releasing the page
+      class ArchiveSweep
+        def initialize(object, widget_resolver)
+          self.object = object
+          self.widget_resolver = widget_resolver
+        end
+
+        def sweep!(garbage)
+          # NOTE: this emulates permission elevation:
+          # permissionWrite -> permissionRoot
+          return unless self.object.permission.write?
+
+          garbage.each do |widget_object_id|
+            # TODO: improve performance here
+            widget_object = self.widget_resolver.all.find {|w| w.id == widget_object_id }
+            archive!(widget_object)
+          end
+        end
+
+        protected
+        attr_accessor :object, :widget_resolver
+        def archive!(widget_object)
+          Reactor::Sudo.su(Fiona7.root) do
+            widget_object.send(:crul_obj).remove_active_contents!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/widget_gc/sweep_strategies/factory.rb

@@ -0,0 +1,21 @@
+require 'fiona7/widget_gc/sweep_strategies/revert_sweep'
+require 'fiona7/widget_gc/sweep_strategies/archive_sweep'
+
+module Fiona7
+  module WidgetGc
+    module SweepStrategies
+      module Factory
+        def self.for(mode, name=Fiona7.widget_gc_strategy)
+          case [mode, name]
+          when [:update, :revert_archive]
+            RevertSweep
+          when [:release, :revert_archive]
+            ArchiveSweep
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/widget_gc/sweep_strategies/revert_sweep.rb

@@ -0,0 +1,33 @@
+module Fiona7
+  module WidgetGc
+    module SweepStrategies
+      # This garbage collection strategy deletes working versions
+      # of garbage widget objects
+      # Its usefulness is limited to objects which hasn't been released yet
+      # or gained links in working version
+      #
+      # This strategy should be only used
+      # after deleting widgets
+      class RevertSweep
+        def initialize(object, widget_resolver)
+          self.object = object
+          self.widget_resolver = widget_resolver
+        end
+
+        def sweep!(garbage)
+          garbage.each do |widget_object_id|
+            # TODO: improve performance here
+            widget_object = self.widget_resolver.all.find {|w| w.id == widget_object_id }
+            revert!(widget_object)
+          end
+        end
+
+        protected
+        attr_accessor :object, :widget_resolver
+        def revert!(widget_object)
+          widget_object.revert! if widget_object.really_edited?
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/widget_object_id_collector.rb

@@ -0,0 +1,22 @@
+module Fiona7
+  # Extracts widget object IDs from a widgetlist attribute read from
+  # Fiona7::WriteObj#attr_values[]
+  # 
+  # The array contains integer IDs of the objects representing
+  # the widgets within given attr_value.
+  # For nil values it returns an empty array.
+  class WidgetObjectIdCollector
+    def initialize(attr_value)
+      self.attr_value = attr_value
+    end
+
+    def call
+      (attr_value || []).map do |widget_hash|
+        widget_hash["destination"].try(:to_i)
+      end.compact
+    end
+
+    protected
+    attr_accessor :attr_value
+  end
+end

data/lib/fiona7/widget_resolver.rb

@@ -9,6 +9,10 @@ module Fiona7
 
     attr_reader :id_map, :path_map, :instance_map
 
+    def all
+      self.instance_map.values
+    end
+
     protected
     attr_accessor :value, :obj_repository
     attr_writer :id_map, :path_map, :instance_map

data/lib/fiona7/widgetlist_enumerator.rb

@@ -0,0 +1,30 @@
+module Fiona7
+  # Takes a Fiona7::WriteObj as input and iterates over each
+  # widgetlist attribute that it has.
+  #
+  # This is very low-level class hence it returns mangled attribute names
+  class WidgetlistEnumerator
+    def initialize(object)
+      self.object = object
+    end
+
+    def each
+      self.object.attr_values.each do |attr_name, attr_value|
+        next unless attr_name != "X_widget_pool"
+        next unless self.widgetlist?(object, attr_name)
+
+        yield(attr_name, attr_value)
+      end
+    end
+
+    protected
+    attr_accessor :object
+
+    def widgetlist?(object, attr_name)
+      attr_def = object.attr_defs[attr_name] || {}
+      type_tag = (attr_def["help_texts"]||{})["de"]||""
+
+      type_tag =~ /"widgetlist"/
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.5.5.3.1
+  version: 1.5.5.4.0
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -331,7 +331,14 @@ files:
 - lib/fiona7/verity_search_engine.rb
 - lib/fiona7/version.rb
 - lib/fiona7/version_helper.rb
+- lib/fiona7/widget_gc/garbage_collector.rb
+- lib/fiona7/widget_gc/marker.rb
+- lib/fiona7/widget_gc/sweep_strategies/archive_sweep.rb
+- lib/fiona7/widget_gc/sweep_strategies/factory.rb
+- lib/fiona7/widget_gc/sweep_strategies/revert_sweep.rb
+- lib/fiona7/widget_object_id_collector.rb
 - lib/fiona7/widget_resolver.rb
+- lib/fiona7/widgetlist_enumerator.rb
 - lib/fiona7/workspace.rb
 - lib/infopark_fiona7.rb
 - lib/tasks/fiona7_tasks.rake