infopark_fiona7 1.2.0.2.3 → 1.5.2.0.0

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

@@ -0,0 +1,13 @@
+module Fiona7
+  module Controllers
+    module RestAPI
+      class SessionController
+        def update(id, payload)
+          # NO OP
+          new_session = payload[:session].merge(id: id, maxage: 2_000_000 ).stringify_keys
+          return new_session
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/engine.rb

@@ -157,21 +157,16 @@ module Fiona7
           config.editing_auth do |env|
             request  = ActionDispatch::Request.new(env)
             session  = request.session
-            rsession = Reactor::SessionHelper::RsessionHelper.from_session(session)
+            rsession = session[:rsession]
             if rsession && rsession.user?
               Fiona7::ScrivitoUser.define(rsession.user)
             end
           end
 
           config.find_user do |user_id|
-            begin
-              user = Reactor::Cache::User.instance.get(user_id)
-              Fiona7::ScrivitoUser.define(user)
-            rescue Reactor::Cm::XmlSingleRequestError => e
-              # this is the error code for entry (possibly user) not found
-              # other errors we want to pass on (unauthorized, etc)
-              raise e unless e.message =~ /060001/
-            end
+            user = Reactor::Cache::User.instance.get(user_id)
+
+            Fiona7::ScrivitoUser.define(user)
           end
         end
       end
@@ -181,6 +176,8 @@ module Fiona7
       end
 
       RailsConnector::Configuration.instance_name = config.instance
+
+      Scrivito::Configuration.tenant = config.instance
     end
   end
     
@@ -242,7 +239,7 @@ module Fiona7
           # 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 !rsession.user?
+          if !session[:rsession]
             rsession.destroy
           end
         end

data/lib/fiona7/facet_builder.rb

@@ -8,7 +8,7 @@ module Fiona7
 
       @attribute    = facet_params[:attribute]
 
-      @limit        = [facet_params[:limit] || 20, 100].min # default = 20, limit <= 100
+      @limit        = [facet_params[:limit] || 10, 100].min # default = 10, limit <= 100
       @fake_limit   = 100
       @include_objs = facet_params[:include_objs] || false
 
@@ -47,6 +47,10 @@ module Fiona7
           # this gives a true total!
           facet[:total] = search.total
         end
+      else
+        @facets.each do |facet|
+          facet[:results] = []
+        end
       end
 
       @facets

data/lib/fiona7/naive_search_engine.rb

@@ -118,6 +118,15 @@ module Fiona7
           else
             @all = @all.where(:path => value)
           end
+        elsif field == :_permalink
+          value = [value] unless value.is_a?(Array)
+          if (@all.is_a?(Array))
+            @all = @all.select do |o|
+              value.include?(o.permalink)
+            end
+          else
+            @all = @all.where(:permalink => value)
+          end
         elsif field == :_parent_path
           parent_obj = @klass.where(path: value).first
           if parent_obj

data/lib/fiona7/routers/rest_api.rb

@@ -1,6 +1,9 @@
 require "fiona7/controllers/rest_api/obj_controller"
 require "fiona7/controllers/rest_api/blob_controller"
 require "fiona7/controllers/rest_api/workspace_controller"
+require "fiona7/controllers/rest_api/session_controller"
+
+require "fiona7/controllers/rest_api/error_handler"
 
 class Scrivito::CmsRestApi
   class << self
@@ -52,6 +55,9 @@ class Scrivito::CmsRestApi
         when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/changes\Z/
           _, _, workspace_id,_ = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::WorkspaceController.new.changes(workspace_id)
+        when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/objs\/mget+\Z/
+          _, _, workspace_id, _, _ = *resource_path.split("/")
+          Fiona7::Controllers::RestAPI::ObjController.new.fetch_multiple2(workspace_id, payload)
         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)
@@ -71,6 +77,8 @@ class Scrivito::CmsRestApi
           original_get(resource_path, payload, options||{})
         end
       end
+    rescue *Fiona7::ErrorHandler::HANDLED_ERRORS => e
+      raise Fiona7::ErrorHandler.new(e).sdk_error
     end
 
     alias_method :original_delete, :delete
@@ -94,6 +102,8 @@ class Scrivito::CmsRestApi
       else
         original_delete(resource_path, payload, options||{})
       end
+    rescue *Fiona7::ErrorHandler::HANDLED_ERRORS => e
+      raise Fiona7::ErrorHandler.new(e).sdk_error
     end
 
     alias_method :original_post, :post
@@ -114,6 +124,8 @@ class Scrivito::CmsRestApi
       else
         original_post(resource_path, payload, options||{})
       end
+    rescue *Fiona7::ErrorHandler::HANDLED_ERRORS => e
+      raise Fiona7::ErrorHandler.new(e).sdk_error
     end
 
     alias_method :original_put, :put
@@ -143,9 +155,14 @@ class Scrivito::CmsRestApi
       when /\A\/?blobs\/[a-zA-Z0-9]+\/copy/
         _, _, blob_id, _ = * resource_path.split("/")
         Fiona7::Controllers::RestAPI::BlobController.new.copy(blob_id, payload)
+      when /\A\/?sessions\/[a-zA-Z0-9]+/
+        _, _, session_id = *resource_path.split("/")
+        Fiona7::Controllers::RestAPI::SessionController.new.update(session_id, payload)
       else
         original_put(resource_path, payload, options||{})
       end
+    rescue *Fiona7::ErrorHandler::HANDLED_ERRORS => e
+      raise Fiona7::ErrorHandler.new(e).sdk_error
     end
   end
 end

data/lib/fiona7/scrivito_patches/attribute_content.rb

@@ -20,6 +20,16 @@ module Scrivito
         to_s.titleize
       end
 
+      # support shadow classes
+      def as_json
+        {
+          name: to_s,
+          descriptionForEditor: description_for_editor,
+          attributes: attribute_definitions.map(&:as_json),
+        }
+      end
+
+
       def register_attribute_definitions(obj_class)
         type_register = Fiona7::TypeRegister.instance
         self.attribute_definitions.each do |attribute_definition|
@@ -27,6 +37,24 @@ module Scrivito
           type_register.add_usr_attr(obj_class, attribute_definition.name, attribute_definition.type, attribute_definition.values.presence)
         end
       end
+
+      # support legacy attribute names
+      def assert_valid_attribute_name(name)
+        if name == 'id'
+          raise ScrivitoError, "Invalid attribute name 'id'. 'id' is reserved for the system."
+        end
+
+        if name !~ /\A[A-Za-z][A-Za-z0-9_]*\z/ # <-- PATCH HERE
+          raise ScrivitoError, "Invalid attribute name '#{name}'. " \
+              "The first character must be an ASCII letter, " \
+              "subsequent characters may also be digits or underscores."
+        end
+
+        if name.size > 50
+          raise ScrivitoError, "Invalid attribute name '#{name}'. " \
+              "Attribute names must not be longer than 50 characters."
+        end
+      end
     end
   end
 end

data/lib/fiona7/scrivito_patches/cms_routing.rb

@@ -34,7 +34,7 @@ module Scrivito
     def path_or_url_without_editing_context(target, path_or_url, options)
       if target.is_a?(Link)
         path_or_url_for_links(target, path_or_url, options)
-      elsif target.is_a?(::Scrivito::BasicObj)
+      elsif target.is_a?(::Scrivito::BasicObj) # <-- patch here
         path_or_url_for_objs(target, path_or_url, options)
       elsif target.respond_to?(:first)
         if target.first.is_a?(Link)
@@ -50,20 +50,22 @@ module Scrivito
       end
     end
 
-    # Use fiona connector permalinks in legacy mode
+
+    # Use fiona connector permalinks and binary urls in legacy mode
     def path_or_url_for_objs(obj, path_or_url, options)
       permalink = obj.permalink
-      if permalink && route_defined?(:permalink) && permalink.split('/').first != 'scrivito'
-
+      if permalink && (route = find_route(:permalink)) && permalink.split('/').first != 'scrivito'
+        # -- patch here --
         if Fiona7.mode == :legacy
           context.public_send("cms_permalink_#{path_or_url}", options.merge(:permalink => permalink))
         else
-          use_route(:permalink, path_or_url, options.merge(:permalink => permalink))
+          route.generate(path_or_url, options.merge(:permalink => permalink))
         end
-      elsif homepage?(obj) && route_defined?(:homepage)
-        use_route(:homepage, path_or_url, options)
+        # -- patch ends here --
+      elsif homepage?(obj) && route = find_route(:homepage)
+        route.generate(path_or_url, options)
       elsif obj.binary?
-        # use fiona connector routes when possible
+        # -- patch here --
         if Fiona7.mode == :legacy && self.image_options.blank?
           if binary = obj.binary
             params = {
@@ -72,6 +74,7 @@ module Scrivito
               format: obj.file_extension
             }
 
+            # use fiona connector routes when possible
             context.public_send("cms_id_#{path_or_url}", params)
           else
             LINK_TO_EMPTY_BLOB
@@ -79,9 +82,10 @@ module Scrivito
         else
           binary_obj_url(obj) || LINK_TO_EMPTY_BLOB
         end
-      elsif route_defined?(:slug_id)
+        # -- patch ends here --
+      elsif route = find_route(:slug_id)
         slug = obj.slug.present? ? obj.slug.sub(/^\//, '') : nil
-        id_path_or_url_for_objs(obj, path_or_url, options.merge(slug: slug))
+        route.generate(path_or_url, options.merge(id: obj.id, slug: slug))
       else
         raise ScrivitoError, "The required scrivito route 'slug_id' is not defined. "\
           "Please add a 'slug_id' definition to your routes.rb. See the documentation"\
@@ -89,27 +93,6 @@ module Scrivito
       end
     end
 
-    # use fiona connector routes when possible
-    def id_path_or_url_for_objs(obj, path_or_url, options)
-      if Fiona7.mode == :standalone
-        options[:id] = obj.id
-
-        # Options must have the key slug.
-        # Otherwise Rails will use the slug from current request params.
-        options[:slug] ||= nil
-
-        use_route(:slug_id, path_or_url, options)
-      else
-        options[:id] = obj.id
-
-        # Options must have the key slug.
-        # Otherwise Rails will use the slug from current request params.
-        options[:slug] ||= nil
-
-        context.public_send("cms_id_#{path_or_url}", options)
-      end
-    end
-
   end
 end
 

data/lib/fiona7/scrivito_patches/page_config.rb

@@ -9,6 +9,7 @@ module Scrivito
         id: obj.id,
         path: obj.path,
         obj_class: obj.obj_class,
+        description_for_editor: obj.description_for_editor,
         has_children: obj.children.any?,
         has_conflict: obj.has_conflict?,
         has_details_view: obj_has_details_view?,

data/lib/fiona7/scrivito_user.rb

@@ -24,8 +24,9 @@ module Fiona7
         # whether the user is trying to publish changes made to a particular website
         # section, here "investor relations", which requires a special permission.
         #
-        user_definition.restrict_obj_publish(using: :_path) do |path|
-          obj = Fiona7::WriteObj.find_by_path(path)
+        user_definition.restrict_obj_publish(using: :_id) do |id|
+          obj  = Fiona7::WriteObj.find(id)
+          path = obj.path
           if !obj || !obj.permission.release?(rsession_user.user_name)
             I18n.t(:"fiona7.publish_permission_resticted", path: path)
           elsif obj && !obj.valid?(:release)

data/lib/fiona7/type_register.rb

@@ -216,6 +216,10 @@ module Fiona7
           # was initially ad-hoc created, but now
           # has a proper definition
           true
+        when [:number, :float]
+          true
+        when [:number, :integer]
+          true
         else
           message = "Attribute types for #{attr_name} incompatible: CMS uses #{cms_type} but the application provided #{usr_type}"
           if ::Fiona7.config.dont_yell_at_me_for_abusing_attributes

data/lib/fiona7/verity_search_engine.rb

@@ -86,14 +86,13 @@ module Fiona7
         conditions = query.map do |q|
           field = resolve_field_name(q[:field])
 
+          # paths are sadly not in the search index by default.
+          next if field == :visiblePath
+
           case q[:operator]
           when :equal
             if field == :__dummy__
               '("edited" <#IN> state)'
-            elsif field ==:_path
-              paths = Array(q[:value])
-              ids = Fiona7::WriteObj.where(path: paths).select(:obj_id).limit(1000).map(&:obj_id).map(&:to_s).presence || ["1000"]
-              search_in(:objId, ids)
             else
               search_in(field, q[:value])
             end
@@ -114,12 +113,6 @@ module Fiona7
               values = as_values_array(q[:value])
               values = values.map {|v| "#{v}*" }
               full_text_query_string(values)
-            elsif field == :_path
-              query = []
-              paths = Array(q[:value]).map {|p| "#{p}%" }
-              paths.each { |_| query << " (path LIKE ?) " }
-              ids = Fiona7::WriteObj.where(query.join(' AND '), paths).select(:obj_id).limit(1000).map(&:obj_id).map(&:to_s).presence || ["1000"]
-              search_in(:objId, ids)
             else
               values = as_values_array(q[:value])
               values = values.map {|v| "#{v}*" }
@@ -143,7 +136,7 @@ module Fiona7
 
       def search_in(field, values)
         values = [values] unless values.kind_of?(Array)
-        if [:objClass, :objId, :permalink, :lastChanged, :name].include?(field)
+        if [:objClass, :obj_id, :permalink, :lastChanged, :name].include?(field)
           fields = [field.to_s]
         else
           fields = Fiona7::AttributeNamesFromQueries.new(field.to_s, @query).attributes || Fiona7::AttributeNamesFromCms.new(field.to_s).attributes || [field.to_s]
@@ -179,15 +172,11 @@ module Fiona7
         when :_obj_class
           :objClass
         when :_path
-          :_path
+          :visiblePath
         when :_modification
           :__dummy__
         when :id
-          :objId
-        when :_id
-          :objId
-        when :obj_id
-          :objId
+          :obj_id
         when :_permalink
           :permalink
         when :_last_changed

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.2.0.2.3"
+  VERSION = "1.5.2.0.0"
 end

data/lib/fiona7/workspace.rb

@@ -58,6 +58,8 @@ module Fiona7
         title: self.title,
         revision_id: self.revision_id,
         content_state_id: self.content_state_id,
+        outdated: false,
+        auto_update: (self.id == :rtc),
         memberships: self.memberships
       }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.2.0.2.3
+  version: 1.5.2.0.0
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.1
+        version: 1.22.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.1
+        version: 1.22.4
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
+  name: scrivito_development
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '0'
 description: scrivito-compatible interface for classic Fiona
 email:
 - tomasz.przedmojski@infopark.de
@@ -135,12 +135,20 @@ files:
 - app/assets/images/fiona7-marker.png
 - app/assets/javascripts/fiona7.js
 - app/assets/javascripts/fiona7_ui.js
-- app/assets/javascripts/scrivito_patches/models/ajax.js
-- app/assets/javascripts/scrivito_patches/models/blob.js
+- app/assets/javascripts/scrivito_patches/ajax.js
+- app/assets/javascripts/scrivito_patches/ajax_error_handling.js
+- app/assets/javascripts/scrivito_patches/attribute_serializer.js
+- app/assets/javascripts/scrivito_patches/base_obj_path.js
+- app/assets/javascripts/scrivito_patches/binary_utils.js
+- app/assets/javascripts/scrivito_patches/cms_rest_api.js
+- app/assets/javascripts/scrivito_patches/models/api/basic_obj.js
+- app/assets/javascripts/scrivito_patches/models/binary_field_element.js
 - app/assets/javascripts/scrivito_patches/models/obj.js
+- app/assets/javascripts/scrivito_patches/obj_serializer.js
 - app/assets/stylesheets/fiona7-login.css.scss
 - app/assets/stylesheets/fiona7.css.scss
 - app/assets/stylesheets/fiona7_ui.css.scss
+- app/controllers/fiona7/api_controller.rb
 - app/controllers/fiona7/blobs_controller.rb
 - app/controllers/fiona7/default_scrivito_cms_controller.rb
 - app/controllers/fiona7/release_controller.rb
@@ -148,6 +156,7 @@ files:
 - app/controllers/fiona7/workflow_controller.rb
 - app/controllers/fiona7_login_page_controller.rb
 - app/controllers/scrivito/cms_dispatch_controller.rb
+- app/controllers/scrivito/obj_class_controller.rb
 - app/controllers/scrivito/objs_controller.rb
 - app/controllers/scrivito/webservice_controller.rb
 - app/helpers/fiona7_login_helper.rb
@@ -164,10 +173,13 @@ files:
 - app/views/fiona7_login_page/index.html.erb
 - app/views/layouts/fiona7_login_page_layout.html.erb
 - app/views/scrivito/ui/index.html.erb
+- app/views/scrivito/webservice/_workspace.json.jbuilder
 - config/delayed_routes.rb
+- config/locales/errors.yml
 - config/locales/login.yml
 - config/locales/permissions.yml
 - config/locales/release.yml
+- config/locales/workflow.yml
 - config/precedence_routes.rb
 - infopark_fiona7.gemspec
 - lib/fiona7/access_permission_check.rb
@@ -232,7 +244,9 @@ files:
 - lib/fiona7/complex_object.rb
 - lib/fiona7/controller_helper.rb
 - lib/fiona7/controllers/rest_api/blob_controller.rb
+- lib/fiona7/controllers/rest_api/error_handler.rb
 - lib/fiona7/controllers/rest_api/obj_controller.rb
+- lib/fiona7/controllers/rest_api/session_controller.rb
 - lib/fiona7/controllers/rest_api/workspace_controller.rb
 - lib/fiona7/current_user_map.rb
 - lib/fiona7/custom_verity_accessor.rb