infopark_cloud_connector 6.9.4 → 6.9.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjQxZDQ1MTE2NzI2YjU3MTQ3Zjg0MDY0MWFjZDEyZTE4Y2Q0MzQzMg==
+  data.tar.gz: !binary |-
+    YmNmZjYwMGZiYWRmZjRmODEzNGZlNGEwMWY4YmVlOTIyOTBiOTZjNA==
+SHA512:
+  metadata.gz: !binary |-
+    Mzk1OGU2Y2FjNmY0Mzc4ZDA5MmFhOTVkZDI4ZWQ0ZjA2YjI0NmEyNjYzZDMw
+    MDRiNzIwNDNjMzhkZjI4MDJjNTliNDI0NDg5ZDM3NzllOTBiNDcwZjg3NjQy
+    ODI5NGNhZjNhMzQ0MzgzNTE3MDVjMGRlMzg3NzUwMDM2MDU2MDU=
+  data.tar.gz: !binary |-
+    ZmNiYjYyMTkzY2M3NzkzYTcwM2NlODk0YjRlNDExZDQ2MzM2ZTA0ZDc3M2U2
+    YmRlM2EyNTUzNzlmMGJlOTg4YzA2NjhjOGNhNzFiOWNlMDhhMzEyNDVjNDg5
+    N2QyNWI0MjhmZDU2OTFhZWZkMTkzOGZlYzA4NmNjOGMzMjFkNTc=

data/README

@@ -1,7 +1,5 @@
 = Infopark Cloud Connector
 
-Infopark Cloud Connector is part of {https://rubygems.org/gems/infopark_rails_connector Infopark Rails Connector}.
-
 The Cloud Connector makes CMS objects maintained by means of the cloud-based Infopark CMS available to your Rails application. It offers easy-to-use functionality for rendering CMS content, doing searches, etc.
 
-For more information about Infopark Rails and Cloud Connector, please visit {http://dev.infopark.net/ the Infopark Dev Center}. For details regarding recent changes to the Infopark CMS and the Cloud Connector can be found in our {http://dev.infopark.net/blog Dev Center Blog}.
+For more information about Infopark Cloud Connector, please visit {http://dev.infopark.net/ the Infopark Dev Center}. For details regarding recent changes to the Infopark CMS and the Cloud Connector can be found in our {http://dev.infopark.net/blog Dev Center Blog}.

data/app/controllers/cms_controller.rb

@@ -0,0 +1,7 @@
+# This controller inherits all of its behavior from
+# {RailsConnector::DefaultCmsController}.
+#
+# {CmsController} is referenced by the Rails Connector routes.
+# @api public
+class CmsController < RailsConnector::DefaultCmsController
+end

data/app/controllers/rails_connector/default_cms_controller.rb

@@ -0,0 +1,43 @@
+module RailsConnector
+
+  # This controller provides some default includes ({CmsAccessible}),
+  # before filters (+load_object+, among others), and actions to simplify
+  # CMS object handling. It should never be used directly, but only as a
+  # super class to {CmsController}.
+  # @api public
+  class DefaultCmsController < ApplicationController
+    include CmsAccessible
+    before_filter :load_object
+    before_filter :ensure_object_is_active
+    before_filter :ensure_object_is_permitted
+    before_filter :set_google_expire_header
+
+    # Default Action. Delivers files directly if their mime type is not text/html
+    # @api public
+    def index
+      deliver_file if @obj.mime_type != "text/html"
+    end
+
+    # Toggles edit markers. The current status is stored in the session.
+    # @api public
+    def toggle_editmarkers
+      session[:hide_editmarkers] = !session[:hide_editmarkers]
+      redirect_to cms_id_url(@obj)
+    end
+
+    # This method indicates if this controller should be used automatically when an Obj is
+    # requested via the Rails Connector's standard routes. It returns true by default.
+    #
+    # Overwrite it to return false if you do want your controller to be excluded from Obj dispatching.
+    #
+    # You may also implement a method with the name {use_for_obj_dispatch?} in controllers not
+    # descending from {DefaultCmsController} to include them in Obj dispatching.
+    #
+    # @see Obj#controller_name
+    # @api public
+    def self.use_for_obj_dispatch?
+      true
+    end
+  end
+
+end

data/app/controllers/rails_connector/objs_controller.rb

@@ -33,6 +33,16 @@ module RailsConnector
       render json: {}
     end
 
+    def copy
+      render json: copy_obj(get_obj_attributes(params[:id]), params[:parent_path])
+    end
+
+    def duplicate
+      attributes = get_obj_attributes(params[:id])
+
+      render json: copy_obj(attributes, parent_path(attributes['_path']))
+    end
+
     def page_class_selection
       valid_page_classes = Obj.valid_page_classes_beneath(params[:parent_path]) || all_page_classes
       valid_page_classes.map!(&:to_s)
@@ -104,6 +114,25 @@ module RailsConnector
       end
     end
 
+    def copy_obj(copied_attributes, target_path=nil)
+      copied_attributes.delete('id')
+      copied_attributes.delete('_last_changed')
+
+      copied_attributes['_path'] = "#{target_path}/#{SecureRandom.hex(6)}"
+
+      CmsRestApi.task_unaware_request(
+        :post, "revisions/#{Workspace.current.revision_id}/objs", obj: copied_attributes)
+    end
+
+    def get_obj_attributes(id)
+      CmsRestApi.task_unaware_request(
+        :get, "revisions/#{Workspace.current.revision_id}/objs/#{id}")
+    end
+
+    def parent_path(path)
+      path.split('/')[0..-2].join('/')
+    end
+
     def current_page
       Obj.find(params[:current_page_id]) if params[:current_page_id].present?
     end

data/app/controllers/rails_connector/widget_renderer.rb

@@ -31,7 +31,7 @@ class WidgetRenderer < AbstractController::Base
     rescue ActionView::MissingTemplate => e
       view_context.widget_thumbnail(
         widget_dir.titleize,
-        'thumbnail.html.erb does not existing. Please provide one.',
+        'thumbnail.html.erb does not exist. Please provide one.',
         view_context.image_tag('180x120.gif')
       )
     end

data/app/controllers/rails_connector/workspaces_controller.rb

@@ -25,6 +25,10 @@ module RailsConnector
       render json: CmsRestApi.task_unaware_request(:put, "workspaces/#{params[:id]}/publish", {})
     end
 
+    def rebase
+      render json: CmsRestApi.task_unaware_request(:put, "workspaces/#{params[:id]}/rebase", {})
+    end
+
     private
 
     def workspace_params

data/app/helpers/cms_helper.rb

@@ -0,0 +1,7 @@
+# {CmsHelper} is a wrapper around {RailsConnector::DefaultCmsHelper}.
+# It can be replaced in your application in order to add or
+# modify helpers.
+# @api public
+module CmsHelper
+  include RailsConnector::DefaultCmsHelper
+end

data/app/helpers/cms_routing_helper.rb

@@ -0,0 +1,7 @@
+# {CmsRoutingHelper} is a wrapper around {RailsConnector::DefaultCmsRoutingHelper}.
+# It can be replaced in your application in order to add or
+# modify helpers.
+# @api public
+module CmsRoutingHelper
+  include RailsConnector::DefaultCmsRoutingHelper
+end

data/app/helpers/rails_connector/cms_asset_helper.rb

@@ -44,12 +44,6 @@ module RailsConnector
       if args.second.nil? || args.second.is_a?(Hash)
         # Backwards compatibility.
         target = args.first
-        if target.is_a?(LinkList)
-          ActiveSupport::Deprecation.warn(%{
-            Calling "cms_image_tag" with a "LinkList" is not allowed anymore.
-            Please use following syntax instead: cms_image_tag(@obj, :linklist).
-          })
-        end
 
         tag_options = args.second || {}
         tag_options.symbolize_keys!
@@ -63,7 +57,7 @@ module RailsConnector
         tag_options     = args.third || {}
         editing_options = args.fourth || {}
 
-        cms_tag('img', obj, field_name, cms_image_tag_options(field_name, obj[field_name],
+        cms_tag('img', obj, field_name, cms_image_tag_options(obj, field_name,
             tag_options.symbolize_keys, editing_options.symbolize_keys))
       end
 
@@ -71,16 +65,29 @@ module RailsConnector
 
     private
 
-    def cms_image_tag_options(field_name, target, tag_options, editing_options)
-      tag_options.reverse_merge(alt: display_title(target)).tap do |options|
-        options[:src] ||= begin
-          target_path = cms_path(target)
-          if target_path == RailsConnector::DefaultCmsRoutingHelper::LINK_TO_EMPTY_LINKLIST
-            editing_options[:placeholder] || image_path('rails_connector/image_placeholder.png')
-          else
-            target_path
-          end
-        end
+    def cms_image_tag_options(obj, field_name, tag_options, editing_options)
+      tag_options.reverse_merge(src: cms_image_tag_src(obj, field_name, editing_options),
+          alt: cms_image_tag_alt(obj, field_name))
+    end
+
+    def cms_image_tag_src(obj, field_name, editing_options)
+      cms_image_tag_path(obj, field_name) || editing_options[:placeholder] ||
+          image_path('rails_connector/image_placeholder.png')
+    end
+
+    def cms_image_tag_alt(obj, field_name)
+      display_title(obj[field_name])
+    end
+
+    def cms_image_tag_path(obj, field_name)
+      field_type = obj.type_of_attribute(field_name)
+      field_value = obj[field_name]
+
+      case field_type
+      when 'reference' then field_value && cms_path(field_value)
+      when 'linklist'
+        path = cms_path(field_value)
+        path == DefaultCmsRoutingHelper::LINK_TO_EMPTY_LINKLIST ? nil : path
       end
     end
 

data/app/helpers/rails_connector/cms_tag_helper.rb

@@ -46,7 +46,7 @@ module RailsConnector
       end
 
       options = options.merge({
-        'data-ip-field-id' => obj.id,
+        'data-ip-private-field-id' => obj.id,
         'data-ip-field-obj-class' => obj.obj_class,
         'data-ip-field-name' => field_name,
         'data-ip-field-type' => field_type,
@@ -61,7 +61,7 @@ module RailsConnector
         if inplace_editing_allowed? && FIELD_TYPES_WITH_ORIGINAL_CONTENT.include?(field_type)
           original_value = display_original_value(obj[field_name])
           original_content = cms_tag_original_content(field_type, original_value)
-          options['data-ip-field-original-content'] = MultiJson.encode(original_content)
+          options['data-ip-private-field-original-content'] = MultiJson.encode(original_content)
         end
 
         inner_html = block_given? ? capture { yield } : display_value(obj[field_name])
@@ -150,8 +150,11 @@ module RailsConnector
         inner_html << list.output
       end
 
+      valid_page_classes = Obj.valid_page_classes_beneath(obj.path)
+
       options = options.merge({
-        'data-ip-child-list-path' => obj.path,
+        'data-ip-private-child-list-path' => obj.path,
+        'data-ip-private-child-list-allowed-classes' => valid_page_classes.to_json,
       }) if inplace_editing_allowed?
 
       content_tag(tag_name, inner_html, options)
@@ -163,9 +166,9 @@ module RailsConnector
       options = {}
 
       if inplace_editing_allowed?
-        options['data-ip-widget-id'] = widget.id
-        options['data-ip-widget-obj-class'] = widget.obj_class
-        options['data-ip-widget-has-edit-view'] = true if renderer.has_edit_view?(widget.obj_class)
+        options['data-ip-private-widget-id'] = widget.id
+        options['data-ip-private-widget-obj-class'] = widget.obj_class
+        options['data-ip-private-widget-has-edit-view'] = true if renderer.has_edit_view?(widget.obj_class)
       end
 
       content_tag(:div, options) do

data/app/helpers/rails_connector/default_cms_helper.rb

@@ -0,0 +1,23 @@
+module RailsConnector
+
+  # This is a wrapper module for the default set of Rails Connector helper modules.
+  #
+  # To make autoloading from +CmsController+ work, this module must be wrapped
+  # by a module named +CmsHelper+:
+  #
+  #   module CmsHelper
+  #     include RailsConnector::DefaultCmsHelper
+  #   end
+  # @api public
+  module DefaultCmsHelper
+    include DisplayHelper
+    include MarkerHelper
+    include CmsAssetHelper
+    include RailsConnector::CmsAssetHelper
+    include RailsConnector::TableOfContentsHelper
+    include RailsConnector::EditingHelper
+    include RailsConnector::LayoutHelper
+    include RailsConnector::CmsTagHelper
+  end
+
+end

data/app/helpers/rails_connector/default_cms_routing_helper.rb

@@ -0,0 +1,101 @@
+module RailsConnector
+
+  # @api public
+  module DefaultCmsRoutingHelper
+    # Returns the path for +target+ using the +CmsController+ routes.
+    # +target+ can be an +Obj+ or a +Link+ or a +LinkList+.
+    # If +target+ is a +Linklist+, it must be non-empty. The first +Link+ from the +LinkList+ will be used.
+    # +options+ are optional and include url settings such as path parameters or protocol.
+    # @return [String]
+    # @api public
+    def cms_path(target, options = {})
+      cms_path_or_url(target, "path", options)
+    end
+
+    # Returns the absolute URL for target using the +CmsController+ routes.
+    # +target+ can be an +Obj+ or a +Link+ or a +LinkList+.
+    # If +target+ is a +Linklist+, it must be non-empty. The first +Link+ from the +LinkList+ will be used.
+    # +options+ are optional and include url settings such as path parameters or protocol.
+    # @return [String]
+    # @api public
+    def cms_url(target, options = {})
+      cms_path_or_url(target, "url", options)
+    end
+
+    LINK_TO_UNREACHABLE = "#__target_object_not_reachable"
+    LINK_TO_EMPTY_LINKLIST = "#__empty_linklist"
+
+    def cms_path_or_url(target, path_or_url, options = {})
+      if target.is_a?(Link)
+        cms_path_or_url_for_links(target, path_or_url, options)
+      elsif target.is_a?(Obj)
+        cms_path_or_url_for_objs(target, path_or_url, options)
+      elsif target.respond_to?(:first)
+        if target.first.is_a?(Link)
+          cms_path_or_url_for_links(target.first, path_or_url, options)
+        else
+          return LINK_TO_EMPTY_LINKLIST
+        end
+      else
+        raise "cms_path or cms_url was called with an instance of #{target.class}. "+
+          "It must only be called with an Obj or a Link or a non-empty LinkList."
+      end
+    end
+
+    def cms_path_or_url_for_links(link, path_or_url, options = {})
+      return LINK_TO_UNREACHABLE if link.internal? && link.obj.nil?
+      url = basic_url_or_path_for_link(link, path_or_url, options)
+      url = url + "?#{link.query}" if link.query.present? && options.empty?
+      url = url + "##{link.fragment}" if link.fragment.present?
+      url
+    end
+
+    def cms_path_or_url_for_objs(obj, path_or_url, options = {})
+      permalink = obj.permalink
+      ignore_body_data_url = options.delete(:ignore_body_data_url)
+      if permalink && !Configuration.editor_interface_enabled?
+        __send__("cms_permalink_#{path_or_url}", options.merge(:permalink => permalink))
+      elsif obj.homepage? && !Configuration.editor_interface_enabled?
+        __send__("root_#{path_or_url}", options)
+      else
+        if obj.body_data_url && !ignore_body_data_url
+          enforce_protocol_from_request(obj.body_data_url)
+        elsif obj.binary? && !obj.file_extension.blank?
+          __send__("cms_id_#{path_or_url}",
+            options.merge(:id => obj.id, :slug => obj.slug.presence, :format => obj.file_extension))
+        else
+          routing_options = options.merge(:id => obj.id, :slug => obj.slug.presence)
+          __send__("cms_id_#{path_or_url}", routing_options)
+        end
+      end
+    end
+
+    private
+
+    def basic_url_or_path_for_link(link, path_or_url, options = {})
+      if link.internal?
+        __send__("cms_#{path_or_url}", link.obj, options)
+      else
+        url = link.external_url
+        options.delete(:ignore_body_data_url)
+        url = merge_options(url, options) if options.any?
+        url
+      end
+    end
+
+    def merge_options(url, options)
+      parsed_url = URI.parse(url)
+
+      query = Rack::Utils.parse_query(parsed_url.query)
+      merged_query = query.merge(options.stringify_keys)
+      parsed_url.query = merged_query.to_query
+
+      parsed_url.to_s
+    end
+
+    def enforce_protocol_from_request(url)
+      request.ssl? && !url.starts_with?('https') ? url.gsub(/^http/, 'https') : url
+    end
+
+  end
+end

data/app/helpers/rails_connector/display_helper.rb

@@ -67,39 +67,13 @@ module RailsConnector
 
     private
 
-    LINK_PATTERN = '<?\binternallink:(\d+)\b>?'
-    LINK_EXPRESSION = %r(#{LINK_PATTERN})
-
-    def convert_links(content_attribute, cms_path_options = {})
-      return content_attribute unless content_attribute =~ LINK_EXPRESSION
-      link_map = content_attribute.source.text_links.each_with_object({}) do |link, map|
-        map[link.id.to_s] = link
-      end
-      content_attribute.gsub(%r(#{LINK_PATTERN}(['"]?))) do
-        link = link_map[$1.to_s]
-        if link.blank?
-          "#{CmsRoutingHelper::LINK_TO_UNREACHABLE}#{$2}"
-        else
-          uri = "#{cms_path(link, cms_path_options)}#{$2}"
-          html_link(link, uri)
+    def convert_links(html, cms_path_options = {})
+      if html
+        html.gsub(%r{<?\bobjid:([a-f0-9]{16})\b>?}) do
+          cms_path(Obj.find($1), cms_path_options)
         end
       end
     end
 
-    def html_link(link, uri)
-      subst = uri
-      name, value =
-          case link.tag_name
-          when 'img', 'input'
-            ['alt', link.title || ""]
-          when 'a', 'link'
-            ['title', begin link.title unless link.title.blank? end]
-          end
-      if value
-        subst << %( #{name}="#{h(value)}")
-      end
-      subst << %( target="#{h(link.target)}") unless link.target.blank?
-      subst
-    end
   end
 end

data/app/helpers/rails_connector/editing_helper.rb

@@ -22,6 +22,9 @@ module RailsConnector
       false
     end
 
+    def current_page_has_children?
+      @obj && @obj.children.any?
+    end
   end
 
 end