infopark_fiona7 0.30.0.2 → 0.70.0.1

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

@@ -34,7 +34,7 @@ module Fiona7
 
         def create(values)
           id = (values[:workspace][:id] || values[:workspace]["id"])
-          id = id.to_sym
+          id = (id || :no_id_provided).to_sym
           Assert.constraint(
             id == :rtc,
             "Only rtc workspace can be created"

data/lib/fiona7/engine.rb

@@ -15,29 +15,56 @@ require "infopark_reactor"
 
 require "fiona7/mode_switch"
 require "fiona7/scrivito_patches/attribute_content"
+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/client_config"
+require "fiona7/scrivito_patches/cms_backend"
+require "fiona7/scrivito_patches/cms_field_tag"
 require "fiona7/scrivito_patches/controller_actions"
-require "fiona7/scrivito_patches/cms_dispatch_controller"
+# 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/link_parser"
-require "fiona7/scrivito_patches/obj_class"
 require "fiona7/scrivito_patches/migrator"
 require "fiona7/scrivito_patches/type_computer"
 require "fiona7/scrivito_patches/workspace"
 
+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
+
 
 require "fiona7/routers/content_service"
 require "fiona7/routers/rest_api"
 
 require 'fiona7/scrivito_user'
 
+require 'fiona7/type_synchronizer'
+
 module Fiona7
   mattr_accessor :mode
   mattr_accessor :login
+  mattr_accessor :root
 
   class Config < Struct.new("Config", :mode, :instance, :host, :port, :username, :secret, :root_mode)
   end
@@ -54,6 +81,8 @@ module Fiona7
         secret: config.secret
       }
 
+      Fiona7.root = config.username
+
       Fiona7.mode = config.mode
       if Fiona7.login = !config.root_mode
         Scrivito.configure do |config|
@@ -84,6 +113,13 @@ module Fiona7
     
   class Engine < ::Rails::Engine
 
+    config.to_prepare do
+      # TODO: do some smart optimizations
+      require "fiona7/initializer"
+      initializer = Fiona7::Initializer.new
+      initializer.initialize_system
+    end
+
     initializer "fiona7.mode_switch" do |app|
       mode = nil
 
@@ -95,6 +131,10 @@ module Fiona7
         raise "Invalid mode: #{Fiona7.mode}. Valid modes are :legacy and :standalone. Please refer to the documentation for more information"
       end
 
+      # delayed init, patching sooner breaks AR
+      # later and it breaks Obj
+      require "fiona7/fiona_connector_patches/basic_obj"
+
       ModeSwitch::Composite.new(app).public_send(mode)
     end
 
@@ -115,24 +155,35 @@ module Fiona7
     end
 
     initializer "fiona7.authorize_reactor" do |app|
+
       ActionController::Base.__send__(:define_method, :rsession_auth) do
         if !Fiona7.login
-          rsession.user_name = 'root' unless rsession.user_name == 'root'
+          rsession.user_name = Fiona7.root unless rsession.user_name == Fiona7.root
         end
       end 
     end
 
     initializer "fiona7.patch_assets" do |app|
-      app.config.assets.precompile += %w(fiona7.css fiona7.js fiona7-login.css)
+      app.config.assets.precompile += %w(fiona7_ui.css fiona7_ui.js fiona7.css fiona7.js fiona7-login.css)
     end
 
     initializer "fiona7.runtime_patches" do |app|
-      # delayed init, patching sooner breaks AR
-      require "fiona7/fiona_connector_patches/basic_obj"
+      require "fiona7/scrivito_patches/cms_dispatch_controller"
+      require "fiona7/scrivito_patches/webservice_controller"
+      require "fiona7/scrivito_patches/objs_controller"
     end
 
+    initializer "fiona7.preload_cms_type_defs" do |app|
+      type_register = Fiona7::TypeRegister.instance
+      RailsConnector::Meta::EagerLoader.instance.obj_classes.each do |_, obj_class|
+        type_register.read_mangled(obj_class.name)
+      end
+
+    end
     # This ensures that reactor is loaded in the app
     config.after_initialize { Fiona7::WriteObj }
 
+    config.app_middleware.use "Fiona7::Middleware::TableSwitchingMiddleware"
+    config.app_middleware.use "Fiona7::Middleware::ServerDetectionMiddleware"
   end
 end

data/lib/fiona7/fiona_connector_patches/basic_obj.rb

@@ -1,9 +1,55 @@
 require 'rails_connector/basic_obj'
+require 'fiona7/shadow_classes'
 
 module RailsConnector
   class BasicObj
     def scrivito_obj
       Scrivito::Obj.find(self.id)
     end
+
+    # never use cached permissions
+    def permissions
+      arel_permissions
+    end
+
+    def self.in_place(type='Obj',&block)
+      klass = ShadowClasses.fetch(self.name,type)
+      klass.class_eval(&block)
+      klass
+    end
+
+    def self.widget_class
+      self.shadow_class
+    end
+
+    def self.model_class
+      self.shadow_class
+    end
+
+    def self.shadow_class
+      ShadowClasses.const_get(self.name, false)
+    end
+
+
+    class << self
+
+      def inherited(subclass,*args)
+        super
+        if subclass.name == 'Obj' && !::Scrivito.const_defined?('Obj', false)
+          ::Scrivito.const_set('Obj', Class.new(::Scrivito::BasicObj))
+        end
+      end
+    end
+
+  end
+end
+
+module Reactor
+  module Persistence
+    module ClassMethods
+      def sanitize_name(old_name)
+        old_name
+      end
+    end
   end
 end

data/lib/fiona7/initializer.rb

@@ -10,6 +10,15 @@ module Fiona7
       'X_widget_pool'  => 'linklist'
     }
 
+    def initialize_system
+      should_run = self.sanity_check
+      return unless should_run
+
+      self.classes_and_attributes
+      self.set_valid_sub_obj_classes
+      self.create_login_page
+    end
+
     def sanity_check
       any_class_present = false
       classes_present = CLASSES_MAP.all? do |name, type|
@@ -17,7 +26,8 @@ module Fiona7
         any_class_present ||= obj_class && obj_class.obj_type == type
       end
 
-      classes_present && raise("Initialization has already been performed, there is not need to perform it again.")
+      return false if classes_present
+
       any_class_present && raise("Misconfiguration of obj classes detected")
 
       any_attribute_present = false
@@ -27,6 +37,8 @@ module Fiona7
       end
 
       any_class_present && raise("Misconfiguration of attributes detected")
+
+      return true
     end
 
     def classes_and_attributes
@@ -54,17 +66,9 @@ module Fiona7
     end
 
     def create_login_page
+      # TODO: write new creation procedure
       Scrivito::Workspace.current = Scrivito::Workspace.find('rtc')
-      Scrivito::ObjClass.create(
-        name: 'Fiona7LoginPage',
-        title: 'Login Page',
-        attributes: [
-          {name: "title", type: "string"},
-          {name: "body", type: "html"}
-        ]
-      )
-      Scrivito::Obj.create(_obj_class: 'Fiona7LoginPage', _path: '/_global/login_page', title: 'Log in')
-      Scrivito::ObjClass.find('Fiona7LoginPage').update(is_active: false)
+      Scrivito::BasicObj.create(_obj_class: 'Fiona7LoginPage', _path: '/_global/login_page', title: 'Log in')
     end
 
     protected

data/lib/fiona7/json/obj_decorator.rb

@@ -6,7 +6,6 @@ module Fiona7
 end
 
 require 'fiona7/assert'
-require 'fiona7/type_register_mixin'
 require 'fiona7/link_converter/fiona_to_scrivito'
 require 'fiona7/json/widget_decorator'
 require 'fiona7/widget_resolver'
@@ -14,8 +13,6 @@ require 'fiona7/widget_resolver'
 module Fiona7
   module JSON
     class ObjDecorator
-      include TypeRegisterMixin
-
       def initialize(klass, obj)
         @klass = klass
         @obj = obj
@@ -34,43 +31,59 @@ module Fiona7
       protected
       def standard_attrs
         attrs = {
-          _id: [@obj.id],
-          _path: [@obj.path],
-          _obj_class: [@obj.obj_class],
+          _id: [@obj.id.to_s],
+          _obj_class: [@obj.obj_class.gsub("__", "::")],
           _last_changed: [@obj.last_changed.try(:to_iso)],
           _widget_pool: [{}]
         }
+        if !@obj.edited? && !@obj.released?
+          attrs[:_modification] = "new"
+        elsif @obj.edited? && !@obj.released?
+          attrs[:_modification] = "new"
+        elsif @obj.edited? && @obj.released?
+          attrs[:_modification] = "edited"
+        end
+
+        attrs[:_path] = [@obj.path] unless @obj.path =~ /^\/_orphaned/
         attrs[:_permalink] = [@obj.permalink] if @obj.permalink.present?
         attrs
       end
 
       def add_custom_attributes(attrs, *args)
-        type_register.annotated_attributes(@obj.obj_class).each do |attribute|
-          virtual_attribute_name = attribute.virtual_name
+        type_definition = Fiona7::TypeRegister.instance.read_mangled(@obj.obj_class)
+        type_definition.attrs.each do |attribute|
+          virtual_attribute_name = attribute.name
           real_attribute_name    = attribute.real_name
-          virtual_attribute_type = attribute.virtual_type
+          virtual_attribute_type = attribute.type.to_sym
 
           val = case virtual_attribute_type
           when :link
-            deserialize_link(@obj[real_attribute_name].try(:first))
+            deserialize_link(@obj.attr_values[real_attribute_name].try(:first))
           when :linklist
-            (@obj[real_attribute_name] || []).map {|link| deserialize_link(link) }
+            (@obj.attr_values[real_attribute_name] || []).map {|link| deserialize_link(link) }
           when :multienum
             @obj[real_attribute_name] || []
           when :reference
-            deserialize_reference(@obj[real_attribute_name].try(:first))
+            deserialize_reference(@obj.attr_values[real_attribute_name].try(:first))
           when :referencelist
-            (@obj[real_attribute_name] || []).map {|link| deserialize_reference(link) }.compact
+            (@obj.attr_values[real_attribute_name] || []).map {|link| deserialize_reference(link) }.compact
           when :date
             @obj[real_attribute_name].try(:to_iso)
-          when :widget
-            deserialize_widget_field(@obj[real_attribute_name] || [])
+          when :widgetlist
+            deserialize_widget_field(@obj.attr_values[real_attribute_name] || [])
           when :html
             deserialize_html(@obj[real_attribute_name])
           when :binary
-            deserialize_binary(@obj[real_attribute_name].try(:first))
+            if !Fiona7.mode == :legacy || !@obj.binary?
+              deserialize_binary(@obj.attr_values[real_attribute_name].try(:first))
+            else
+              {id: "%032d" % @obj.id.to_s}
+            end
           when :enum, :multienum, :text, :string
             @obj[real_attribute_name]
+          when :stringlist
+            # TODO: get rid of this rescue nil
+            ::JSON.parse(@obj[real_attribute_name]) rescue nil 
           else
             Assert.success(
               false,
@@ -84,35 +97,44 @@ module Fiona7
 
       def deserialize_link(link)
         if link
-          {
+          deserialized = {
             # remove possible external prefix for protcol-less urls
-            url: link.url.try(:gsub, /\Aexternal:/, ''),
-            title: link.title,
-            target: link.target,
+            url: link["url"].try(:gsub, /\Aexternal:/, ''),
+            title: link["title"],
+            target: link["target"],
             # content service uses destination
-            destination: link.destination_object_id,
+            destination: link["destination"].to_s,
             # rest api uses obj_id
-            obj_id: link.destination_object_id,
-            query: link.query,
-            fragment: link.fragment
+            obj_id: link["destination"].to_s,
+            query: link["search"],
+            fragment: link["fragment"]
           }
+
+          # TODO: refactor this code
+          if deserialized[:url].present?
+            deserialized.delete(:destination)
+            deserialized.delete(:obj_id)
+          end
+
+          deserialized
         end
       end
 
       def deserialize_reference(link)
-        if link && link.internal?
-          link.destination_object_id
+        if link && link["type"] == "internal"
+          link["destination"].to_s
         end
       end
 
       def deserialize_widget_field(linklist)
         if !linklist.empty?
+          widget_ids = []
           widgets = linklist.map do |link|
-            widget_id = link.title
-            {widget: widget_id}
+            widget_id = link["title"]
+            widget_ids << widget_id
           end
 
-          {list: widgets}
+          widget_ids
         end
       end
 
@@ -122,7 +144,7 @@ module Fiona7
 
       def deserialize_binary(link)
         if link
-          binary_id = link.title
+          binary_id = link["title"]
           if binary_id.length == 32 && binary_id =~ /0{16,}0*[0-9]+/
             {id: binary_id}
           end
@@ -130,7 +152,7 @@ module Fiona7
       end
 
       def replace_widget_pool(attrs, *args)
-        if (widget_links = @obj[:X_widget_pool])
+        if (widget_links = @obj.attr_values["X_widget_pool"])
 
           resolver = WidgetResolver.new(widget_links, @klass)
 

data/lib/fiona7/json/reverse_obj_decorator.rb

@@ -0,0 +1,36 @@
+module Fiona7
+  module JSON
+    class ReverseObjDecorator < ObjDecorator
+      def as_json(*args)
+        with_types = super()
+        reverse_types = {}
+
+        with_types.each do |attr, (value, type)|
+          if type.nil?
+            reverse_types[attr] = value
+          else
+            reverse_types[attr] = [type, value]
+          end
+        end
+
+        if reverse_types[:_widget_pool] && !reverse_types[:_widget_pool].empty?
+          widgets_reverse_types = reverse_types[:_widget_pool].map do |id, values|
+            reversed_values = {}
+            values.each do |attr, (value, type)|
+              if type.nil?
+                reversed_values[attr] = value
+              else
+                reversed_values[attr] = [type, value]
+              end
+            end
+            [id, reversed_values]
+          end
+
+          reverse_types[:_widget_pool] = Hash[widgets_reverse_types]
+        end
+
+        reverse_types.as_json(*args)
+      end
+    end
+  end
+end