pages_core 3.5.1 → 3.6.0

data/app/helpers/application_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module ApplicationHelper #:nodoc:
   include PagesCore::ApplicationHelper
 end

data/app/helpers/frontend_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module FrontendHelper #:nodoc:
   include PagesCore::FrontendHelper
 end

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

@@ -1,15 +1,13 @@
-# encoding: utf-8
-
 module PagesCore
   module Admin
     module AdminHelper
       include PagesCore::Admin::LabelledFieldHelper
       include PagesCore::Admin::TagEditorHelper
 
-      attr_accessor :page_title
-      attr_accessor :page_description
-      attr_accessor :page_description_class
-      attr_accessor :page_description_links
+      attr_writer :page_title
+      attr_writer :page_description
+      attr_writer :page_description_class
+      attr_writer :page_description_links
 
       def add_body_class(class_name)
         @body_classes ||= []
@@ -24,14 +22,51 @@ module PagesCore
         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), "–".html_safe)
+      end
+
       # 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 }
-        )
+      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)
@@ -39,7 +74,7 @@ module PagesCore
         return unless block_given?
         tab = {
           name:    name.to_s.humanize,
-          key:     name.to_s.underscore.gsub(/[\s]+/, "_"),
+          key:     options[:key] || name.to_s.underscore.gsub(/[\s]+/, "_"),
           options: options,
           content: capture(&block)
         }
@@ -47,8 +82,15 @@ module PagesCore
         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),
+                                      name: name,
+                                      value: content))
+      end
+
       def link_separator
-        ' <span class="separator">|</span> '.html_safe
+        safe_join [" ", content_tag(:span, "|", class: "separator"), " "]
       end
 
       def deprecate_page_description_args(string = nil, class_name = nil)
@@ -57,11 +99,10 @@ module PagesCore
                                           "page_description is deprecated, " \
                                           "use page_description_class=")
         end
-        if string
-          ActiveSupport::Deprecation.warn("Setting description with " \
-                                          "page_description is deprecated, " \
-                                          "use page_description=")
-        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)
@@ -105,6 +146,20 @@ module PagesCore
                     class: "content_tab",
                     id: "content-tab-#{key}")
       end
+
+      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)
+      end
     end
   end
 end

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

@@ -0,0 +1,36 @@
+module PagesCore
+  module Admin
+    class FormBuilder < PagesCore::FormBuilder
+      include DynamicImage::Helper
+
+      def rich_text_area(attr, options = {})
+        @template.rich_text_area_tag(
+          "#{object_name}[#{attr}]",
+          object.send(attr),
+          options
+        )
+      end
+
+      def image_uploader(attr, options = {})
+        @template.image_uploader_tag(
+          "#{object_name}[#{foreign_key(attr)}]",
+          object.send(attr),
+          options
+        )
+      end
+
+      def labelled_image_uploader(attribute, label_text = nil, options = {})
+        labelled_field(attribute, label_text, options) do |opts|
+          image_uploader(attribute, opts)
+        end
+      end
+
+      private
+
+      def foreign_key(attr)
+        object.class.reflections[attr.to_s].options[:foreign_key] ||
+          "#{attr}_id".to_sym
+      end
+    end
+  end
+end

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module Admin
     module LabelledFieldHelper
@@ -20,12 +18,12 @@ module PagesCore
       #
       def labelled_field(field, label, options = {})
         content_tag(:div, class: labelled_field_class(options)) do
-          (
-           labelled_field_label(label, options) +
-             labelled_field_description(options[:description]) +
-             field +
-             (options[:check_box_description] || "")
-          ).html_safe
+          safe_join(
+            [labelled_field_label(label, options),
+             labelled_field_description(options[:description]),
+             field,
+             (options[:check_box_description] || "")]
+          )
         end
       end
 

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module Admin
     module TagEditorHelper

data/app/helpers/pages_core/application_helper.rb

@@ -1,9 +1,8 @@
-# encoding: utf-8
-
 # Methods added to this helper will be available to all templates
 # in the application.
 module PagesCore
   module ApplicationHelper
+    include PagesCore::AttachmentsHelper
     include PagesCore::HeadTagsHelper
     include PagesCore::ImagesHelper
     include PagesCore::MetaTagsHelper

data/app/helpers/pages_core/attachments_helper.rb

@@ -0,0 +1,36 @@
+module PagesCore::AttachmentsHelper
+  def attachment_path(*args)
+    super(*attachment_params(args))
+  end
+
+  def download_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
+
+    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)
+    end
+    args
+  end
+
+  def attachment_digest(attachment)
+    Attachment.verifier.generate(attachment.id.to_s)
+  end
+end

data/app/helpers/pages_core/form_builder.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   class FormBuilder < ActionView::Helpers::FormBuilder
     include ActionView::Helpers::TagHelper
@@ -11,7 +9,8 @@ module PagesCore
     end
 
     def image_file_preview(attribute)
-      return "" unless object.send(attribute)
+      return "" unless object.send(attribute) &&
+                       !object.send(attribute).new_record?
       content_tag(
         :p, @template.dynamic_image_tag(object.send(attribute), size: "120x100")
       )
@@ -23,10 +22,8 @@ module PagesCore
 
     def label_and_errors(attribute, label_text)
       return label_text unless object.errors[attribute].any?
-      safe_join(
-        [label_text,
-         content_tag(:span, object.errors[attribute].first, class: "error")],
-        " ")
+      error = content_tag(:span, object.errors[attribute].first, class: "error")
+      safe_join([label_text, error], " ")
     end
 
     def label_for(attribute, label_text = nil)
@@ -36,11 +33,10 @@ module PagesCore
     end
 
     def labelled_check_box(
-      attribute, label_text = nil, options = {},
-      checked_value = "1", unchecked_value = "0"
+      attr, label = nil, options = {}, checked = "1", unchecked = "0"
     )
-      labelled_field(attribute, label_text, options) do |opts|
-        check_box(attribute, opts, checked_value, unchecked_value)
+      labelled_field(attr, label, options) do |opts|
+        check_box(attr, opts, checked, unchecked)
       end
     end
 

data/app/helpers/pages_core/frontend_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module FrontendHelper
     def root_pages
@@ -13,9 +11,5 @@ module PagesCore
     attr_reader :search_query
 
     attr_reader :search_category_id
-
-    def comment_honeypot_field
-      text_field_tag "email", "", class: "comment_email"
-    end
   end
 end

data/app/helpers/pages_core/head_tags_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module HeadTagsHelper
     # Sets a document title.
@@ -71,8 +69,14 @@ module PagesCore
       # The block output must be captured first
       block_output = block_given? ? capture(&block) : nil
 
-      "<!doctype html>\n<html lang=\"#{I18n.locale}\">".html_safe +
-        content_tag(:head) { safe_join(head_tag_contents(block_output), "\n") }
+      safe_join(
+        [
+          "<!doctype html>\n<html lang=\"#{I18n.locale}\">".html_safe,
+          content_tag(:head) do
+            safe_join(head_tag_contents(block_output), "\n")
+          end
+        ]
+      )
     end
 
     # Generates a link to an RSS feed.

data/app/helpers/pages_core/images_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module ImagesHelper
     include DynamicImage::Helper

data/app/helpers/pages_core/meta_tags_helper.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module PagesCore
   module MetaTagsHelper
     # Sets a default image to use for meta tags. Supports
@@ -38,7 +36,7 @@ module PagesCore
 
     # Returns true if meta description has been set.
     def meta_description?
-      !meta_description.blank?
+      meta_description.present?
     end
 
     # Sets an image to use for meta tags. Supports
@@ -62,7 +60,7 @@ module PagesCore
 
     # Returns true if meta image has been set.
     def meta_image?
-      !meta_image.blank? || default_meta_image?
+      meta_image.present? || default_meta_image?
     end
 
     # Sets keywords for meta tags.
@@ -81,7 +79,7 @@ module PagesCore
 
     # Returns true if meta keywords have been set.
     def meta_keywords?
-      !meta_keywords.blank?
+      meta_keywords.present?
     end
 
     private

data/app/helpers/pages_core/open_graph_tags_helper.rb

@@ -1,9 +1,7 @@
-# encoding: utf-8
-
 module PagesCore
   module OpenGraphTagsHelper
     def open_graph_properties
-      @_open_graph_properties ||= {}
+      @open_graph_properties ||= {}
     end
 
     # Outputs Open Graph tags for Facebook.

data/app/helpers/pages_core/page_path_helper.rb

@@ -1,16 +1,12 @@
-# encoding: utf-8
-
 module PagesCore
   module PagePathHelper
     def page_path(locale, page, options = {})
       page.localize(locale) do |p|
-        if p.full_path? && PagesCore.config.localizations?
-          "/#{locale}/" + URI.escape(p.full_path)
-        elsif p.full_path?
-          "/" + URI.escape(p.full_path)
-        else
-          super(locale, p, options)
-        end
+        return super(locale, p, options) unless p.full_path?
+
+        (PagesCore.config.localizations? ? "/#{locale}/" : "/") +
+          escape_page_path(p.full_path) +
+          paginated_section(options)
       end
     end
 
@@ -29,6 +25,10 @@ module PagesCore
 
     private
 
+    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(
@@ -36,5 +36,10 @@ module PagesCore
       )
       [(opts[:locale] || @locale), page_or_locale]
     end
+
+    def paginated_section(opts)
+      return "" unless opts[:page]
+      "/page/#{opts[:page]}"
+    end
   end
 end