RubyGems - pages_core - Versions diffs - 3.6.2 → 3.7.0 - Mend

pages_core 3.6.2 → 3.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (232) hide show

data/app/helpers/pages_core/head_tags_helper.rb CHANGED Viewed

@@ -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))
@@ -72,7 +75,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
         ]
@@ -110,7 +113,7 @@ module PagesCore
       [
         tag(:meta, charset: "utf-8"),
         tag(:meta, "http-equiv" => "X-UA-Compatible", "content" => "IE=edge"),
-        content_tag(:title, document_title),
+        tag.title(document_title),
         meta_description_tag, meta_keywords_tag,
         (tag(:link, rel: "image_src", href: meta_image) if meta_image?),
         open_graph_tags,
@@ -121,11 +124,13 @@ module PagesCore
     def meta_description_tag
       return unless 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)
     end
   end

data/app/helpers/pages_core/images_helper.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module PagesCore
   module OpenGraphTagsHelper
     def open_graph_properties
@@ -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 CHANGED Viewed

@@ -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/jobs/pages_core/autopublish_job.rb CHANGED Viewed

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
 module PagesCore
-  class AutopublishJob < ActiveJob::Base
+  class AutopublishJob < ApplicationJob
     queue_as :pages_core
     def perform

data/app/jobs/pages_core/sweep_cache_job.rb CHANGED Viewed

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
 module PagesCore
-  class SweepCacheJob < ActiveJob::Base
+  class SweepCacheJob < ApplicationJob
     queue_as :pages_core
     def perform
-      PagesCore::CacheSweeper.sweep!
+      PagesCore::StaticCache.handler.sweep_now!
     end
   end
 end

data/app/mailers/admin_mailer.rb CHANGED Viewed

@@ -1,17 +1,7 @@
-class AdminMailer < ActionMailer::Base
-  default from: proc { "\"Pages\" <support@anyone.no>" }
+# frozen_string_literal: true
-  def error_report(error_report, from, description)
-    @error_report = error_report
-    @from = from
-    @description = description
-    short_message = @error_report[:message].gsub(/[\s\n]+/, " ")[0..80]
-    mail(
-      to:      "system+error@anyone.no",
-      from:    "\"Error reports\" <system+error@anyone.no>",
-      subject: "[#{PagesCore.config(:site_name)}] Error: #{short_message}"
-    )
-  end
+class AdminMailer < ApplicationMailer
+  default from: proc { "\"Pages\" <support@anyone.no>" }
   def password_reset(user, url)
     @user = user
@@ -26,7 +16,7 @@ class AdminMailer < ActionMailer::Base
     @invite = invite
     @url = url
     mail(
-      to:      @invite.email,
+      to: @invite.email,
       subject: "#{PagesCore.config(:site_name)} has invited you to Pages"
     )
   end

data/app/models/attachment.rb CHANGED Viewed

@@ -1,4 +1,6 @@
-class Attachment < ActiveRecord::Base
+# frozen_string_literal: true
+class Attachment < ApplicationRecord
   include Dis::Model
   include PagesCore::Sweepable
@@ -25,12 +27,12 @@ class Attachment < ActiveRecord::Base
     def formats
       {
-        "audio/mpeg"      => :mp3,
-        "image/gif"       => :gif,
-        "image/jpeg"      => :jpg,
-        "image/jpg"       => :jpg,
-        "image/pjpeg"     => :jpg,
-        "image/png"       => :png,
+        "audio/mpeg" => :mp3,
+        "image/gif" => :gif,
+        "image/jpeg" => :jpg,
+        "image/jpg" => :jpg,
+        "image/pjpeg" => :jpg,
+        "image/png" => :png,
         "application/pdf" => :pdf
       }
     end
@@ -52,7 +54,7 @@ class Attachment < ActiveRecord::Base
   def filename_extension
     if filename_extension?
-      filename.match(/\.([^\.]+)$/)[1]
+      filename.match(/\.([^.]+)$/)[1]
     else
       ""
     end

data/app/models/autopublisher.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class Autopublisher
   class << self
     def run!(_options = {})
@@ -13,6 +15,7 @@ class Autopublisher
     def queue!
       return unless queued_pages.any?
       PagesCore::AutopublishJob
         .set(wait_until: queued_pages.first.published_at)
         .perform_later

data/app/models/category.rb CHANGED Viewed

@@ -1,4 +1,6 @@
-class Category < ActiveRecord::Base
+# frozen_string_literal: true
+class Category < ApplicationRecord
   has_many :page_categories, dependent: :destroy
   has_many :pages, through: :page_categories
   validates :name, presence: true

data/app/models/concerns/pages_core/has_roles.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module PagesCore
   module HasRoles
     extend ActiveSupport::Concern

data/app/models/concerns/pages_core/humanizable_param.rb CHANGED Viewed

@@ -1,17 +1,20 @@
+# frozen_string_literal: true
 module PagesCore
   module HumanizableParam
     include ActiveSupport::Inflector
     extend ActiveSupport::Concern
     def humanized_param(slug)
-      return id.to_s unless slug && slug.present?
+      return id.to_s unless slug&.present?
       "#{id}-" + transliterate(slug)
                  .downcase
-                 .gsub(/[\[\{]/, "(")
-                 .gsub(/[\]\}]/, ")")
-                 .gsub(/[^[[:alnum:]]()\-]+/, "-")
-                 .gsub(/[\-]{2,}/, "-")
-                 .gsub(/(^\-|\-$)/, "")
+                 .gsub(/[\[{]/, "(")
+                 .gsub(/}\]/, ")")
+                 .gsub(/[^[[:alnum:]]()-]+/, "-")
+                 .gsub(/-{2,}/, "-")
+                 .gsub(/(^-|-$)/, "")
     end
   end
 end

data/app/models/concerns/pages_core/page_model/attachments.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module PagesCore
   module PageModel
     module Attachments

data/app/models/concerns/pages_core/page_model/autopublishable.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module PagesCore
   module PageModel
     module Autopublishable

data/app/models/concerns/pages_core/page_model/dated_page.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module PagesCore
   module PageModel
     module DatedPage
@@ -14,25 +16,21 @@ module PagesCore
       module ClassMethods
       end
-      # Finds the page's next sibling by date. Returns nil if there isn't one.
+      # Finds the page's next sibling by date. Returns nil if there
+      # isn't one.
       def next_sibling_by_date
-        siblings = siblings_by_date
-        return unless siblings.any?
-        siblings[(siblings.to_a.index(self) + 1)...siblings.length]
-          .try(&:first)
+        siblings_by_date.where("starts_at >= ?", starts_at)&.first
       end
-      # Finds the page's previous sibling by date. Returns nil if there isn't one.
+      # Finds the page's previous sibling by date. Returns nil if
+      # there isn't one.
       def previous_sibling_by_date
-        siblings = siblings_by_date
-        return unless siblings.any?
-        siblings[0...siblings.to_a.index(self)].try(&:last)
+        siblings_by_date.where("starts_at < ?", starts_at)&.last
       end
       def upcoming?
         return false unless ends_at?
         ends_at > Time.zone.now
       end
@@ -53,6 +51,8 @@ module PagesCore
       def siblings_by_date
         siblings.reorder("starts_at ASC, pages.id DESC")
+                .where
+                .not(id: id)
       end
     end
   end

data/app/models/concerns/pages_core/page_model/images.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module PagesCore
   module PageModel
     module Images
@@ -16,7 +18,9 @@ module PagesCore
         after_save :update_primary_image
         accepts_nested_attributes_for :page_images,
-                                      reject_if: proc { |a| a["image_id"].blank? },
+                                      reject_if: proc { |a|
+                                                   a["image_id"].blank?
+                                                 },
                                       allow_destroy: true
       end

data/app/models/concerns/pages_core/page_model/localizable.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module PagesCore
   module PageModel
     module Localizable

data/app/models/concerns/pages_core/page_model/pathable.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module PagesCore
   module PageModel
     module Pathable
@@ -6,43 +8,32 @@ module PagesCore
       included do
         has_many :page_paths, dependent: :destroy
-        validates :path_segment, format: { with: /\A[[[:alnum:]]\-_]*\z/ }
+        validates :path_segment, format: { with: /\A[[[:alnum:]]-_]*\z/ }
         validate :path_segment_cannot_be_routable
         before_validation :ensure_no_path_segment_on_deletion
         after_save :ensure_path_segment
         after_save :associate_page_path
       end
-      def full_path(last_segment = nil)
-        last_segment ||= path_segment
-        return nil unless full_path?(last_segment)
-        if parent
-          [parent.full_path, last_segment].join("/")
-        else
-          last_segment
-        end
+      def full_path
+        generate_full_path
       end
-      def full_path?(last_segment = nil)
-        last_segment ||= path_segment
-        if parent
-          parent.full_path? && last_segment.present?
-        else
-          last_segment.present?
-        end
+      def full_path?
+        path_segment.present? && pathable?
       end
       def ensure_path_segment
         return if deleted? || path_segment? || !name?
-        if path_collision?(generated_path_segment)
-          update path_segment: "#{generated_path_segment}-#{id}"
-        else
-          update path_segment: generated_path_segment
-        end
+        segment = generated_path_segment
+        segment = "#{segment}-#{id}" if path_collision?(segment)
+        update(path_segment: segment)
       end
       def pathable?
         return true unless parent
         parent.full_path?
       end
@@ -50,18 +41,27 @@ module PagesCore
       def associate_page_path
         return if deleted? || !full_path?
         PagePath.build(self)
       end
       def ensure_no_path_segment_on_deletion
         return unless deleted?
         self.path_segment = nil
       end
+      def generate_full_path(last_segment = nil)
+        last_segment ||= path_segment
+        return nil unless last_segment.present? && pathable?
+        [parent&.full_path, last_segment].compact.join("/")
+      end
       def generated_path_segment
-        transliterated_name.gsub(/[^[[:alnum:]]\-_]+/, "-")
-                           .gsub(/[\-]{2,}/, "-")
-                           .gsub(/(^\-|\-$)/, "")
+        transliterated_name.gsub(/[^[[:alnum:]]-_]+/, "-")
+                           .gsub(/-{2,}/, "-")
+                           .gsub(/(^-|-$)/, "")
                            .mb_chars
                            .downcase
       end
@@ -81,12 +81,13 @@ module PagesCore
       def path_collision?(path_segment)
         sibling_path_segments.include?(path_segment) ||
-          page_path_matches_routes?(full_path(path_segment))
+          page_path_matches_routes?(generate_full_path(path_segment))
       end
       def path_segment_cannot_be_routable
         return unless full_path?
         return unless page_path_matches_routes?(full_path)
         errors.add(:path_segment, "can't match an existing URL")
       end