pages_core 3.6.2 → 3.8.2

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module Admin
     module LabelledFieldHelper
@@ -17,7 +19,7 @@ module PagesCore
       #   <% end %>
       #
       def labelled_field(field, label, options = {})
-        content_tag(:div, class: labelled_field_class(options)) do
+        tag.div(class: labelled_field_class(options)) do
           safe_join(
             [labelled_field_label(label, options),
              labelled_field_description(options[:description]),
@@ -30,9 +32,8 @@ module PagesCore
       def image_upload_field(form, label, method = :image, options = {})
         output = ""
         if form.object.send(method)
-          output += content_tag(:p,
-                                dynamic_image_tag(form.object.send(method),
-                                                  size: "120x100"))
+          output += tag.p(dynamic_image_tag(form.object.send(method),
+                                            size: "120x100"))
         end
         output + labelled_field(
           form.file_field(method),
@@ -43,7 +44,7 @@ module PagesCore
       private
 
       def labelled_field_class(options = {})
-        if options[:errors] && options[:errors].any?
+        if options[:errors]&.any?
           "field field-with-errors"
         else
           "field"
@@ -51,19 +52,21 @@ module PagesCore
       end
 
       def labelled_field_label(label, options = {})
-        content_tag(:label) do
+        tag.label do
           label + labelled_field_errors(options[:errors])
         end
       end
 
       def labelled_field_description(str)
         return "" unless str
-        content_tag(:p, str, class: "description")
+
+        tag.p(str, class: "description")
       end
 
       def labelled_field_errors(errors)
-        return "" unless errors && errors.any?
-        content_tag(:span, class: "error") { Array(errors).last }
+        return "" unless errors&.any?
+
+        tag.span(class: "error") { Array(errors).last }
       end
     end
   end

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

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module Admin
+    module PageBlocksHelper
+      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
+
+      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 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
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module PagesCore
+  module Admin
+    module PageJsonHelper
+      def page_json(page)
+        { id: page.id, param: page.to_param,
+          name: page.name,
+          parent_page_id: page.parent_page_id,
+          locale: page.locale, status: page.status,
+          news_page: page.news_page,
+          published_at: page.published_at,
+          pinned: page.pinned?, starts_at: page.starts_at,
+          permissions: page_permissions(page) }
+      end
+
+      def page_permissions(page)
+        [(:edit if policy(page).edit?),
+         (:create if policy(page).edit?)].compact
+      end
+    end
+  end
+end

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

@@ -1,45 +1,17 @@
+# frozen_string_literal: true
+
 module PagesCore
   module Admin
     module TagEditorHelper
-      def tag_editor_for(
-        form_helper, item, field_name = :serialized_tags, options = {}
-      )
-        tags = options[:tags] || Tag.tags_and_suggestions_for(item, limit: 20)
-        tagged = options[:tagged] || item.tags
-        options[:placeholder] ||= "Add tag..."
-        content_tag(:div, class: "tag-editor clearfix") do
-          form_helper.hidden_field(field_name, class: "serialized_tags") +
-            tag_check_boxes(tags, tagged) +
-            add_tag_button(options)
-        end
-      end
-
-      private
-
-      def tag_check_box(tag, tagged)
-        content_tag(:span, class: :tag) do
-          check_box_tag(
-            "tag-#{tag.id}",
-            1,
-            tagged.include?(tag)
-          ) + content_tag(:span, tag.name, class: :name)
-        end
-      end
-
-      def tag_check_boxes(tags, tagged)
-        content_tag(:div, class: :tags) do
-          safe_join(tags.map { |t| tag_check_box(t, tagged) }, "")
-        end
-      end
-
-      def add_tag_button(options = {})
-        content_tag(:div, class: "add-tag-form") do
-          text_field_tag(
-            "add_tag",
-            options[:placeholder],
-            class: "add-tag"
-          ) + content_tag(:button, "Add", class: "add-tag-button")
-        end
+      def tag_editor_for(form, object, attribute: :serialized_tags)
+        object ||= form.object
+        react_component(
+          "TagEditor",
+          { enabled: object.tags.map(&:name),
+            tags: Tag.tags_and_suggestions_for(object, limit: 20)
+                     .map(&:name),
+            name: "#{form.object_name}[#{attribute}]" }
+        )
       end
     end
   end

data/app/helpers/pages_core/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Methods added to this helper will be available to all templates
 # in the application.
 module PagesCore
@@ -14,6 +16,7 @@ module PagesCore
       page.localize(link_locale) do |p|
         title = options[:title] || p.name.to_s
         return title unless conditional_options?(options)
+
         link_to(title, page_link_path(link_locale, p), class: options[:class])
       end
     end

data/app/helpers/pages_core/attachments_helper.rb

@@ -1,36 +1,40 @@
-module PagesCore::AttachmentsHelper
-  def attachment_path(*args)
-    super(*attachment_params(args))
-  end
+# frozen_string_literal: true
 
-  def download_attachment_path(*args)
-    super(*attachment_params(args))
-  end
+module PagesCore
+  module AttachmentsHelper
+    def attachment_path(*args)
+      super(*attachment_params(args))
+    end
 
-  def page_file_path(*args)
-    ActiveSupport::Deprecation.warn(
-      "#page_file_path is deprecated, use #attachment_path"
-    )
-    page_file = args.detect { |a| a.is_a?(PageFile) }
-    return attachment_path(page_file.attachment) if page_file
+    def download_attachment_path(*args)
+      super(*attachment_params(args))
+    end
 
-    super(*args)
-  end
+    def page_file_path(*args)
+      ActiveSupport::Deprecation.warn(
+        "#page_file_path is deprecated, use #attachment_path"
+      )
+      page_file = args.detect { |a| a.is_a?(PageFile) }
+      return attachment_path(page_file.attachment) if page_file
 
-  private
+      super(*args)
+    end
+
+    private
 
-  def attachment_params(args)
-    attachment = args.detect { |a| a.is_a?(Attachment) }
-    args = [attachment.digest] + args if args.first == attachment
-    if args.last.is_a?(Hash)
-      args.last[:format] = attachment.filename_extension
-    else
-      args.push(format: attachment.filename_extension)
+    def attachment_params(args)
+      attachment = args.detect { |a| a.is_a?(Attachment) }
+      args = [attachment.digest] + args if args.first == attachment
+      if args.last.is_a?(Hash)
+        args.last[:format] = attachment.filename_extension
+      else
+        args.push(format: attachment.filename_extension)
+      end
+      args
     end
-    args
-  end
 
-  def attachment_digest(attachment)
-    Attachment.verifier.generate(attachment.id.to_s)
+    def attachment_digest(attachment)
+      Attachment.verifier.generate(attachment.id.to_s)
+    end
   end
 end

data/app/helpers/pages_core/form_builder.rb

@@ -1,18 +1,21 @@
+# frozen_string_literal: true
+
 module PagesCore
   class FormBuilder < ActionView::Helpers::FormBuilder
     include ActionView::Helpers::TagHelper
 
-    def field_with_label(attr, str, label = nil)
-      classes = ["field"]
+    def field_with_label(attr, str, label = nil, class_name = nil)
+      classes = ["field", class_name]
       classes << "field-with-errors" if object.errors[attr].any?
-      content_tag(:div, label_for(attr, label) + str, class: classes.join(" "))
+      tag.div(label_for(attr, label) + str, class: classes.compact.join(" "))
     end
 
     def image_file_preview(attribute)
       return "" unless object.send(attribute) &&
                        !object.send(attribute).new_record?
-      content_tag(
-        :p, @template.dynamic_image_tag(object.send(attribute), size: "120x100")
+
+      tag.p(
+        @template.dynamic_image_tag(object.send(attribute), size: "120x100")
       )
     end
 
@@ -22,14 +25,15 @@ module PagesCore
 
     def label_and_errors(attribute, label_text)
       return label_text unless object.errors[attribute].any?
-      error = content_tag(:span, object.errors[attribute].first, class: "error")
+
+      error = tag.span(object.errors[attribute].first, class: "error")
       safe_join([label_text, error], " ")
     end
 
     def label_for(attribute, label_text = nil)
       label_text ||= object.class.human_attribute_name(attribute)
-      content_tag("label", label_and_errors(attribute, label_text),
-                  for: [object.class.to_s.underscore, attribute].join("_"))
+      tag.label(label_and_errors(attribute, label_text),
+                for: [object.class.to_s.underscore, attribute].join("_"))
     end
 
     def labelled_check_box(
@@ -78,7 +82,7 @@ module PagesCore
     end
 
     def labelled_password_field(attribute, label_text = nil, options = {})
-      labelled_field(attribute, label_text, options) do |opts|
+      labelled_field(attribute, label_text, options, "text-field") do |opts|
         password_field(attribute, opts)
       end
     end
@@ -90,13 +94,13 @@ module PagesCore
     end
 
     def labelled_text_area(attribute, label_text = nil, options = {})
-      labelled_field(attribute, label_text, options) do |opts|
+      labelled_field(attribute, label_text, options, "text-area") do |opts|
         text_area(attribute, opts)
       end
     end
 
     def labelled_text_field(attribute, label_text = nil, options = {})
-      labelled_field(attribute, label_text, options) do |opts|
+      labelled_field(attribute, label_text, options, "text-field") do |opts|
         text_field(attribute, opts)
       end
     end
@@ -109,12 +113,12 @@ module PagesCore
 
     protected
 
-    def labelled_field(attribute, label_text = nil, options = {})
+    def labelled_field(attr, label_text = nil, options = {}, class_name = nil)
       if label_text.is_a?(Hash) && options == {}
         options = label_text
         label_text = nil
       end
-      field_with_label(attribute, yield(options), label_text)
+      field_with_label(attr, yield(options), label_text, class_name)
     end
   end
 end

data/app/helpers/pages_core/frontend_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module FrontendHelper
     def root_pages
@@ -8,8 +10,6 @@ module PagesCore
       @root_page ||= root_pages.first
     end
 
-    attr_reader :search_query
-
-    attr_reader :search_category_id
+    attr_reader :search_query, :search_category_id
   end
 end

data/app/helpers/pages_core/head_tags_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module HeadTagsHelper
     # Sets a document title.
@@ -30,6 +32,7 @@ module PagesCore
     def feed_tags(options = {})
       feeds = Page.enabled_feeds(@locale, options)
       return unless feeds.any?
+
       feed_tags = [
         rss_link_tag(PagesCore.config(:site_name),
                      pages_url(@locale, format: :rss))
@@ -45,14 +48,8 @@ module PagesCore
     #  google_analytics_tags "UA-12345678-1"
     #
     def google_analytics_tags(account_id)
-      javascript_tag(
-        "(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||" \
-          "function(){\n (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new " \
-          "Date();a=s.createElement(o),\nm=s.getElementsByTagName(o)[0];" \
-          "a.async=1;a.src=g;m.parentNode.insertBefore(a,m)\n})(window," \
-          "document,'script','//www.google-analytics.com/analytics.js','ga');" \
-          "\n\nga('create', '#{account_id}', 'auto');\nga('send', 'pageview');"
-      )
+      render(partial: "pages_core/google_analytics",
+             locals: { account_id: account_id })
     end
 
     # Outputs a HTML5 doctype and head tags, with document title
@@ -72,7 +69,7 @@ module PagesCore
       safe_join(
         [
           "<!doctype html>\n<html lang=\"#{I18n.locale}\">".html_safe,
-          content_tag(:head) do
+          tag.head do
             safe_join(head_tag_contents(block_output), "\n")
           end
         ]
@@ -84,13 +81,10 @@ module PagesCore
     #  rss_link_tag "My feed", "feed.rss"
     #
     def rss_link_tag(title, href)
-      tag(
-        :link,
-        rel: "alternate",
-        type: "application/rss+xml",
-        title: title,
-        href: href
-      )
+      tag.link(rel: "alternate",
+               type: "application/rss+xml",
+               title: title,
+               href: href)
     end
 
     # Outputs Typekit tags.
@@ -108,11 +102,11 @@ module PagesCore
 
     def head_tag_contents(block_output)
       [
-        tag(:meta, charset: "utf-8"),
-        tag(:meta, "http-equiv" => "X-UA-Compatible", "content" => "IE=edge"),
-        content_tag(:title, document_title),
+        tag.meta(charset: "utf-8"),
+        tag.meta("http-equiv" => "X-UA-Compatible", "content" => "IE=edge"),
+        tag.title(document_title),
         meta_description_tag, meta_keywords_tag,
-        (tag(:link, rel: "image_src", href: meta_image) if meta_image?),
+        (tag.link(rel: "image_src", href: meta_image) if meta_image?),
         open_graph_tags,
         csrf_meta_tags,
         block_output
@@ -121,12 +115,14 @@ module PagesCore
 
     def meta_description_tag
       return unless meta_description?
-      tag(:meta, name: "description", content: meta_description)
+
+      tag.meta(name: "description", content: meta_description)
     end
 
     def meta_keywords_tag
       return unless meta_keywords?
-      tag(:meta, name: "keywords", content: meta_keywords)
+
+      tag.meta(name: "keywords", content: meta_keywords)
     end
   end
 end

data/app/helpers/pages_core/images_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module ImagesHelper
     include DynamicImage::Helper
@@ -28,6 +30,7 @@ module PagesCore
     def extract_alt_text(record_or_array)
       record = extract_dynamic_image_record(record_or_array)
       return {} unless record.alternative?
+
       { alt: record.alternative }
     end
   end

data/app/helpers/pages_core/meta_tags_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module MetaTagsHelper
     # Sets a default image to use for meta tags. Supports
@@ -72,7 +74,7 @@ module PagesCore
         @meta_keywords = Array(args.first).join(", ")
       else
         keywords = @meta_keywords
-        keywords ||= @page.tag_list if @page && @page.tags.any?
+        keywords ||= @page.tag_list if @page&.tags&.any?
         strip_tags(keywords)
       end
     end

data/app/helpers/pages_core/open_graph_tags_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module OpenGraphTagsHelper
     def open_graph_properties
@@ -11,7 +13,7 @@ module PagesCore
         properties
           .delete_if { |_, content| content.nil? }
           .map do |name, content|
-          tag(:meta, property: "og:#{name}", content: content)
+          tag.meta(property: "og:#{name}", content: content)
         end,
         "\n"
       )
@@ -37,12 +39,12 @@ module PagesCore
 
     def default_open_graph_properties
       {
-        type:        "website",
-        site_name:   PagesCore.config(:site_name),
-        title:       default_open_graph_title,
-        image:       (meta_image if meta_image?),
+        type: "website",
+        site_name: PagesCore.config(:site_name),
+        title: default_open_graph_title,
+        image: (meta_image if meta_image?),
         description: default_open_graph_description,
-        url:         request.url
+        url: request.url
       }
     end
   end

data/app/helpers/pages_core/page_path_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagesCore
   module PagePathHelper
     def page_path(locale, page, options = {})
@@ -6,17 +8,19 @@ module PagesCore
 
         (PagesCore.config.localizations? ? "/#{locale}/" : "/") +
           escape_page_path(p.full_path) +
+          (html_format?(options) ? "" : ".#{options[:format]}") +
           paginated_section(options)
       end
     end
 
     def page_url(page_or_locale, page = nil, opts = {})
       locale, page = page_url_locale_and_page(page_or_locale, page, opts)
+
       page.localize(locale) do |p|
-        if p.redirects?
-          p.redirect_path(locale: locale)
+        if p.redirects? && html_format?(opts)
+          page_redirect_url(locale, p)
         elsif p.full_path
-          "#{request.protocol}#{request.host_with_port}" + page_path(locale, p)
+          base_page_url + page_path(locale, p, opts)
         else
           super(locale, p, opts)
         end
@@ -25,12 +29,28 @@ module PagesCore
 
     private
 
+    def page_redirect_url(locale, page)
+      redirect = page.redirect_path(locale: locale)
+      return redirect if redirect =~ %r{^https?://}
+
+      base_page_url + redirect
+    end
+
+    def base_page_url
+      "#{request.protocol}#{request.host_with_port}"
+    end
+
+    def html_format?(opts)
+      opts[:format].blank? || opts[:format].to_sym == :html
+    end
+
     def escape_page_path(path)
       path.split("/").map { |s| CGI.escape(s) }.join("/")
     end
 
     def page_url_locale_and_page(page_or_locale, page, opts)
       return [page_or_locale, page] if page
+
       ActiveSupport::Deprecation.warn(
         "Calling page_url without locale is deprecated"
       )
@@ -39,6 +59,7 @@ module PagesCore
 
     def paginated_section(opts)
       return "" unless opts[:page]
+
       "/page/#{opts[:page]}"
     end
   end

data/app/javascript/admin-dist.js

@@ -0,0 +1,2 @@
+import startPages from "./index.js";
+startPages();