infopark_fiona7 0.71.1.12 → 1.1.0.0.0

data/config/routes.rb

@@ -7,5 +7,7 @@ Rails.application.routes.draw do
 
   delete '/_f/logout', to: 'fiona7/sessions#destroy', as: :fiona7_logout
 
-  put '/__scrivito/objs/:id/release(.:format)', to: 'fiona7/release#release', as: :fiona7_release
+  put '/__scrivito/objs/release(.:format)', to: 'fiona7/release#release', as: :fiona7_release
+
+  get '/__scrivito/objs/:id/release/preview(.:format)', to: 'fiona7/release#preview', as: :fiona7_release_preview
 end

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.71"
+  s.add_dependency "scrivito", "= 1.1.0"
   s.add_dependency "scrivito_sdk"
   s.add_dependency "scrivito_editors"
   s.add_dependency "infopark_fiona_connector", "= 7.0.1.beta2"

data/lib/fiona7/assert.rb

@@ -12,6 +12,10 @@ module Fiona7
       def success(condition, message)
         raise Scrivito::ScrivitoError, message unless condition
       end
+
+      def exists(condition, message)
+        raise Scrivito::ResourceNotFound, message unless condition
+      end
     end
   end
 end

data/lib/fiona7/attribute_name_mangler.rb

@@ -0,0 +1,19 @@
+require "fiona7/obj_class_name_mangler"
+
+module Fiona7
+  class AttributeNameMangler
+    def initialize(attribute, obj_class)
+      @attribute = attribute
+      @obj_class = obj_class
+    end
+
+    def mangle
+      if Fiona7.mode == :standalone
+        mangled_obj_class = Fiona7::ObjClassNameMangler.new(@obj_class).mangle
+        "s_#{mangled_obj_class}__#{@attribute}"
+      else
+        @attribute
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_names_from_cms.rb

@@ -0,0 +1,17 @@
+require "fiona7/type_register"
+require "fiona7/obj_classes_from_cms"
+require "fiona7/attribute_name_mangler"
+
+module Fiona7
+  class AttributeNamesFromCms
+    def initialize(attribute, type_register=Fiona7::TypeRegister.instance)
+      @attribute = attribute
+      @type_register = type_register
+    end
+
+    def attributes
+      obj_classes = Fiona7::ObjClassesFromCms.new(@type_register).obj_classes
+      obj_classes.map {|obj_class| Fiona7::AttributeNameMangler.new(@attribute, obj_class).mangle }.uniq
+    end
+  end
+end

data/lib/fiona7/attribute_names_from_queries.rb

@@ -0,0 +1,17 @@
+require "fiona7/obj_classes_from_queries"
+require "fiona7/attribute_name_mangler"
+
+module Fiona7
+  class AttributeNamesFromQueries
+    def initialize(attribute, queries)
+      @attribute = attribute
+      @queries   = queries
+    end
+
+    def attributes
+      obj_classes = Fiona7::ObjClassesFromQueries.new(@queries).obj_classes
+      obj_classes.map {|obj_class| AttributeNameMangler.new(@attribute, obj_class).mangle }.uniq.presence if obj_classes
+    end
+
+  end
+end

data/lib/fiona7/builder/obj_builder.rb

@@ -6,7 +6,8 @@ module Fiona7
 end
 
 require 'fiona7/type_register'
-require 'fiona7/recursive_link_resolver'
+require 'fiona7/obj_class_name_mangler'
+require 'fiona7/obj_class_name_demangler'
 #require 'fiona7/write_obj'
 #require 'fiona7/released_obj'
 require 'fiona7/builder/batch_widget_writer'
@@ -53,7 +54,7 @@ module Fiona7
       def prepare_object
         @path              = @values.delete(:_path) || generate_orphaned_path
         @obj_class         = @values.delete(:_obj_class)
-        @real_obj_class    = TypeRegister::NameAliaser.new(virtual: @obj_class).real_obj_class
+        @real_obj_class    = Fiona7::ObjClassNameMangler.new(@obj_class).mangle
         @widget_pool       = @values.delete(:_widget_pool)
         @permalink         = @values.delete(:_permalink)
 

data/lib/fiona7/builder/obj_updater.rb

@@ -26,10 +26,10 @@ module Fiona7
         @name, parent_path = name_and_parent_path_from_path(@path) if (@path)
         if obj_class = @values.delete(:_obj_class)
           @obj_class      = obj_class
-          @real_obj_class = TypeRegister::NameAliaser.new(virtual: @obj_class).real_obj_class
+          @real_obj_class = Fiona7::ObjClassNameMangler.new(@obj_class).mangle
         else
           @real_obj_class = @obj.obj_class
-          @obj_class      = TypeRegister::NameAliaser.new(real: @real_obj_class).virtual_obj_class
+          @obj_class      = Fiona7::ObjClassNameDemangler.new(@real_obj_class).demangle
         end
 
         ensure_obj_class_exists

data/lib/fiona7/builder/widget_builder.rb

@@ -17,7 +17,7 @@ module Fiona7
       def prepare_object
         @path              = self.generate_widget_path
         @obj_class         = @values.delete(:_obj_class)
-        @real_obj_class    = TypeRegister::NameAliaser.new(virtual: @obj_class).real_obj_class
+        @real_obj_class    = Fiona7::ObjClassNameMangler.new(@obj_class).mangle
 
         @path = "/#{@path}" unless @path.start_with?('/')
         @name, parent_path = name_and_parent_path_from_path(@path)

data/lib/fiona7/builder/widget_updater.rb

@@ -21,10 +21,10 @@ module Fiona7
 
         if obj_class = @values.delete(:_obj_class)
           @obj_class      = obj_class
-          @real_obj_class = TypeRegister::NameAliaser.new(virtual: @obj_class).real_obj_class
+          @real_obj_class = Fiona7::ObjClassNameMangler.new(@obj_class).mangle
         else
           @real_obj_class = @obj.obj_class
-          @obj_class      = TypeRegister::NameAliaser.new(real: @real_obj_class).virtual_obj_class
+          @obj_class      = Fiona7::ObjClassNameDemangler.new(@real_obj_class).demangle
         end
 
         ensure_obj_class_exists

data/lib/fiona7/complex_object.rb

@@ -0,0 +1,24 @@
+module Fiona7
+  class ComplexObject
+    def initialize(obj)
+      @obj = obj
+    end
+
+    def widgets
+      # 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 binaries
+      type_definition = Fiona7::TypeRegister.instance.read_mangled(@obj.obj_class)
+      type_definition.attrs.each do |attribute|
+        if attribute.type == :binary && attribute.real_name != "blob"
+          (obj[attribute.real_name] || []).each do |link|
+            referenced << link.destination_object
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,8 @@ require 'fiona7/builder/obj_updater'
 require 'fiona7/naive_search_engine'
 require 'fiona7/verity_search_engine'
 
+require 'fiona7/facet_builder'
+
 require 'fiona7/assert'
 
 require 'fiona7/json/reverse_obj_decorator'
@@ -52,6 +54,19 @@ module Fiona7
           return ::JSON.parse(::ActiveSupport::JSON.encode(decorated))
         end
 
+        def fetch_multiple(revision_id, payload)
+          # TODO: use implementation from ContentService controller
+          # FIXME: code duplication with fetch_by_id
+          obj_ids = payload.with_indifferent_access[:ids]
+          klass = revision_id.start_with?('f') ? ReleasedObj : EditedObj
+          objs = klass.where(obj_id: obj_ids)
+          objs_arr = obj_ids.map {|obj_id| objs.find {|o| o.id == obj_id.to_i } }
+
+          decorated = objs_arr.map {|obj| obj ? Fiona7::JSON::ReverseObjDecorator.new(klass, obj) : nil }
+          response = ::JSON.parse(::ActiveSupport::JSON.encode({"results" => decorated}))
+          return response
+        end
+
         def fetch_by_id(workspace_id, obj_id)
           klass = matching_class(workspace_id)
           obj = klass.where(obj_id: obj_id).first
@@ -85,35 +100,66 @@ module Fiona7
 
         def search(workspace_id, params)
           klass = matching_class(workspace_id)
+          params = params.symbolize_keys
+
+          facets = params[:facets] || []
+
+          if params[:continuation]
+            conti  = ::JSON.parse(Base64.decode64(params[:continuation])).symbolize_keys #rescue {}
+          else
+            conti = {}
+          end
+
+          offset = conti[:offset]      || params[:offset]     || 0
+          # 10 is the default value in original implementation
+          size   = conti[:size]        || params[:size]       || 10
+          order  = (conti[:sort_order] || params[:sort_order] || :asc).to_sym
+          sort   = (conti[:sort_by]    || params[:sort_by]    || :id).to_sym
+
+          if params[:query].present?
+            normalize_query_params(params[:query])
+
+            query  = (params[:query] || []).dup
 
-          if params[:query].blank?
-            return ::JSON.parse(::ActiveSupport::JSON.encode({
+            puts "SEARCH: #{query}"
+            if use_naive_search_engine?(query)
+              puts "NAIVE"
+              search = NaiveSearchEngine.new(klass, query, offset, size, sort, order)
+            else
+              puts "VERITY"
+              search = VeritySearchEngine.new(klass, query, offset, size, sort, order)
+            end
+            result = search.results.map {|o_id| {id: o_id} }
+            total  = search.total
+
+            # TODO: search engine should not destroy query :/
+            query  = (params[:query] || []).dup
+
+            response = {
+              total: total,
+              results: result
+            }
+          else
+            query = []
+
+            response = {
               total: 0,
               results: []
-            }))
+            }
           end
 
-          offset = params[:offset] || 0
-          size   = params[:size] || 100
-          query  = (params[:query] || []).dup
-          order  = (params[:sort_order] || :asc).to_sym
-          sort   = (params[:sort_by] || :id).to_sym
-          
-          #puts "SEARCH: #{query}"
-          if use_naive_search_engine?(query)
-            #puts "NAIVE"
-            search = NaiveSearchEngine.new(klass, query, offset, size, sort, order)
-          else
-            #puts "VERITY"
-            search = VeritySearchEngine.new(klass, query, offset, size, sort, order)
+          if response[:total] > offset + size
+            response[:continuation] = Base64.encode64({
+              size: size,
+              offset: (offset+size),
+              sort_order: order,
+              sort_by: sort,
+            }.to_json)
           end
-          result = search.results.map {|o| {id: o.id} }
-          total  = search.total
 
-          return ::JSON.parse(::ActiveSupport::JSON.encode({
-            total: total,
-            results: result
-          }))
+          response[:facets] = facets.map {|facet| FacetBuilder.new(facet.symbolize_keys, query, klass).build } unless facets.empty?
+
+          return ::JSON.parse(::ActiveSupport::JSON.encode(response))
         end
 
         def update(workspace_id, values)
@@ -156,7 +202,7 @@ module Fiona7
             end
           end
           if outside_objects.length != 0
-            outside_paths = outside_objects.map(&:path).join(" ")
+            outsize_paths = outsize_objects.map(&:path).join(" ")
             Assert.input(
               false,
               "Cannot remove object because #{outside_paths} have links pointing to it"
@@ -190,10 +236,36 @@ module Fiona7
           )
         end
 
+        # This is required because the sdk is inconsistent 
+        # in its usage of search operators
+        def normalize_query_params(query_params)
+          query_params.each do |query_param|
+            query_param.symbolize_keys!
+            query_param[:operator] = query_param[:operator].to_sym
+            query_param[:field] = query_param[:field].to_sym
+
+            case query_param[:operator]
+            when :contains
+              query_param[:operator] = :search
+            when :contains_prefix
+              query_param[:operator] = :prefix_search
+            when :equals
+              query_param[:operator] = :equal
+            when :starts_with
+              query_param[:operator] = :prefix
+            when :is_greater_than
+              query_param[:operator] = :greater_than
+            when :is_less_than
+              query_param[:operator] = :less_than
+            end
+          end
+        end
+
         def use_naive_search_engine?(query)
           false ||
             query.empty? ||
-            query.any? {|q| q[:field].to_sym == :_path && (q[:operator].to_sym == :equal || query.length == 1)} ||
+            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) ||

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

@@ -7,15 +7,31 @@ module Fiona7
       class WorkspaceController
         def fetch(id)
           id = id.to_sym
-          Assert.input(
+          Assert.exists(
             id == :published || id == :rtc,
-            "Workspace does not exist"
+            "Could not find Scrivito::Workspace with id #{id}"
           )
 
           w = Workspace.new(id)
           return ::JSON.parse(::ActiveSupport::JSON.encode(w))
         end
 
+        def changes(id)
+          id = id.to_sym
+          Assert.exists(
+            id == :published || id == :rtc,
+            "Could not find Scrivito::Workspace with id #{id}"
+          )
+
+          w = Workspace.new(id)
+          w_json = ::JSON.parse(::ActiveSupport::JSON.encode(w))
+          {
+            "workspace" => w_json,
+            "current" => w.content_state_id,
+            "objs" => "*"
+          }
+        end
+
         def publish(id)
           raise "Unexpected workspace_id: #{id}" unless id.to_s == "rtc"
           WriteObj.where(is_edited: 1).each do |obj|
@@ -33,6 +49,11 @@ module Fiona7
           Assert.contraint(false, "Workspaces cannot be deleted")
         end
 
+        def update(id)
+          # DUMMY NO OP
+          {}
+        end
+
         def create(values)
           id = (values[:workspace][:id] || values[:workspace]["id"])
           id = (id || :no_id_provided).to_sym

data/lib/fiona7/engine.rb

@@ -21,19 +21,20 @@ require "fiona7/scrivito_patches/attribute_serializer"
 require "fiona7/scrivito_patches/basic_obj"
 require "fiona7/scrivito_patches/basic_widget"
 require "fiona7/scrivito_patches/binary"
-require "fiona7/scrivito_patches/cms_backend"
 require "fiona7/scrivito_patches/child_list_tag"
+require "fiona7/scrivito_patches/cms_backend"
 require "fiona7/scrivito_patches/cms_field_tag"
-require "fiona7/scrivito_patches/controller_actions"
 # different load order !!
 #require "fiona7/scrivito_patches/cms_dispatch_controller"
 require "fiona7/scrivito_patches/cms_rest_api"
 require "fiona7/scrivito_patches/cms_routing"
 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/obj_data_from_rest"
 require "fiona7/scrivito_patches/page_config"
+require "fiona7/scrivito_patches/preset_routes"
+require "fiona7/scrivito_patches/routing_extensions"
 require "fiona7/scrivito_patches/type_computer"
 require "fiona7/scrivito_patches/workspace"
 
@@ -42,27 +43,10 @@ require "fiona7/fiona_connector_patches/cms_accessible"
 require "fiona7/middleware/table_switching_middleware"
 require "fiona7/middleware/server_detection_middleware"
 
-module Scrivito
-  class LogSubscriber < ActiveSupport::LogSubscriber
-    def backend_request(event)
-      self.class.runtime += event.duration
-      return unless logger.debug?
-
-      duration = '(%.1fms)' % [event.duration]
-
-      param = event.payload[:params]
-      param_text = " #{param}" if param
-
-      verb_text = event.payload[:verb].upcase
-      path_text = event.payload[:path]
-
-      debug "  Fiona7 #{verb_text} #{path_text}#{param_text} #{duration}"
-    end
-  end
-end
+# components
+require "fiona7/recursive_object_finder"
+require "fiona7/complex_object"
 
-
-require "fiona7/routers/content_service"
 require "fiona7/routers/rest_api"
 
 require 'fiona7/scrivito_user'
@@ -124,6 +108,10 @@ module Fiona7
     
   class Engine < ::Rails::Engine
 
+    config.after_initialize do
+      puts "ENGINE AFTER INITIALIZE"
+    end
+
     config.to_prepare do
       # TODO: do some smart optimizations
       initializer = Fiona7::Initializer.new