infopark_cloud_connector 6.9.2.1.125136549 → 6.9.3.1.36404185

data/README

@@ -1,5 +1,7 @@
 = Infopark Cloud Connector
 
-Infopark Cloud Connector integrates the {https://rubygems.org/gems/infopark_rails_connector Infopark Rails Connector} with the Infopark Cloud Express CMS.
+Infopark Cloud Connector is part of {https://rubygems.org/gems/infopark_rails_connector Infopark Rails Connector}.
 
-For more information about Infopark Rails and Cloud Connector, please visit {http://kb.infopark.de/ Infopark’s Knowledge Base}. Details about recent changes to Infopark Cloud Express CMS and the Cloud Connector can be found in the {https://kb.infopark.de/cms-news Latest CMS News}.
+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}.

data/app/controllers/rails_connector/objs_controller.rb

@@ -1,7 +1,8 @@
 module RailsConnector
 
   class ObjsController < WebserviceController
-    before_filter :load_object, only: [:show, :edit, :update, :destroy, :create_widget]
+    before_filter :load_object, only: [:show, :edit, :update, :destroy, :widget_class_selection,
+        :create_widget, :edit_widget]
 
     def show
       render json: {markup: render_to_string(layout: false)}
@@ -16,9 +17,7 @@ module RailsConnector
     end
 
     def edit
-      markup = WidgetRenderer.new(request).
-          process(:edit, @obj, current_page, params[:field_name], @obj.widget_container)
-      render json: {markup: markup}
+      render json: {markup: render_to_string(@obj.edit_view_path, layout: false)}
     end
 
     def update
@@ -35,28 +34,30 @@ module RailsConnector
     end
 
     def page_class_selection
-      thumbnails = {}
-      obj_classes = CmsRestApi.task_unaware_request(:get,
-        "revisions/#{Workspace.current.revision_id}/obj_classes"
-      )
-      obj_classes['results'].each do |obj_class|
+      valid_page_classes = Obj.valid_page_classes_beneath(params[:parent_path]) || all_page_classes
+      valid_page_classes.map!(&:to_s)
+
+      page_class_names = valid_page_classes.map do |page_class_name|
         begin
-          name = obj_class['name']
-          thumbnails[name] = render_to_string("#{name.underscore}/thumbnail")
+          markup = render_to_string("#{page_class_name.underscore}/thumbnail")
+          {name: page_class_name, markup: markup}
         rescue ActionView::MissingTemplate
         end
       end
-      render json: thumbnails
+
+      render json: page_class_names.compact
     end
 
     def widget_class_selection
-      widgets = {}
-      Dir[Rails.root + 'app/widgets/*'].each do |widget_path|
-        widget_dir = File.basename(widget_path)
-        widget_class_name = widget_dir.camelize
-        widgets[widget_class_name] = WidgetRenderer.new(request).process('thumbnail', widget_dir)
+      valid_widget_classes = @obj.valid_widget_classes_for(params[:field_name]) || all_widget_classes
+      valid_widget_classes.map!(&:to_s)
+
+      widgets_classes = valid_widget_classes.map do |widget_class_name|
+        markup = WidgetRenderer.new(request).process('thumbnail', widget_class_name.underscore)
+        {name: widget_class_name, markup: markup}
       end
-      render json: widgets
+
+      render json: widgets_classes
     end
 
     def create_widget
@@ -74,6 +75,12 @@ module RailsConnector
       render json: {markup: render_to_string(layout: false)}
     end
 
+    def edit_widget
+      markup = WidgetRenderer.new(request).
+          process(:edit, @obj, current_page, params[:field_name], @obj.widget_container)
+      render json: {markup: markup}
+    end
+
     private
 
     def load_object
@@ -101,6 +108,16 @@ module RailsConnector
       Obj.find(params[:current_page_id]) if params[:current_page_id].present?
     end
     helper_method :current_page
+
+    def all_page_classes
+      page_classes = CmsRestApi.task_unaware_request(:get,
+          "revisions/#{Workspace.current.revision_id}/obj_classes")['results']
+      page_classes.map { |page_class| page_class['name'] }.sort
+    end
+
+    def all_widget_classes
+      Dir[Rails.root + 'app/widgets/*'].map { |path| File.basename(path).camelize }.sort
+    end
   end
 
 end

data/app/helpers/rails_connector/cms_tag_helper.rb

@@ -2,6 +2,7 @@ module RailsConnector
 
   # @api public
   module CmsTagHelper
+    FIELD_TYPES_WITH_ORIGINAL_CONTENT = %w[string text html enum multienum]
     VOID_TAGS = %w[area base br col command embed hr img input keygen
         link meta param source track wbr]
 
@@ -48,23 +49,12 @@ module RailsConnector
         end
         inner_html = safe_join(rendered_widgets)
       else
-        block_result = nil
-        if inplace_editing_allowed?
-          original_value = if block_given?
-            block_result = capture { yield }
-          else
-            display_original_value(obj[attribute])
-          end
-          original_value ||= ''
-          # Concate with empty string to disable html_safe:
-          options['data-ip-field-original-content'] = '' + original_value
+        if inplace_editing_allowed? && FIELD_TYPES_WITH_ORIGINAL_CONTENT.include?(field_type)
+          original_content = MultiJson.encode(display_original_value(obj[attribute]))
+          options['data-ip-field-original-content'] = original_content
         end
 
-        inner_html = if block_given?
-          block_result || capture { yield }
-        else
-          display_value(obj[attribute])
-        end
+        inner_html = block_given? ? capture { yield } : display_value(obj[attribute])
       end
 
       if VOID_TAGS.include?(tag_name.to_s)

data/app/helpers/rails_connector/display_helper.rb

@@ -0,0 +1,105 @@
+module RailsConnector
+
+  # This module contains a helper that can be used to render attributes of the CMS models.
+  # @api public
+  module DisplayHelper
+
+    # For a consistent look of your site and easy maintenance, only the display helpers
+    # should be used to render an attribute <em>value</em> of a CMS model.
+    #
+    #   <%= display_value @obj.title %>
+    # Renders the value, taking its type into account.
+    # * An HtmlString will be exported by converting its links
+    # * A Time will be exported in an international form: Year-Month-Day Hour:Minutes
+    # * A non-HTML String will be quoted
+    # * other values will be rendered unchanged
+    #
+    # @api public
+    def display_value(value)
+      case value
+        when HtmlString then convert_links(value).html_safe
+        when String then h(value)
+        when Time then h(l(value))
+        else value
+      end
+    end
+
+    def display_original_value(value)
+      case value
+        when HtmlString then convert_links(value, :ignore_body_data_url => true).html_safe
+        else display_value(value)
+      end
+    end
+
+    # Renders a field from the CMS, including an edit marker for the preview
+    # If the option :marker is +false+, no edit marker will be rendered.
+    #
+    # <%= display_field @obj, :title %>
+    #
+    # When creating an edit marker, all options except :marker are passed to {MarkerHelper#edit_marker}.
+    #
+    # @api public
+    def display_field(obj, attr, options = {})
+      options.reverse_merge!({
+        :marker => ![:id, :path, :created, :last_changed, :version].include?(attr.to_sym)
+        })
+      if options.delete :marker
+        edit_marker(obj, attr, options) do |obj, attr|
+          display_value obj[attr]
+        end
+      else
+        display_value obj[attr]
+      end
+    end
+
+    # Legacy method - deprecated
+    #
+    # Use display_value and display_field instead
+    def display(*args)
+      if args.last.kind_of? Hash
+        options = args.pop
+      else
+        options = {}
+      end
+      return display_value(args.first) if args.size == 1
+      display_field(args[0], args[1], options)
+    end
+
+    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)
+        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

@@ -16,6 +16,12 @@ module RailsConnector
       Configuration.editing_auth_callback.call(request.env)
     end
 
+    def current_page_has_edit_view?
+      @obj && lookup_context.find(@obj.edit_view_path).present?
+    rescue ActionView::MissingTemplate
+      false
+    end
+
   end
 
 end

data/app/views/rails_connector/_editing_javascript.html.erb

@@ -9,7 +9,8 @@
       })
     );
     infopark.obj.current_page_id = "<%= @obj.try(:id) %>";
-    infopark.admin_gui_base_url = "<%= RailsConnector::CmsRestApi.credentials[:url] %>";
+    infopark.obj.current_page_has_edit_view = <%= current_page_has_edit_view? %>;
+    infopark.admin_gui_base_url = "<%= RailsConnector::CmsRestApi.configuration.url %>";
     infopark.editing.initialize();
   });
 <% end %>