infopark_fiona_connector 7.0.1.5.2.3.rc4 → 7.0.1.5.2.3.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3016968e6569e5825fbaf32c6dfebc557246474586a6912e594257661241dd1c
-  data.tar.gz: 2da35bdfdbba9df92e6b7f5d40684540c0ee7c197c40b0e222f90fe332a1fbbf
+  metadata.gz: a758ecfed1d6c530c1ae32e5f893f07283905d44027ee8edbd138c8cc51047a2
+  data.tar.gz: 8706ba3ec80d4356d2cffb52414c34f264211b2f8adc0328faac2dd665b9bef4
 SHA512:
-  metadata.gz: ed81faf6eb5b8093042ce75b6c69b3d7c33cba47d2bb5bf66f90441be4f1ee109b5a6d0c91d7e7538bafde5611fbd8fa301ae917117b7cdb68e601e087adef2c
-  data.tar.gz: 65a581c015442b5e8639c84dabd2903e74bfbf59f4165cafec1732acb8bbd0aafe65193bebec5433e62c5241d47657c8eaf97d3ccd193661e5959d82021d4459
+  metadata.gz: 15962ebaa0a711d6f2ec3a0e23b661d17cb42e04815e116bde12047ac772914999eebcb74b03c3685906fa5a57de9bb63f1f0bc64ed5498e57e1a2a621963b09
+  data.tar.gz: a323ffab660d396984fd2f9384114c3544807bddf1a0a3117d83ba0d155016b907cb3ce0fe489e158685c04873bec6e3bb6bcecf833e83d463725ab1f114faee

data/app/controllers/cms_controller.rb

@@ -4,4 +4,4 @@
 # {CmsController} is referenced by the Rails Connector routes.
 # @api public
 class CmsController < RailsConnector::DefaultCmsController
-end
+end

data/app/controllers/rails_connector/default_cms_controller.rb

@@ -1,5 +1,4 @@
 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
@@ -39,5 +38,4 @@ module RailsConnector
       true
     end
   end
-
 end

data/app/helpers/cms_helper.rb

@@ -4,4 +4,4 @@
 # @api public
 module CmsHelper
   include RailsConnector::DefaultCmsHelper
-end
+end

data/app/helpers/cms_routing_helper.rb

@@ -4,4 +4,4 @@
 # @api public
 module CmsRoutingHelper
   include RailsConnector::DefaultCmsRoutingHelper
-end
+end

data/app/helpers/rails_connector/cms_asset_helper.rb

@@ -1,5 +1,4 @@
 module RailsConnector
-
   # This module contains helpers that can be used to reference images and other assets stored in the CMS.
   #
   # Use this helper to take advantage of rails' asset host mechanism.
@@ -38,6 +37,7 @@ module RailsConnector
     def cms_asset_path(target)
       regular_path = cms_path(target)
       return regular_path if regular_path.first == "#"
+
       asset_path(regular_path)
     end
 
@@ -45,11 +45,10 @@ module RailsConnector
 
     def display_title(target)
       if target.respond_to?(:display_title)
-        return target.display_title
+        target.display_title
       elsif target.respond_to?(:first) && target.first.respond_to?(:display_title)
-        return target.first.display_title
+        target.first.display_title
       end
     end
-
   end
-end
+end

data/app/helpers/rails_connector/cms_tag_helper.rb

@@ -1,7 +1,4 @@
 module RailsConnector
-
   module CmsTagHelper
-
   end
-
 end

data/app/helpers/rails_connector/default_cms_helper.rb

@@ -1,5 +1,4 @@
 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
@@ -19,5 +18,4 @@ module RailsConnector
     include RailsConnector::LayoutHelper
     include RailsConnector::CmsTagHelper
   end
-
 end

data/app/helpers/rails_connector/default_cms_routing_helper.rb

@@ -1,5 +1,4 @@
 module RailsConnector
-
   # @api public
   module DefaultCmsRoutingHelper
     # Returns the path for +target+ using the +CmsController+ routes.
@@ -22,8 +21,8 @@ module RailsConnector
       cms_path_or_url(target, "url", options)
     end
 
-    LINK_TO_UNREACHABLE = "#__target_object_not_reachable"
-    LINK_TO_EMPTY_LINKLIST = "#__empty_linklist"
+    LINK_TO_UNREACHABLE = "#__target_object_not_reachable".freeze
+    LINK_TO_EMPTY_LINKLIST = "#__empty_linklist".freeze
 
     def cms_path_or_url(target, path_or_url, options = {})
       if target.is_a?(Link)
@@ -34,16 +33,17 @@ module RailsConnector
         if target.first.is_a?(Link)
           cms_path_or_url_for_links(target.first, path_or_url, options)
         else
-          return LINK_TO_EMPTY_LINKLIST
+          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."
+        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.destination_object.nil?
+
       url = basic_url_or_path_for_link(link, path_or_url, options)
       url = append_search(url, link) if options.empty?
 
@@ -54,7 +54,7 @@ module RailsConnector
       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))
+        __send__("cms_permalink_#{path_or_url}", options.merge(permalink: permalink))
       elsif obj.homepage? && !Configuration.editor_interface_enabled?
         __send__("root_#{path_or_url}", options)
       else
@@ -62,9 +62,9 @@ module RailsConnector
           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))
+                   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)
+          routing_options = options.merge(id: obj.id, slug: obj.slug.presence)
           __send__("cms_id_#{path_or_url}", routing_options)
         end
       end
@@ -76,11 +76,11 @@ module RailsConnector
       if link.internal?
         __send__("cms_#{path_or_url}", link.destination_object, options)
       else
-        if link.external_prefix?
-          url = remove_external_prefix(link.url)
-        else
-          url = link.url
-        end
+        url = if link.external_prefix?
+                remove_external_prefix(link.url)
+              else
+                link.url
+              end
 
         options.delete(:ignore_body_data_url)
         url = merge_options(url, options) if options.any?
@@ -113,8 +113,7 @@ module RailsConnector
     end
 
     def enforce_protocol_from_request(url)
-      request.ssl? && !url.starts_with?('https') ? url.gsub(/^http/, 'https') : url
+      request.ssl? && !url.starts_with?("https") ? url.gsub(/^http/, "https") : url
     end
-
   end
 end

data/app/helpers/rails_connector/display_helper.rb

@@ -1,9 +1,7 @@
 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.
     #
@@ -17,18 +15,18 @@ module RailsConnector
     # @api public
     def display_value(value)
       case value
-        when MarkdownString then markdown(convert_links(value)).html_safe
-        when HtmlString then convert_links(value).html_safe
-        when String then html_escape_once(value).html_safe
-        when Time then html_escape_once(l(value)).html_safe
-        else value
+      when MarkdownString then markdown(convert_links(value)).html_safe
+      when HtmlString then convert_links(value).html_safe
+      when String then html_escape_once(value).html_safe
+      when Time then html_escape_once(l(value)).html_safe
+      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)
+      when HtmlString then convert_links(value, ignore_body_data_url: true).html_safe
+      else display_value(value)
       end
     end
 
@@ -42,8 +40,8 @@ module RailsConnector
     # @api public
     def display_field(obj, attr, options = {})
       options.reverse_merge!({
-        :marker => ![:id, :path, :created, :last_changed, :version].include?(attr.to_sym)
-        })
+                               marker: !%i(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]
@@ -57,36 +55,38 @@ module RailsConnector
     #
     # Use display_value and display_field instead
     def display(*args)
-      if args.last.kind_of? Hash
-        options = args.pop
-      else
-        options = {}
-      end
+      options = if args.last.is_a? Hash
+                  args.pop
+                else
+                  {}
+                end
       return display_value(args.first) if args.size == 1
+
       display_field(args[0], args[1], options)
     end
 
     private
 
     def markdown(string)
-      require 'maruku'
+      require "maruku"
       Maruku.new(string).to_html
     end
 
-    LINK_PATTERN = '<?\binternallink:(\d+)\b>?'
-    LINK_EXPRESSION = %r(#{LINK_PATTERN})
+    LINK_PATTERN = '<?\binternallink:(\d+)\b>?'.freeze
+    LINK_EXPRESSION = /#{LINK_PATTERN}/.freeze
 
     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]
+      content_attribute.gsub(/#{LINK_PATTERN}(['"]?)/) do
+        link = link_map[Regexp.last_match(1).to_s]
         if link.blank?
-          "#{CmsRoutingHelper::LINK_TO_UNREACHABLE}#{$2}"
+          "#{CmsRoutingHelper::LINK_TO_UNREACHABLE}#{Regexp.last_match(2)}"
         else
-          uri = "#{cms_path(link, cms_path_options)}#{$2}"
+          uri = "#{cms_path(link, cms_path_options)}#{Regexp.last_match(2)}"
           if link.markdown?
             markdown_link(link, uri)
           else
@@ -99,15 +99,13 @@ module RailsConnector
     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}="#{html_escape_once(value)}")
-      end
+        case link.tag_name
+        when "img", "input"
+          ["alt", link.title || ""]
+        when "a", "link"
+          ["title", begin link.title unless link.title.blank? end]
+        end
+      subst << %( #{name}="#{html_escape_once(value)}") if value
       subst << %( target="#{html_escape_once(link.target)}") unless link.target.blank?
       subst
     end
@@ -116,7 +114,7 @@ module RailsConnector
       subst = "<#{uri}>"
       unless link.title.blank?
         case link.markdown_type
-        when 'inline', 'reference'
+        when "inline", "reference"
           subst << %( "#{html_escape_once(link.title)}")
         end
       end

data/app/helpers/rails_connector/editing_helper.rb

@@ -1,13 +1,7 @@
 module RailsConnector
-
   module EditingHelper
+    def include_editing_stylesheet; end
 
-    def include_editing_stylesheet
-    end
-
-    def include_editing_javascript
-    end
-
+    def include_editing_javascript; end
   end
-
 end

data/app/helpers/rails_connector/layout_helper.rb

@@ -1,16 +1,14 @@
 module RailsConnector
-
   # This module contains helpers that render tags for the html head
   # and the end of the html body.
   # @api public
   module LayoutHelper
-
     # Renders all tags needed in the html head.
     # @api public
     def rails_connector_header_tags
       html = "".html_safe
-      html += tag('meta', :name => 'generator',
-          :content => "Rails Connector for Infopark CMS Fiona by Infopark AG (www.infopark.de)")
+      html += tag("meta", name: "generator",
+                          content: "Rails Connector for Infopark CMS Fiona by Infopark AG (www.infopark.de)")
       html += include_edit_marker_support
       html += include_editing_stylesheet
       html
@@ -25,5 +23,4 @@ module RailsConnector
       html
     end
   end
-
 end

data/app/helpers/rails_connector/marker_helper.rb

@@ -1,5 +1,4 @@
 module RailsConnector
-
   # This module contains helpers that can be used to build markers for the preview.
   #
   # The helpers will not render anything if not in editor mode!
@@ -42,13 +41,13 @@ module RailsConnector
     # Hint: You should not render edit markers within elements that are hidden via CSS (<code>display:none</code>),
     # otherwise they cannot be displayed correctly.
     # @api public
-    def edit_marker(obj, attr, options = {}, &block)
+    def edit_marker(obj, attr, options = {})
       if Configuration.editor_interface_enabled? && !session[:hide_editmarkers]
         context = (options.delete :context) || @obj
         default_value = options.delete(:default_value)
 
         if block_given?
-          content = block.call(obj, attr)
+          content = yield(obj, attr)
           content = default_value || raw("&nbsp;") if content.blank?
         else
           content = attr.to_s.humanize
@@ -56,25 +55,25 @@ module RailsConnector
         end
 
         marker_id = store_marker_definition(
-          :obj_id => obj.id,
-          :attribute => format_attribute_name_for_gui(attr),
-          :context_id => context ? context.id : nil,
-          :size => options.delete(:size),
-          :target => options.delete(:target),
-          :memberships => required_memberships_for_editing(obj, attr)
+          obj_id: obj.id,
+          attribute: format_attribute_name_for_gui(attr),
+          context_id: context ? context.id : nil,
+          size: options.delete(:size),
+          target: options.delete(:target),
+          memberships: required_memberships_for_editing(obj, attr)
         )
 
         store_edit_marker_markup(content_tag(:a, "",
-            :class => "nps_edit_marker nps_marker_id_#{marker_id}"))
+                                             class: "nps_edit_marker nps_marker_id_#{marker_id}"))
 
         tag_type = options.delete(:tag) || :span
         content_tag(
           tag_type,
           content.to_s,
-          options.merge(:class => "#{options[:class]}", :id => "nps_marker_id_#{marker_id}")
+          options.merge(class: (options[:class]).to_s, id: "nps_marker_id_#{marker_id}")
         )
       else
-        block_given? ? block.call(obj, attr) : nil
+        block_given? ? yield(obj, attr) : nil
       end
     end
 
@@ -84,9 +83,7 @@ module RailsConnector
     # <em>value</em> the link text or e.g. an image_tag
     # @api public
     def toggle_edit_marker_link(value)
-      if Configuration.editor_interface_enabled?
-        link_to value, toggle_markers_url(@obj)
-      end
+      link_to value, toggle_markers_url(@obj) if Configuration.editor_interface_enabled?
     end
 
     # Renders a marker for an action to be performed with any number of objects.
@@ -102,7 +99,7 @@ module RailsConnector
     #
     #   <%= action_marker :workflow_release, [@obj] %>
     # @api public
-    def action_marker(action, objs, options = {}, &block)
+    def action_marker(action, objs, options = {})
       return unless Configuration.editor_interface_enabled?
 
       context = (options.delete :context) || @obj
@@ -111,20 +108,20 @@ module RailsConnector
       params = options.delete(:params)
       permissions = options.delete(:permissions) || [:read]
 
-      if objs.size == 1
-        memberships = required_memberships_for_permissions(objs.first, permissions)
-      else
-        memberships = []
-      end
+      memberships = if objs.size == 1
+                      required_memberships_for_permissions(objs.first, permissions)
+                    else
+                      []
+                    end
 
       marker_id = store_marker_definition(
-        :memberships => memberships
+        memberships: memberships
       )
 
       link_to(
-        block_given? ? block.call : action.to_s.humanize,
+        block_given? ? yield : action.to_s.humanize,
         uri_for_action_marker(action, objs, context, size, target, params),
-        options.merge(:class => ["nps_action_marker", "nps_marker_id_#{marker_id}", options[:class]].compact.join(' '))
+        options.merge(class: ["nps_action_marker", "nps_marker_id_#{marker_id}", options[:class]].compact.join(" "))
       )
     end
 
@@ -141,7 +138,7 @@ module RailsConnector
         size = options.delete(:size)
         target = options.delete(:target) || "_blank"
 
-        link_to name.to_s, '#', onclick: "inline_editing.openEditDialog('#{obj.id}', '#{attr}', '#{context.id || 'null'}', '#{size || 'null'}', '#{target || 'null'}'); return false;"
+        link_to name.to_s, "#", onclick: "inline_editing.openEditDialog('#{obj.id}', '#{attr}', '#{context.id || "null"}', '#{size || "null"}', '#{target || "null"}'); return false;"
       end
     end
 
@@ -165,17 +162,17 @@ module RailsConnector
     #     Content
     #   <% end %>
     # @api public
-    def marker_menu(left=0, top=0, &block)
+    def marker_menu(left = 0, top = 0, &block)
       self.current_marker_menu_id = store_marker_definition(
-        :offset_left => left,
-        :offset_top => top
+        offset_left: left,
+        offset_top: top
       )
       store_marker_markup(content_tag(
-        :div,
-        marker_menu_markup(capture(&block)),
-        :class => "nps_marker_menu nps_marker_id_#{current_marker_menu_id}",
-        :id => "nps_marker_menu_#{current_marker_menu_id}"
-      ))
+                            :div,
+                            marker_menu_markup(capture(&block)),
+                            class: "nps_marker_menu nps_marker_id_#{current_marker_menu_id}",
+                            id: "nps_marker_menu_#{current_marker_menu_id}"
+                          ))
       nil
     end
 
@@ -191,7 +188,7 @@ module RailsConnector
       content_tag(
         tag_name,
         capture(&block),
-        options.merge(:class => "#{marker_menu_target_class} #{options[:class]}")
+        options.merge(class: "#{marker_menu_target_class} #{options[:class]}")
       )
     end
 
@@ -203,7 +200,9 @@ module RailsConnector
     # an element (e.g. an image) you need to supply this css class.
     # @api public
     def marker_menu_target_class
-      "nps_marker_menu_target nps_marker_menu_target_#{current_marker_menu_id}" if Configuration.editor_interface_enabled?
+      if Configuration.editor_interface_enabled?
+        "nps_marker_menu_target nps_marker_menu_target_#{current_marker_menu_id}"
+      end
     end
 
     # Renders the necessary JavaScript and CSS includes to use the edit markers.
@@ -212,7 +211,7 @@ module RailsConnector
         raw <<-EOF
           #{stylesheet_link_tag :editmarker}
           #{javascript_include_tag :editmarker}
-          #{content_tag(:script, :type => 'text/javascript') { 'inline_editing.init();' }}
+          #{content_tag(:script, type: "text/javascript") { "inline_editing.init();" }}
         EOF
       end
     end
@@ -220,6 +219,7 @@ module RailsConnector
     # Renders the necessary marker code to use edit markers and marker menus.
     def render_marker_code
       return unless Configuration.editor_interface_enabled?
+
       html = raw("#{render_marker_definitions}\n#{render_marker_menus}\n#{render_edit_markers}")
       reset_marker_code
       html
@@ -250,7 +250,7 @@ module RailsConnector
     # [options] options that will be delegated to the {#link_to_edit} helper.
     # @api public
     def edit_item(title, css_class, obj, attribute, options = {})
-      edit_link = link_to_edit(content_tag(:span, title, :class => css_class), obj, attribute, options)
+      edit_link = link_to_edit(content_tag(:span, title, class: css_class), obj, attribute, options)
       content_tag(:li, edit_link)
     end
 
@@ -263,27 +263,27 @@ module RailsConnector
     # [options] options that will be delegated to the {#action_marker} helper.
     # @api public
     def action_item(title, css_class, objs, action, options = {})
-      action_link = action_marker(action, objs, options) { content_tag(:span, title, :class => css_class) }
+      action_link = action_marker(action, objs, options) { content_tag(:span, title, class: css_class) }
       content_tag(:li, action_link)
     end
 
-  private
+    private
 
-    attr_accessor :current_marker_menu_id
+    attr_writer :current_marker_menu_id
 
     def current_marker_menu_id
       @current_marker_menu_id or raise "Tried to create a marker menu target before a marker menu was created!"
     end
 
-    JS_HEADER = <<ENDOFSTRING
-<script type="text/javascript">
-// <![CDATA[
-ENDOFSTRING
+    JS_HEADER = <<~ENDOFSTRING.freeze
+      <script type="text/javascript">
+      // <![CDATA[
+    ENDOFSTRING
 
-    JS_FOOTER = <<ENDOFSTRING
-// ]]>
-</script>
-ENDOFSTRING
+    JS_FOOTER = <<~ENDOFSTRING.freeze
+      // ]]>
+      </script>
+    ENDOFSTRING
 
     def store_marker_definition(definition)
       @marker_definitions ||= {}
@@ -298,8 +298,9 @@ ENDOFSTRING
 
     def render_marker_definitions
       return unless @marker_definitions.present?
+
       "#{JS_HEADER}inline_editing.storeMarkerDefinitions(#{@marker_definitions.to_json});" +
-          "#{JS_FOOTER}"
+        JS_FOOTER.to_s
     end
 
     def store_marker_markup(markup)
@@ -326,11 +327,11 @@ ENDOFSTRING
 
     def required_memberships_for_editing(obj, attr)
       permissions = [:read]
-      if [:name, :obj_class, :workflow, :suppressexport, :permalink].include?(attr.to_sym)
-        permissions << :root
-      else
-        permissions << :write
-      end
+      permissions << if %i(name obj_class workflow suppressexport permalink).include?(attr.to_sym)
+                       :root
+                     else
+                       :write
+                     end
 
       required_memberships_for_permissions(obj, permissions)
     end
@@ -342,31 +343,29 @@ ENDOFSTRING
     def uri_for_action_marker(action, objects, context = nil, size = nil, target = nil, params = nil)
       action = action.to_s
       objectIds = objects.collect(&:id).to_json
-      contextId = context.nil? ? 'null' : context.id
-      size = size.nil? ? 'null' : "'#{size}'"
-      target = target.nil? ? 'null' : "'#{target}'"
-      params = params.blank? ? 'null' : "'#{escape_javascript(params.to_json.gsub('"','%22'))}'"
+      contextId = context.nil? ? "null" : context.id
+      size = size.nil? ? "null" : "'#{size}'"
+      target = target.nil? ? "null" : "'#{target}'"
+      params = params.blank? ? "null" : "'#{escape_javascript(params.to_json.gsub('"', "%22"))}'"
       "javascript:parent.openActionDialog('#{action}',#{objectIds},#{contextId},#{params},#{size},#{target})"
     end
 
     def format_attribute_name_for_gui(attr)
       attr = attr.to_s
-      attr = 'blob' if attr == 'body'
-      attr = attr.camelize(:lower) if %w{ valid_from valid_until obj_class }.include? attr
+      attr = "blob" if attr == "body"
+      attr = attr.camelize(:lower) if %w(valid_from valid_until obj_class).include? attr
       attr
     end
 
     def marker_menu_markup(content)
-      raw %Q{<a class="nps_marker_menu_button" name="nps_marker_menu_button" href="#">MENU</a>
+      raw %(<a class="nps_marker_menu_button" name="nps_marker_menu_button" href="#">MENU</a>
       <div class="nps_marker_menu_content" style="display:none;">
         <div class="b1"></div><div class="b2"></div><div class="b3"></div><div class="b4"></div>
         <div class="core">
           #{content}
         </div>
         <div class="b4"></div><div class="b3"></div><div class="b2"></div><div class="b1"></div>
-      </div>}
+      </div>)
     end
-
   end
-
 end