infopark_fiona7 1.5.5.5.1 → 1.6.1.1.0

data/lib/fiona7/linked_id_finder.rb

@@ -0,0 +1,44 @@
+require 'fiona7/super_id_finder'
+require 'fiona7/attribute_names_from_cms'
+
+module Fiona7
+  class LinkedIdFinder
+    def initialize(fields=[], connection=::Fiona7::WriteObj.connection, instance_name=RailsConnector::CmsBaseModel.instance_name)
+      @fields     = fields.map {|f|
+        Fiona7::AttributeNamesFromCms.new(f).attributes
+      }.flatten
+      @instance   = instance_name
+      @connection = connection
+    end
+
+    def find(klass, ids)
+      mode               = klass == Fiona7::ReleasedObj ? :live : :preview
+      forbidden          = Fiona7::ForbiddenObjClasses.new
+
+      # first we find objects linking directly
+      # NOTE: this may return widget objects
+      linking_directly   = Fiona7::SuperIdFinder.new(
+        forbidden.system_obj_classes, @fields, @connection, @instance
+      ).find(
+        mode, ids
+      )
+
+      # now we resolve widget objects
+      linking_indirectly = Fiona7::SuperIdFinder.new(
+        forbidden.all, ['X_widget_pool'], @connection, @instance
+      ).find(
+        mode, linking_directly
+      )
+
+      all_linking        = linking_directly + linking_indirectly
+
+      # finally, this removes widget objects from the result
+      # we also remove system classes, just to be extra sure
+      klass.
+        where(obj_id: all_linking).
+        where.not(obj_class: forbidden.all).
+        select(:obj_id).
+        map(&:obj_id)
+    end
+  end
+end

data/lib/fiona7/name_and_parent_from_path.rb

@@ -0,0 +1,11 @@
+module Fiona7
+  module NameAndParentFromPath
+    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
+  end
+end

data/lib/fiona7/referenced_id_finder.rb

@@ -0,0 +1,24 @@
+require 'fiona7/super_id_finder'
+require 'fiona7/attribute_names_from_cms'
+
+module Fiona7
+  class ReferencedIdFinder
+    def initialize(fields=[], connection=::Fiona7::WriteObj.connection, instance_name=RailsConnector::CmsBaseModel.instance_name)
+      fields     = fields.map {|f|
+        Fiona7::AttributeNamesFromCms.new(f).attributes
+      }.flatten
+      forbidden  = Fiona7::ForbiddenObjClasses.new.call
+
+      @id_finder = Fiona7::SuperIdFinder.new(
+        forbidden, fields, connection, instance_name
+      )
+    end
+
+    def find(klass, ids)
+      @id_finder.find(
+        klass == Fiona7::ReleasedObj ? :live : :preview,
+        ids
+      )
+    end
+  end
+end

data/lib/fiona7/release_collector.rb

@@ -0,0 +1,85 @@
+require 'fiona7/recursive_object_finder'
+
+module Fiona7
+  class ReleaseCollector
+    def initialize(obj_id)
+      @obj    = Fiona7::WriteObj.find(obj_id)
+      @finder = Fiona7::RecursiveObjectFinder.new(@obj)
+    end
+
+    def call
+      [
+        images,
+        downloads,
+        referenced,
+        linked
+      ].compact
+    end
+
+    def self.call(obj_id)
+      self.new(obj_id).call
+    end
+
+    protected
+    def images
+      objs = @finder.images.select {|o| o.really_edited? }
+
+
+      if objs.any?
+        group = {
+          title: t(:"fiona7.release.images"),
+          objs: objs_to_items(objs, true)
+        }
+      end
+    end
+
+    def downloads
+      objs = @finder.downloads.select {|o| o.really_edited? }
+
+      if objs.any?
+        group = {
+          title: t(:"fiona7.release.downloads"),
+          objs: objs_to_items(objs, true)
+        }
+      end
+    end
+
+    def referenced
+      objs = @finder.referenced.select {|o| o.really_edited? }
+
+      if objs.any?
+        group = {
+          title: t(:"fiona7.release.referenced"),
+          objs: objs_to_items(objs, true)
+        }
+      end
+    end
+
+    def linked
+      objs = @finder.linked.select {|o| o.really_edited? }
+
+      if objs.any?
+        group = {
+          title: t(:"fiona7.release.linked"),
+          objs: objs_to_items(objs, false)
+        }
+      end
+    end
+
+
+    def objs_to_items(objs, checked=true)
+      items = objs.map do |obj|
+        {
+          id: obj.id,
+          title: (obj.title.presence || obj.path),
+          description: obj.obj_class,
+          checked: checked
+        }
+      end
+    end
+
+    def t(key, options={})
+      I18n.t(key, {locale: (Scrivito::Configuration.ui_locale || I18n.locale)}.merge(options))
+    end
+  end
+end

data/lib/fiona7/routers/rest_api.rb

@@ -49,6 +49,8 @@ class Scrivito::CmsRestApi
         when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/objs\/search/
           _, _, workspace_id = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::ObjController.new.search(workspace_id, payload)
+        when /\A\/?workspaces\/by_modified_obj/
+          Fiona7::Controllers::RestAPI::WorkspaceController.new.by_modified_obj()
         when /\A\/?workspaces\/[a-zA-Z0-9_-]+\Z/
           _, _, workspace_id = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::WorkspaceController.new.fetch(workspace_id)

data/lib/fiona7/scrivito_patches/cms_field_tag.rb

@@ -22,6 +22,7 @@ module Scrivito
     private
     # add permission checking
     def authenticated_editor?
+      # NOTE: we check the permissions on the object and not on the widget object itself. It would probaby be better (but slower) to check on the widget object
       editing_context.authenticated_editor? &&
         (permitted?(editing_context.editor.id, obj_not_widget_id, :root) ||
          permitted?(editing_context.editor.id, obj_not_widget_id, :write))

data/lib/fiona7/scrivito_patches/cms_rest_api.rb

@@ -1,26 +1,26 @@
 require 'scrivito/cms_rest_api.rb'
-require 'fiona7/blob_id_generator'
+require 'fiona7/temporary_uploader'
 
 module Scrivito
   class CmsRestApi
-    # Stub upload_future_binary since the uploads are handled directly in ruby.
+    # uploads are handled differently than in scrivito_sdk
     def self.upload_future_binary(future_binary, obj_id)
-      file = future_binary.file_to_upload
-      # TODO: code deduplication with obj builder
-      parent = Fiona7::WriteObj.find(obj_id.to_i)
-      ext       = ::File.extname(file.path).to_s[1..-1]
-      name      = ::File.basename(file.path, '.' + ext.to_s)
-      obj_class = if ['jpg', 'jpeg', 'gif', 'png', 'tif', 'tiff'].include?(ext)
-                    'X_Image'
-                  else
-                    'X_Generic'
-                  end
+      if future_binary.id_to_copy
+        normalized_id = normalize_path_component(future_binary.id_to_copy)
+        put("blobs/#{normalized_id}/copy", future_binary.to_h.merge(destination_obj_id: obj_id))
+      else
+        file       = future_binary.file_to_upload
+        filename   = future_binary.filename
 
-      raise Scrivito::ScrivitoError.new("File extension of uploaded file cannot be identified", 422) if ext.nil?
+        if !filename.present? && file
+          ext      = ::File.extname(file.path).to_s[1..-1]
+          filename = ::File.basename(file.path, '.' + ext.to_s)
+        end
 
-      upload = Fiona7::WriteObj.upload(file, ext, {name: name, parent: parent, obj_class: obj_class}).tap(&:release!)
-      encoded_id = Fiona7::BlobIdGenerator.new(upload.id, upload.last_changed).call
-      {'id' => encoded_id}
+        encoded_id = Fiona7::TemporaryUploader.new(file, filename, obj_id).call
+
+        {'id' => encoded_id, 'destination_obj' => obj_id}
+      end
     end
 
     def self.activate_upload(*args)

data/lib/fiona7/scrivito_patches/cms_routing.rb

@@ -4,6 +4,7 @@ module Scrivito
   class CmsRouting
     def convert_links(html)
       if html
+        # v-- patch here
         html.to_str.gsub(%r{\bobjid:([a-f0-9]{4,})\b([^"']*)}) do
           if obj = Obj.find_by_id($1)
             options = {}

data/lib/fiona7/scrivito_patches/link_parser.rb

@@ -2,14 +2,17 @@ require 'scrivito/link_parser'
 
 module Scrivito
   class LinkParser
-    # Patch to handle legacy mode
-    def dispatch_route_for(route_params)
-      if route_params && (
-        (route_params[:controller] == 'scrivito/cms_dispatch') ||
-        (route_params[:controller] == 'rails_connector/cms_dispatch')
-      )
-        route_params
+    # Handle legacy mode correctly
+    def find_obj_via_id_or_permalink(route_params)
+      return unless route_params[:controller] == SCRIVITO_CMS_DISPATCH ||
+        route_params[:controller] == 'rails_connector/cms_dispatch' # <-- PATCH HERE
+
+      if id = route_params[:id]
+        Obj.find(id)
+      elsif permalink = route_params[:permalink]
+        Obj.find_by_permalink(permalink)
       end
+    rescue Scrivito::ResourceNotFound
     end
   end
 end

data/lib/fiona7/scrivito_patches/workspace.rb

@@ -2,11 +2,6 @@ require 'scrivito/workspace'
 
 module Scrivito
   class Workspace
-    # there are no conflicts.
-    def conflict_warning_for(*args)
-      []
-    end
-
     # there are no outdated workspaces
     def outdated?
       false

data/lib/fiona7/super_id_finder.rb

@@ -0,0 +1,68 @@
+module Fiona7
+  class SuperIdFinder
+    def initialize(forbidden_obj_classes=[], fields=[], connection=::Fiona7::WriteObj.connection, instance_name=RailsConnector::CmsBaseModel.instance_name)
+      @instance_name = instance_name
+      @forbidden     = forbidden_obj_classes
+      @fields        = fields
+      @conn          = connection
+    end
+
+    def find(type=:preview, obj_ids)
+      case type
+      when :preview
+        preview(obj_ids)
+      when :live
+        live(obj_ids)
+      else
+        raise ArgumentError, "Uknown type #{type.inspect} expected :preview or :live"
+      end
+    end
+
+    def preview(obj_ids)
+      query = "SELECT #{objects_table}.object_id FROM #{links_table} INNER JOIN #{objects_table} ON #{links_table}.content_id = #{objects_table}.edited_content_id WHERE #{links_table}.sub_object_id IN #{obj_ids_array(obj_ids)} #{self.obj_class_condition} UNION SELECT #{objects_table}.object_id FROM #{links_table} INNER JOIN #{objects_table} ON #{links_table}.content_id = #{objects_table}.committed_cont_id WHERE #{links_table}.sub_object_id IN #{obj_ids_array(obj_ids)} #{self.obj_class_condition} UNION SELECT #{objects_table}.object_id FROM #{links_table} INNER JOIN #{objects_table} ON #{links_table}.content_id = #{objects_table}.released_cont_id WHERE #{links_table}.sub_object_id IN  #{obj_ids_array(obj_ids)} AND #{objects_table}.committed_cont_id IS NULL AND #{objects_table}.edited_content_id IS NULL #{self.obj_class_condition} #{self.field_condition}"
+      ids = self.sql_query(query).to_a.flatten
+    end
+
+    def live(obj_ids)
+      query = "SELECT #{objects_table}.object_id FROM #{links_table} INNER JOIN #{objects_table} ON #{links_table}.content_id = #{objects_table}.released_cont_id WHERE #{links_table}.sub_object_id IN #{obj_ids_array(obj_ids)} #{self.obj_class_condition} #{self.field_condition}"
+      ids = self.sql_query(query).to_a.flatten
+    end
+
+    protected
+    def links_table
+      "#{@instance_name}_links"
+    end
+
+    def obj_ids_array(obj_ids)
+      obj_ids = obj_ids.presence || [0]
+      values = obj_ids.map {|obj_id| @conn.quote(obj_id) }.join(", ")
+      " (#{values}) "
+    end
+
+    def obj_class_condition
+      if @forbidden.present?
+        values = @forbidden.map { |f| @conn.quote(f) }.join(", ")
+        " AND #{objects_table}.obj_class NOT IN (#{values}) "
+      else
+        ""
+      end
+    end
+
+    def field_condition
+      if @fields.present?
+        values = @fields.map { |f| @conn.quote(f) }.join(", ")
+        " AND #{links_table}.attribute_name IN (#{values}) "
+      else
+        ""
+      end
+    end
+
+    def objects_table
+      "#{@instance_name}_objects"
+    end
+
+    def sql_query(query, *args)
+      @conn.execute(query, *args)
+    end
+  end
+end

data/lib/fiona7/super_object_finder.rb

@@ -1,3 +1,5 @@
+require 'fiona7/super_id_finder'
+
 # This class allows to access objects linking to
 # given object, i.e. super objects
 #
@@ -8,6 +10,7 @@ module Fiona7
       @instance_name = instance_name
       @conn          = connection || model.connection
       @model         = model
+      @id_finder     = SuperIdFinder.new([], [], @conn, @instance_name)
     end
 
     def find(type=:preview, obj)
@@ -27,8 +30,7 @@ module Fiona7
     # This means that all objects that are reachable in preview
     # are returned (unreleased, commited etc.)
     def preview(obj)
-      query = "SELECT #{objects_table}.object_id FROM #{links_table} INNER JOIN #{objects_table} ON #{links_table}.content_id = #{objects_table}.edited_content_id WHERE #{links_table}.sub_object_id = #{obj.obj_id.to_i} #{self.obj_class_condition} UNION SELECT #{objects_table}.object_id FROM #{links_table} INNER JOIN #{objects_table} ON #{links_table}.content_id = #{objects_table}.committed_cont_id WHERE #{links_table}.sub_object_id = #{obj.obj_id.to_i} #{self.obj_class_condition} UNION SELECT #{objects_table}.object_id FROM #{links_table} INNER JOIN #{objects_table} ON #{links_table}.content_id = #{objects_table}.released_cont_id WHERE #{links_table}.sub_object_id = #{obj.obj_id.to_i} AND #{objects_table}.committed_cont_id IS NULL AND #{objects_table}.edited_content_id IS NULL #{self.obj_class_condition}"
-      ids = self.sql_query(query).to_a.flatten
+      ids = @id_finder.preview([obj.obj_id])
       @model.find(ids).select(&:exportable?)
     end
 
@@ -38,26 +40,9 @@ module Fiona7
     # This means that only the objects that are reachable in
     # live are returned, i.e. avaiable for outside world
     def live(obj)
-      query = "SELECT #{objects_table}.object_id FROM #{links_table} INNER JOIN #{objects_table} ON #{links_table}.content_id = #{objects_table}.released_cont_id WHERE #{links_table}.sub_object_id = #{obj.obj_id.to_i} #{self.obj_class_condition}"
-      ids = self.sql_query(query).to_a.flatten
+      ids = @id_finder.live([obj.obj_id])
       @model.find(ids).select(&:exportable?)
     end
 
-    protected
-    def links_table
-      "#{@instance_name}_links"
-    end
-
-    def obj_class_condition
-      ""
-    end
-
-    def objects_table
-      "#{@instance_name}_objects"
-    end
-
-    def sql_query(query, *args)
-      @conn.execute(query, *args)
-    end
   end
 end

data/lib/fiona7/temporary_uploader.rb

@@ -0,0 +1,33 @@
+require 'fiona7/builder/indirect_blob_builder'
+require 'fiona7/upload_path_selector'
+require 'fiona7/blob_id_generator'
+
+module Fiona7
+  # This class uploads a file into a temporary location to be reused later.
+  # It returns the blob id of the uploaded file.
+  class TemporaryUploader
+    def initialize(file, filename, obj_id=nil)
+      @file     = file
+      @filename = filename
+      @obj_id   = obj_id
+    end
+
+    def call
+      obj = Builder::IndirectBlobBuilder.new(upload_path, @filename, @file).call
+      BlobIdGenerator.new(obj.obj_id, obj.last_changed).call
+    end
+
+    private
+    def upload_path
+      if Fiona7.mode == :standalone
+        dest_obj = Fiona7::WriteObj.find(@obj_id) rescue nil
+        if dest_obj
+          return UploadPathSelector.new(dest_obj).call
+        end
+      end
+
+      # TODO: legacy
+      '/_uploads/temp'
+    end
+  end
+end

data/lib/fiona7/upload_path_selector.rb

@@ -0,0 +1,17 @@
+module Fiona7
+  class UploadPathSelector
+    def initialize(obj)
+      @obj = obj
+    end
+
+    def call
+      # only publication type can contain children (code = "5")
+      # for uploads on root object we should use the general container aswell
+      if @obj.obj_type_code != "5" || @obj.id == 2001
+        "/_uploads/#{@obj.id}"
+      else
+        "#{@obj.path}/_uploads"
+      end
+    end
+  end
+end