infopark_fiona7 0.71.0.7 → 0.71.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07728fd57fdb01877b58ba69bde489bc1e5e2508
-  data.tar.gz: bb716b43bd3cf4f5a2939f794386126315e488cc
+  metadata.gz: 3aaff7962c5f0c2bdce5d3856198cdab579fd8ac
+  data.tar.gz: cd04d39d77dc5bf489ff07becaff1e2c1ab20eb1
 SHA512:
-  metadata.gz: eb53ab8dd8c92567f7939801f61cc715fe299273346294d801a81dabdf54d5387ab4899fb3978fabec66f0d4b9c266163d1d04c2742d69fa7d7511c187348125
-  data.tar.gz: 328d9ac70b382b59fdb1632859ae0a4f00f338f7aa25d33d5c0ace84346c5828298c20841cd8eaa57e6b34becc454a00f9a5b2ed94595ffbc10ae70c7f17e8f9
+  metadata.gz: abe935f615d9b6b4bdd548c3f3f9e194ece6f54531bc1c425e81b608cc1cca8bedcc6dc6f3e64cbfdab30dc9d49394f095a27f8c98dba1f38bbc99672a5a28d4
+  data.tar.gz: e8879992375f4b647a9a0b60ed6140a3d351f1c5bfc3591e796c77645756786ba8052ccbe877a70f7538095f317d0f79a33b3105b53b6ef3f05feaff0edfb3ea

data/app/assets/javascripts/fiona7_ui.js

@@ -149,7 +149,7 @@
   actions = ["release"];
 
   scrivito.gui.on('document', function(cms_document) {
-    console.log('adding release button');
+    //console.log('adding release button');
     var obj = cms_document.page();
 
     _.each(actions, function(action,idx) {

data/app/assets/javascripts/scrivito_patches/models/obj.js

@@ -202,7 +202,7 @@
 
       create: function(attrs) {
         return prepare_attrs(scrivito.random_id(), attrs).then(function(prepared_attrs) {
-          provide_default_path(prepared_attrs, prepared_attrs._obj_class);
+          provide_default_path(prepared_attrs, provide_default_name(prepared_attrs));
           return persist_obj_data(prepared_attrs).then(function (data) {
             scrivito.obj_class_selection.store(prepared_attrs._obj_class);
             return scrivito.obj.create_instance(data);
@@ -220,6 +220,27 @@
     }
   });
 
+  var provide_default_name = function (attrs) {
+    var default_name = null;
+
+    $.each(attrs, function (key, value) {
+      if (value && value.is_uploaded_binary && value.filename) {
+        default_name = value.filename;
+      } else if (instance_of_anywhere(value, 'File')) {
+        default_name = value.name;
+      }
+    });
+
+    if (default_name === null) {
+      default_name = attrs._obj_class;
+    } else {
+      // this removes file extension if present
+      default_name = default_name.replace(/\.[^\.]+$/, '');
+    }
+
+    return default_name;
+  };
+
   var provide_default_path = function (attrs, default_name) {
     if (!(attrs._path)) {
       var current_page = scrivito.application_document().page();
@@ -318,14 +339,7 @@
   };
 
   var instance_of_anywhere = function (object, ctor_name) {
-    var i, val=false, possible_ctor;
-    for (i=0; i < window.frames.length; ++i) {
-      possible_ctor = window.frames[i][ctor_name];
-      if ((typeof possible_ctor === 'function') && (object instanceof possible_ctor)) {
-        val = true;
-      }
-    }
-    return val;
+    return (object && (typeof object === 'object') && object.constructor && object.constructor.name === ctor_name);
   };
 
   var format_date_number = function(number) {

data/app/controllers/fiona7/release_controller.rb

@@ -2,28 +2,61 @@ module Fiona7
   class ReleaseController < ActionController::Base
     def release
       @releasable = Set.new
+      @errors = []
 
       @obj = WriteObj.find(params[:id])
 
-
-      @releasable.merge(referenced_objects(@obj))
-      @releasable.merge(widgets(@obj))
-      @releasable << @obj
+      recursively_find_objects(@releasable, @obj, Set.new)
 
       @releasable.each do |obj|
         if obj.really_edited?
-          obj.take
-          obj.release!
+          carefully_release(@errors, obj)
         end
       end
 
+      # TODO: display errors
       render json: {}
     end
 
     protected
+
+    def carefully_release(errors, obj)
+      obj.take
+      obj.release!
+    rescue => e
+      Rails.logger.error("Error occured when releasing #{@obj.id}: unable to release Object with ID #{obj.id} (#{obj.path} because: #{e.inspect}")
+
+      # TODO: translate
+      error = "Unable to release Object with ID #{obj.id} because: #{e.message}"
+      errors << error
+    end
+
+    def recursively_find_objects(set, obj, already_encountered)
+      # already_encountered prevents loops
+      widgets_of_this_object = widgets(obj) - already_encountered
+      referenced_objects_of_this_object = referenced_objects(obj) - already_encountered
+
+      already_encountered.merge(widgets_of_this_object)
+      already_encountered.merge(referenced_objects_from_widgets)
+
+      widgets_of_this_object.each do |widget|
+        recursively_find_objects(set, widget, already_encountered)
+      end
+
+      referenced_objects_of_this_object.each do |referenced|
+        recursively_find_objects(set, referenced, already_encountered)
+      end
+
+      set.merge(widgets_of_this_object)
+      set.merge(referenced_objects_of_this_object)
+      set << obj
+
+      set
+    end
+
     def widgets(obj)
       links = @obj[:X_widget_pool] || []
-      WriteObj.where(obj_id: links.map {|l| l.destination_object_id }).to_a
+      WriteObj.where(obj_id: links.map {|l| l.destination_object_id }).to_a.to_set
     end
 
     def referenced_objects(obj)

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

@@ -109,7 +109,11 @@ module Fiona7
         end
 
         def find_by_permalink(permalink)
-          @klass.where(permalink: permalink).limit(1).to_a
+          if permalink
+            @klass.where(permalink: permalink).limit(1).to_a
+          else
+            []
+          end
         end
       end
     end

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

@@ -6,6 +6,7 @@ require 'fiona7/builder/obj_builder'
 require 'fiona7/builder/obj_updater'
 
 require 'fiona7/naive_search_engine'
+require 'fiona7/verity_search_engine'
 
 require 'fiona7/assert'
 
@@ -97,8 +98,15 @@ module Fiona7
           query  = (params[:query] || []).dup
           order  = (params[:sort_order] || :asc).to_sym
           sort   = (params[:sort_by] || :id).to_sym
-
-          search = NaiveSearchEngine.new(klass, query, offset, size, sort, order)
+          
+          #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: o.id} }
           total  = search.total
 
@@ -181,6 +189,17 @@ module Fiona7
             "Workspace #{workspace_id} is not writable, only workspace rtc is writable"
           )
         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.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) ||
+            false
+        end
       end
     end
   end

data/lib/fiona7/current_user_map.rb

@@ -2,7 +2,9 @@ module Fiona7
   module CurrentUserMapHelper
     def self.groups_for_user(user)
       user_name = user.id rescue ""
-      Reactor::Cache::User.instance.get(user_name).groups
+      Reactor::Sudo.su(Fiona7.root) do
+        Reactor::Cache::User.instance.get(user_name).groups
+      end
     rescue => e
       Rails.logger.error "Error occured reading user groups of #{user_name} (#{e.message})"
       []

data/lib/fiona7/custom_verity_accessor.rb

@@ -0,0 +1,122 @@
+require "rails_connector/ses"
+require "builder"
+
+module Fiona7
+  class CustomVerityAccessor < ::RailsConnector::SES::VerityAccessor
+    require 'net/http'
+    require 'uri'
+    require "rexml/document"
+
+    #--
+    # Options: see VeritySearchRequest
+    #++
+    def initialize(query, options = {})
+      @query = query
+      @options = {
+        :host => 'localhost',
+        :port => 3011,
+        :offset => 0,
+        :limit => 10,
+        :min_relevance => 50,
+        :max_docs => 'unlimited',
+        :parser => 'simple',
+        :sort_order => [["score", "desc"], ["name", "asc"]],
+        :collections => ['cm-contents'],
+        :base_query => nil
+      }.merge(options)
+      @options[:collections] = Array(options[:collection]).flatten if options.has_key?(:collection)
+    end
+
+    # Queries the SES and returns a SearchResult.
+    #
+    # Exceptions:
+    # * SearchError - SES reported an error.
+    #
+    def search
+      parse_response_payload(send_to_ses(build_request_payload))
+    end
+
+    private
+
+    def build_request_payload
+      x = ::Builder::XmlMarkup.new
+      x.instruct!
+      x.tag!('ses-payload', 'payload-id' => 'd-1f6a64dec16aa328-00000020-i', 'timestamp' => Time.now.to_iso, 'version' => '6') {
+        x.tag!('ses-header') {
+          x.tag!('ses-sender', 'sender-id' => '42', 'name' => 'infopark-rails-connector')
+        }
+        x.tag!('ses-request', 'request-id' => 'd-1f6a64dec16aa328-00000021-j-1', 'preclusive' => 'false') {
+          x.tag!('ses-search') {
+            x.query @query, :parser => @options[:parser]
+            x.resultRecord {
+              x.resultField 'objId'
+              x.resultField 'score'
+            }
+            x.offset {
+              x.start @options[:offset].to_i + 1
+              x.length @options[:limit]
+            }
+            x.minRelevance @options[:min_relevance]
+            x.maxDocs @options[:max_docs]
+
+            unless @options[:sort_order].blank?
+              x.sortOrder {
+                @options[:sort_order].each do |attribute, direction|
+                  x.sortField attribute, :direction => direction
+                end
+              }
+            end
+
+            x.searchBase {
+              @options[:collections].each {|item| x.collection item }
+              x.query @options[:base_query], :parser => @options[:parser] if @options[:base_query]
+            }
+          }
+        }
+      }
+    end
+
+    def send_to_ses(payload)
+      res = Net::HTTP.new(@options[:host], @options[:port].to_i).start do |http|
+        req = Net::HTTP::Post.new('/xml')
+        req.body = payload
+        http.request(req)
+      end
+      res.body
+    end
+
+    def parse_response_payload(response)
+      xml = REXML::Document.new(response)
+      if xml.elements['/ses-payload/ses-response/ses-code'].attributes['numeric'] == "200"
+        build_successful_result(xml)
+      else
+        handle_error(xml)
+      end
+    end
+
+    def build_successful_result(response)
+      result = RailsConnector::SES::SearchResult.new(response.elements['/ses-payload/ses-response/ses-code/searchResults'].attributes['hits'].to_i)
+      response.elements.to_a('/ses-payload/ses-response/ses-code/searchResults/record').each do |record|
+        hit = RailsConnector::SES::Hit.new(record.elements['objId'].text.to_i, record.elements['score'].text.to_f)
+        result << hit
+      end
+      result
+    end
+
+    # SES raises these errors:
+    # 100171: ERROR_SYSTEM_SES_INTERNALVERITYERROR_DS
+    # 100230: ERROR_SYSTEM_SES_VERITYERROR_DS
+    # 100099: ERROR_SYSTEM_SES_DUPLICATECOLLETION_S
+    # 100173: ERROR_SYSTEM_SES_OPENCOLLECTIONFAILED
+    # 100103: ERROR_SYSTEM_SEARCHENGINE_SESSIONNEWFAILED
+    # 100177: ERROR_SYSTEM_SEARCHENGINE_BULKSUBMITFAILED
+    def handle_error(response)
+      msg = ""
+      response.elements.each('/ses-payload/ses-response/ses-code/errorStack/error') do |error|
+        msg << error.elements['phrase'].text
+        msg << "\n"
+      end
+      raise RailsConnector::SES::SearchError, msg
+    end
+  end
+end

data/lib/fiona7/engine.rb

@@ -89,6 +89,9 @@ module Fiona7
         secret: config.secret
       }
 
+      Fiona7::VeritySearchEngine::VeritySearchRequest.configured_host = config.host
+      Fiona7::VeritySearchEngine::VeritySearchRequest.configured_port = config.port.to_i + 3
+
       Fiona7.root = config.username
 
       Fiona7.mode = config.mode

data/lib/fiona7/verity_search_engine.rb

@@ -0,0 +1,215 @@
+require "fiona7/search_engine"
+require "rails_connector/verity_search_request"
+require "fiona7/custom_verity_accessor"
+
+module Fiona7
+  class VeritySearchEngine < SearchEngine
+    def results
+      # scrivito sdk likes to send a query with limit 0
+      # just to fetch the total count of results
+      # but verity does not like limit 0 very much
+      if @limit == 0
+        @limit = 1
+      end
+
+      construct_search_request
+      fetch_results
+      fetch_objects
+    end
+
+    protected
+    def construct_search_request
+      # TODO: sort order!
+      options = {}
+      options[:sort_order] = [["score", "desc"], ["lastChanged", "desc"]]
+      options[:limit] = @limit.to_i if @limit
+      options[:offset] = @offset.to_i if @offset.to_i > 0
+      @search_request = VeritySearchRequest.new(@query, options, @klass == Fiona7::ReleasedObj)
+    end
+
+    def fetch_results
+      @results = @search_request.fetch_hits
+      @count = @results.total_hits
+    end
+
+    def fetch_objects
+      unordered_objects = @klass.where(obj_id: @results.map(&:id)).to_a
+      ordered_objects = @results.map {|r| unordered_objects.find {|o| o.id.to_i == r.id } }.compact
+    end
+
+    class VeritySearchRequest < ::RailsConnector::VeritySearchRequest
+      def initialize(query, options={}, use_released=false)
+        @query_string = build_query_string(query)
+        @options = default_search_options.merge(options)
+        @use_released ||= use_released
+      end
+
+      def fetch_hits
+        Fiona7::CustomVerityAccessor.new(@query_string, {:base_query => base_query}.merge(@options)).search
+      end
+
+      protected
+
+      class << self
+        attr_accessor :configured_host, :configured_port
+      end
+
+      def default_search_options
+        {
+          :host => self.class.configured_host,
+          :port => self.class.configured_port,
+          :collection => 'cm-contents'
+        }
+      end
+
+      def build_query_string(query)
+        query = normalize_query(query)
+        if full_text_query?(query)
+          full_text_query_string(extract_words(query))
+        else
+          complex_query_string(query)
+        end
+      end
+
+      def full_text_query?(query)
+        query.any? {|q| q[:field] == :'*' && (q[:operator] == :prefix_search || q[:operator] == :search)}
+      end
+
+      def complex_query_string(query)
+        conditions = query.map do |q|
+          if q[:field] == :'*'
+            Rails.logger.error("Unexpected field * when processing search request: #{q.inspect}")
+            next
+          end
+
+          resolved_field = resolve_field_name(q[:field])
+
+          # paths are sadly not in the search index.
+          next if resolved_field == :visiblePath
+
+          case q[:operator]
+          when :equal
+            if q[:field] == :_modification
+              '("edited" <#IN> state)'
+            else
+              field_operator_value(resolved_field, "=", q[:value])
+            end
+          when :search
+            field_operator_value(resolved_field, "<#CONTAINS>", q[:value])
+          when :greater_than
+            field_operator_value(resolved_field, ">", q[:value])
+          when :less_than
+            field_operator_value(resolved_field, "<", q[:value])
+          when :prefix, :prefix_search
+            values = q[:value]
+            values = [values] unless values.kind_of?(Array)
+            values.map {|v| "#{v}*" }
+            values_operator_field(values, "<#IN>", resolved_field)
+          else
+            raise "Operator: #{q[:operator]} not supported"
+          end
+        end.compact
+
+        if conditions.empty?
+          query_string = ""
+        else
+          query_string = "<#AND> (" + conditions.join(", ") + ")"
+        end
+      end
+
+      def field_operator_value(field, operator, values)
+        values = [values] unless values.kind_of?(Array)
+
+        condition = values.map do |value|
+          %|(#{field} #{operator} "#{self.class.sanitize(value)}")|
+        end.join(", ")
+
+        %|(<#OR> #{condition})|
+      end
+
+      def values_operator_field(values, operator, field)
+        values = [values] unless values.kind_of?(Array)
+
+        condition = values.map do |value|
+          %|("#{self.class.sanitize(value)}" #{operator} #{field})|
+        end.join(", ")
+
+        %|(<#OR> #{condition})|
+      end
+
+      def resolve_field_name(field)
+        if Fiona7.mode != :legacy
+          Rails.logger.error("This method is not compatible with modes other than legacy")
+        end
+
+        case field
+        when :_obj_class
+          :objClass
+        when :_path
+          :visiblePath
+        when :_modification
+          :__dummy__
+        when :id
+          :obj_id
+        when :_permalink
+          :permalink
+        when :_last_changed
+          :lastChanged
+        when :_name
+          :name
+        else
+          field
+        end
+      end
+
+      def normalize_query(query)
+        query = query.map do |q|
+          q.symbolize_keys
+          q[:operator] = q[:operator].to_sym
+          q[:field] = q[:field].to_sym
+          q
+        end
+      end
+
+      def extract_words(query)
+        q = query.find {|q| q[:field] == :'*' && (q[:operator] == :prefix_search || q[:operator] == :search) }
+        if q[:value].kind_of?(Array)
+          q[:value]
+        else
+          [q[:value]]
+        end
+      end
+
+      def full_text_query_string(words)
+        words = words.map do |word|
+          word = self.class.sanitize(word)
+          word unless %w(and or not).include?(word.downcase)
+        end.compact.join(", ")
+        "<#AND> (#{words})"
+      end
+
+      def base_query_conditions
+        conditions = {}
+        conditions[:objTypes] = '<#ANY> (
+        ("generic" <#IN> objType),
+        ("document" <#IN> objType),
+        ("publication" <#IN> objType)
+      )'
+        if @use_released
+          conditions[:content] = '("released" <#IN> state)'
+          conditions[:suppressExport] = '("0" <#IN> suppressExport)'
+          conditions[:validFrom] = "(validFrom < #{Time.now.to_iso})"
+          conditions[:validUntil] =  %!<#OR> (
+                      (validUntil = ""),
+                      (validUntil > #{Time.now.to_iso})
+                    )!
+        else
+          conditions[:suppressExport] = '("0" <#IN> suppressExport)'
+          end
+        #conditions[:notWidget] = '("Widget" <#IN/NOT> objClass)'
+        conditions[:notWidget] = '(objClass <#ENDS/NOT> "Widget")'
+        conditions
+      end
+    end
+  end
+end

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "0.71.0.7"
+  VERSION = "0.71.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 0.71.0.7
+  version: 0.71.1.0
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -183,6 +183,7 @@ files:
 - lib/fiona7/controllers/rest_api/obj_controller.rb
 - lib/fiona7/controllers/rest_api/workspace_controller.rb
 - lib/fiona7/current_user_map.rb
+- lib/fiona7/custom_verity_accessor.rb
 - lib/fiona7/editing_env_check.rb
 - lib/fiona7/engine.rb
 - lib/fiona7/fiona_connector_patches/basic_obj.rb
@@ -239,6 +240,7 @@ files:
 - lib/fiona7/type_loader.rb
 - lib/fiona7/type_register.rb
 - lib/fiona7/type_synchronizer.rb
+- lib/fiona7/verity_search_engine.rb
 - lib/fiona7/version.rb
 - lib/fiona7/version_helper.rb
 - lib/fiona7/widget_resolver.rb