infopark_fiona7 0.30.0.2 → 0.70.0.1

data/lib/fiona7/json/widget_decorator.rb

@@ -6,8 +6,10 @@ module Fiona7
       protected
       def standard_attrs
         attrs = {
-          _obj_class: [@obj.obj_class]
+          _obj_class: [@obj.obj_class.gsub("__", "::")]
         }
+
+        attrs
       end
 
       def replace_widget_pool(attrs, *args)

data/lib/fiona7/link_converter/fiona_to_scrivito.rb

@@ -9,28 +9,60 @@ module Fiona7
 
       def convert(content)
         return content unless content.present?
-        extend RailsConnector::DefaultCmsRoutingHelper unless kind_of?(RailsConnector::DefaultCmsRoutingHelper)
-        extend RailsConnector::DisplayHelper unless kind_of?(RailsConnector::DisplayHelper)
 
-        RailsConnector::StringTagging.tag_as_html(content, @obj.send(:attr_dict))
-        display_value(content)
+        convert_links(content)
       end
 
-      def cms_id_path(options)
-        "objid:#{options[:id]}"
+      protected
+
+      LINK_PATTERN = '<?\binternallink:(\d+)\b>?'
+      LINK_EXPRESSION = %r(#{LINK_PATTERN})
+
+      def link_map
+        @link_map ||= Hash[@obj.attr_values["text_links"].map{|l| [l["link_id"].to_s, l]}]
       end
 
-      def root_path(*args)
-        "objid:2001"
+      def convert_links(content_attribute)
+        return content_attribute unless content_attribute =~ LINK_EXPRESSION
+
+        content_attribute.gsub(%r(#{LINK_PATTERN}(['"]?))) do
+          link = link_map[$1.to_s]
+          if link.blank?
+            raise "Unable to convert links"
+            "#{RailsConnector::DefaultCmsRoutingHelper::LINK_TO_UNREACHABLE}#{$2}"
+          else
+
+            uri = "#{cms_path(link)}#{$2}"
+            html_link(link, uri)
+          end
+        end
       end
 
-      def cms_permalink_path(options={})
-        obj = WriteObj.find_by_permalink(options[:permalink])
-        if obj
-          "objid:#{obj.id}"
+      def cms_path(link)
+        if link["type"] == "internal"
+          base = "objid:#{link['destination']}"
+          base += "?#{link['search']}" if link['search'].present?
+          base += "##{link['fragment']}" if link['fragment'].present?
+          base
         else
-          ''
+          link["url"]
+        end
+      end
+
+      def html_link(link, uri)
+        subst = uri
+        name, value =
+          case link["tag_name"]
+          when 'img', 'input'
+            ['alt', link["title"] || ""]
+          when 'a', 'link'
+            ['title', begin link["title"] unless link["title"].blank? end]
+          end
+        if value
+          subst << %( #{name}="#{h(value)}")
         end
+        subst << %( target="#{h(link['target'])}") unless link['target'].blank?
+        subst
       end
     end
   end

data/lib/fiona7/link_converter/scrivito_to_fiona.rb

@@ -12,7 +12,7 @@ module Fiona7
       private
       def serialize_html
         # TODO: this an incomplete list of possible tags
-        link_expressions = [/(href|src)\s*=\s*"([^"]*)"/, /(href|src)\s*=\s*'([^']*)'/]
+        link_expressions = [/(href)\s*=\s*"([^"]*)"/, /(href)\s*=\s*'([^']*)'/]
         link_expressions.each do |expr|
           @value.gsub!(expr) do |string|
             target = $2

data/lib/fiona7/middleware/server_detection_middleware.rb

@@ -0,0 +1,27 @@
+module Fiona7
+  module Middleware
+    class ServerDetectionMiddleware
+      class << self
+        attr_accessor :server_detected
+        attr_accessor :server_name, :server_port
+
+        def server_detected?
+          !!server_detected
+        end
+      end
+
+      self.server_detected = false
+
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        self.class.server_detected = true
+        self.class.server_name = env['SERVER_NAME']
+        self.class.server_port = (env['SERVER_PORT'].presence || 80).to_i
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/fiona7/middleware/table_switching_middleware.rb

@@ -0,0 +1,33 @@
+require "fiona7/table_switcher"
+
+module Fiona7
+  module Middleware
+    class TableSwitchingMiddleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        if Fiona7.mode == :legacy
+          editing_context = env[Scrivito::EditingContextMiddleware::ENVKEY]
+
+          use_preview = editing_context.authenticated_editor? && selected_workspace_id(editing_context) == 'rtc'
+
+          TableSwitcher.new(
+            Fiona7::WriteObj,
+            use_preview ? "preview_objs" : "objs"
+          ).switch
+        end
+
+        @app.call(env)
+      end
+
+      def selected_workspace_id(editing_context)
+        # NOTE: this does not require workspace lookup/load_obj
+        # and thus is potentially faster
+        editing_context.instance_variable_get(:@selected_workspace_id).to_s
+      end
+
+    end
+  end
+end

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

@@ -1,16 +1,10 @@
 Rails.application.routes.draw do
-  get '/' => 'scrivito/cms_dispatch#index', as: :scrivito_root
+  match '/', via: :all, to: 'scrivito/cms_dispatch#index', as: :scrivito_root
 
-  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'
-
-  get '/__scrivito/details_page/:resource_id' => 'scrivito/cms_dispatch#details_page'
-
-  match ':id(/*slug)',
-    to: 'scrivito/cms_dispatch#index',
-    constraints: { id: /\d+|[0-9a-f]{16}/ },
-    as: 'scrivito_id',
-    via: :all
+  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
 
   match '/*permalink',
     to: 'scrivito/cms_dispatch#index',

data/lib/fiona7/mode_switch/composite.rb

@@ -1,7 +1,6 @@
 require 'fiona7/mode_switch/abstract_mode_switch'
 require 'fiona7/mode_switch/views'
 require 'fiona7/mode_switch/cms_routes'
-require 'fiona7/mode_switch/constants'
 
 module Fiona7
   module ModeSwitch
@@ -11,7 +10,6 @@ module Fiona7
 
         @views      = Views.new(self.app)
         @cms_routes = CmsRoutes.new(self.app)
-        @constants  = Constants.new(self.app)
       end
 
       def standalone
@@ -23,10 +21,10 @@ module Fiona7
       end
 
       protected
-      attr_reader :views, :cms_routes, :constants
+      attr_reader :views, :cms_routes
 
       def switches
-        [self.views, self.cms_routes, self.constants]
+        [self.views, self.cms_routes]
       end
     end
   end

data/lib/fiona7/naive_search_engine.rb

@@ -3,6 +3,7 @@ require "fiona7/search_engine"
 module Fiona7
   class NaiveSearchEngine < SearchEngine
     def results
+      #debugger
       fetch_all
       apply_filters
       exclude_widgets
@@ -12,10 +13,14 @@ module Fiona7
 
     protected
     def fetch_all
-      obj_class_filter = @query.find {|q| q[:field] == :_obj_class && q[:operator] == :equal }
+      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 }
       if obj_class_filter
         @all = @klass.where(obj_class: obj_class_filter[:value])
         @query.delete(obj_class_filter)
+      elsif id_filter
+        @query.delete(id_filter)
+        @all = @klass.where(obj_id: id_filter[:value])
       else
         # FIXME: this is deprecated
         @all = @klass.all
@@ -29,31 +34,65 @@ module Fiona7
     end
 
     def exclude_widgets
+      # skip when handling ActiveRelation
+      return unless @all.kind_of?(Array)
+
       widget_regexp = /\/_widgets\/([0-9]+\/){0,1}[^\/]+\Z/
       @all.to_a.delete_if {|o| o.path =~ widget_regexp }
     end
 
     def order_results
-      sort_field = resolve_field_name(@sort)
+      if !@all.kind_of?(Array) 
+        field = @sort.to_sym
+
+        if field == :_last_changed
+          @all = @all.order("last_changed" => @order)
+        elsif field == :id
+          @all = @all.order("obj_id" => @order)
+        else
+          # NOTE: we actually ignore sorting here !!
+          @all = @all.order("last_changed" => :desc)
+        end
+
+        return
+      end
+
+      sort_field = @sort
       @all = @all.to_a
-      @all.sort_by! {|o| o.send(:[], sort_field) }
+      #@all.sort_by! {|o| o.send(:[], resolve_field_name(o,sort_field)) }
+      @all.sort! do |a,b|
+        a_value = a.send(:[], resolve_field_name(a,sort_field)) 
+        b_value = b.send(:[], resolve_field_name(b,sort_field))
+
+        if a_value.nil?
+          1
+        elsif b_value.nil?
+          -1
+        else
+          a_value <=> b_value
+        end
+      end
       @all.reverse! if @order == :desc
     end
 
     def limit_size
-      @count = @all.length
-      @all[@offset, @limit] || []
+      @count = @all.count
+      if @all.kind_of?(Array)
+        @all[@offset, @limit] || []
+      else
+        @all.offset(@offset).limit(@limit).to_a
+      end
     end
 
     protected
     def apply_filter(filter)
-      field    = resolve_field_name(filter[:field])
+      field    = filter[:field]
       operator = filter[:operator].to_sym
       value    = filter[:value]
 
       case filter[:operator]
       when :equal
-        if field == :modification
+        if field == :_modification || field == "_modification"
           if value != ["new", "edited", "deleted"]
             raise "Unsupported modification values: #{value.inspect}. Only #{["new", "edited", "deleted"].inspect} are supported"
           else
@@ -63,30 +102,41 @@ module Fiona7
         else
           if value.is_a?(Array)
             @all = @all.to_a.select do |o|
-              field_value = o.send(:[], field)
+              resolved_field = resolve_field_name(o, field)
+              field_value = o.send(:[], resolved_field)
+              if resolved_field == :obj_id
+                field_value = field_value.to_s
+              end
               # FIXME: linklist, referencelist unsupported
               if field_value.is_a?(Array)
                 !(value & field_value).empty?
               else
-                value.include?(o.send(:[], field))
+                value.include?(field_value)
               end
             end
           else
-            @all = @all.to_a.select {|o| o.send(:[], field) == value }
+            @all = @all.to_a.select do |o|
+              resolved_field = resolve_field_name(o, field)
+              field_value = o.send(:[], resolved_field)
+              if resolved_field == :obj_id
+                field_value = field_value.to_s
+              end
+              field_value == value
+            end
           end
         end
-      when :prefix
-        @all = @all.to_a.select {|o| o.send(:[], field).to_s.start_with?(value) }
+      when :prefix, :prefix_search
+        @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s.start_with?(value) }
       when :greater_than
-        @all = @all.to_a.select {|o| o.send(:[], field).to_s > (value) }
+        @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s > (value) }
       when :less_than
-        @all = @all.to_a.select {|o| o.send(:[], field).to_s < (value) }
+        @all = @all.to_a.select {|o| o.send(:[], resolve_field_name(o,field)).to_s < (value) }
       else
         raise "Operator: #{filter[:operator]} not supported"
       end
     end
 
-    def resolve_field_name(field)
+    def resolve_field_name(obj, field)
       field = field.to_sym
       case field
       when :_obj_class
@@ -104,7 +154,7 @@ module Fiona7
       when :_name
         :name
       else
-        field
+        Fiona7::TypeRegister.instance.read(obj.obj_class).find_attribute(field).real_name.to_sym
       end
     end
   end

data/lib/fiona7/routers/rest_api.rb

@@ -1,4 +1,3 @@
-require "fiona7/controllers/rest_api/obj_class_controller"
 require "fiona7/controllers/rest_api/obj_controller"
 require "fiona7/controllers/rest_api/blob_controller"
 require "fiona7/controllers/rest_api/workspace_controller"
@@ -15,41 +14,54 @@ class Scrivito::CmsRestApi
     def get(resource_path, payload = nil, options = nil)
       @number_of_requests += 1 if resource_path == @count_requests
 
-      if !resource_path.start_with?('/')
-        resource_path = '/' + resource_path
-      end
+      
+      action = :get
+      ActiveSupport::Notifications.instrumenter.instrument(
+        "backend_request.scrivito",
+        {
+          :path => resource_path,
+          :verb => action,
+          :params => action == :get ? payload : nil
+        }
+      ) do
 
-      #$stdout.puts "DEBUG GET: #{resource_path}"
-      case resource_path
-      when /\A\/?revisions\/[a-zA-Z0-9_-]+\/obj_classes\Z/, /\A\/?workspaces\/[a-zA-Z0-9_-]+\/obj_classes\Z/
-        Fiona7::Controllers::RestAPI::ObjClassController.new.all
-      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)
-      when /\A\/?workspaces\Z/
-        Fiona7::Controllers::RestAPI::WorkspaceController.new.all
-      when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/objs\/find_by_path/
-        _, _, workspace_id = *resource_path.split("/")
-        path = resource_path.match(/path=(.*)\Z/)[1]
-        Fiona7::Controllers::RestAPI::ObjController.new.fetch_by_path(workspace_id, path)
-      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\/[a-zA-Z0-9_-]+\/obj_classes\/[a-zA-z0-9_-]+\Z/
-        _, _, workspace_id, _, obj_class_name = *resource_path.split("/")
-        Fiona7::Controllers::RestAPI::ObjClassController.new.fetch(workspace_id, obj_class_name)
-      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_-]+\/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)
-      else
-        #$stdout.puts "GET: #{resource_path}"
-        original_get(resource_path, payload, options)
+        if !resource_path.start_with?('/')
+          resource_path = '/' + resource_path
+        end
+
+        #$stdout.puts "DEBUG GET: #{resource_path}"
+        case resource_path
+        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)
+        when /\A\/?workspaces\Z/
+          Fiona7::Controllers::RestAPI::WorkspaceController.new.all
+        when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/objs\/find_by_path/
+          _, _, workspace_id = *resource_path.split("/")
+          path = resource_path.match(/path=(.*)\Z/)[1]
+          Fiona7::Controllers::RestAPI::ObjController.new.fetch_by_path(workspace_id, path)
+        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\/[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_-]+\/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_-]+\/transform\Z/
+          _, _, blob_id = *resource_path.split("/")
+          Fiona7::Controllers::RestAPI::BlobController.new.fetch(blob_id, payload[:transformation])
+        when /\A\/?blobs\/[a-zA-Z0-9_-]+\/meta_data\Z/
+          _, _, blob_id = *resource_path.split("/")
+          Fiona7::Controllers::RestAPI::BlobController.new.metadata(blob_id)
+        else
+          $stdout.puts "GET: #{resource_path}"
+          original_get(resource_path, payload, options||{})
+        end
       end
     end
 
@@ -73,7 +85,7 @@ class Scrivito::CmsRestApi
         Fiona7::Controllers::RestAPI::ObjController.new.destroy(workspace_id, obj_id)
       else
         #$stdout.puts "DELETE: #{resource_path}"
-        original_delete(resource_path, payload, options)
+        original_delete(resource_path, payload, options||{})
       end
     end
 
@@ -89,15 +101,12 @@ class Scrivito::CmsRestApi
       case resource_path
       when /\A\/?workspaces\Z/
         Fiona7::Controllers::RestAPI::WorkspaceController.new.create(payload)
-      when /\A\/?workspaces\/[a-zA-Z0-9]+\/obj_classes/
-        _, _, workspace_id = *resource_path.split("/")
-        Fiona7::Controllers::RestAPI::ObjClassController.new.create(workspace_id, payload)
       when /\A\/?workspaces\/[a-zA-Z0-9]+\/objs/
         _, _, workspace_id = *resource_path.split("/")
         Fiona7::Controllers::RestAPI::ObjController.new.create(workspace_id, payload)
       else
         #$stdout.puts "POST: #{resource_path}"
-        original_post(resource_path, payload, options)
+        original_post(resource_path, payload, options||{})
       end
     end
 
@@ -115,10 +124,6 @@ class Scrivito::CmsRestApi
         _, _, workspace_id, _, obj_id = *resource_path.split("/")
         payload[:obj][:_id] = obj_id
         Fiona7::Controllers::RestAPI::ObjController.new.update(workspace_id, payload)
-      when /\A\/?workspaces\/[a-zA-Z0-9]+\/obj_classes\/[a-zA-z0-9_-]+\Z/
-        _, _, workspace_id, _, obj_class_name = *resource_path.split("/")
-        payload[:obj_class][:name] = obj_class_name
-        Fiona7::Controllers::RestAPI::ObjClassController.new.update(workspace_id, payload)
       when /\A\/?workspaces\/[a-zA-Z0-9]+\/publish/
         _, _, workspace_id = *resource_path.split("/")
         Fiona7::Controllers::RestAPI::WorkspaceController.new.publish(workspace_id)
@@ -128,7 +133,7 @@ class Scrivito::CmsRestApi
         Fiona7::Controllers::RestAPI::WorkspaceController.new.publish(workspace_id)
       else
         #$stdout.puts "PUT: #{resource_path}"
-        original_put(resource_path, payload, options)
+        original_put(resource_path, payload, options||{})
       end
     end
   end