pages_core 3.6.2 → 3.8.2

data/app/formatters/pages_core/html_formatter.rb

@@ -1,9 +1,7 @@
+# frozen_string_literal: true
+
 module PagesCore
   class HtmlFormatter
-    include ActionView::Helpers::AssetTagHelper
-    include PagesCore::ImagesHelper
-    include Rails.application.routes.url_helpers
-
     class << self
       def to_html(string, options = {})
         new(string, options).to_html
@@ -16,12 +14,9 @@ module PagesCore
     end
 
     def to_html
-      string = parse_images(parse_files(parse_attachments(@string)))
-      if @options[:shorten] && string.length > @options[:shorten]
-        string = string[0..@options[:shorten]] + "..."
-      end
+      string = shorten(parse_images(parse_files(parse_attachments(@string))))
       string += " #{@options[:append]}" if @options[:append]
-      RedCloth.new(string).to_html.html_safe
+      fix_markup(RedCloth.new(string).to_html).html_safe
     end
 
     private
@@ -34,31 +29,6 @@ module PagesCore
       /\[file:([\d,]+)\]/
     end
 
-    def image_expression
-      /\[image:(\d+)([^\]]*)?\]/
-    end
-
-    def embed_image(id, size:, class_name:, link:)
-      image = Image.find(id).localize(I18n.locale)
-      class_name = ["image", image_class_name(image), class_name].compact
-      image_tag = dynamic_image_tag(image,
-                                    size: size, crop: false, upscale: false)
-      content_tag(:figure,
-                  (link ? link_to(image_tag, link) : image_tag) +
-                  image_caption(image),
-                  class: class_name)
-    rescue ActiveRecord::RecordNotFound
-      nil
-    end
-
-    def embed_image_size(str)
-      if str =~ /size="(\d*x\d*)"/
-        Regexp.last_match(1)
-      else
-        "2000x2000"
-      end
-    end
-
     def find_attachment(id)
       Attachment.find(id).localize(I18n.locale)
     rescue ActiveRecord::RecordNotFound
@@ -85,6 +55,10 @@ module PagesCore
          .compact
     end
 
+    def fix_markup(str)
+      Nokogiri::HTML.fragment(str).to_html
+    end
+
     def parse_attachments(string)
       string.gsub(attachment_expression).each do |str|
         PagesCore.config.attachment_embedder.new(
@@ -101,40 +75,16 @@ module PagesCore
       end
     end
 
-    def parse_image(str)
-      id = str.match(image_expression)[1]
-      options = str.match(image_expression)[2]
-      class_name = (Regexp.last_match(1) if options =~ /class="([\s\-\w]+)"/)
-      link = (Regexp.last_match(1) if options =~ /link="([^"]+)"/)
-      embed_image(id,
-                  size: embed_image_size(options),
-                  class_name: class_name,
-                  link: link)
-    end
-
     def parse_images(string)
-      string.gsub(image_expression).each do |str|
-        parse_image(str)
-      end
+      PagesCore::ImageEmbedder.new(string).embed
     end
 
-    def image_caption(image)
-      return unless image.caption?
-      content_tag(:figcaption, image.caption)
-    end
-
-    def image_class_name(image)
-      if image.size.x == image.size.y
-        "square"
-      elsif image.size.x > image.size.y
-        "landscape"
-      else
-        "portrait"
+    def shorten(string)
+      unless @options[:shorten] && string.length > @options[:shorten]
+        return string
       end
-    end
 
-    def link_to(content, href)
-      content_tag(:a, content, href: href)
+      "#{string[0..@options[:shorten]]}..."
     end
   end
 end

data/app/formatters/pages_core/image_embedder.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module PagesCore
+  class ImageEmbedder
+    include ActionView::Helpers::AssetTagHelper
+    include PagesCore::ImagesHelper
+    include Rails.application.routes.url_helpers
+
+    def initialize(string)
+      @string = string
+    end
+
+    def embed
+      parse_images(@string)
+    end
+
+    private
+
+    def image_expression
+      /\[image:(\d+)([^\]]*)?\]/
+    end
+
+    def embed_image(id, size:, class_name:, link:)
+      image = Image.find(id).localize(I18n.locale)
+      class_name = ["image", image_class_name(image), class_name].compact
+      image_tag = dynamic_image_tag(image,
+                                    size: size, crop: false, upscale: false)
+      tag.figure((link ? link_to(image_tag, link) : image_tag) +
+                  image_caption(image), class: class_name)
+    rescue ActiveRecord::RecordNotFound
+      nil
+    end
+
+    def embed_image_size(str)
+      if str =~ /size="(\d*x\d*)"/
+        Regexp.last_match(1)
+      else
+        "2000x2000"
+      end
+    end
+
+    def image_caption(image)
+      return unless image.caption?
+
+      tag.figcaption(image.caption)
+    end
+
+    def image_class_name(image)
+      if image.size.x == image.size.y
+        "square"
+      elsif image.size.x > image.size.y
+        "landscape"
+      else
+        "portrait"
+      end
+    end
+
+    def link_to(content, href)
+      tag.a(content, href: href)
+    end
+
+    def parse_image(str)
+      id = str.match(image_expression)[1]
+      options = str.match(image_expression)[2]
+      class_name = (Regexp.last_match(1) if options =~ /class="([\s\-\w]+)"/)
+      link = (Regexp.last_match(1) if options =~ /link="([^"]+)"/)
+      embed_image(id,
+                  size: embed_image_size(options),
+                  class_name: class_name,
+                  link: link)
+    end
+
+    def parse_images(string)
+      string.gsub(image_expression).each do |str|
+        parse_image(str)
+      end
+    end
+  end
+end

data/app/formatters/pages_core/link_renderer.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module PagesCore
   class LinkRenderer < WillPaginate::ActionView::LinkRenderer
     def previous_page
       num = @collection.current_page > 1 &&
-            @collection.current_page - 1
+            (@collection.current_page - 1)
       previous_or_next_page(num, "Previous", "previous")
     end
 
     def next_page
       num = @collection.current_page < total_pages &&
-            @collection.current_page + 1
+            (@collection.current_page + 1)
       previous_or_next_page(num, "Next", "next")
     end
   end

data/app/helpers/admin/admin_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   module AdminHelper
     include PagesCore::Admin::AdminHelper

data/app/helpers/admin/menu_helper.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Admin
   module MenuHelper
     def header_tabs(group)
-      content_tag :ul, class: group.to_s do
+      tag.ul(class: group.to_s) do
         safe_join(menu_items_for(group).map do |item|
-          content_tag :li do
+          tag.li do
             path = instance_eval(&item.path)
             link_to(item.label,
                     path,
@@ -20,9 +22,9 @@ module Admin
         .select { |_, routing| routing[:controller] == params[:controller] }
     end
 
-    def find_menu_candidate
+    def find_menu_candidate(&block)
       menu_item_candidates
-        .select { |item, routing| yield(item, routing) }
+        .select { |item, routing| block.call(item, routing) }
         .try(&:first)
         .try(&:first)
     end

data/app/helpers/admin/pages_helper.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 module Admin
   module PagesHelper
+    include PagesCore::Admin::PageBlocksHelper
+
     def available_templates_for_select
       PagesCore::Templates.names.collect do |template|
         if template == "index"
@@ -26,39 +30,6 @@ module Admin
       ([page.author] + User.activated).uniq
     end
 
-    def page_block_field(form, block_name, block_options)
-      labelled_field(
-        if block_options[:type] == :select
-          page_block_select(form, block_name, block_options)
-        else
-          page_block_text_field(form, block_name, block_options)
-        end,
-        block_options[:title],
-        errors: form.object.errors[block_name],
-        description: block_options[:description]
-      )
-    end
-
-    def page_block_select(form, block_name, block_options)
-      opts = localize_page_select_options(form, block_options)
-      opts = opts.call if opts.is_a?(Proc)
-      opts = opts.map { |v| [v, v] } unless nested_array?(opts)
-      opts = ([["", nil]] + opts).uniq
-
-      value = form.object.send(block_name)
-      opts << [value, value] unless opts.map(&:last).include?(value)
-
-      form.send(:select, block_name, opts)
-    end
-
-    def page_block_text_field(form, block_name, block_options)
-      form.send(
-        block_options[:size] == :field ? :text_field : :rich_text_area,
-        block_name,
-        page_block_field_options(block_options)
-      )
-    end
-
     def page_name(page, options = {})
       page_names = if options[:include_parents]
                      page.self_and_ancestors.reverse
@@ -83,34 +54,10 @@ module Admin
 
     private
 
-    def localize_page_select_options(form, block_options)
-      if block_options[:options].is_a?(Hash)
-        block_options[:options][form.object.locale.to_sym]
-      else
-        block_options[:options]
-      end
-    end
-
     def nested_array?(array)
       array.present? && array.first.is_a?(Array)
     end
 
-    def page_block_classes(class_name, block_options = {})
-      [class_name, block_options[:class]].join(" ").strip
-    end
-
-    def page_block_field_options(block_options = {})
-      opts = { placeholder: block_options[:placeholder] }
-      if block_options[:size] == :field
-        opts.merge(class: page_block_classes("rich", block_options))
-      else
-        opts.merge(
-          class: page_block_classes("rich", block_options),
-          rows: (block_options[:size] == :large ? 15 : 5)
-        )
-      end
-    end
-
     def page_name_with_fallback(page)
       if page.name?
         page.name.to_s

data/app/helpers/application_helper.rb

@@ -1,3 +1,5 @@
-module ApplicationHelper #:nodoc:
+# frozen_string_literal: true
+
+module ApplicationHelper # :nodoc:
   include PagesCore::ApplicationHelper
 end

data/app/helpers/frontend_helper.rb

@@ -1,3 +1,5 @@
-module FrontendHelper #:nodoc:
+# frozen_string_literal: true
+
+module FrontendHelper # :nodoc:
   include PagesCore::FrontendHelper
 end

data/app/helpers/pages_core/admin/admin_helper.rb

@@ -1,13 +1,17 @@
+# frozen_string_literal: true
+
 module PagesCore
   module Admin
     module AdminHelper
+      include PagesCore::Admin::ContentTabsHelper
+      include PagesCore::Admin::DateRangeHelper
+      include PagesCore::Admin::ImageUploadsHelper
+      include PagesCore::Admin::PageJsonHelper
       include PagesCore::Admin::LabelledFieldHelper
       include PagesCore::Admin::TagEditorHelper
 
-      attr_writer :page_title
-      attr_writer :page_description
-      attr_writer :page_description_class
-      attr_writer :page_description_links
+      attr_writer :page_title, :page_description, :page_description_class,
+                  :page_description_links
 
       def add_body_class(class_name)
         @body_classes ||= []
@@ -16,72 +20,10 @@ module PagesCore
 
       def body_classes
         classes = @body_classes || []
-        classes << controller.class.to_s.underscore
-        classes << "#{controller.action_name}_action" if controller.action_name
         classes << "with_notice" if flash[:notice]
         classes
       end
 
-      def page_date_range(page)
-        if page.all_day?
-          date_range(page.starts_at.to_date, page.ends_at.to_date)
-        else
-          date_range(page.starts_at, page.ends_at)
-        end
-      end
-
-      def date_range(starts_at, ends_at)
-        show_time = !(starts_at.is_a?(Date) && ends_at.is_a?(Date))
-        dates = if starts_at.year != ends_at.year
-                  [l(starts_at, format: :pages_full), l(ends_at, format: :pages_full)]
-                elsif starts_at.month != ends_at.month
-                  [l(starts_at, format: :pages_date), l(ends_at, format: :pages_full)]
-                elsif starts_at.day != ends_at.day && !show_time
-                  [l(starts_at, format: :pages_day), l(ends_at, format: :pages_full)]
-                elsif starts_at.day != ends_at.day
-                  [l(starts_at, format: :pages_date), l(ends_at, format: :pages_full)]
-                elsif !show_time
-                  [l(starts_at, format: :pages_full)]
-                else
-                  [l(starts_at, format: :pages_full), l(ends_at, format: :pages_time)]
-                end
-        safe_join(dates.map(&:strip), "&ndash;".html_safe)
-      end
-
-      # Generates tags for an editable dynamic image.
-      def editable_dynamic_image_tag(image, width: 250, caption: false, locale: nil)
-        react_component("EditableImage",
-                        editable_image_options(
-                          image,
-                          width: width,
-                          caption: caption,
-                          locale: locale
-                        ).merge(width: width))
-      end
-
-      def image_uploader_tag(name, image, options = {})
-        opts = { caption: false, locale: nil }.merge(options)
-        react_component("ImageUploader",
-                        editable_image_options(
-                          image,
-                          caption: opts[:caption],
-                          locale: opts[:locale]
-                        ).merge(attr: name, alternative: opts[:alternative]))
-      end
-
-      def content_tab(name, options = {}, &block)
-        @content_tabs ||= []
-        return unless block_given?
-        tab = {
-          name:    name.to_s.humanize,
-          key:     options[:key] || name.to_s.underscore.gsub(/[\s]+/, "_"),
-          options: options,
-          content: capture(&block)
-        }
-        @content_tabs << tab
-        content_tab_tag(tab[:key], tab[:content])
-      end
-
       def rich_text_area_tag(name, content = nil, options = {})
         react_component("RichTextArea",
                         options.merge(id: sanitize_to_id(name),
@@ -90,7 +32,7 @@ module PagesCore
       end
 
       def link_separator
-        safe_join [" ", content_tag(:span, "|", class: "separator"), " "]
+        safe_join [" ", tag.span("|", class: "separator"), " "]
       end
 
       def deprecate_page_description_args(string = nil, class_name = nil)
@@ -100,6 +42,7 @@ module PagesCore
                                           "use page_description_class=")
         end
         return unless string
+
         ActiveSupport::Deprecation.warn("Setting description with " \
                                         "page_description is deprecated, " \
                                         "use page_description=")
@@ -116,49 +59,22 @@ module PagesCore
       end
 
       def page_description_links(links = nil)
-        if links
-          ActiveSupport::Deprecation.warn(
-            "Setting page description_links with page_description_links " \
-              "is deprecated, use page_description_links="
-          )
-          @page_description_links = links
-        else
-          @page_description_links
-        end
-      end
+        return @page_description_links unless links
 
-      def page_title(title = nil)
-        if title
-          ActiveSupport::Deprecation.warn(
-            "Setting page title with page_title is deprecated, use page_title="
-          )
-          @page_title = title
-        else
-          @page_title
-        end
+        ActiveSupport::Deprecation.warn(
+          "Setting page description_links with page_description_links " \
+          "is deprecated, use page_description_links="
+        )
+        @page_description_links = links
       end
 
-      private
-
-      def content_tab_tag(key, content)
-        content_tag(:div,
-                    content,
-                    class: "content_tab",
-                    id: "content-tab-#{key}")
-      end
+      def page_title(title = nil)
+        return @page_title unless title
 
-      def editable_image_options(image, width: 250, caption: false, locale: nil)
-        image_opts = if image
-                       { src: dynamic_image_path(image, size: "#{width * 2}x"),
-                         image: ::Admin::ImageSerializer.new(image) }
-                     else
-                       {}
-                     end
-        image_opts.merge(width: width,
-                         caption: caption,
-                         locale: locale || I18n.default_locale,
-                         locales: PagesCore.config.locales,
-                         csrf_token: form_authenticity_token)
+        ActiveSupport::Deprecation.warn(
+          "Setting page title with page_title is deprecated, use page_title="
+        )
+        @page_title = title
       end
     end
   end

data/app/helpers/pages_core/admin/content_tabs_helper.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module Admin
+    module ContentTabsHelper
+      def content_tab(name, options = {}, &block)
+        @content_tabs ||= []
+        return unless block_given?
+
+        tab = {
+          name: name.to_s.humanize,
+          key: options[:key] || name.to_s.underscore.gsub(/\s+/, "_"),
+          options: options,
+          content: capture(&block)
+        }
+        @content_tabs << tab
+        content_tab_tag(tab[:key], tab[:content])
+      end
+
+      private
+
+      def content_tab_tag(key, content)
+        tag.div(content,
+                class: "content-tab",
+                id: "content-tab-#{key}",
+                data: { tab: key,
+                        "main-target" => "tab" })
+      end
+    end
+  end
+end

data/app/helpers/pages_core/admin/date_range_helper.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module Admin
+    module DateRangeHelper
+      def page_date_range(page)
+        if page.all_day?
+          date_range(page.starts_at.to_date, page.ends_at.to_date)
+        else
+          date_range(page.starts_at, page.ends_at)
+        end
+      end
+
+      def date_range(starts_at, ends_at)
+        dates = different_year_date_range(starts_at, ends_at) ||
+                different_month_date_range(starts_at, ends_at) ||
+                different_day_date_range(starts_at, ends_at) ||
+                same_day_date_range(starts_at, ends_at)
+        safe_join(dates.map(&:strip), "–".html_safe)
+      end
+
+      private
+
+      def different_year_date_range(starts_at, ends_at)
+        return if starts_at.year == ends_at.year
+
+        [l(starts_at, format: :pages_full), l(ends_at, format: :pages_full)]
+      end
+
+      def different_month_date_range(starts_at, ends_at)
+        return if starts_at.month == ends_at.month
+
+        [l(starts_at, format: :pages_date), l(ends_at, format: :pages_full)]
+      end
+
+      def different_day_date_range(starts_at, ends_at)
+        return if starts_at.day == ends_at.day
+
+        if starts_at.is_a?(Date) && ends_at.is_a?(Date)
+          [l(starts_at, format: :pages_day), l(ends_at, format: :pages_full)]
+        else
+          [l(starts_at, format: :pages_date), l(ends_at, format: :pages_full)]
+        end
+      end
+
+      def same_day_date_range(starts_at, ends_at)
+        if starts_at.is_a?(Date) && ends_at.is_a?(Date)
+          [l(starts_at, format: :pages_full)]
+        else
+          [l(starts_at, format: :pages_full), l(ends_at, format: :pages_time)]
+        end
+      end
+    end
+  end
+end

data/app/helpers/pages_core/admin/form_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module Admin
     class FormBuilder < PagesCore::FormBuilder
@@ -19,6 +21,12 @@ module PagesCore
         )
       end
 
+      def labelled_rich_text_area(attribute, label_text = nil, options = {})
+        labelled_field(attribute, label_text, options) do |opts|
+          rich_text_area(attribute, opts)
+        end
+      end
+
       def labelled_image_uploader(attribute, label_text = nil, options = {})
         labelled_field(attribute, label_text, options) do |opts|
           image_uploader(attribute, opts)

data/app/helpers/pages_core/admin/image_uploads_helper.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module Admin
+    module ImageUploadsHelper
+      # Generates tags for an editable dynamic image.
+      def editable_dynamic_image_tag(image, width: 250,
+                                     caption: false, locale: nil)
+        react_component("EditableImage",
+                        editable_image_options(
+                          image,
+                          width: width,
+                          caption: caption,
+                          locale: locale
+                        ).merge(width: width))
+      end
+
+      def image_uploader_tag(name, image, options = {})
+        opts = { caption: false, locale: nil }.merge(options)
+        react_component("ImageUploader",
+                        editable_image_options(
+                          image,
+                          caption: opts[:caption],
+                          locale: opts[:locale]
+                        ).merge(attr: name, alternative: opts[:alternative]))
+      end
+
+      private
+
+      def editable_image_src_options(image, width)
+        return {} unless image
+
+        { src: dynamic_image_path(image, size: "#{width * 2}x"),
+          image: ::Admin::ImageResource.new(image).to_hash }
+      end
+
+      def editable_image_options(image, width: 250, caption: false, locale: nil)
+        editable_image_src_options(image, width).merge(
+          width: width,
+          caption: caption,
+          locale: locale || I18n.default_locale,
+          locales: PagesCore.config.locales
+        )
+      end
+    end
+  end
+end