infopark_fiona7 1.2.0.2.3 → 1.5.2.0.0

data/config/locales/workflow.yml

@@ -0,0 +1,24 @@
+de:
+  fiona7:
+    workflow:
+      actions: Aktionen
+      edit: Bearbeiten
+      take: Übernehmen
+      forward: Weiterleiten
+      commit: Einreichen
+      sign: Abzeichnen
+      reject: Ablehnen
+      release: Freigeben
+
+
+en:
+  fiona7:
+    workflow:
+      actions: Actions
+      edit: Edit
+      take: Take
+      forward: Forward
+      commit: Commit
+      sign: Sign
+      reject: Reject
+      release: Release

data/config/precedence_routes.rb

@@ -4,6 +4,7 @@ Rails.application.routes.draw do
 end
 
 Fiona7::Engine.routes.draw do
+  match '/_f7/tenants/:name/perform', to: 'fiona7/api#perform', via: [:post, :put]
   get '/_b/:id(/:name)' => 'fiona7/blobs#show', as: :fiona7_blob
 
   match '/_b/:id(/:name)' => 'fiona7/blobs#query', as: :fiona7_blob_meta, via: [:head]
@@ -30,7 +31,7 @@ Scrivito::SdkEngine.routes.draw do
   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,}/}
+    get ':id', to: 'cms_dispatch#index', as: :base_id, constraints: {id: /\d+/} # <-- patch here
 
     resources :objs, controller: 'objs', only: [:show, :create, :update, :destroy],
         defaults: {format: :json} do
@@ -44,15 +45,10 @@ Scrivito::SdkEngine.routes.draw do
         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 :revert_widget
         put :restore_widget
         put :transfer_modifications
@@ -60,20 +56,17 @@ Scrivito::SdkEngine.routes.draw do
     end
 
     resources :tasks, controller: 'tasks', only: [:show], defaults: {format: :json}
+    resources :sessions, controller: 'sessions', only: [:update], defaults: {format: :json}
 
-    get 'blobs/upload_permission' => 'blobs#upload_permission', defaults: {format: :json}
-    put 'blobs/activate_upload' => 'blobs#activate_upload', defaults: {format: :json}
-    put 'blobs/copy' => 'blobs#copy', defaults: {format: :json}
+    get 'obj_class/:obj_class_name/defaults', to: 'obj_class#defaults'
+    put 'resolve_paths' => 'resolve_paths#resolve', defaults: {format: :json}
 
     resources :workspaces,
       controller: 'workspaces',
-      only: [:index, :show, :create, :destroy],
+      only: [:index, :show],
       defaults: {format: :json} do
         member do
-          put :rename
-          put :memberships
-          put :rebase
-          put :publish
+          put :publish_approval
           get :check
         end
       end

data/infopark_fiona7.gemspec

@@ -14,15 +14,17 @@ Gem::Specification.new do |s|
   s.summary     = "scrivito-compatible interface for classic Fiona"
   s.description = "scrivito-compatible interface for classic Fiona"
 
-  s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md", "infopark_fiona7.gemspec"]
+  s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md", "infopark_fiona7.gemspec"].reject do |f|
+    /^app\/assets.*\.es6\.js$/ =~ f
+  end.sort
 
   s.add_dependency "rails", "~> 4.2.2"
-  s.add_dependency "scrivito", "= 1.2.0"
+  s.add_dependency "scrivito", "= 1.5.2"
   s.add_dependency "scrivito_sdk"
   s.add_dependency "scrivito_editors"
   s.add_dependency "infopark_fiona_connector", "= 7.0.1.beta2"
-  s.add_dependency "infopark_reactor", ">= 1.23.1"
+  s.add_dependency "infopark_reactor", ">= 1.22.4"
   s.add_dependency "mini_magick"
-  s.add_dependency "jquery-ui-rails", "< 6.0.0"
   #s.add_development_dependency "ruby-prof"
+  s.add_development_dependency "scrivito_development"
 end

data/lib/fiona7/assert.rb

@@ -2,11 +2,11 @@ module Fiona7
   class Assert
     class << self
       def constraint(condition, message, code=418)
-        raise Scrivito::ClientError.new(message, code) unless condition
+        raise Scrivito::ClientError.new(message, http_code: code) unless condition
       end
 
       def input(condition, message, code=422)
-        raise Scrivito::ClientError.new(message, code) unless condition
+        raise Scrivito::ClientError.new(message, http_code: code) unless condition
       end
 
       def success(condition, message)

data/lib/fiona7/attribute_readers/factory.rb

@@ -49,6 +49,10 @@ module Fiona7
                    Fiona7::AttributeReaders::MultienumAsMultienum
                  when [:number, :string], [:number, :text]
                    Fiona7::AttributeReaders::NumberAsString
+                 when [:integer, :string], [:integer, :text]
+                   Fiona7::AttributeReaders::NumberAsString
+                 when [:float, :string], [:float, :text]
+                   Fiona7::AttributeReaders::NumberAsString
                  when [:html, :html]
                    Fiona7::AttributeReaders::HtmlAsHtml
                  when [:binary, :linklist]

data/lib/fiona7/attribute_type_mapper.rb

@@ -6,6 +6,7 @@ module Fiona7
     def initialize(obj_class, source=Fiona7.custom_attribute_types)
       self.custom = CustomAttributeTypeMapper.new(obj_class, source)
       self.built_in = BuiltInTypeMapper.new(obj_class)
+      self.obj_class = obj_class
     end
 
     def call(attribute, virtual_type)
@@ -16,7 +17,7 @@ module Fiona7
     end
 
     protected
-    attr_accessor :custom, :built_in
+    attr_accessor :custom, :built_in, :obj_class
 
     def validate!(attribute, mapped_type)
       [:string, :text, :enum, :multienum,
@@ -53,6 +54,8 @@ module Fiona7
         linklist:    :linklist,
         string:      :string,
         date:        :date,
+        float:       :string,
+        integer:     :string,
         html:        :html,
         enum:        :enum,
         multienum:   :multienum,

data/lib/fiona7/attribute_writers/binary_as_binary.rb

@@ -43,7 +43,7 @@ module Fiona7
           # standard handling!
           self.obj.set(attribute_name.to_s, self.upload_file(file))
         else
-          ext  = ::File.extname(file.path).to_s[1..-1]
+          ext  = ::File.extname(file.path).to_s[1..-1].to_s.downcase
           self.obj.upload(file, ext)
         end
       end
@@ -53,7 +53,7 @@ module Fiona7
           # standard handling!
           self.obj.set(attribute_name.to_s, self.upload_uploaded_file(file))
         else
-          ext  = ::File.extname(file.original_filename).to_s[1..-1]
+          ext  = ::File.extname(file.original_filename).to_s[1..-1].to_s.downcase
           self.obj.upload(file.open, ext)
         end
       end

data/lib/fiona7/attribute_writers/binary_as_linklist.rb

@@ -55,7 +55,7 @@ module Fiona7
           # standard handling!
           self.obj.set(attribute_name.to_s, self.upload_file(file))
         else
-          ext  = ::File.extname(file.path).to_s[1..-1]
+          ext  = ::File.extname(file.path).to_s[1..-1].to_s.downcase
           self.obj.upload(file, ext)
         end
       end
@@ -65,7 +65,7 @@ module Fiona7
           # standard handling!
           self.obj.set(attribute_name.to_s, self.upload_uploaded_file(file))
         else
-          ext  = ::File.extname(file.original_filename).to_s[1..-1]
+          ext  = ::File.extname(file.original_filename).to_s[1..-1].to_s.downcase
           self.obj.upload(file.open, ext)
         end
       end

data/lib/fiona7/attribute_writers/factory.rb

@@ -56,6 +56,10 @@ module Fiona7
                    Fiona7::AttributeWriters::MultienumAsMultienum
                  when [:number, :string], [:number, :text]
                    Fiona7::AttributeWriters::NumberAsString
+                 when [:integer, :string], [:integer, :text]
+                   Fiona7::AttributeWriters::NumberAsString
+                 when [:float, :string], [:float, :text]
+                   Fiona7::AttributeWriters::NumberAsString
                  when [:html, :html]
                    Fiona7::AttributeWriters::HtmlAsHtml
                  when [:binary, :linklist]

data/lib/fiona7/builder/indirect_blob_builder.rb

@@ -16,8 +16,8 @@ module Fiona7
         end
 
         parent    = ensure_parent_exists(parent_path)
-        ext       = ::File.extname(@filename).to_s[1..-1]
-        name      = ::File.basename(@filename, '.' + ext.to_s)
+        ext       = ::File.extname(@filename).to_s[1..-1].to_s.downcase
+        name      = ::File.basename(@filename, '.' + ext)
         obj_class = if ['jpg', 'jpeg', 'gif', 'png', 'tif', 'tiff'].include?(ext)
                       'X_Image'
                     else

data/lib/fiona7/builder/lazy_blob_copier.rb

@@ -154,7 +154,7 @@ module Fiona7
       def split_filename(filename)
         return unless filename
 
-        ext  = ::File.extname(filename)[1..-1]
+        ext  = ::File.extname(filename).to_s[1..-1].to_s.downcase
         base = ::File.basename(filename, ::File.extname(filename))
 
         return base, ext

data/lib/fiona7/builder/obj_builder.rb

@@ -19,10 +19,53 @@ require 'fiona7/attribute_writers/factory'
 
 module Fiona7
   module Builder
+    class ParamPreprocessor
+      def self.call(*args)
+        self.new.call(*args)
+      end
+
+      def call(params)
+        remove_rack_formdata_workaround(params.symbolize_keys)
+      end
+
+      protected
+      # Rack is unable to handle the data format mandated by scrivito:
+      # obj[_widget_pool][somewidget][widget_attr][][widgetlist]
+      # obj[_widget_pool][somewidget][widget_attr][][]=otherwidget1
+      # obj[_widget_pool][somewidget][widget_attr][][]=otherwidget2
+      #
+      # thus we introduce an extended format to work around this
+      # problem and still be able to send API requests through
+      # form-data:
+      #
+      # obj[_widget_pool][somewidget][widget_attr][][widgetlist]
+      # obj[_widget_pool][somewidget][widget_attr][formdata$workaround][]=otherwidget1
+      # obj[_widget_pool][somewidget][widget_attr][formdata$workaround][]=otherwidget2
+      #
+      # This method normalizes the extended format to the usual one
+      def remove_rack_formdata_workaround(params)
+        if params.kind_of?(Hash) 
+          if params.has_key?("formdata$workaround")
+            params["formdata$workaround"]
+          else
+            Hash[
+              params.map { |key, value|
+                [key, remove_rack_formdata_workaround(value)]
+              }
+            ]
+          end
+        elsif params.kind_of?(Array)
+          params.map { |value| remove_rack_formdata_workaround(value) }
+        else
+          params
+        end
+      end
+    end
+
     class ObjBuilder
 
       def initialize(values)
-        @values = values.symbolize_keys
+        @values = ParamPreprocessor.call(values)
         # garbage
         @values.delete(:_modification)
         # revert command sends this info. which is silly.
@@ -138,23 +181,13 @@ module Fiona7
         full_text = ::YAML.load(@obj.attr_values["X_full_text"]) rescue {}
         full_text = {} unless full_text.kind_of?(Hash)
         full_text["_widget_pool"] ||= {}
-        full_text["_widget_pool"].deep_merge!(filtered_widget_pool)
+        full_text["_widget_pool"].deep_merge!(@widget_pool)
         full_text.to_yaml
       rescue => e
         Rails.logger.error("Unable to store information for search engine: #{e.message}")
         nil
       end
 
-      def filtered_widget_pool
-        (@widget_pool || {}).deep_dup.tap do |filtered|
-          filtered.each do |k, values|
-            if values.kind_of?(Hash)
-              values.delete_if {|k, v| !(v.respond_to?(:first) && ["string", "enum", "stringlist", "text", "html", "multienum"].include?(v.first)) }
-            end
-          end
-        end.as_json
-      end
-
       def name_and_parent_path_from_path(path)
         components = path.split('/')
         name       = components.pop.presence

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

@@ -0,0 +1,49 @@
+module Fiona7
+  class ErrorHandler
+    HANDLED_ERRORS = [
+      Reactor::Cm::MissingCredentials,
+      Reactor::Cm::XmlRequestError,
+      Reactor::NoWorkingVersion,
+      Reactor::NotPermitted,
+      Reactor::AlreadyReleased,
+      Fiona7::TypeSystemError
+    ]
+
+    attr_accessor :error, :locale
+
+    def initialize(error, locale = Scrivito::Configuration.ui_locale || I18n.locale)
+      self.error  = error
+      self.locale = locale
+    end
+
+    def sdk_error
+      Scrivito::ApplicationError.new(self.processed_message)
+    end
+
+    def api_error
+      self.processed_message
+    end
+
+    def processed_message
+      Rails.logger.error(self.error.inspect)
+      Rails.logger.error(self.error.backtrace.join("\n"))
+
+      case self.error
+      when Reactor::Cm::XmlRequestError
+        self.error.message.gsub(/\[[0-9]+\] /, '')
+      when Reactor::Cm::MissingCredentials
+        I18n.t(:"fiona7.errors.missing_credentials", locale: self.locale)
+      when Reactor::NoWorkingVersion
+        I18n.t(:"fiona7.errors.no_working_version", locale: self.locale)
+      when Reactor::NotPermitted
+        I18n.t(:"fiona7.errors.not_permitted", locale: self.locale)
+      when Reactor::AlreadyReleased
+        I18n.t(:"fiona7.errors.already_released", locale: self.locale)
+      when Fiona7::TypeSystemError
+        I18n.t(:"fiona7.errors.type_system", locale: self.locale)
+      else
+        self.error.message
+      end
+    end
+  end
+end

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

@@ -28,11 +28,12 @@ module Fiona7
           # some stupid creators give us an id. fck them
           values[:obj].delete("_id")
           values[:obj].delete(:_id)
+          path = values[:obj][:_path]  || values[:obj]["_path"]
           # This is a hack to make it seem as if the root obj does not exist
-          if values[:obj][:_path] != '/' && values[:obj]["_path"] != '/'
-            obj = Builder::ObjBuilder.new(values[:obj].dup).build
+          if (path == "/") || ( obj = Fiona7::WriteObj.where(obj_class: 'X_Container', path: path).first )
+            obj = Builder::ObjUpdater.new(values[:obj].merge(_id: ((obj && obj.id) || 2001))).build
           else
-            obj = Builder::ObjUpdater.new(values[:obj].merge(_id: 2001)).build
+            obj = Builder::ObjBuilder.new(values[:obj].dup).build
           end
 
           klass = EditedObj
@@ -75,6 +76,11 @@ module Fiona7
           return response
         end
 
+        def fetch_multiple2(workspace_id, payload)
+          revision_id = workspace_id == 'published' ? 'f' : 'b'
+          return fetch_multiple(revision_id, payload)
+        end
+
         def fetch_by_id(workspace_id, obj_id)
           klass = matching_class(workspace_id)
           obj = klass.where(obj_id: obj_id).first
@@ -137,9 +143,7 @@ module Fiona7
           sort   = (conti[:sort_by]    || params[:sort_by]    || default_sort_by).to_sym
 
           if params[:query].present?
-            normalize_query_params(params[:query])
-
-            query  = (params[:query] || []).dup
+            query = normalize_query_params(params[:query])
 
             Rails.logger.debug "Executing search for: #{query.inspect}"
             if use_naive_search_engine?(query)
@@ -152,9 +156,6 @@ module Fiona7
             result = search.results.map {|o_id| {id: o_id} }
             total  = search.total
 
-            # TODO: search engine should not destroy query :/
-            query  = (params[:query] || []).dup
-
             response = {
               total: total,
               results: result
@@ -185,8 +186,16 @@ module Fiona7
         def update(workspace_id, values)
           assert_writable(workspace_id)
 
-          obj = Builder::ObjUpdater.new(values[:obj].dup.with_indifferent_access).build
           klass = EditedObj
+          id = (values[:obj]["_id"] || values[:obj][:_id]).to_s.to_i
+          # Scrivito SDK does not understand the difference
+          # between create and update
+          if (id < 2001 || id >= 2**31 || !klass.exists?(id))
+            return self.create(workspace_id, values)
+          end
+
+
+          obj = Builder::ObjUpdater.new(values[:obj].dup.with_indifferent_access).build
           decorated = Fiona7::JSON::ReverseObjDecorator.new(klass, obj)
 
           ::Fiona7.run_callbacks(:update_obj, obj.id)
@@ -261,32 +270,37 @@ module Fiona7
         # This is required because the sdk is inconsistent 
         # in its usage of search operators
         def normalize_query_params(query_params)
+          result = []
           query_params.each do |query_param|
-            query_param.symbolize_keys!
-            query_param[:operator] = query_param[:operator].to_sym
-            query_param[:field] = query_param[:field].to_sym
+            new_query_param = query_param.symbolize_keys
+            new_query_param[:operator] = query_param[:operator].to_sym
+            new_query_param[:field] = query_param[:field].to_sym
 
             case query_param[:operator]
             when :contains
-              query_param[:operator] = :search
+              new_query_param[:operator] = :search
             when :contains_prefix
-              query_param[:operator] = :prefix_search
+              new_query_param[:operator] = :prefix_search
             when :equals
-              query_param[:operator] = :equal
+              new_query_param[:operator] = :equal
             when :starts_with
-              query_param[:operator] = :prefix
+              new_query_param[:operator] = :prefix
             when :is_greater_than
-              query_param[:operator] = :greater_than
+              new_query_param[:operator] = :greater_than
             when :is_less_than
-              query_param[:operator] = :less_than
+              new_query_param[:operator] = :less_than
             end
+
+            result << new_query_param
           end
+
+          result
         end
 
         def use_naive_search_engine?(query)
           false ||
             query.empty? ||
-            query.any? {|q| (q[:field].to_sym == :_path || q[:field].to_sym == :_name)&& (query.length == 1)} ||
+            query.any? {|q| (q[:field].to_sym == :_path || q[:field].to_sym == :_name)&& (q[:operator].to_sym == :equal || q[:operator].to_sym == :prefix || query.length == 1)} ||
             query.any? {|q| q[:field].to_sym == :_parent_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) ||