infopark_fiona7 1.1.0.0.10 → 1.2.0.0.0

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

@@ -1,3 +1,5 @@
+require 'fiona7/builder/lazy_blob_copier'
+
 module Fiona7
   module Controllers
     module RestAPI
@@ -29,6 +31,7 @@ module Fiona7
             }
           }
         end
+
         def metadata(blob_id)
           meta_binary = BinaryHandling::MetaBinary.new(blob_id)
           content_type = meta_binary.mime_type
@@ -50,6 +53,22 @@ module Fiona7
             }
           }
         end
+
+        def copy(blob_id, params)
+          input              = params.symbolize_keys
+          blob_id            = blob_id.to_i
+          destination_obj_id = input[:destination_obj_id]
+          filename           = input[:filename]
+          content_type       = input[:content_type]
+          destination_obj    = Fiona7::WriteObj.find(destination_obj_id)
+
+          Fiona7::Builder::LazyBlobCopier.new({
+            destination_obj: destination_obj,
+            source_blob_id: blob_id,
+            filename: filename,
+            content_type: content_type
+          }).call.stringify_keys
+        end
       end
     end
   end

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

@@ -34,6 +34,8 @@ module Fiona7
 
           klass = EditedObj
           decorated = Fiona7::JSON::ReverseObjDecorator.new(klass, obj)
+
+          ::Fiona7.run_callbacks(:create_obj, obj.id)
           
           return ::JSON.parse(::ActiveSupport::JSON.encode(decorated))
         end
@@ -121,13 +123,13 @@ module Fiona7
 
             query  = (params[:query] || []).dup
 
-            puts "SEARCH: #{query}"
+            Rails.logger.debug "Executing search for: #{query.inspect}"
             if use_naive_search_engine?(query)
-              puts "NAIVE"
+              Rails.logger.debug "Using DB-native lookup for search"
               search = NaiveSearchEngine.new(klass, query, offset, size, sort, order)
             else
-              puts "VERITY"
-              search = VeritySearchEngine.new(klass, query, offset, size, sort, order)
+              Rails.logger.debug "Using configured search engine: #{::Fiona7.search_engine.name}"
+              search = ::Fiona7.search_engine.new(klass, query, offset, size, sort, order)
             end
             result = search.results.map {|o_id| {id: o_id} }
             total  = search.total
@@ -168,6 +170,8 @@ module Fiona7
           obj = Builder::ObjUpdater.new(values[:obj].dup.with_indifferent_access).build
           klass = EditedObj
           decorated = Fiona7::JSON::ReverseObjDecorator.new(klass, obj)
+
+          ::Fiona7.run_callbacks(:update_obj, obj.id)
           return ::JSON.parse(::ActiveSupport::JSON.encode(decorated))
         end
 

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

@@ -34,10 +34,11 @@ module Fiona7
 
         def publish(id)
           raise "Unexpected workspace_id: #{id}" unless id.to_s == "rtc"
-          WriteObj.where(is_edited: 1).each do |obj|
+          WriteObj.where(is_edited: 1).order('path DESC').each do |obj|
             begin
               obj.take
               obj.release!
+              ::Fiona7.run_callbacks(:release_obj, obj.id) unless obj.path =~ /\/_widgets\//
             rescue => e
               raise "Release impossible of: #{obj.path} because: #{e.message}"
             end

data/lib/fiona7/engine.rb

@@ -55,16 +55,48 @@ require 'fiona7/scrivito_user'
 
 require 'fiona7/type_synchronizer'
 
+
+require 'fiona7/naive_search_engine'
+require 'fiona7/verity_search_engine'
+
 module Fiona7
   mattr_accessor :mode
   mattr_accessor :login
   mattr_accessor :root
 
-  class Config < Struct.new("Config", :mode, :instance, :host, :port, :username, :secret, :root_mode)
+  mattr_accessor :callbacks
+  self.callbacks =  {
+    :create_obj => [],
+    :update_obj => [],
+    :release_obj => []
+  }
+
+  mattr_accessor :search_engine
+  self.search_engine = Fiona7::VeritySearchEngine
+
+  def self.run_callbacks(callback, *params)
+    (self.callbacks[callback] || []).each do |callback_proc|
+      begin
+        callback_proc.call(*params)
+      rescue => e
+        Rails.logger.error("An error occured when running a callback: #{callback} with #{params.inspect}")
+        Rails.logger.error("#{e.class}: #{e.message}")
+        Rails.logger.error(e.backtrace[0,30].join("\n"))
+      end
+    end
+  end
+
+  def self.workflows_enabled?
+    true
+  end
+
+  class Config < Struct.new("Config", :mode, :instance, :host, :port, :username, :secret, :root_mode, :dont_yell_at_me_for_abusing_attributes)
   end
 
+  mattr_accessor :config
+
   def self.configure(&block)
-    Config.new.tap do |config|
+    self.config = Config.new.tap do |config|
       yield config
 
       Reactor::Configuration.xml_access = {
@@ -116,6 +148,11 @@ module Fiona7
       initializer.initialize_system
     end
 
+    initializer "fiona7.add_cms_routing_paths", :after => "scrivito.add_cms_routing_paths" do |app|
+      precedence_route = File.expand_path("precedence_routes.rb", paths['config'].to_a.first)
+      app.routes_reloader.paths.unshift(precedence_route)
+    end
+
     initializer "fiona7.mode_switch" do |app|
       mode = nil
 
@@ -154,6 +191,16 @@ module Fiona7
       ActionController::Base.__send__(:define_method, :rsession_auth) do
         if !Fiona7.login
           rsession.user_name = Fiona7.root unless rsession.user_name == Fiona7.root
+        else
+          # This is interessting! We check for an existing rsession
+          # and if we don't find any, we destroy rsession. Why?
+          # Calling rsession.destroy first constructs the session
+          # for the current user (root most likely), which is not
+          # really a thing that we want - being root by default
+          # should only happen in the root mode
+          if !session[:rsession]
+            rsession.destroy
+          end
         end
       end 
     end
@@ -170,8 +217,15 @@ module Fiona7
       RailsConnector::Meta::EagerLoader.instance.obj_classes.each do |_, obj_class|
         type_register.read_mangled(obj_class.name)
       end
+    end
+
 
+    # Installs delayed, low-priority scrivito routes (primarily: permalink route)
+    initializer "fiona7.add_cms_routing_paths", :after => :add_routing_paths do |app|
+      cms_route = File.expand_path("delayed_routes.rb", paths['config'].to_a.first)
+      app.routes_reloader.paths.push(cms_route)
     end
+
     # This ensures that reactor is loaded in the app
     config.after_initialize { Fiona7::WriteObj }
 

data/lib/fiona7/json/obj_decorator.rb

@@ -9,6 +9,7 @@ require 'fiona7/assert'
 require 'fiona7/link_converter/fiona_to_scrivito'
 require 'fiona7/json/widget_decorator'
 require 'fiona7/widget_resolver'
+require 'fiona7/blob_id_generator'
 
 module Fiona7
   module JSON
@@ -90,7 +91,7 @@ module Fiona7
             if !Fiona7.mode == :legacy || !@obj.binary?
               deserialize_binary(@obj.attr_values[real_attribute_name].try(:first))
             else
-              {id: "%032d" % @obj.id.to_s}
+              {id: Fiona7::BlobIdGenerator.new(@obj.id, @obj.last_changed).call}
             end
           when :enum, :multienum, :text, :string
             if real_attribute_name == "suppress_export"
@@ -98,6 +99,8 @@ module Fiona7
             else
               @obj[real_attribute_name]
             end
+          when :number
+            @obj[real_attribute_name].to_f
           when :stringlist
             if Fiona7.mode == :legacy && real_attribute_name == "channels"
               @obj["channels"] || []

data/lib/fiona7/link_converter/fiona_to_scrivito.rb

@@ -45,7 +45,9 @@ module Fiona7
           base += "##{link['fragment']}" if link['fragment'].present?
           base
         else
-          link["url"]
+          # This cleans-up pseudo-external links.
+          # Such links have a external: scheme.
+          link["url"].to_s.sub(/^external:/, '')
         end
       end
 

data/lib/fiona7/link_converter/scrivito_to_fiona.rb

@@ -20,10 +20,21 @@ module Fiona7
         end
         link_expressions.each do |expr|
           @value.gsub!(expr) do |string|
+            attr   = $1
             target = $2
             objid  = objid_from_target(target)
             if objid
-              "#{$1}=\"#{obj_path(objid)}\""
+              # This is a normal objid link
+              "#{attr}=\"#{obj_path(objid)}\""
+            elsif target =~ /^#/
+              # This is a link with anchor only if such link
+              # is placed within a widget it would become
+              # invalid (because it would produce a self-link
+              # in the widget)
+              #
+              # This works around this problem by producing
+              # an external link instead.
+              "#{attr}=\"external:#{target}\""
             else
               string
             end

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

@@ -1,72 +1,2 @@
-Rails.application.routes.draw do
-  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
-
-        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}
-
-    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)
+Scrivito::PresetRoutes.install_into(Rails.application.routes, true)
 

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

@@ -1,72 +1,2 @@
-Rails.application.routes.draw do
-  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
-
-        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}
-
-    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_slave_into(Rails.application.routes)
+Scrivito::PresetRoutes.install_slave_into(Rails.application.routes, true)
 

data/lib/fiona7/recursive_object_finder.rb

@@ -73,10 +73,22 @@ module Fiona7
 
     def find_images(obj)
       find_selected(obj) do |link, attribute|
-        if link.internal?
-          destination_object = link.destination_object
-          if destination_object && destination_object.image?
-            true
+        if Fiona7.mode == :legacy
+          if link.internal?
+            destination_object = link.destination_object
+            if destination_object && destination_object.image?
+              true
+            end
+          end
+        else
+          if link.internal?
+            destination_object = link.destination_object
+            # now we check whether destination_object links X_Image
+            attribute = Fiona7::AttributeNameMangler.new(:blob, destination_object.obj_class).mangle
+            blob_link = (destination_object[attribute] || []).first
+            if blob_link && blob_link.internal? && blob_link.destination_object.try(:obj_class) == 'X_Image'
+              true
+            end
           end
         end
       end
@@ -84,10 +96,22 @@ module Fiona7
 
     def find_downloads(obj)
       find_selected(obj) do |link, attribute|
-        if link.internal?
-          destination_object = link.destination_object
-          if destination_object && destination_object.generic?
-            true
+        if Fiona7.mode == :legacy
+          if link.internal?
+            destination_object = link.destination_object
+            if destination_object && destination_object.generic?
+              true
+            end
+          end
+        else
+          if link.internal?
+            destination_object = link.destination_object
+            # now we check whether destination_object links X_Generic
+            attribute = Fiona7::AttributeNameMangler.new(:blob, destination_object.obj_class).mangle
+            blob_link = (destination_object[attribute] || []).first
+            if blob_link && blob_link.internal? && blob_link.destination_object.try(:obj_class) == 'X_Generic'
+              true
+            end
           end
         end
       end

data/lib/fiona7/routers/rest_api.rb

@@ -29,7 +29,7 @@ class Scrivito::CmsRestApi
           resource_path = '/' + resource_path
         end
 
-        $stdout.puts "DEBUG GET: #{resource_path}"
+        #Rails.logger.debug "F7 REST GET: #{resource_path}"
         case resource_path
         when /\A\/?revisions\/[a-zA-Z0-9_-]+\/objs\/mget\Z/
           _, _, revision_id, _, _ = *resource_path.split("/")
@@ -68,7 +68,6 @@ class Scrivito::CmsRestApi
           _, _, 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
@@ -93,7 +92,6 @@ class Scrivito::CmsRestApi
         _, _, workspace_id, _, obj_id = *resource_path.split("/")
         Fiona7::Controllers::RestAPI::ObjController.new.destroy(workspace_id, obj_id)
       else
-        #$stdout.puts "DELETE: #{resource_path}"
         original_delete(resource_path, payload, options||{})
       end
     end
@@ -106,7 +104,7 @@ class Scrivito::CmsRestApi
         resource_path = '/' + resource_path
       end
 
-      #$stdout.puts "DEBUG POST: #{resource_path}"
+      #Rails.logger.debug "F7 REST POST: #{resource_path}"
       case resource_path
       when /\A\/?workspaces\Z/
         Fiona7::Controllers::RestAPI::WorkspaceController.new.create(payload)
@@ -114,7 +112,6 @@ class Scrivito::CmsRestApi
         _, _, 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||{})
       end
     end
@@ -127,7 +124,7 @@ class Scrivito::CmsRestApi
         resource_path = '/' + resource_path
       end
 
-      #$stdout.puts "DEBUG PUT: #{resource_path}"
+      #Rails.logger.debug "F7 PUT: #{resource_path}"
       case resource_path
       when /\A\/?workspaces\/[a-zA-Z0-9]+\/objs\/[a-zA-Z0-9]+\Z/
         _, _, workspace_id, _, obj_id = *resource_path.split("/")
@@ -143,8 +140,10 @@ class Scrivito::CmsRestApi
       when /\A\/?workspaces\/[a-zA-Z0-9]+/
         _, _, workspace_id = *resource_path.split("/")
         Fiona7::Controllers::RestAPI::WorkspaceController.new.update(workspace_id)
+      when /\A\/?blobs\/[a-zA-Z0-9]+\/copy/
+        _, _, blob_id, _ = * resource_path.split("/")
+        Fiona7::Controllers::RestAPI::BlobController.new.copy(blob_id, payload)
       else
-        #$stdout.puts "PUT: #{resource_path}"
         original_put(resource_path, payload, options||{})
       end
     end