infopark_fiona7 0.70.0.1 → 0.70.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fb73f7dbb42f72a2226f87ebefc5917d783bc43
-  data.tar.gz: a44f89e1afabe37ea6b3dac2e090b7ea2e4e1330
+  metadata.gz: f088c3d3fb8b3fb487f3ec6fb4aa27f6956381f1
+  data.tar.gz: 267da049a8f2ace22d74c96f491f78337cfb9387
 SHA512:
-  metadata.gz: 08b11f576e6b7250c72fd1d8edd3e4651e5438a09c58c6a4f77815e1d50ad65cd9e117e15681b7ba4017516e3b7910f19dd4e6ecb6acd924f9fe9e90d8cd67de
-  data.tar.gz: 0ab455e74160f1d43e325b52d0cf65bf83becddd06fed7c5d1e9c1ede64a709b002055a6a4c310aeb608b71ca927bff3a1148592e33b979db49c9472a48e2fcf
+  metadata.gz: 93e13fbd24b6925353e4148c0a8c9c9035e1a83a14bc9e633a6d3a1ec34d9d10d9f78554374559a2ad613706d2af296b586e959a8626d54e4a8deb03f942719c
+  data.tar.gz: 4d1bdb3634d7cba7a39f247033fe9f0cb5046905c70b990d9239e11372876024032703f08f38eab081a8b826fba7fe1d0aedcb76b67d9418152c132b09a9ad4e

data/app/controllers/scrivito/cms_dispatch_controller.rb

@@ -0,0 +1,87 @@
+module Scrivito
+
+  class CmsDispatchController < ActionController::Metal
+    include ActionController::Redirecting
+    include Rails.application.routes.url_helpers
+    include Scrivito::RoutingHelper
+
+    def process(action)
+      CmsEnv.new(env).load
+
+      if !obj_not_found? && action == 'legacy'
+        if Scrivito::Configuration.legacy_routing
+          action = 'index'
+        else
+          redirect_to scrivito_path(loaded_obj), status: :moved_permanently
+          return self.response
+        end
+      end
+
+      if obj_not_found? && editing_context.workspace_changed?
+        redirect_to :scrivito_root
+        return self.response
+      end
+
+      controller = target_controller(env)
+      env["action_dispatch.request.path_parameters"]["controller"] = controller.controller_path
+
+      if !obj_not_found? && action == 'index'
+        action = loaded_obj.controller_action_name
+      end
+
+      env["action_dispatch.request.path_parameters"]["action"] = action
+
+      self.response = controller.action(action).call(env)
+    end
+
+    private
+
+    def main_app
+      Rails.application.routes.url_helpers
+    end
+
+    def scrivito_engine
+      Scrivito::SdkEngine.routes.url_helpers
+    end
+
+    def editing_context
+      EditingContextMiddleware.from_request(request)
+    end
+
+    # support legacy mode
+    def target_controller(env)
+      return default_controller if obj_not_found?
+      controller = "#{loaded_obj.controller_name}Controller".constantize
+
+      if controller.respond_to?(:use_for_obj_dispatch?) && controller.use_for_obj_dispatch? && controller.include?(Scrivito::ControllerActions)
+        controller
+      else
+        default_controller
+      end
+    rescue NameError
+      default_controller
+    end
+
+    def loaded_obj
+      env[CmsEnv::OBJ_ENV_KEY]
+    end
+
+    def obj_not_found?
+      loaded_obj.is_a?(StandardError)
+    end
+
+    # support DefaultScrivitoCmsController!
+    def default_controller
+      return Fiona7::DefaultScrivitoCmsController if Fiona7.mode == :legacy
+      CmsController
+    rescue NameError => e
+      if e.message.include?('CmsController')
+        raise 'Your application does not define the "CmsController" needed for Scrivito. '\
+          'Did you forget to run "rails generate scrivito:install"?'
+      else
+        raise
+      end
+    end
+  end
+
+end

data/app/controllers/scrivito/objs_controller.rb

@@ -0,0 +1,240 @@
+module Scrivito
+  class ObjsController < WebserviceController
+    around_action :require_selected_workspace_write_authorization, only: [
+      :copy,
+      :create,
+      :destroy,
+      :destroy_widget,
+      :duplicate,
+      :mark_resolved,
+      :restore,
+      :restore_widget,
+      :revert,
+      :revert_widget,
+      :update,
+    ]
+
+    before_filter :require_identical_selected_and_visible_workspace, only: [
+      :copy,
+      :create,
+      :duplicate,
+      :page_class_selection,
+      :update,
+      :widget_class_selection,
+    ]
+
+    def show
+      in_selected_workspace { render }
+    end
+
+    def widget
+      in_selected_workspace { render }
+    end
+
+    def create
+      params_parser = ObjCreateParamsParser.new(request.host, request.port)
+      @obj = Obj.create(params_parser.parse(params[:obj]), scrivito_user: scrivito_user)
+      render :obj
+    rescue ObjClassNotFound
+      head :not_found
+    end
+
+    def details
+      assert_dialog_layout
+      render current_obj.details_view_path, layout: 'scrivito_dialog', formats: :html
+    end
+
+    def update
+      params_parser = ObjUpdateParamsParser.new(request.host, request.port,
+        current_obj: current_obj, scrivito_user: scrivito_user)
+      current_obj.update(params_parser.parse(params[:obj]))
+    rescue ObjClassNotFound
+      head :not_found
+    end
+
+    def destroy
+      in_selected_workspace do
+        parent = current_obj.parent
+        @redirect_to = parent ? scrivito_path(parent) : scrivito_root_path
+        current_obj.destroy
+      end
+    end
+
+    def destroy_widget
+      in_selected_workspace { current_widget.destroy }
+      render_empty_json
+    end
+
+    def revert
+      in_selected_workspace { current_obj.revert }
+      render_empty_json
+    end
+
+    def revert_widget
+      in_selected_workspace { current_widget.revert }
+      render_empty_json
+    end
+
+    def restore
+      in_selected_workspace { Obj.restore(params[:id]) }
+      render_empty_json
+    end
+
+    def restore_widget
+      in_selected_workspace { current_obj.restore_widget(params[:widget_id]) }
+      render_empty_json
+    end
+
+    # optimized away
+    def conflicting_workspaces
+      @workspaces = []
+      render :workspaces
+    end
+
+    # optimized away
+    def is_outdated
+      @is_outdated = false
+    end
+
+    def mark_resolved
+      in_selected_workspace { current_obj.mark_resolved }
+      render_empty_json
+    end
+
+    def copy
+      @obj = copy_obj(current_obj, params[:parent_path])
+      render :obj
+    end
+
+    def duplicate
+      @obj = copy_obj(current_obj, current_obj.parent_path)
+      render :obj
+    end
+
+    def page_class_selection
+      @page_class_markup = valid_page_classes.map do |page_class_name|
+        build_selection_option(page_class_name)
+      end
+    end
+
+    def widget_class_selection
+      load_obj
+
+      @widgets_classes = valid_widget_classes.map do |widget_class_name|
+        build_selection_option(widget_class_name)
+      end
+    end
+
+    def search
+      in_selected_workspace do
+        @query = MultiJson.decode(params[:query]).with_indifferent_access
+        @enumerator = ObjSearchBuilder.new(@query).build
+
+        if params[:query_action] == 'size'
+          render :search_only_size
+        elsif @formatter = fetch_formatter(@query[:format])
+          render :search
+        else
+          render :format_missing_error, status: :not_found
+        end
+      end
+    end
+
+    private
+
+    def require_identical_selected_and_visible_workspace
+      if selected_workspace != editing_context.visible_workspace
+        raise ScrivitoError, 'selected and visible workspace are not identical'
+      end
+    end
+
+    def require_selected_workspace_write_authorization(&block)
+      authorize_workspace_access(:write, selected_workspace, &block)
+    end
+
+    def in_selected_workspace(&block)
+      selected_workspace.as_current(&block)
+    end
+
+    def selected_workspace
+      editing_context.selected_workspace
+    end
+
+    def current_obj
+      @obj || load_obj
+    end
+    helper_method :current_obj
+
+    def load_obj
+      @obj = Obj.find(params[:id])
+    end
+
+    def current_widget
+      @widget || load_widget
+    end
+    helper_method :current_widget
+
+    def load_widget
+      raise ScrivitoError, 'no widget_id param specified' if params[:widget_id].blank?
+      unless @widget = current_obj.widget_from_pool(params[:widget_id])
+        raise ResourceNotFound, "widget with ID '#{params[:widget_id]}' not found"
+      end
+      @widget
+    end
+
+    def copy_obj(obj, parent_path)
+      id = SecureRandom.hex(8)
+      obj.copy(_id: id, _path: parent_path && "#{parent_path}/#{id}")
+    end
+
+    def fetch_formatter(name)
+      name ? Configuration.obj_formats[name] : proc { |obj, _| obj.id }
+    end
+
+    def build_selection_option(class_name)
+      template_path = "#{class_name.underscore}/thumbnail"
+      markup = begin
+        render_to_string(template_path, layout: false, formats: :html)
+      rescue ActionView::MissingTemplate
+        render_to_string('scrivito/fallback_thumbnail', layout: false, formats: :html,
+            locals: {class_name: class_name, template_path: template_path})
+      end
+      {name: class_name, markup: markup}
+    end
+
+    def valid_page_classes
+      without_hidden_classes(page_classes_from_obj).map(&:to_s)
+    end
+
+    def page_classes_from_obj
+      Obj.valid_page_ruby_classes_beneath(params[:parent_path])
+    end
+
+    def valid_widget_classes
+      widget_classes = current_widget_or_obj.valid_widget_ruby_classes_for(params[:field_name])
+
+      without_hidden_classes(widget_classes).map(&:to_s)
+    end
+
+    def without_hidden_classes(obj_types)
+      obj_types.reject(&:hide_from_editor?)
+    end
+
+    def current_widget_or_obj
+      widget_id = params[:widget_id]
+      (widget_id && current_obj.widgets[widget_id]) || current_obj
+    end
+
+    def assert_dialog_layout
+      view_context.lookup_context.find('layouts/scrivito_dialog')
+    rescue ActionView::MissingTemplate
+      raise %{
+        Missing the Scrivito dialog layout!
+
+        Scrivito requires a special view layout in order to render the details dialog.
+        Normally the install generator places it in `app/views/layouts/scrivito_dialog.html.erb`.
+        If upgrading Scrivito, please re-run the install generator: `rails g scrivito:install`.
+      }
+    end
+  end
+end

data/app/controllers/scrivito/webservice_controller.rb

@@ -0,0 +1,69 @@
+module Scrivito
+
+class WebserviceController < ActionController::Base
+  rescue_from ClientError do |exception|
+    @exception = exception
+    render 'scrivito/webservice/error', formats: :json, status: exception.http_code
+  end
+
+  before_filter :merge_correctly_parsed_json_params
+  before_filter :authorize
+
+  private
+
+  def authorize
+    render_forbidden unless allow_access?
+  end
+
+  def editing_context
+    EditingContextMiddleware.from_request(request)
+  end
+
+  def scrivito_user
+    editing_context.editor
+  end
+
+  # If +true+, allow access to ObjsController, else deny access.
+  # See {Scrivito::Configuration.editing_auth} for details.
+  # @return [Boolean]
+  def allow_access?
+    !!scrivito_user
+  end
+
+  # Workaround for https://github.com/rails/rails/issues/8832
+  # + support for binary uploads
+  def merge_correctly_parsed_json_params
+    if request.format.json?
+      body = request.body.read
+      request.body.rewind
+      params.merge!(ActiveSupport::JSON.decode(body)) if body.present? && !request.form_data?
+    end
+  rescue JSON::ParserError => e
+    # Rails TestRequest mixes up arguments, therefore ignore elements here
+    raise e unless Rails.env.test?
+  end
+
+  def can_user_access_workspace?(verb, workspace)
+    scrivito_user.can?(verb, workspace)
+  end
+
+  def authorize_workspace_access(verb, workspace)
+    can_user_access_workspace?(verb, workspace) ? yield : render_forbidden
+  end
+
+  def render_forbidden
+    render text: 'Forbidden', status: 403
+  end
+
+  def render_empty_json
+    render 'scrivito/webservice/empty', formats: :json
+  end
+
+  def can_user_read_workspace?(workspace)
+    can_user_access_workspace?(:read, workspace)
+  end
+
+  helper_method :can_user_read_workspace?
+end
+
+end

data/app/helpers/fiona7_override_helper.rb

@@ -43,6 +43,9 @@ module Fiona7OverrideHelper
 
     scrivito_tag_list(tag_name, obj, field_name, options) do |list, scrivito_child|
       fiona_child = children_map[scrivito_child.id]
+
+      next unless fiona_child.exportable? # suppress_export !
+
       block.call(list, fiona_child)
     end
   end

data/lib/fiona7/engine.rb

@@ -168,9 +168,6 @@ module Fiona7
     end
 
     initializer "fiona7.runtime_patches" do |app|
-      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|

data/lib/fiona7/json/obj_decorator.rb

@@ -73,6 +73,8 @@ module Fiona7
             deserialize_widget_field(@obj.attr_values[real_attribute_name] || [])
           when :html
             deserialize_html(@obj[real_attribute_name])
+          when :markdown
+            nil
           when :binary
             if !Fiona7.mode == :legacy || !@obj.binary?
               deserialize_binary(@obj.attr_values[real_attribute_name].try(:first))

data/lib/fiona7/scrivito_patches/basic_obj.rb

@@ -57,23 +57,25 @@ module Scrivito
     end
 
     # Originally this method refers to the global Obj via ::Obj
+    # and does not support shadow classes
     def self.where(field, operator, value, boost = nil)
       assert_not_basic_obj('.where')
       if self == Obj || self == ::Obj
         Workspace.current.objs.where(field, operator, value, boost)
       else
-        Workspace.current.objs.where(:_obj_class, :equals, name)
+        Workspace.current.objs.where(:_obj_class, :equals, to_s)
             .and(field, operator, value, boost)
       end
     end
 
     # Originally this method refers to the global Obj via ::Obj
+    # and does not support shadow classes
     def self.all
       assert_not_basic_obj('.all')
       if self == Obj || self == ::Obj
         Workspace.current.objs.all
       else
-        find_all_by_obj_class(name)
+        find_all_by_obj_class(to_s)
       end
     end
 

data/lib/fiona7/type_loader.rb

@@ -29,6 +29,9 @@ module Fiona7
       #puts "loading #{obj_class}"
       if Fiona7.mode == :legacy
         type_definition.add_attr('title', :string, 'title', :string)
+        type_definition.add_attr('valid_from', :date, 'valid_from', :date)
+        type_definition.add_attr('valid_until', :date, 'valid_until', :date)
+
         if self.rc_obj_class.obj_type == 'publication' || self.rc_obj_class.obj_type == 'document'
           type_definition.add_attr('body', :html, 'body', :html)
         elsif self.rc_obj_class.obj_type == 'image' || self.rc_obj_class.obj_type == 'generic'

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "0.70.0.1"
+  VERSION = "0.70.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 0.70.0.1
+  version: 0.70.0.2
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,6 +143,9 @@ files:
 - app/controllers/fiona7/release_controller.rb
 - app/controllers/fiona7/sessions_controller.rb
 - app/controllers/fiona7_login_page_controller.rb
+- app/controllers/scrivito/cms_dispatch_controller.rb
+- app/controllers/scrivito/objs_controller.rb
+- app/controllers/scrivito/webservice_controller.rb
 - app/helpers/fiona7_login_helper.rb
 - app/helpers/fiona7_override_helper.rb
 - app/models/fiona7/edited_obj.rb
@@ -205,7 +208,6 @@ files:
 - lib/fiona7/scrivito_patches/binary.rb
 - lib/fiona7/scrivito_patches/client_config.rb
 - lib/fiona7/scrivito_patches/cms_backend.rb
-- lib/fiona7/scrivito_patches/cms_dispatch_controller.rb
 - lib/fiona7/scrivito_patches/cms_field_tag.rb
 - lib/fiona7/scrivito_patches/cms_rest_api.rb
 - lib/fiona7/scrivito_patches/cms_routing.rb
@@ -213,9 +215,7 @@ files:
 - lib/fiona7/scrivito_patches/link_parser.rb
 - lib/fiona7/scrivito_patches/migrator.rb
 - lib/fiona7/scrivito_patches/obj_class.rb
-- lib/fiona7/scrivito_patches/objs_controller.rb
 - lib/fiona7/scrivito_patches/type_computer.rb
-- lib/fiona7/scrivito_patches/webservice_controller.rb
 - lib/fiona7/scrivito_patches/workspace.rb
 - lib/fiona7/scrivito_user.rb
 - lib/fiona7/search_engine.rb

data/lib/fiona7/scrivito_patches/cms_dispatch_controller.rb

@@ -1,31 +0,0 @@
-require 'scrivito/cms_dispatch_controller'
-module Scrivito
-
-  class CmsDispatchController 
-    def target_controller(env)
-      return default_controller if obj_not_found?
-      controller = "#{loaded_obj.controller_name}Controller".constantize
-
-      if controller.respond_to?(:use_for_obj_dispatch?) && controller.use_for_obj_dispatch? && controller.include?(Scrivito::ControllerActions)
-        controller
-      else
-        default_controller
-      end
-    rescue NameError
-      default_controller
-    end
-
-    def default_controller
-      return Fiona7::DefaultScrivitoCmsController if Fiona7.mode == :legacy
-      CmsController
-    rescue NameError => e
-      if e.message.include?('CmsController')
-        raise 'Your application does not define the "CmsController" needed for Scrivito. '\
-          'Did you forget to run "rails generate scrivito:install"?'
-      else
-        raise
-      end
-    end
-  end
-
-end

data/lib/fiona7/scrivito_patches/objs_controller.rb

@@ -1,18 +0,0 @@
-module Scrivito
-  # trigger load
-  ObjsController
-  class ObjsController < WebserviceController
-
-    # optimized away
-    def is_outdated
-      @is_outdated = false
-    end
-
-    # optimized away
-    def conflicting_workspaces
-      @workspaces = []
-      render :workspaces
-    end
-
-  end
-end

data/lib/fiona7/scrivito_patches/webservice_controller.rb

@@ -1,21 +0,0 @@
-module Scrivito
-
-  # trigger load
-  WebserviceController
-
-  class WebserviceController < ActionController::Base
-
-    # Workaround for https://github.com/rails/rails/issues/8832
-    def merge_correctly_parsed_json_params
-      if request.format.json?
-        body = request.body.read
-        request.body.rewind
-        params.merge!(ActiveSupport::JSON.decode(body)) if body.present? && !request.form_data?
-      end
-    rescue JSON::ParserError => e
-      # Rails TestRequest mixes up arguments, therefore ignore elements here
-      raise e unless Rails.env.test?
-    end
-  end
-
-end