infopark_fiona7 1.5.5.5.1 → 1.6.1.1.0

data/lib/fiona7/builder/lazy_blob_copier.rb

@@ -1,6 +1,8 @@
 require 'fiona7/super_object_finder'
 require 'fiona7/blob_id_generator'
-require 'fiona7/builder/indirect_blob_builder'
+require 'fiona7/builder/indirect_blob_builder_for_obj'
+require 'fiona7/builder/container_chain_builder'
+require 'fiona7/upload_path_selector'
 
 module Fiona7
   module Builder
@@ -22,7 +24,7 @@ module Fiona7
     class LazyBlobCopier
       def initialize(attrs={})
         @destination_obj = attrs[:destination_obj]
-        @attribute       = attrs[:attr_name] || 'blob'
+        @attribute       = attrs[:attr_name]
         @source_blob_id  = attrs[:source_blob_id]
         @filename        = attrs[:filename]
         @content_type    = attrs[:content_type]
@@ -36,8 +38,10 @@ module Fiona7
         @blob_obj   = Fiona7::WriteObj.find(@source_blob_id.to_i)
         @source_obj = find_unique_source_obj
 
-        if @destination_obj == @source_obj
-          rename
+        if @source_obj == nil
+          link_orphaned_blob
+        elsif @destination_obj == @source_obj
+          rename_or_assign
         else
           copy
         end
@@ -47,13 +51,54 @@ module Fiona7
 
       protected
 
-      def rename
-        return unless @basename.present? && @ext.present?
+      def rename_or_assign
+        if @basename.present? && @ext.present?
+          if Fiona7.mode == :legacy
+            direct_rename
+          else
+            indirect_rename
+          end
+        else
+          if Fiona7.mode == :legacy
+            # no assignment required
+          else
+            # assign the new blob
+            @destination_obj.set(@attribute, {
+              title:                @source_blob_id,
+              destination_object:   @blob_obj
+            }) if @attribute
+          end
+        end
+      end
 
+      def link_orphaned_blob
         if Fiona7.mode == :legacy
-          direct_rename
+          # NOTE: orphaned blobs in legacy are probably temporary files
+          direct_copy
+          if is_a_tempfile?(@blob_obj)
+            begin
+              # NOTE: this is a very ugly hack to clean up temporary
+              blob_obj = @blob_obj
+              @destination_obj.singleton_class.after_save { blob_obj.destroy rescue nil }
+            rescue
+            end
+          end
         else
-          indirect_rename
+          # move source blob to a proper location
+          parent = ContainerChainBuilder.new(UploadPathSelector.new(@destination_obj).call).call
+          if parent.obj_id != @blob_obj.parent_obj_id
+            @blob_obj.reload_attributes
+            @blob_obj.update_attributes!({
+              parent:               parent
+            })
+          end
+
+          # link the orphaned blob
+          @destination_blob_id = @source_blob_id
+          @destination_obj.set(@attribute, {
+            title:                @destination_blob_id,
+            destination_object:   @blob_obj
+          }) if @attribute
         end
       end
 
@@ -66,6 +111,7 @@ module Fiona7
       end
 
       def direct_rename
+        # TODO: move source blob
         @destination_obj.set(:name, @basename)
         # CM stores the file extension as :contentType and not the mimetype
         @destination_obj.set(:content_type, @ext)
@@ -94,7 +140,7 @@ module Fiona7
         @destination_obj.set(@attribute, {
           title:                @destination_blob_id,
           destination_object:   @blob_obj
-        })
+        }) if @attribute
       end
 
       def direct_copy
@@ -148,7 +194,7 @@ module Fiona7
 
         @destination_obj.set(@attribute, {
           title: @destination_blob_id, destination_object: destination_blob
-        })
+        }) if @attribute
       end
 
       def split_filename(filename)
@@ -161,7 +207,7 @@ module Fiona7
       end
 
       def validate_input!
-        if Fiona7.mode == :legacy && @attribute != 'blob'
+        if Fiona7.mode == :legacy && @attribute && @attribute != 'blob'
           raise Scrivito::ClientError.new("Blob attributes other than :blob are unsupported in :legacy mode")
         end
         if !extension_and_content_type_match?
@@ -177,13 +223,16 @@ module Fiona7
         return false if @ext.blank?
 
         return MIME::Types.type_for(@ext).any? {|m| m.content_type == @content_type }
-      #rescue
         return false
       end
 
       def find_unique_source_obj
         if Fiona7.mode == :legacy
-          return @blob_obj
+          if is_a_temporary_upload?(@blob_obj)
+            nil
+          else
+            @blob_obj
+          end
         end
 
         linking = Fiona7::SuperObjectFinder.new.find(@blob_obj)
@@ -199,8 +248,13 @@ module Fiona7
 
       def construct_destination_blob
         filename = @filename || (@source_obj.name + "." + @source_obj.file_extension)
-        Fiona7::Builder::IndirectBlobBuilder.new(@destination_obj, filename).call
+        Fiona7::Builder::IndirectBlobBuilderForObj.new(@destination_obj, filename).call
+
+      end
 
+      def is_a_tempfile?(blob_obj)
+        Fiona7.mode == :legacy &&
+          ['X_Generic', 'X_Image'].include?(blob_obj.obj_class)
       end
     end
   end

data/lib/fiona7/builder/obj_builder.rb

@@ -18,6 +18,10 @@ require 'fiona7/attribute_writers/factory'
 
 require 'fiona7/widget_gc/garbage_collector'
 
+require 'fiona7/name_and_parent_from_path'
+
+require 'fiona7/builder/container_chain_builder'
+
 
 module Fiona7
   module Builder
@@ -65,6 +69,7 @@ module Fiona7
     end
 
     class ObjBuilder
+      include NameAndParentFromPath
 
       def initialize(values)
         @values = ParamPreprocessor.call(values)
@@ -108,7 +113,7 @@ module Fiona7
 
         @path = "/#{@path}" unless @path.start_with?('/')
         @name, parent_path = name_and_parent_path_from_path(@path)
-        @parent            = ensure_parent_exists(parent_path) if parent_path
+        @parent            = ContainerChainBuilder.new(parent_path).call
 
         ensure_obj_class_exists
 
@@ -229,37 +234,6 @@ module Fiona7
         end.as_json
       end
 
-      def name_and_parent_path_from_path(path)
-        components = path.split('/')
-        name       = components.pop.presence
-        parent_path= components.join('/').presence || '/'
-
-        return name, parent_path
-      end
-
-      def ensure_parent_exists(path)
-        remaining  = path.split("/")
-        current    = []
-        paths      = []
-        original   = path
-
-        while !remaining.empty?
-          current.push(remaining.shift)
-
-          path = current.join('/').presence || '/'
-          paths.push(path)
-        end
-
-        paths.each do |path|
-          if !WriteObj.exists?(path: path)
-            name, parent_path = name_and_parent_path_from_path(path)
-            WriteObj.create!(name: name, parent_obj_id: WriteObj.find_by_path(parent_path).id, obj_class: 'X_Container')
-          end
-        end
-
-        WriteObj.find_by_path(original) || (raise "Tried to make sure that the parent under '#{original}' exist, but it does not :(")
-      end
-
       def generate_orphaned_path
         return nil if update?
         "_orphaned/#{SecureRandom.hex(16)}"

data/lib/fiona7/builder/obj_updater.rb

@@ -20,11 +20,12 @@ module Fiona7
         @widget_pool = @values.delete(:_widget_pool)
         @permalink   = @values.key?(:_permalink) ? (@values.delete(:_permalink) || "") : nil
 
-
-        # revert command sends this info. which is silly.
+        # revert command sends this info. we cannot do anything useful with it.
         @values.delete(:_last_changed)
 
-        @name, parent_path = name_and_parent_path_from_path(@path) if (@path)
+        @name, parent_path        = name_and_parent_path_from_path(@path) if (@path)
+        old_name, old_parent_path = name_and_parent_path_from_path(@obj.path)
+
         if obj_class = @values.delete(:_obj_class)
           @obj_class      = obj_class
           @real_obj_class = Fiona7::ObjClassNameMangler.new(@obj_class).mangle
@@ -42,7 +43,14 @@ module Fiona7
         # setting the name without changing the value counts
         # as changing the name attribute for the CM
         @obj.name = @name if !@name.blank? && @name != @obj.name
-        # TODO: move (parent change)
+
+        # this is a obj move operation
+        if parent_path && old_parent_path != parent_path
+          # we first have to make sure that the new parent exists
+          # FIXME: moving the object and changing the obj class
+          # will not move the object
+          @obj.parent = ContainerChainBuilder.new(parent_path).call
+        end
       end
 
     end

data/lib/fiona7/builder/widget_builder.rb

@@ -29,7 +29,7 @@ module Fiona7
 
         @path = "/#{@path}" unless @path.start_with?('/')
         @name, parent_path = name_and_parent_path_from_path(@path)
-        @parent            = ensure_parent_exists(parent_path) if parent_path
+        @parent            = ContainerChainBuilder.new(parent_path).call
 
         ensure_obj_class_exists
 

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

@@ -56,18 +56,24 @@ module Fiona7
 
         def copy(blob_id, params)
           input              = params.symbolize_keys
-          blob_id            = blob_id.to_i
+          blob_id            = blob_id
           destination_obj_id = input[:destination_obj_id]
           filename           = input[:filename]
           content_type       = input[:content_type]
           destination_obj    = Fiona7::WriteObj.find(destination_obj_id)
 
-          Fiona7::Builder::LazyBlobCopier.new({
+          destination_obj.reload_attributes
+
+          binary_spec = Fiona7::Builder::LazyBlobCopier.new({
             destination_obj: destination_obj,
             source_blob_id: blob_id,
             filename: filename,
             content_type: content_type
           }).call.stringify_keys
+
+          destination_obj.save!
+
+          return binary_spec
         end
       end
     end

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

@@ -279,8 +279,12 @@ module Fiona7
           result = []
           query_params.each do |query_param|
             new_query_param = query_param.symbolize_keys
-            new_query_param[:operator] = query_param[:operator].to_sym
-            new_query_param[:field] = query_param[:field].to_sym
+            new_query_param[:operator] = new_query_param[:operator].to_sym
+            if new_query_param[:field].is_a?(Array)
+              new_query_param[:field] = new_query_param[:field].map(&:to_sym)
+            else
+              new_query_param[:field] = new_query_param[:field].to_sym
+            end
 
             case query_param[:operator]
             when :contains
@@ -306,12 +310,12 @@ module Fiona7
         def use_naive_search_engine?(query)
           false ||
             query.empty? ||
-            query.any? {|q| (q[:field].to_sym == :_path || q[:field].to_sym == :_name)&& (q[:operator].to_sym == :equal || q[:operator].to_sym == :prefix || query.length == 1)} ||
-            query.any? {|q| q[:field].to_sym == :_parent_path && (q[:operator].to_sym == :equal || query.length == 1)} ||
-            (query.length == 1 && query.first[:field].to_sym == :_modification) ||
-            (query.length == 1 && query.first[:field].to_sym == :_obj_class) ||
-            (query.length == 1 && query.first[:field].to_sym == :id) ||
-            (query.length == 1 && query.first[:field].to_sym == :_permalink) ||
+            query.any? {|q| (q[:field] == :_path || q[:field] == :_name)&& (q[:operator] == :equal || q[:operator] == :prefix || query.length == 1)} ||
+            query.any? {|q| q[:field] == :_parent_path && (q[:operator] == :equal || query.length == 1)} ||
+            (query.length == 1 && query.first[:field] == :_modification) ||
+            (query.length == 1 && query.first[:field] == :_obj_class) ||
+            (query.length == 1 && query.first[:field] == :id) ||
+            (query.length == 1 && query.first[:field] == :_permalink) ||
             false
         end
       end

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

@@ -50,12 +50,18 @@ module Fiona7
           Assert.contraint(false, "Workspaces cannot be deleted")
         end
 
+        def by_modified_obj
+          ['rtc']
+        end
+
         def update(id)
           # DUMMY NO OP
           {}
         end
 
         def create(values)
+          values ||= {}
+          values[:workspace] ||= {}
           id = (values[:workspace][:id] || values[:workspace]["id"])
           id = (id || :no_id_provided).to_sym
           Assert.constraint(

data/lib/fiona7/engine.rb

@@ -17,7 +17,6 @@ require "fiona7/initializer"
 require "fiona7/mode_switch"
 require "fiona7/controller_helper"
 require "fiona7/scrivito_patches/attribute_content"
-require "fiona7/scrivito_patches/attribute_serializer"
 require "fiona7/scrivito_patches/basic_obj"
 require "fiona7/scrivito_patches/basic_widget"
 require "fiona7/scrivito_patches/binary"
@@ -32,8 +31,6 @@ 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/model_library"
-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"
@@ -47,6 +44,7 @@ require "fiona7/middleware/server_detection_middleware"
 
 # components
 require "fiona7/recursive_object_finder"
+require "fiona7/release_collector"
 require "fiona7/complex_object"
 
 require "fiona7/routers/rest_api"
@@ -77,6 +75,54 @@ module Fiona7
     :release_obj => []
   }
 
+  # Allows to specify custom release patterns for objects
+  # So for example if releasing a page should release some other
+  # (for example unreferenced) page, then this can be used
+  # to achieve the desired behavior.
+  #
+  # This parameter accepts anything responding to .call method
+  # and receiveing one parameter: obj_id.
+  #
+  # Thus it is possible to use a lambda like this:
+  # 
+  #   release_collector = lambda do |obj_id|
+  #     # ...
+  #   end
+  #
+  # or a class based implementation.
+  #
+  # It is expected that the release collector returns an Array
+  # of Hashes with the following format:
+  #
+  #   [
+  #     {
+  #       # this is a title for a group of objects
+  #       title: 'This title will be shown in the dialog',
+  #       # this is the list of objects presented underneath
+  #       objs: [
+  #         {
+  #           # the ID of the object to be released
+  #           id: 2001,
+  #           # "Title" of the object which will be displayed
+  #           title: 'Root',
+  #           # "Description" of the object, typically obj_class
+  #           description: 'RootObj',
+  #           # If true, then release checkbox will be checked
+  #           # i.e. without additional input from the user it will 
+  #           # get released automatically
+  #           checked: true
+  #         }
+  #       ]
+  #   ]
+  #
+  # Obviously it possible to define multiple groups and multiple
+  # objects in each group.
+  #
+  # It is recommended that custom implementations inherit
+  # or delegate to Fiona7::ReleaseCollector which is the
+  # default implementation.
+  mattr_accessor :release_collector
+
   # Allows to specify custom typing for virtual attribute types
   # Besides the built in mapping:
   #    link:           :linklist,

data/lib/fiona7/forbidden_obj_classes.rb

@@ -5,13 +5,24 @@ module Fiona7
     SYSTEM_CLASSES = ['X_Generic', 'X_Image', 'X_Container'].freeze
 
     def call
+      self.system_obj_classes +
+        self.widget_obj_classes
+    end
+
+    def all
+      self.call
+    end
+
+    def system_obj_classes
+      SYSTEM_CLASSES
+    end
+
+    def widget_obj_classes
       # NOTE: to_s handles shadow classes properly
       widget_classes = Scrivito.models.widgets.map(&:to_s)
-      widget_obj_classes = widget_classes.map do |obj_class|
+      widget_classes.map do |obj_class|
         Fiona7::ObjClassNameMangler.new(obj_class).mangle
       end
-
-      SYSTEM_CLASSES + widget_obj_classes
     end
   end
 end