pages_core 3.4.3 → 3.7.0

data/app/formatters/pages_core/html_formatter.rb

@@ -1,11 +1,7 @@
-# encoding: utf-8
+# 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
@@ -18,69 +14,77 @@ module PagesCore
     end
 
     def to_html
-      string = parse_images(@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
 
-    def image_expression
-      /\[image:(\d+)([\s="\-\w]*)?\]/
+    def attachment_expression
+      /\[attachment:([\d,]+)\]/
     end
 
-    def embed_image(id, size:, class_name:)
-      image = Image.find(id).localize(I18n.locale)
-      class_name = ["image", image_class_name(image), class_name].compact
-      content_tag(
-        :figure,
-        dynamic_image_tag(
-          image,
-          size: size,
-          crop: false,
-          upscale: false
-        ) + image_caption(image),
-        class: class_name
-      )
+    def file_expression
+      /\[file:([\d,]+)\]/
+    end
+
+    def find_attachment(id)
+      Attachment.find(id).localize(I18n.locale)
     rescue ActiveRecord::RecordNotFound
       nil
     end
 
-    def parse_images(string)
-      string.gsub(image_expression).each do |str|
-        id = str.match(image_expression)[1]
-        options = str.match(image_expression)[2]
+    def find_attachments(str)
+      str.match(attachment_expression)[1]
+         .split(",")
+         .map { |id| find_attachment(id) }
+         .compact
+    end
 
-        size  =  if options.match(/size="(\d*x\d*)"/)
-                   Regexp.last_match(1)
-                 else
-                   "2000x2000"
-                 end
+    def find_file(id)
+      PageFile.find(id).localize(I18n.locale)
+    rescue ActiveRecord::RecordNotFound
+      nil
+    end
 
-        class_name = if options.match(/class="([\s\-\w]+)"/)
-                       Regexp.last_match(1)
-                     end
+    def find_files(str)
+      str.match(file_expression)[1]
+         .split(",")
+         .map { |id| find_file(id) }
+         .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(
+          find_attachments(str)
+        ).to_html
+      end
+    end
 
-        embed_image(id, size: size, class_name: class_name)
+    def parse_files(string)
+      string.gsub(file_expression).each do |str|
+        PagesCore.config.attachment_embedder.new(
+          find_files(str).map(&:attachment)
+        ).to_html
       end
     end
 
-    def image_caption(image)
-      return unless image.caption?
-      content_tag(:figcaption, image.caption)
+    def parse_images(string)
+      PagesCore::ImageEmbedder.new(string).embed
     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
+
+      "#{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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module PagesCore
+  class LinkRenderer < WillPaginate::ActionView::LinkRenderer
+    def previous_page
+      num = @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
+      previous_or_next_page(num, "Next", "next")
+    end
+  end
+end

data/app/helpers/admin/admin_helper.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Admin
   module AdminHelper

data/app/helpers/admin/menu_helper.rb

@@ -1,34 +1,30 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Admin
   module MenuHelper
     def header_tabs(group)
-      content_tag :ul, class: group.to_s do
-        menu_items_for(group).map do |item|
-          content_tag :li do
+      tag.ul(class: group.to_s) do
+        safe_join(menu_items_for(group).map do |item|
+          tag.li do
             path = instance_eval(&item.path)
-            link_to(
-              item.label,
-              path,
-              class: (current_menu_item?(item) ? "current" : "")
-            )
+            link_to(item.label,
+                    path,
+                    class: (current_menu_item?(item) ? "current" : ""))
           end
-        end.join.html_safe
+        end)
       end
     end
 
     protected
 
     def menu_item_candidates
-      routes = Rails.application.routes
-      menu_items
-        .map { |item| [item, routes.recognize_path(instance_eval(&item.path))] }
-        .select { |_item, routing| routing[:controller] == params[:controller] }
+      routed_menu_items
+        .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
@@ -61,5 +57,12 @@ module Admin
           item.options[:if] && !instance_eval(&item.options[:if])
         end
     end
+
+    def routed_menu_items
+      routes = Rails.application.routes
+      menu_items
+        .select { |item| item.path.is_a?(Proc) }
+        .map { |item| [item, routes.recognize_path(instance_eval(&item.path))] }
+    end
   end
 end

data/app/helpers/admin/pages_helper.rb

@@ -1,31 +1,8 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Admin
   module PagesHelper
-    def page_block_field(form, block_name, block_options)
-      if block_options[:size] == :field
-        labelled_field(
-          form.text_field(
-            block_name,
-            class:       ['text', block_options[:class]].join(" "),
-            placeholder: block_options[:placeholder]
-          ),
-          block_options[:title],
-          errors:      form.object.errors[block_name],
-          description: block_options[:description]
-        )
-      else
-        labelled_field form.text_area(
-          block_name,
-          rows:        (block_options[:size] == :large ? 15 : 5),
-          class:       ['rich', block_options[:class]].join(" "),
-          placeholder: block_options[:placeholder]
-        ),
-          block_options[:title],
-          errors:      form.object.errors[block_name],
-          description: block_options[:description]
-      end
-    end
+    include PagesCore::Admin::PageBlocksHelper
 
     def available_templates_for_select
       PagesCore::Templates.names.collect do |template|
@@ -37,23 +14,39 @@ module Admin
       end
     end
 
+    def file_embed_code(file)
+      "[file:#{file.id}]"
+    end
+
+    def news_section_name(page, news_pages)
+      if news_pages.select { |p| p.name == page.name }.length > 1
+        page_name(page, include_parents: true)
+      else
+        page_name(page)
+      end
+    end
+
+    def page_authors(page)
+      ([page.author] + User.activated).uniq
+    end
+
     def page_name(page, options = {})
       page_names = if options[:include_parents]
-                     [page.ancestors, page].flatten
+                     page.self_and_ancestors.reverse
                    else
                      [page]
                    end
       safe_join(
         page_names.map { |p| page_name_with_fallback(p) },
-        " » ".html_safe
+        raw(" » ")
       )
     end
 
     def publish_time(time)
-      if time.year != Time.now.year
+      if time.year != Time.zone.now.year
         time.strftime("on %b %d %Y at %H:%M")
-      elsif time.to_date != Time.now.to_date
-        time.strftime("on %b %Y at %H:%M")
+      elsif time.to_date != Time.zone.now.to_date
+        time.strftime("on %b %d at %H:%M")
       else
         time.strftime("at %H:%M")
       end
@@ -61,6 +54,10 @@ module Admin
 
     private
 
+    def nested_array?(array)
+      array.present? && array.first.is_a?(Array)
+    end
+
     def page_name_with_fallback(page)
       if page.name?
         page.name.to_s

data/app/helpers/application_helper.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module ApplicationHelper #:nodoc:
   include PagesCore::ApplicationHelper

data/app/helpers/frontend_helper.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module FrontendHelper #:nodoc:
   include PagesCore::FrontendHelper

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

@@ -1,64 +1,57 @@
-# encoding: utf-8
+# 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
 
-      # Generates tags for an editable dynamic image.
-      def editable_dynamic_image_tag(image, options = {})
-        preview_url = uncropped_dynamic_image_url(image, size: "800x")
-        link_to(
-          dynamic_image_tag(image, options), admin_image_path(image),
-          class: "editableImage",
-          data: { "preview-url" => preview_url }
-        )
+      attr_writer :page_title, :page_description, :page_description_class,
+                  :page_description_links
+
+      def add_body_class(class_name)
+        @body_classes ||= []
+        @body_classes << class_name
       end
 
       def body_classes
         classes = @body_classes || []
-        classes << controller.class.underscore
-        classes << "#{controller.action_name}_action"
-        classes << "with_sidebar" if content_for?(:sidebar)
         classes << "with_notice" if flash[:notice]
-        classes.reverse.join(" ")
+        classes
       end
 
-      def add_body_class(class_name)
-        @body_classes ||= []
-        @body_classes << class_name
+      def rich_text_area_tag(name, content = nil, options = {})
+        react_component("RichTextArea",
+                        options.merge(id: sanitize_to_id(name),
+                                      name: name,
+                                      value: content))
       end
 
-      attr_accessor :page_title
-      attr_accessor :page_description
-      attr_accessor :page_description_class
-      attr_accessor :page_description_links
+      def link_separator
+        safe_join [" ", tag.span("|", class: "separator"), " "]
+      end
 
-      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
+      def deprecate_page_description_args(string = nil, class_name = nil)
+        if class_name
+          ActiveSupport::Deprecation.warn("Setting class through " \
+                                          "page_description is deprecated, " \
+                                          "use page_description_class=")
         end
+        return unless string
+
+        ActiveSupport::Deprecation.warn("Setting description with " \
+                                        "page_description is deprecated, " \
+                                        "use page_description=")
       end
 
       def page_description(string = nil, class_name = nil)
-        if class_name
-          ActiveSupport::Deprecation.warn(
-            "Setting page description class through page_description " \
-              "is deprecated, use page_description_class="
-          )
-          @page_description_class = class_name
-        end
+        deprecate_page_description_args(string, class_name)
+        @page_description_class = class_name if class_name
         if string
-          ActiveSupport::Deprecation.warn(
-            "Setting description with page_description is deprecated, " \
-              "use page_description="
-          )
           @page_description = string
         else
           @page_description
@@ -66,42 +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 sidebar(string = "", &block)
-        @sidebar = string
-        return unless block_given?
-        @sidebar += capture(&block)
+        ActiveSupport::Deprecation.warn(
+          "Setting page description_links with page_description_links " \
+          "is deprecated, use page_description_links="
+        )
+        @page_description_links = links
       end
 
-      def content_tab(name, options = {}, &block)
-        @content_tabs ||= []
-        return unless block_given?
-        tab = {
-          name:    name.to_s.humanize,
-          key:     name.to_s.underscore.gsub(/[\s]+/, "_"),
-          options: options,
-          content: capture(&block)
-        }
-        @content_tabs << tab
-        tab_output = "<div class=\"content_tab\" " \
-          "id=\"content-tab-#{tab[:key]}\">"
-        tab_output += tab[:content]
-        tab_output += "</div>"
-        tab_output.html_safe
-      end
+      def page_title(title = nil)
+        return @page_title unless title
 
-      def link_separator
-        ' <span class="separator">|</span> '.html_safe
+        ActiveSupport::Deprecation.warn(
+          "Setting page title with page_title is deprecated, use page_title="
+        )
+        @page_title = title
       end
     end
   end