infopark_fiona7 0.71.1.12 → 1.1.0.0.0

data/lib/fiona7/obj_classes_from_queries.rb

@@ -0,0 +1,11 @@
+module Fiona7
+  class ObjClassesFromQueries
+    def initialize(queries)
+      @queries = queries
+    end
+
+    def obj_classes
+      @queries.map {|q| q[:value] if q[:operator] == :equal && q[:field] == :_obj_class }.flatten.compact.uniq.presence if @queries
+    end
+  end
+end

data/lib/fiona7/recursive_object_finder.rb

@@ -0,0 +1,149 @@
+require 'set'
+
+module Fiona7
+  class RecursiveObjectFinder
+    attr_reader :starting_obj, :widgets, :images, :downloads, :referenced, :linked
+
+    def initialize(starting_obj, max_levels=3)
+      @starting_obj = starting_obj
+      @max_levels   = max_levels
+
+      @widgets      = []
+      @images       = []
+      @downloads    = []
+      @referenced   = []
+      @linked       = []
+
+      recursive_compute(@starting_obj, Set[@starting_obj], @max_levels)
+    end
+
+    protected
+    def recursive_compute(obj, already_encountered, levels)
+      return if levels <= 0
+
+      new_widgets = find_widgets(obj) - already_encountered
+      already_encountered.merge(new_widgets)
+
+      new_images = find_images(obj) - already_encountered
+      already_encountered.merge(new_images)
+
+      new_downloads = find_downloads(obj) - already_encountered
+      already_encountered.merge(new_downloads)
+
+      new_referenced = find_referenced(obj) - already_encountered
+      already_encountered.merge(new_referenced)
+
+      new_linked = find_linked(obj) - already_encountered
+      already_encountered.merge(new_linked)
+
+
+      new_widgets.each do |new_obj|
+        @widgets << new_obj
+      end
+
+      new_images.each do |new_obj|
+        @images << new_obj
+      end
+
+      new_downloads.each do |new_obj|
+        @downloads << new_obj
+      end
+
+      new_referenced.each do |new_obj|
+        @referenced << new_obj
+      end
+
+      new_linked.each do |new_obj|
+        @linked << new_obj
+      end
+
+
+      new_objs = new_widgets
+      new_widgets.each do |new_obj|
+        recursive_compute(new_obj, already_encountered, levels-1)
+      end
+
+    end
+
+    def find_widgets(obj)
+      # TODO: optimize this through attr_values
+      links = obj[:X_widget_pool] || []
+      WriteObj.where(obj_id: links.map {|l| l.destination_object_id }).to_a.to_set
+    end
+
+    def find_images(obj)
+      find_selected(obj) do |link, attribute|
+        if link.internal?
+          destination_object = link.destination_object
+          if destination_object && destination_object.image?
+            true
+          end
+        end
+      end
+    end
+
+    def find_downloads(obj)
+      find_selected(obj) do |link, attribute|
+        if link.internal?
+          destination_object = link.destination_object
+          if destination_object && destination_object.generic?
+            true
+          end
+        end
+      end
+    end
+
+    def find_referenced(obj)
+      find_selected(obj) do |link, attribute|
+        if link.internal? && attribute && (attribute.type == :reference || attribute.type == :referencelist)
+          destination_object = link.destination_object
+          if destination_object && !(destination_object.image? || destination_object.generic?)
+            true
+          end
+        end
+      end
+    end
+
+    def find_linked(obj)
+      find_selected(obj) do |link, attribute|
+        if link.internal? && (!attribute || (attribute.type == :link || attribute.type == :linklist))
+          destination_object = link.destination_object
+          if destination_object && !(destination_object.image? || destination_object.generic?)
+            true
+          end
+        end
+      end
+    end
+
+    def find_selected(obj)
+      referenced = Set.new
+
+      # TODO: optimize this through attr_values
+      type_definition = Fiona7::TypeRegister.instance.read_mangled(obj.obj_class)
+      type_definition.attrs.each do |attribute|
+        if attribute.type == :reference || attribute.type == :referencelist && attribute.name != "child_order"
+          (obj[attribute.real_name] || []).each do |link|
+            if yield(link, attribute)
+              referenced << link.destination_object
+            end
+          end
+        elsif attribute.type == :link || attribute.type == :linklist 
+          (obj[attribute.real_name] || []).each do |link|
+            if yield(link, attribute)
+              referenced << link.destination_object
+            end
+          end
+        end
+      end
+
+      obj.text_links.each do |link|
+        if yield(link, nil)
+          referenced << link.destination_object
+        end
+      end
+
+      referenced
+    end
+
+  end
+end

data/lib/fiona7/routers/rest_api.rb

@@ -29,8 +29,12 @@ class Scrivito::CmsRestApi
           resource_path = '/' + resource_path
         end
 
-        #$stdout.puts "DEBUG GET: #{resource_path}"
+        $stdout.puts "DEBUG GET: #{resource_path}"
+        pp payload
         case resource_path
+        when /\A\/?revisions\/[a-zA-Z0-9_-]+\/objs\/mget\Z/
+          _, _, revision_id, _, _ = *resource_path.split("/")
+          Fiona7::Controllers::RestAPI::ObjController.new.fetch_multiple(revision_id, payload)
         when /\A\/?revisions\/[a-zA-Z0-9_-]+\/objs\/[a-zA-Z0-9_-]+\Z/
           _, _, revision_id, _, obj_id = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::ObjController.new.fetch_by_id_from_revision(revision_id, obj_id)
@@ -46,12 +50,18 @@ class Scrivito::CmsRestApi
         when /\A\/?workspaces\/[a-zA-Z0-9_-]+\Z/
           _, _, workspace_id = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::WorkspaceController.new.fetch(workspace_id)
+        when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/changes\Z/
+          _, _, workspace_id,_ = *resource_path.split("/")
+          Fiona7::Controllers::RestAPI::WorkspaceController.new.changes(workspace_id)
         when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/objs\/[a-zA-Z0-9_-]+\Z/
           _, _, workspace_id, _, obj_id = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::ObjController.new.fetch_by_id(workspace_id, obj_id)
         when /\A\/?blobs\/[a-zA-Z0-9_-]+\Z/
           _, _, blob_id = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::BlobController.new.fetch(blob_id)
+        when /\A\/?blobs\/[a-zA-Z0-9_-]+\/no_cache\Z/
+          _, _, blob_id = *resource_path.split("/")
+          Fiona7::Controllers::RestAPI::BlobController.new.fetch(blob_id)
         when /\A\/?blobs\/[a-zA-Z0-9_-]+\/transform\Z/
           _, _, blob_id = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::BlobController.new.fetch(blob_id, payload[:transformation])
@@ -131,6 +141,9 @@ class Scrivito::CmsRestApi
         raise Scrivito::ScrivitoError, 'Rebase operation unsupported for workspaces'
         _, _, workspace_id = *resource_path.split("/")
         Fiona7::Controllers::RestAPI::WorkspaceController.new.publish(workspace_id)
+      when /\A\/?workspaces\/[a-zA-Z0-9]+/
+        _, _, workspace_id = *resource_path.split("/")
+        Fiona7::Controllers::RestAPI::WorkspaceController.new.update(workspace_id)
       else
         #$stdout.puts "PUT: #{resource_path}"
         original_put(resource_path, payload, options||{})

data/lib/fiona7/routing_monkey_patch.rb

@@ -4,8 +4,11 @@ module ActionDispatch
       def add_route(app, conditions = {}, requirements = {}, defaults = {}, name = nil, anchor = true)
         raise ArgumentError, "Invalid route name: '#{name}'" unless name.blank? || name.to_s.match(/^[_a-z]\w*$/i)
 
-        forbidden_paths = [::File.join(Gem.loaded_specs['scrivito_sdk'].full_name, "config/routes.rb"),
-          ::File.join(Gem.loaded_specs['infopark_fiona_connector'].full_name, "config/cms_routes.rb")]
+        forbidden_paths = [
+          ::File.join(Gem.loaded_specs['scrivito_sdk'].full_gem_path, "config/routes.rb"),
+          ::File.join(Gem.loaded_specs['scrivito_sdk'].full_gem_path, "config/precedence_routes.rb"),
+          ::File.join(Gem.loaded_specs['infopark_fiona_connector'].full_gem_path, "config/cms_routes.rb")
+        ]
 
         if caller.any? {|path| forbidden_paths.any? {|fp| path.include?(fp) } }
           return  # bad dog scrivito/fiona_connector, bad dog! no cms_routes for you

data/lib/fiona7/scrivito_patches/attribute_serializer.rb

@@ -5,7 +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 FutureBinary   then attribute_value.file_to_upload
       when UploadedBinary then attribute_value.params
       else
         raise_validation_error(attribute_definition.name,

data/lib/fiona7/scrivito_patches/basic_obj.rb

@@ -9,11 +9,6 @@ module Scrivito
       @_type_computer ||= TypeComputer.new(Scrivito::BasicObj, Obj)
     end
 
-    # to_param should only return strings and our ids are numbers
-    def to_param
-      id.to_s
-    end
-
     # optimized away
     def outdated?
       false
@@ -68,10 +63,10 @@ module Scrivito
     # and does not support shadow classes
     def self.where(field, operator, value, boost = nil)
       assert_not_basic_obj('.where')
-      if self == Obj || self == ::Obj
+      if self == ::Obj || self == Obj
         Workspace.current.objs.where(field, operator, value, boost)
       else
-        Workspace.current.objs.where(:_obj_class, :equals, to_s)
+        Workspace.current.objs.where(:_obj_class, :equals, name)
             .and(field, operator, value, boost)
       end
     end
@@ -80,10 +75,10 @@ module Scrivito
     # and does not support shadow classes
     def self.all
       assert_not_basic_obj('.all')
-      if self == Obj || self == ::Obj
+      if self == ::Obj || self == Obj
         Workspace.current.objs.all
       else
-        find_all_by_obj_class(to_s)
+        find_all_by_obj_class(name)
       end
     end
 

data/lib/fiona7/scrivito_patches/basic_widget.rb

@@ -2,15 +2,6 @@ require 'scrivito/basic_widget'
 
 module Scrivito
   class BasicWidget
-    # patch hash to handle numeric ids
-    def hash
-      if @obj && @id
-        (id.to_s + obj.id.to_s).hash
-      else
-        super
-      end
-    end
-
     def self.widget_class
       self
     end

data/lib/fiona7/scrivito_patches/cms_backend.rb

@@ -2,11 +2,6 @@ require 'scrivito/cms_backend'
 
 module Scrivito
   class CmsBackend
-    def die_content_service
-      # TODO: remove this
-      false
-    end
-
     # prevent the use of local URLs (localhost:7104) from cache
     # when running under a server
     def find_blob_data_from_cache(id, access, verb, transformation_definition)
@@ -27,22 +22,22 @@ module Scrivito
     end
 
     # prevent real get requests since we run everything locally
-    def request_blob_metadata_from_s3(url)
-      @query_counter += 1
+    # def request_blob_metadata_from_s3(url)
+    #   @query_counter += 1
 
-      blob_id = /\/_b\/([0-9]+)/.match(url)[1]
+    #   blob_id = /\/_b\/([0-9]+)/.match(url)[1]
 
-      raise ScrivitoError, "Unexpected 's3' url: #{url}" unless blob_id.present?
+    #   raise ScrivitoError, "Unexpected 's3' url: #{url}" unless blob_id.present?
 
-      rest_api_meta_data = Fiona7::Controllers::RestAPI::BlobController.new.metadata(blob_id)
+    #   rest_api_meta_data = Fiona7::Controllers::RestAPI::BlobController.new.metadata(blob_id)
 
-      meta_data = {}
-      meta_data[:content_type]   = rest_api_meta_data['meta_data']['content_type'].last
-      meta_data[:content_length] = rest_api_meta_data['meta_data']['content_length'].last
-      meta_data[:cache_control]  = 'no-transform,public,max-age=300,s-maxage=900'
+    #   meta_data = {}
+    #   meta_data[:content_type]   = rest_api_meta_data['meta_data']['content_type'].last
+    #   meta_data[:content_length] = rest_api_meta_data['meta_data']['content_length'].last
+    #   meta_data[:cache_control]  = 'no-transform,public,max-age=300,s-maxage=900'
 
-      meta_data
-    end
+    #   meta_data
+    # end
 
   end
 end

data/lib/fiona7/scrivito_patches/cms_rest_api.rb

@@ -4,7 +4,7 @@ module Scrivito
   class CmsRestApi
     # 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
+      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]

data/lib/fiona7/scrivito_patches/cms_routing.rb

@@ -4,7 +4,7 @@ module Scrivito
   class CmsRouting
     def convert_links(html)
       if html
-        html.to_str.gsub(%r{\bobjid:([a-f0-9]{4,16})\b([^"']*)}) do
+        html.to_str.gsub(%r{\bobjid:([a-f0-9]{4,})\b([^"']*)}) do
           if obj = Obj.find_by_id($1)
             options = {}
 
@@ -12,13 +12,14 @@ module Scrivito
               begin
                 uri = URI.parse($2)
                 options.merge!(extract_query(uri))
-                options['anchor'] = uri.fragment
+                options[:anchor] = uri.fragment
               rescue
               end
             end
 
             if editing_context.display_mode == 'editing'
-              id_path_or_url_for_objs(obj, :path, options)
+              options[:id] = obj.id
+              scrivito_engine.base_id_path(options)
             else
               path_or_url(obj, :path, options)
             end
@@ -29,46 +30,62 @@ module Scrivito
       end
     end
 
-    # do not reference global Obj
-    def path_or_url_without_editing_context(target, path_or_url, options)
-      if target.is_a?(Link)
-        path_or_url_for_links(target, path_or_url, options)
-      elsif target.is_a?(Obj) || target.is_a?(BasicObj)
-        path_or_url_for_objs(target, path_or_url, options)
-      elsif target.respond_to?(:first)
-        if target.first.is_a?(Link)
-          path_or_url_for_links(target.first, path_or_url, options)
-        else
-          return LINK_TO_EMPTY_LINKLIST
-        end
-      elsif target.is_a?(Binary)
-        binary_url(target)
-      else
-        raise "scrivito_path or scrivito_url was called with an instance of #{target.class}. "+
-          "It must only be called with an Obj or a Link or a non-empty LinkList."
-      end
-    end
-
-    # use rails connector permalinks in legacy mode
+    # Use fiona connector permalinks in legacy mode
     def path_or_url_for_objs(obj, path_or_url, options)
       permalink = obj.permalink
-      if permalink
+      if permalink && route_defined?(:permalink)
+
         if Fiona7.mode == :legacy
-          main_app
-          .public_send("cms_permalink_#{path_or_url}", options.merge(:permalink => permalink))
+          context.public_send("cms_permalink_#{path_or_url}", options.merge(:permalink => permalink))
         else
-          main_app
-          .public_send("scrivito_permalink_#{path_or_url}", options.merge(:permalink => permalink))
+          use_route(:permalink, path_or_url, options.merge(:permalink => permalink))
         end
-      elsif homepage?(obj)
-        main_app.public_send("scrivito_root_#{path_or_url}", options)
+      elsif homepage?(obj) && route_defined?(:homepage)
+        use_route(:homepage, path_or_url, options)
       elsif obj.binary?
-        binary_obj_url(obj) || LINK_TO_EMPTY_BLOB
-      else
+        # use fiona connector routes when possible
+        if Fiona7.mode == :legacy
+          if binary = obj.binary
+            obj_id = obj.id
+
+            context.public_send("cms_id_#{path_or_url}", {id: obj_id, slug: binary.filename})
+          else
+            LINK_TO_EMPTY_BLOB
+          end
+        else
+          binary_obj_url(obj) || LINK_TO_EMPTY_BLOB
+        end
+      elsif route_defined?(:slug_id)
         slug = obj.slug.present? ? obj.slug.sub(/^\//, '') : nil
         id_path_or_url_for_objs(obj, path_or_url, options.merge(slug: slug))
+      else
+        raise ScrivitoError, "The required scrivito route 'slug_id' is not defined. "\
+          "Please add a 'slug_id' definition to your routes.rb. See the documentation"\
+          " of 'scrivito_route' for further details."
+      end
+    end
+
+    # use fiona connector routes when possible
+    def id_path_or_url_for_objs(obj, path_or_url, options)
+      if Fiona7.mode == :standalone
+        options[:id] = obj.id
+
+        # Options must have the key slug.
+        # Otherwise Rails will use the slug from current request params.
+        options[:slug] ||= nil
+
+        use_route(:slug_id, path_or_url, options)
+      else
+        options[:id] = obj.id
+
+        # Options must have the key slug.
+        # Otherwise Rails will use the slug from current request params.
+        options[:slug] ||= nil
+
+        context.public_send("cms_id_#{path_or_url}", options)
       end
     end
+
   end
 end