pageflow 17.0.5 → 17.1.0

data/app/helpers/pageflow/admin/users_helper.rb

@@ -1,6 +1,6 @@
 module Pageflow
   module Admin
-    module UsersHelper
+    module UsersHelper # rubocop:todo Style/Documentation
       include QuotaHelper
 
       def users_quota_state(account)
@@ -11,13 +11,15 @@ module Pageflow
         }
 
         render('pageflow/admin/users/quota_state',
-               account: account,
-               quota: quota,
-               data_attributes: data_attributes)
+               account:,
+               quota:,
+               data_attributes:)
       end
 
       def collection_for_user_roles
-        User.roles_accessible_by(current_ability).index_by { |role| t(role, :scope => 'pageflow.admin.users.roles') }
+        User.roles_accessible_by(current_ability).index_by do |role|
+          t(role, scope: 'pageflow.admin.users.roles')
+        end
       end
 
       def delete_own_user_section

data/app/helpers/pageflow/admin/widgets_helper.rb

@@ -1,11 +1,11 @@
 module Pageflow
   module Admin
-    module WidgetsHelper
+    module WidgetsHelper # rubocop:todo Style/Documentation
       def admin_widgets_fields(form, config)
         render('pageflow/admin/widgets/fields',
                widgets: form.object.widgets.resolve(config, include_placeholders: true),
-               form: form,
-               config: config)
+               form:,
+               config:)
       end
 
       def admin_widget_types_collection_for_role(config, role)

data/app/helpers/pageflow/asset_urls_helper.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  module AssetUrlsHelper
+  module AssetUrlsHelper # rubocop:todo Style/Documentation
     include RenderJsonHelper
 
     def editor_asset_urls

data/app/helpers/pageflow/audio_files_helper.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  module AudioFilesHelper
+  module AudioFilesHelper # rubocop:todo Style/Documentation
     include RevisionFileHelper
 
     def audio_file_audio_tag(audio_file_perma_id, options = {})
@@ -10,6 +10,7 @@ module Pageflow
 
       audio_file = find_file_in_entry(AudioFile, audio_file_perma_id)
       return unless audio_file
+
       content_tag(:audio, options) do
         audio_file_sources(audio_file, url_options).each do |source|
           concat(tag(:source, source.slice(:src, :type)))
@@ -20,14 +21,16 @@ module Pageflow
     def audio_file_script_tag(audio_file_perma_id, options = {})
       audio_file = find_file_in_entry(AudioFile, audio_file_perma_id)
       return unless audio_file
+
       render('pageflow/audio_files/script_tag',
-             audio_file: audio_file,
+             audio_file:,
              audio_file_sources: audio_file_sources(audio_file, options))
     end
 
     def audio_file_non_js_link(entry, audio_file_perma_id)
       audio_file = find_file_in_entry(AudioFile, audio_file_perma_id)
       return unless audio_file
+
       link_to(t('pageflow.audio.open'), short_audio_file_path(entry, audio_file))
     end
 

data/app/helpers/pageflow/background_image_helper.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  module BackgroundImageHelper
+  module BackgroundImageHelper # rubocop:todo Style/Documentation
     include RevisionFileHelper
 
     def background_image_div(configuration, property_base_name, options = {})
@@ -24,7 +24,7 @@ module Pageflow
       ".load_all_images .#{css_class}, .load_image.#{css_class}"
     end
 
-    class Div
+    class Div # rubocop:todo Style/Documentation
       attr_reader :configuration, :property_base_name, :options
 
       delegate :content_tag, to: :@template
@@ -71,7 +71,7 @@ module Pageflow
 
       def background_position(coord)
         property_name = "#{property_base_name}_#{coord}"
-        configuration.key?(property_name) ? "#{configuration[property_name]}%" : "50%"
+        configuration.key?(property_name) ? "#{configuration[property_name]}%" : '50%'
       end
 
       def file_type
@@ -80,7 +80,7 @@ module Pageflow
       end
     end
 
-    class DivWithSizeAttributes < Div
+    class DivWithSizeAttributes < Div # rubocop:todo Style/Documentation
       include RevisionFileHelper
 
       def data_attributes
@@ -93,7 +93,8 @@ module Pageflow
 
       def inline_style
         if options[:spanning]
-          "padding-top: #{padding_top}%; width: 100%; background-position: 0 0" # fix me (yet disables background_position option)
+          "padding-top: #{padding_top}%; width: 100%; " \
+            'background-position: 0 0' # fix me (yet disables background_position option)
         else
           super
         end
@@ -110,7 +111,7 @@ module Pageflow
       end
 
       def file
-        @file ||= (find_file || :none)
+        @file ||= find_file || :none
         @file == :none ? nil : @file
       end
 

data/app/helpers/pageflow/common_entry_seed_helper.rb

@@ -18,7 +18,7 @@ module Pageflow
       json.file_model_types { config_file_model_types_seed(json, config) }
     end
 
-    class PageTypesSeed
+    class PageTypesSeed # rubocop:todo Style/Documentation
       attr_reader :config
 
       def initialize(config)
@@ -58,9 +58,7 @@ module Pageflow
       def condition(candidate)
         result = candidate[:unless] || candidate[:if]
 
-        if result
-          result[:negated] = !!candidate[:unless]
-        end
+        result[:negated] = !!candidate[:unless] if result
 
         result
       end

data/app/helpers/pageflow/editor/config_helper.rb

@@ -5,7 +5,7 @@ module Pageflow
       include RenderJsonHelper
 
       def editor_config_seeds(entry)
-        render_json_partial('pageflow/editor/config/seeds', entry: entry)
+        render_json_partial('pageflow/editor/config/seeds', entry:)
       end
     end
   end

data/app/helpers/pageflow/editor/files_helper.rb

@@ -11,7 +11,7 @@ module Pageflow
         inner = Pageflow.config.file_types.map { |file_type|
           json = render_json_partial(partial: 'pageflow/editor/files/file',
                                      collection: entry.find_files(file_type.model),
-                                     locals: {file_type: file_type},
+                                     locals: {file_type:},
                                      as: :file)
 
           %("#{file_type.collection_name}": #{json})

data/app/helpers/pageflow/embed_code_helper.rb

@@ -1,17 +1,17 @@
 module Pageflow
-  module EmbedCodeHelper
+  module EmbedCodeHelper # rubocop:todo Style/Documentation
     def embed_code_entry_snippet(entry)
       Pageflow::EmbedCodeHelper::EntrySnippet.new(pageflow, entry)
     end
 
-    class EntrySnippet
+    class EntrySnippet # rubocop:todo Style/Documentation
       def initialize(routes, entry)
         @routes = routes
         @entry = entry
       end
 
       def call
-        %'<iframe src="#{url(entry)}" allowfullscreen></iframe>'
+        %(<iframe src="#{url(entry)}" allowfullscreen></iframe>)
       end
 
       private

data/app/helpers/pageflow/entries_helper.rb

@@ -1,10 +1,10 @@
 module Pageflow
-  module EntriesHelper
+  module EntriesHelper # rubocop:todo Style/Documentation
     def pretty_entry_title(entry)
       return entry.title if entry.site.title == ' '
 
       [entry.title,
-       entry.site.title.presence || entry.site.cname_domain.presence].compact.join(' - ')
+       entry.site.display_title].compact.join(' - ')
     end
 
     def pretty_entry_url(entry, options = {})
@@ -15,7 +15,7 @@ module Pageflow
     module PrettyUrl
       extend self
 
-      def build(routes, entry, options)
+      def build(routes, entry, options = {})
         with_custom_canonical_url_prefix(entry) ||
           default(routes, entry, options)
       end
@@ -24,32 +24,44 @@ module Pageflow
 
       def with_custom_canonical_url_prefix(entry)
         return if entry.site.canonical_entry_url_prefix.blank?
+
         entry = ensure_entry_with_revision(entry)
 
         [
           entry.site.canonical_entry_url_prefix.gsub(':locale', entry.locale),
-          entry.to_param,
+          entry_suffix(entry),
           entry.site.trailing_slash_in_canonical_urls ? '/' : ''
         ].join
       end
 
+      def entry_suffix(entry)
+        if entry.permalink.present?
+          entry_permalink_parts(entry).join
+        else
+          entry.to_param
+        end
+      end
+
       def default(routes, entry, options)
         params =
           options
           .reverse_merge(trailing_slash: entry.site.trailing_slash_in_canonical_urls)
-          .reverse_merge(Pageflow.config.site_url_options(entry.site) || {})
+          .reverse_merge(Pageflow.config_for(entry).public_entry_url_options_for(entry) || {})
 
         if entry.permalink.present?
-          routes.permalink_url(
-            entry.permalink.directory&.path || '',
-            entry.permalink.slug,
-            params
-          )
+          routes.permalink_url(*entry_permalink_parts(entry), params)
         else
           routes.short_entry_url(entry.to_model, params)
         end
       end
 
+      def entry_permalink_parts(entry)
+        [
+          entry.permalink.directory&.path || '',
+          entry.permalink.slug
+        ]
+      end
+
       def ensure_entry_with_revision(entry)
         if entry.is_a?(EntryAtRevision)
           entry
@@ -61,58 +73,71 @@ module Pageflow
 
     def entry_privacy_link_url(entry)
       return unless entry.site.privacy_link_url.present?
+      return entry.site.privacy_link_url if entry.site.privacy_link_url.start_with?('javascript:')
+
       "#{entry.site.privacy_link_url}?lang=#{entry.locale}"
     end
 
     def entry_file_rights(entry)
-      rights = Pageflow.config.file_types.map do |file_type|
+      rights = Pageflow.config.file_types.map { |file_type|
         entry.find_files(file_type.model).map do |file|
           file.rights.presence || entry.account.default_file_rights.presence
         end
-      end.flatten.compact.sort.uniq
+      }.flatten.compact.sort.uniq
 
       if rights.any?
         content_tag :p, class: 'rights' do
-          I18n.t('pageflow.helpers.entries.image_rights') + ": " + rights * ', '
+          "#{I18n.t('pageflow.helpers.entries.image_rights')}: #{rights * ', '}"
         end
       else
         ''
       end
     end
 
-    def entry_global_links(entry)
+    # rubocop:todo Metrics/PerceivedComplexity
+    # rubocop:todo Metrics/CyclomaticComplexity
+    def entry_global_links(entry) # rubocop:todo Metrics/AbcSize
       links = []
 
       if entry.site.imprint_link_label.present? && entry.site.imprint_link_url.present?
-        links << link_to(raw(entry.site.imprint_link_label),
-                         entry.site.imprint_link_url,
-                         target: '_blank',
-                         tabindex: 2,
-                         class: 'legal')
+        links << link_to(
+          raw(entry.site.imprint_link_label),
+          entry.site.imprint_link_url,
+          target: entry.site.imprint_link_url.start_with?('javascript:') ? nil : '_blank',
+          tabindex: 2,
+          class: 'legal'
+        )
       end
 
       if entry.site.copyright_link_label.present? && entry.site.copyright_link_url.present?
-        links << link_to(raw(entry.site.copyright_link_label),
-                         entry.site.copyright_link_url,
-                         target: '_blank',
-                         tabindex: 2,
-                         class: 'copy')
+        links << link_to(
+          raw(entry.site.copyright_link_label),
+          entry.site.copyright_link_url,
+          target: entry.site.copyright_link_url.start_with?('javascript:') ? nil : '_blank',
+          tabindex: 2,
+          class: 'copy'
+        )
       end
 
       if entry.site.privacy_link_url.present?
-        links << link_to(I18n.t('pageflow.public.privacy_notice'),
-                         entry_privacy_link_url(entry),
-                         target: '_blank',
-                         tabindex: 2,
-                         class: 'privacy')
+        links << link_to(
+          I18n.t('pageflow.public.privacy_notice'),
+          entry_privacy_link_url(entry),
+          target: entry.site.privacy_link_url.start_with?('javascript:') ? nil : '_blank',
+          tabindex: 2,
+          class: 'privacy'
+        )
       end
 
       if links.any?
-        content_tag(:span, I18n.t('pageflow.helpers.entries.global_links'), class: 'hidden') + safe_join(links, ''.html_safe)
+        content_tag(:span, I18n.t('pageflow.helpers.entries.global_links'),
+                    class: 'hidden') + safe_join(links, ''.html_safe)
       else
         ''
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     def entry_theme_stylesheet_link_tag(entry)
       stylesheet_link_tag(entry.theme.stylesheet_path,
@@ -156,15 +181,14 @@ module Pageflow
 
     def entry_header_css_class(entry)
       css_class = 'header'
-      if entry.pages.any? && entry.pages.first.configuration['invert']
-        css_class += ' invert'
-      end
+      css_class += ' invert' if entry.pages.any? && entry.pages.first.configuration['invert']
       css_class
     end
 
     def entry_summary(entry)
       return '' if entry.summary.blank?
-      strip_tags(entry.summary.gsub(/<br ?\/?>/, ' ').squish)
+
+      strip_tags(entry.summary.gsub(%r{<br ?/?>}, ' ').squish)
     end
   end
 end

data/app/helpers/pageflow/entry_json_seed_helper.rb

@@ -9,7 +9,7 @@ module Pageflow
 
     def entry_json_seed(entry)
       sanitize_json(render_json_partial('pageflow/entry_json_seed/entry',
-                                        entry: entry)).html_safe
+                                        entry:)).html_safe
     end
 
     def entry_attributes_seed(entry)
@@ -23,7 +23,8 @@ module Pageflow
     def entry_theme_seed(entry)
       theme = entry.theme
       {
-        change_to_parent_page_at_storyline_boundary: theme.change_to_parent_page_at_storyline_boundary?,
+        change_to_parent_page_at_storyline_boundary:
+          theme.change_to_parent_page_at_storyline_boundary?,
         page_change_by_scrolling: theme.page_change_by_scrolling?,
         hide_text_on_swipe: theme.hide_text_on_swipe?
       }

data/app/helpers/pageflow/feeds_helper.rb

@@ -14,14 +14,14 @@ module Pageflow
           {
             locale: entry.locale,
             format: 'atom'
-          }.merge(Pageflow.config.site_url_options(entry.site) || {})
+          }.merge(Pageflow.config.site_url_options_for(entry.site) || {})
         )
 
       tag(:link,
           rel: 'alternate',
           type: 'application/atom+xml',
           title: 'Feed',
-          href: href)
+          href:)
     end
 
     # @api private

data/app/helpers/pageflow/file_background_images_helper.rb

@@ -37,10 +37,10 @@ module Pageflow
       end
 
       def rules_for_file(file_type, file)
-        file_type.css_background_image_urls_for(file, entry: entry).map do |name, url|
+        file_type.css_background_image_urls_for(file, entry:).map do |name, url|
           {
             prefix: rule_prefix(file_type, name),
-            file: file,
+            file:,
             url: url_for_breakpoint(file_type, url)
           }
         end

data/app/helpers/pageflow/file_thumbnails_helper.rb

@@ -1,18 +1,19 @@
 module Pageflow
-  module FileThumbnailsHelper
+  module FileThumbnailsHelper # rubocop:todo Style/Documentation
     def file_thumbnails_css(revision)
       render(partial: 'pageflow/file_types/thumbnails',
              collection: Pageflow.config.file_types.with_thumbnail_support,
              as: :file_type,
              locals: {
-               revision: revision,
+               revision:,
                styles: Pageflow.config.css_rendered_thumbnail_styles
              })
     end
 
     def file_thumbnail_css_class(file, style)
       return if file.blank?
-      [file.to_model.class.model_name.singular, style, file.perma_id] * '_'
+
+      [file.to_model.class.model_name.singular, style, file.perma_id].join('_')
     end
   end
 end

data/app/helpers/pageflow/files_helper.rb

@@ -11,7 +11,7 @@ module Pageflow
       if file.width && file.height
         "#{file.width} x #{file.height}px"
       else
-        "-"
+        '-'
       end
     end
 
@@ -22,9 +22,10 @@ module Pageflow
         minutes = (total_seconds / 60) % 60
         hours = total_seconds / (60 * 60)
 
-        format("%02d:%02d:%02d", hours, minutes, seconds)
+        format('%<hours>02d:%<minutes>02d:%<seconds>02d', hours:, minutes:,
+                                                          seconds:)
       else
-        "-"
+        '-'
       end
     end
 
@@ -37,7 +38,7 @@ module Pageflow
       Pageflow.config.file_types.each do |file_type|
         json.set!(file_type.collection_name) do
           json.array!(entry.find_files(file_type.model)) do |file|
-            json.partial!('pageflow/files/file', file: file, file_type: file_type)
+            json.partial!('pageflow/files/file', file:, file_type:)
           end
         end
       end

data/app/helpers/pageflow/folders_helper.rb

@@ -1,8 +1,11 @@
 module Pageflow
-  module FoldersHelper
+  module FoldersHelper # rubocop:todo Style/Documentation
     def collection_for_folders(current_account, current_folder = nil)
-      accounts = AccountPolicy::Scope.new(current_user, Pageflow::Account)
-                 .entry_creatable.includes(:folders).where('pageflow_folders.id IS NOT NULL')
+      accounts = AccountPolicy::Scope
+                 .new(current_user, Pageflow::Account)
+                 .entry_creatable
+                 .includes(:folders)
+                 .where('pageflow_folders.id IS NOT NULL')
                  .order(:name, 'pageflow_folders.name')
 
       option_groups_from_collection_for_select(accounts,
@@ -23,9 +26,9 @@ module Pageflow
         account_folders[0][:account_id] == current_account.id
       end
 
-      folders_array.map(&:to_a).map do |account_folders|
+      folders_array.map(&:to_a).map { |account_folders|
         account_folders.map(&:id)
-      end.flatten
+      }.flatten
     end
   end
 end

data/app/helpers/pageflow/help_entries_helper.rb

@@ -11,9 +11,9 @@ module Pageflow
       render('pageflow/help_entries/menu', help_entries: config.help_entries)
     end
 
-    def help_entry_li(help_entry, &block)
+    def help_entry_li(help_entry, &)
       css_class = help_entry.children.present? ? 'expandable' : nil
-      content_tag(:li, class: css_class, &block)
+      content_tag(:li, class: css_class, &)
     end
   end
 end

data/app/helpers/pageflow/hreflang_links_helper.rb

@@ -0,0 +1,37 @@
+module Pageflow
+  # Helpers to render alternate links to translations of an entry.
+  #
+  # @since 17.1
+  module HreflangLinksHelper
+    include SocialShareHelper
+
+    # Render alternate links to all published entries that have been
+    # marked as translations of the given entry.
+    def hreflang_link_tags_for_entry(entry)
+      safe_join(
+        translations_for_hreflang_links(entry).each_with_object([]) do |translation, links|
+          links << hreflang_link_tag(translation)
+
+          if translation.default_translation?
+            links << hreflang_link_tag(translation, hreflang: 'x-default')
+          end
+        end
+      )
+    end
+
+    private
+
+    def translations_for_hreflang_links(entry)
+      entry.translations(
+        -> { preload(:site, :account, :translation_group, permalink: :directory) }
+      )
+    end
+
+    def hreflang_link_tag(entry, hreflang: entry.locale)
+      tag('link',
+          rel: 'alternate',
+          hreflang:,
+          href: social_share_entry_url(entry))
+    end
+  end
+end

data/app/helpers/pageflow/info_box_helper.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  module InfoBoxHelper
+  module InfoBoxHelper # rubocop:todo Style/Documentation
     def info_box(configuration)
       css_classes = ['add_info_box']
 
@@ -9,23 +9,19 @@ module Pageflow
         css_classes << 'empty'
       end
 
-      if configuration['additional_title'].blank?
-        css_classes << 'title_empty'
-      end
+      css_classes << 'title_empty' if configuration['additional_title'].blank?
 
-      if configuration['additional_description'].blank?
-        css_classes << 'description_empty'
-      end
+      css_classes << 'description_empty' if configuration['additional_description'].blank?
 
       render('pageflow/pages/info_box',
-             configuration: configuration,
+             configuration:,
              css_class: css_classes * ' ')
     end
 
     def info_box_title(title)
-      if title.present?
-        content_tag(:h3, title)
-      end
+      return unless title.present?
+
+      content_tag(:h3, title)
     end
   end
 end

data/app/helpers/pageflow/media_query_helper.rb

@@ -1,7 +1,7 @@
 module Pageflow
-  module MediaQueryHelper
-    def media_query(condition, &block)
-      content = capture(&block)
+  module MediaQueryHelper # rubocop:todo Style/Documentation
+    def media_query(condition, &)
+      content = capture(&)
 
       if condition == :default
         content

data/app/helpers/pageflow/navigation_bar_helper.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  module NavigationBarHelper
+  module NavigationBarHelper # rubocop:todo Style/Documentation
     def navigation_bar_css_class(entry, options = {})
       [
         options[:class],

data/app/helpers/pageflow/overview_helper.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  module OverviewHelper
+  module OverviewHelper # rubocop:todo Style/Documentation
     def overview_page_description(page)
       if page.configuration['description'].present?
         raw(page.configuration['description'])

data/app/helpers/pageflow/page_types_helper.rb

@@ -1,5 +1,5 @@
 module Pageflow
-  module PageTypesHelper
+  module PageTypesHelper # rubocop:todo Style/Documentation
     include RenderJsonHelper
 
     def page_type_json_seeds(config)
@@ -9,9 +9,9 @@ module Pageflow
     end
 
     def page_type_json_seed(json, page_type)
-      if page_type.json_seed_template
-        json.partial!(template: page_type.json_seed_template, locals: {page_type: page_type})
-      end
+      return unless page_type.json_seed_template
+
+      json.partial!(template: page_type.json_seed_template, locals: {page_type:})
     end
 
     def page_type_templates(entry)
@@ -24,7 +24,7 @@ module Pageflow
                            locals: {
                              configuration: {},
                              page: Page.new,
-                             entry: entry
+                             entry:
                            },
                            layout: false).to_str,
                     type: 'text/html', data: {template: "#{page_type.name}_page"})