infopark_fiona7 0.71.1.12 → 1.1.0.0.0

data/lib/fiona7/facet_builder.rb

@@ -0,0 +1,136 @@
+require "fiona7/verity_search_engine"
+
+module Fiona7
+  class FacetBuilder
+    def initialize(facet_params, query, klass)
+      @query        = query
+      @klass        = klass
+
+      @attribute    = facet_params[:attribute]
+
+      @limit        = [facet_params[:limit] || 20, 100].min # default = 20, limit <= 100
+      @fake_limit   = 100
+      @include_objs = facet_params[:include_objs] || false
+
+      @known_values = Set.new
+      @facets       = []
+      @next_facets  = []
+    end
+
+    def build
+      @facets << fetch_more_facets until limit_reached or !more_facets_available
+
+      # adjust totals
+      for index in 0.upto(@facets.length-2)
+        next_facet_total = @facets[index+1].first[:total] rescue 0
+        @facets[index].each do |facet|
+          facet[:total] -= next_facet_total
+        end
+      end
+
+      # flatten
+      @facets.flatten!
+
+      # sort
+      @facets.sort_by! {|f| f[:total] }.reverse!
+
+      # delete superfluous elements
+      @facets.slice!(@limit, @facets.length)
+
+      # add included objs
+      if @include_objs
+        @facets.each do |facet|
+          include_objs_query = @query.dup
+          include_objs_query << {field: @attribute, operator: :__in__, value: facet[:value]}
+          search = VeritySearchEngine.new(@klass, include_objs_query, 0, @include_objs, @attribute, :desc)
+          facet[:results] = search.results.map {|o_id| {id: o_id.to_s}}
+          # this gives a true total!
+          facet[:total] = search.total
+        end
+      end
+
+      @facets
+    end
+
+    protected
+    def limit_reached
+      (@fake_limit -= 1) < 0
+    end
+
+    def fetch_more_facets
+      @next_facets
+    end
+
+    def more_facets_available
+      @next_facets = []
+
+      search = build_search
+      return false if search.results.empty?
+
+      sample_object = Fiona7::WriteObj.where(obj_id: search.results).first
+      return false if sample_object.nil?
+      new_values = get_attribute_values(sample_object)
+
+      new_values.each do |new_value|
+        next if @known_values.include?(new_value)
+        @known_values << new_value
+
+        @next_facets << {
+          value: new_value,
+          total: search.total
+        }
+      end
+
+      return !@next_facets.empty?
+    end
+
+    def build_search
+      facet_query   = @query.dup
+      facet_query   << {field: @attribute, operator: :__not_in__, value: serialize_known_values} unless @known_values.empty?
+      facet_query   << any_value_present_in_attribute_query
+      # search engine likes to return object which do not exist anymore
+      # hence we try ten objects
+      facet_size    = 10
+      facet_offset  = 0
+      facet_sort    = @attribute
+      facet_order   = :desc
+
+      VeritySearchEngine.new(@klass, facet_query, facet_offset, facet_size, facet_sort, facet_order)
+    end
+
+    # TODO: remove this ugly code
+    def get_attribute_values(sample_object)
+      # TODO: extend this code to handle stringlists and multienums
+      type_definition =  Fiona7::TypeRegister.instance.read_mangled(sample_object.obj_class)
+      attribute = type_definition.find_attribute(@attribute)
+
+      return nil unless attribute
+
+      if attribute.type == :stringlist
+        # TODO: remove deserialization duplication
+        deserialized = ::JSON.parse(sample_object[attribute.real_name]) rescue []
+        deserialized.kind_of?(Array) ? deserialized : []
+      elsif attribute.real_type == :multienum
+        sample_object[attribute.real_name] || []
+      else
+        # TODO: add warning/handling for wrong attributes
+        [sample_object[attribute.real_name].to_s]
+      end
+    end
+
+    def any_value_present_in_attribute_query
+      letters = ('a'..'z').map {|l| "*#{l}*" }
+      numbers = ('0'..'9').map {|l| "*#{l}*" }
+      sanity_patterns = letters + numbers
+
+      {field: @attribute, operator: :__in__, value: sanity_patterns}
+    end
+
+    def serialize_known_values
+      @known_values.map do |kv|
+        kv.blank? ? "dummy123dummy456dummy" : kv.to_s
+      end
+    end
+
+  end
+end

data/lib/fiona7/json/reverse_obj_decorator.rb

@@ -1,3 +1,5 @@
+require "fiona7/json/obj_decorator"
+
 module Fiona7
   module JSON
     class ReverseObjDecorator < ObjDecorator

data/lib/fiona7/mode_switch/cms_routes/scrivito_sdk.rb

@@ -1,14 +1,72 @@
 Rails.application.routes.draw do
-  match '/', via: :all, to: 'scrivito/cms_dispatch#index', as: :scrivito_root
+  mount Scrivito::SdkEngine, at: '/', as: :scrivito_engine
+end
 
-  with_options via: :all, constraints: {id: /[0-9]{4,16}/} do |proxy|
-    proxy.match '(/)(*slug-):id', to: 'scrivito/cms_dispatch#index', as: :cms_id
-    proxy.match ':id(/*slug)', to: 'scrivito/cms_dispatch#legacy', as: :cms_legacy_id
-  end
+Scrivito::SdkEngine.routes.draw do
+  get 'scrivito', to: 'scrivito/ui#index'
+  get 'scrivito/*application_path', to: 'scrivito/ui#index', format: false
+
+  scope '__scrivito', module: 'scrivito' do
+    get ':id', to: 'cms_dispatch#index', as: :base_id, constraints: {id: /\h{4,}/}
+
+    resources :objs, controller: 'objs', only: [:show, :create, :update, :destroy],
+        defaults: {format: :json} do
+      collection do
+        get :page_class_selection
+        get :search
+      end
+
+      member do
+        get :widget
+        get :widget_class_selection
+        get :widget_modification
+        get :conflicting_workspaces
+        get :is_outdated
+        get :binary_no_cache
+
+        post :copy
+        post :duplicate
+
+        put :revert
+        put :restore
+        put :mark_resolved
+        put :destroy_widget
+        put :revert_widget
+        put :restore_widget
+        put :transfer_modifications
+      end
+    end
+
+    resources :tasks, controller: 'tasks', only: [:show], defaults: {format: :json}
 
-  match '/*permalink',
-    to: 'scrivito/cms_dispatch#index',
-    as: :scrivito_permalink,
-    format: false,
-    via: :all
+    get 'blobs/upload_permission' => 'blobs#upload_permission', defaults: {format: :json}
+    put 'blobs/activate_upload' => 'blobs#activate_upload', defaults: {format: :json}
+
+    resources :workspaces,
+      controller: 'workspaces',
+      only: [:index, :show, :create, :destroy],
+      defaults: {format: :json} do
+        member do
+          put :rename
+          put :memberships
+          put :rebase
+          put :publish
+          get :check
+        end
+      end
+
+    get 'users/suggest' => 'users#suggest', defaults: {format: :json}
+    get 'suggest_completion' => 'completion#suggest', defaults: {format: :json}
+
+    get 'render_widget/:id/show_widget/:widget_id' => 'cms_dispatch#show_widget'
+    get 'render_widget/:id/widget_details/:widget_id' => 'cms_dispatch#widget_details'
+
+    get 'page_details/:id' => 'cms_dispatch#page_details'
+    get 'resource_details/:resource_id', to: 'ui#index'
+
+    get 'to_binary' => 'binary_redirect#to_binary', as: :binary
+  end
 end
+
+Scrivito::PresetRoutes.install_into(Rails.application.routes)
+

data/lib/fiona7/mode_switch/cms_routes/scrivito_sdk_slave.rb

@@ -1,20 +1,72 @@
 Rails.application.routes.draw do
-  get '/f7(/)' => 'scrivito/cms_dispatch#index', as: :scrivito_root
+  mount Scrivito::SdkEngine, at: '/', as: :scrivito_engine
+end
+
+Scrivito::SdkEngine.routes.draw do
+  get 'scrivito', to: 'scrivito/ui#index'
+  get 'scrivito/*application_path', to: 'scrivito/ui#index', format: false
+
+  scope '__scrivito', module: 'scrivito' do
+    get ':id', to: 'cms_dispatch#index', as: :base_id, constraints: {id: /\h{4,}/}
+
+    resources :objs, controller: 'objs', only: [:show, :create, :update, :destroy],
+        defaults: {format: :json} do
+      collection do
+        get :page_class_selection
+        get :search
+      end
+
+      member do
+        get :widget
+        get :widget_class_selection
+        get :widget_modification
+        get :conflicting_workspaces
+        get :is_outdated
+        get :binary_no_cache
+
+        post :copy
+        post :duplicate
 
-  get '__scrivito/render_widget/:id/show_widget/:widget_id' => 'scrivito/cms_dispatch#show_widget'
-  get '__scrivito/render_widget/:id/widget_details/:widget_id' => 'scrivito/cms_dispatch#widget_details'
+        put :revert
+        put :restore
+        put :mark_resolved
+        put :destroy_widget
+        put :revert_widget
+        put :restore_widget
+        put :transfer_modifications
+      end
+    end
 
-  get '/__scrivito/details_page/:resource_id' => 'scrivito/cms_dispatch#details_page'
+    resources :tasks, controller: 'tasks', only: [:show], defaults: {format: :json}
 
-  match '/f7/:id(/*slug)',
-    to: 'scrivito/cms_dispatch#index',
-    constraints: { id: /\d+|[0-9a-f]{16}/ },
-    as: 'scrivito_id',
-    via: :all
+    get 'blobs/upload_permission' => 'blobs#upload_permission', defaults: {format: :json}
+    put 'blobs/activate_upload' => 'blobs#activate_upload', defaults: {format: :json}
 
-  match '/f7/*permalink',
-    to: 'scrivito/cms_dispatch#index',
-    as: :scrivito_permalink,
-    format: false,
-    via: :all
+    resources :workspaces,
+      controller: 'workspaces',
+      only: [:index, :show, :create, :destroy],
+      defaults: {format: :json} do
+        member do
+          put :rename
+          put :memberships
+          put :rebase
+          put :publish
+          get :check
+        end
+      end
+
+    get 'users/suggest' => 'users#suggest', defaults: {format: :json}
+    get 'suggest_completion' => 'completion#suggest', defaults: {format: :json}
+
+    get 'render_widget/:id/show_widget/:widget_id' => 'cms_dispatch#show_widget'
+    get 'render_widget/:id/widget_details/:widget_id' => 'cms_dispatch#widget_details'
+
+    get 'page_details/:id' => 'cms_dispatch#page_details'
+    get 'resource_details/:resource_id', to: 'ui#index'
+
+    get 'to_binary' => 'binary_redirect#to_binary', as: :binary
+  end
 end
+
+Scrivito::PresetRoutes.install_slave_into(Rails.application.routes)
+

data/lib/fiona7/mode_switch/views.rb

@@ -13,11 +13,11 @@ module Fiona7
 
       protected
       def scrivito_sdk_path
-        Gem.loaded_specs['scrivito_sdk'].full_name
+        Gem.loaded_specs['scrivito_sdk'].full_gem_path
       end
 
       def fiona_connector_path
-        Gem.loaded_specs['infopark_fiona_connector'].full_name
+        Gem.loaded_specs['infopark_fiona_connector'].full_gem_path
       end
 
       def reorder_view_paths(first, second)

data/lib/fiona7/naive_search_engine.rb

@@ -3,15 +3,24 @@ require "fiona7/search_engine"
 module Fiona7
   class NaiveSearchEngine < SearchEngine
     def results
-      #debugger
+      @objects || execute_search
+      @objects.map {|o| o.id}
+    end
+    
+    def objects
+      @objects || execute_search
+      @objects
+    end
+
+    protected
+    def execute_search
       fetch_all
       apply_filters
       exclude_widgets
       order_results
       limit_size
-    end
+    end 
 
-    protected
     def fetch_all
       obj_class_filter = @query.find {|q| (q[:field] == :_obj_class || q[:field] == "_obj_class") && q[:operator] == :equal }
       id_filter = @query.find {|q| (q[:field] == :id || q[:field] == "id") && q[:operator] == :equal }
@@ -77,7 +86,7 @@ module Fiona7
 
     def limit_size
       @count = @all.count
-      if @all.kind_of?(Array)
+      @objects = if @all.kind_of?(Array)
         @all[@offset, @limit] || []
       else
         @all.offset(@offset).limit(@limit).to_a
@@ -91,7 +100,7 @@ module Fiona7
       value    = filter[:value]
 
       case filter[:operator]
-      when :equal
+      when :equals, :equal
         if field == :_modification || field == "_modification"
           if value != ["new", "edited", "deleted"]
             raise "Unsupported modification values: #{value.inspect}. Only #{["new", "edited", "deleted"].inspect} are supported"
@@ -99,6 +108,30 @@ module Fiona7
             # TODO: this can be solved with AR, faster
             @all = @all.to_a.select {|o| o.edited? }
           end
+        elsif field == :_path
+          value = [value] unless value.is_a?(Array)
+          value.map{|v| v.gsub!('.', '_') }
+          if (@all.is_a?(Array))
+            @all = @all.select do |o|
+              value.include?(o.path)
+            end
+          else
+            @all = @all.where(:path => value)
+          end
+        elsif field == :_parent_path
+          parent_obj = @klass.where(path: value).first
+          if parent_obj
+            parent_obj_id = parent_obj.id
+            if (@all.is_a?(Array))
+              @all = @all.select do |o|
+                o.parent_obj_id == parent_obj_id
+              end
+            else
+              @all = @all.where(:parent_obj_id => parent_obj_id)
+            end
+          else
+            @all = []
+          end
         else
           if value.is_a?(Array)
             @all = @all.to_a.select do |o|
@@ -127,6 +160,8 @@ module Fiona7
         end
       when :prefix, :prefix_search
         if !@all.is_a?(Array) && field.to_sym == :_path
+          # TODO: handle this properly
+          value = value.first if value.kind_of?(Array)
           @all = @all.where("path LIKE ?", "#{value}%")
         else
           @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s.start_with?(value) }

data/lib/fiona7/obj_class_name_demangler.rb

@@ -0,0 +1,11 @@
+module Fiona7
+  class ObjClassNameDemangler
+    def initialize(obj_class)
+      @obj_class = obj_class
+    end
+
+    def demangle
+      @obj_class.gsub('__', '::')
+    end
+  end
+end

data/lib/fiona7/obj_class_name_mangler.rb

@@ -0,0 +1,11 @@
+module Fiona7
+  class ObjClassNameMangler
+    def initialize(obj_class)
+      @obj_class = obj_class
+    end
+
+    def mangle
+      @obj_class.gsub('::', '__')
+    end
+  end
+end

data/lib/fiona7/obj_classes_from_cms.rb

@@ -0,0 +1,14 @@
+require "fiona7/type_register"
+
+module Fiona7
+  class ObjClassesFromCms
+    def initialize(type_register=Fiona7::TypeRegister.instance)
+      @type_register = type_register
+    end
+
+    def obj_classes
+      @type_register.read_all.map(&:virtual_name)
+
+    end
+  end
+end