pages_core 3.12.7 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 163cc3bcfb2a7c108347dc717d33142eb24e14feddda441de64faffda748dfeb
-  data.tar.gz: dfda2479ed024326379ed3776fc4b199ac0d0fffde3d5f98feb9a36911a92e87
+  metadata.gz: cd2414153112fe73c09225371f24be7c61cb4cf9ed3d62a633ec6cc47b10411a
+  data.tar.gz: 3b94c430720c0d75000065047bbc407b59a24e0931e1a39a901107933603d597
 SHA512:
-  metadata.gz: 509ec2e72a86c3b70d4db4d5ebc733b0f744a3919dabc9e45aab0f172226699cf65279fc82dda0ad04caac26146358df816ea0a7b5c9fc2a5e220984f9fd8e0b
-  data.tar.gz: 33c0d864232bd1196aa9920d42a864acbf384946b83a56609f326cec28a68f5e0e4eb53852f89fd82f448450edec9be60149861359fb1ed5c0b7398cd9ad0309
+  metadata.gz: f4648cba128ccec11c3dd5d34485c20d2e33ed02361be1007152e66267166d7b557f87bcd02320120e99e2b3b7510fbd1b242ed32a1b275319cdde6944be62ba
+  data.tar.gz: 16090abcbd624dc65a37de898b8f0c6792d52c9a05b4a9cc1b9a06da3ce0b87dd379df7efad3bf67d23f6d61ccd4b450f7f33e6f0f77cb049cbf7f8c5ff044c9

data/VERSION

@@ -1 +1 @@
-3.12.7
+3.13.0

data/app/controllers/admin/pages_controller.rb

@@ -64,7 +64,7 @@ module Admin
 
     def move
       parent = params[:parent_id] ? Page.find(params[:parent_id]) : nil
-      @page.update(parent: parent, position: params[:position])
+      @page.update(parent:, position: params[:position])
       respond_with_page(@page) { redirect_to admin_pages_url(content_locale) }
     end
 

data/app/controllers/admin/users_controller.rb

@@ -11,7 +11,7 @@ module Admin
 
     def index
       @users = User.activated
-      @invites = Invite.all.order("created_at DESC")
+      @invites = Invite.order("created_at DESC")
     end
 
     def deactivated

data/app/controllers/concerns/pages_core/error_reporting.rb

@@ -5,34 +5,24 @@ module PagesCore
     extend ActiveSupport::Concern
 
     included do
-      before_action :configure_sentry_context
+      before_action :configure_sentry_scope
     end
 
     protected
 
-    def configure_sentry_context
-      return if Rails.env.test?
+    def configure_sentry_scope
+      return if Rails.env.test? || !Object.const_defined?("Sentry")
 
-      if Object.const_defined?("Sentry")
-        Sentry.set_user(current_user_context)
-        Sentry.set_tags(locale: params[:locale] || I18n.default_locale.to_s)
-        Sentry.set_extras(params: params.to_unsafe_h)
-      elsif Object.const_defined?("Raven")
-        configure_legacy_sentry_context
-      end
-    end
-
-    def configure_legacy_sentry_context
-      Raven.user_context(current_user_context)
-      Raven.tags_context(locale: params[:locale] || I18n.default_locale.to_s)
-      Raven.extra_context(params: params.to_unsafe_h)
+      Sentry.set_context("params", params.to_unsafe_h)
+      Sentry.set_tags(locale: params[:locale] || I18n.default_locale.to_s)
+      Sentry.set_user(current_user_context)
     end
 
     def current_user_context
-      return { user_id: :guest } unless logged_in?
+      return {} unless logged_in?
 
-      { user_id: current_user.id,
-        user_email: current_user.email }
+      { id: current_user.id,
+        email: current_user.email }
     end
   end
 end

data/app/controllers/concerns/pages_core/static_cache_controller.rb

@@ -4,10 +4,13 @@ module PagesCore
   module StaticCacheController
     extend ActiveSupport::Concern
 
+    included do
+      helper_method :static_cached?
+    end
+
     module ClassMethods
       def static_cache(*actions, permanent: false)
-        return unless perform_caching
-
+        before_action :prepare_static_cache
         if permanent
           after_action :cache_static_page_permanently, only: actions
         else
@@ -22,6 +25,10 @@ module PagesCore
       @static_cache_disabled = true
     end
 
+    def static_cached?
+      !@static_cache_disabled && @static_cached ? true : false
+    end
+
     private
 
     def cache_static_page
@@ -40,6 +47,10 @@ module PagesCore
       )
     end
 
+    def prepare_static_cache
+      @static_cached = true
+    end
+
     def static_cache_allowed?
       (request.get? || request.head?) && response.status == 200 &&
         perform_caching && !@static_cache_disabled

data/app/controllers/pages_core/attachments_controller.rb

@@ -31,7 +31,7 @@ module PagesCore
       send_ranged_data(@attachment.data,
                        filename: @attachment.filename,
                        type: @attachment.content_type,
-                       disposition: disposition)
+                       disposition:)
     end
 
     def verify_signed_params

data/app/controllers/pages_core/frontend/pages_controller.rb

@@ -121,7 +121,7 @@ module PagesCore
       def redirect_page(page)
         return false unless page.redirects?
 
-        redirect_to(page.redirect_path(locale: locale), allow_other_host: true)
+        redirect_to(page.redirect_path(locale:), allow_other_host: true)
       end
 
       def require_page

data/app/controllers/pages_core/frontend_controller.rb

@@ -22,21 +22,12 @@ module PagesCore
 
     private
 
-    def legacy_locales
-      { "nor" => "nb",
-        "eng" => "en" }
-    end
-
     def page_param
       params[:page].is_a?(String) ? params[:page] : 1
     end
 
     def set_i18n_locale
-      locale_param = content_locale
-      if legacy_locales[locale_param]
-        locale_param = legacy_locales[locale_param]
-      end
-      I18n.locale = locale_param
+      I18n.locale = content_locale
     rescue I18n::InvalidLocale
       raise if Rails.application.config.consider_all_requests_local
 

data/app/controllers/sessions_controller.rb

@@ -22,6 +22,6 @@ class SessionsController < ApplicationController
   protected
 
   def find_user(email, password)
-    User.authenticate(email, password: password) if email && password
+    User.authenticate(email, password:) if email && password
   end
 end

data/app/formatters/pages_core/image_embedder.rb

@@ -23,7 +23,7 @@ module PagesCore
     def embed_image(id, size:, class_name:, link:)
       image_figure(
         Image.find(id).localize(I18n.locale),
-        size: size, class_name: class_name, link: link
+        size:, class_name:, link:
       )
     rescue ActiveRecord::RecordNotFound
       nil
@@ -44,8 +44,8 @@ module PagesCore
       link = (Regexp.last_match(1) if options =~ /link="([^"]+)"/)
       embed_image(id,
                   size: embed_image_size(options),
-                  class_name: class_name,
-                  link: link)
+                  class_name:,
+                  link:)
     end
 
     def parse_images(string)

data/app/helpers/admin/pages_helper.rb

@@ -39,12 +39,12 @@ module Admin
       ([page.author] + User.activated).uniq
     end
 
-    def page_list_row(page, &block)
+    def page_list_row(page, &)
       classes = [page.status_label.downcase]
       classes << "autopublish" if page.autopublish?
       classes << "pinned" if page.pinned?
 
-      tag.tr(capture(&block), class: classes.join(" "))
+      tag.tr(capture(&), class: classes.join(" "))
     end
 
     def page_name(page, options = {})

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

@@ -14,7 +14,7 @@ module PagesCore
       def rich_text_area_tag(name, content = nil, options = {})
         react_component("RichTextArea",
                         options.merge(id: sanitize_to_id(name),
-                                      name: name,
+                                      name:,
                                       value: content))
       end
 

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

@@ -11,14 +11,14 @@ module PagesCore
         content_tabs.any?
       end
 
-      def content_tab(name, options = {}, &block)
+      def content_tab(name, options = {}, &)
         return unless block_given?
 
         tab = {
           name: name.to_s.humanize,
           key: options[:key] || name.to_s.underscore.gsub(/\s+/, "_"),
-          options: options,
-          content: capture(&block)
+          options:,
+          content: capture(&)
         }
         content_tabs.push(tab)
         content_tab_tag(tab[:key], tab[:content])

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

@@ -38,7 +38,7 @@ module PagesCore
 
       def foreign_key(attr)
         object.class.reflections[attr.to_s].options[:foreign_key] ||
-          "#{attr}_id".to_sym
+          :"#{attr}_id"
       end
     end
   end

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

@@ -9,10 +9,10 @@ module PagesCore
         react_component("EditableImage",
                         editable_image_options(
                           image,
-                          width: width,
-                          caption: caption,
-                          locale: locale
-                        ).merge(width: width))
+                          width:,
+                          caption:,
+                          locale:
+                        ).merge(width:))
       end
 
       def image_uploader_tag(name, image, options = {})
@@ -36,8 +36,8 @@ module PagesCore
 
       def editable_image_options(image, width: 250, caption: false, locale: nil)
         editable_image_src_options(image, width).merge(
-          width: width,
-          caption: caption,
+          width:,
+          caption:,
           locale: locale || I18n.default_locale,
           locales: locales_with_dir
         )

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

@@ -24,7 +24,7 @@ module PagesCore
             [labelled_field_label(label, options),
              labelled_field_description(options[:description]),
              field,
-             (options[:check_box_description] || "")]
+             options[:check_box_description] || ""]
           )
         end
       end

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

@@ -6,7 +6,7 @@ module PagesCore
       def locales_with_dir
         locales = PagesCore.config.locales || {}
         locales.each_with_object({}) do |(key, name), hash|
-          hash[key] = { name: name, dir: locale_direction(key) }
+          hash[key] = { name:, dir: locale_direction(key) }
         end
       end
 

data/app/helpers/pages_core/application_helper.rb

@@ -21,10 +21,10 @@ module PagesCore
       end
     end
 
-    def unique_page(page_name, &block)
+    def unique_page(page_name, &)
       page = Page.where(unique_name: page_name).first
       if page && block_given?
-        output = capture(page.localize(content_locale), &block)
+        output = capture(page.localize(content_locale), &)
         concat(output)
       end
       page&.localize(content_locale)
@@ -44,7 +44,7 @@ module PagesCore
 
     def page_link_path(locale, page)
       if page.redirects?
-        page.redirect_path(locale: locale)
+        page.redirect_path(locale:)
       else
         page_path(locale, page)
       end

data/app/helpers/pages_core/head_tags_helper.rb

@@ -50,9 +50,9 @@ module PagesCore
     #    <%= feed_tags %>
     #  <% end %>
     #
-    def head_tag(&block)
+    def head_tag(&)
       # The block output must be captured first
-      block_output = block_given? ? capture(&block) : nil
+      block_output = block_given? ? capture(&) : nil
 
       tag.head { safe_join(head_tag_contents(block_output), "\n") }
     end
@@ -64,34 +64,33 @@ module PagesCore
     def rss_link_tag(title, href)
       tag.link(rel: "alternate",
                type: "application/rss+xml",
-               title: title,
-               href: href)
+               title:,
+               href:)
     end
 
     private
 
     def head_tag_contents(block_output)
       [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?),
        open_graph_tags,
-       csrf_meta_tags,
-       block_output]
+       (csrf_meta_tags unless static_cached?),
+       block_output].compact_blank
     end
 
     def meta_description_tag
       return unless meta_description?
 
-      tag.meta(name: "description", content: meta_description)
+      tag.meta(name: "description", content: meta_description&.strip)
     end
 
     def meta_keywords_tag
       return unless meta_keywords?
 
-      tag.meta(name: "keywords", content: meta_keywords)
+      tag.meta(name: "keywords", content: meta_keywords&.strip)
     end
   end
 end

data/app/helpers/pages_core/images_helper.rb

@@ -57,12 +57,12 @@ module PagesCore
     def picture_tag(image, ratio: nil, sizes: "100vw")
       tag.picture do
         safe_join(
-          [webp_source(image, ratio: ratio, sizes: sizes || "100vw"),
+          [webp_source(image, ratio:, sizes: sizes || "100vw"),
            dynamic_image_tag(image,
                              size: image_size(1050, ratio),
                              crop: (ratio ? true : false),
-                             sizes: sizes,
-                             srcset: srcset(image, ratio: ratio))]
+                             sizes:,
+                             srcset: srcset(image, ratio:))]
         )
       end
     end
@@ -106,11 +106,11 @@ module PagesCore
       size ||= default_image_size
       size = fit_ratio(size, ratio) if ratio
 
-      dynamic_image_tag(image, size: size, crop: ratio && true, upscale: false)
+      dynamic_image_tag(image, size:, crop: ratio && true, upscale: false)
     end
 
     def image_link_to(content, href)
-      tag.a(content, href: href)
+      tag.a(content, href:)
     end
 
     def image_size(width, ratio)
@@ -139,8 +139,8 @@ module PagesCore
       return unless webp_compatible?(image)
 
       tag.source(type: "image/webp",
-                 srcset: srcset(image, ratio: ratio, format: :webp),
-                 sizes: sizes)
+                 srcset: srcset(image, ratio:, format: :webp),
+                 sizes:)
     end
 
     def webp_compatible?(image)

data/app/helpers/pages_core/open_graph_tags_helper.rb

@@ -13,7 +13,7 @@ module PagesCore
         properties
           .compact
           .map do |name, content|
-          tag.meta(property: "og:#{name}", content: content)
+          tag.meta(property: "og:#{name}", content:)
         end,
         "\n"
       )
@@ -42,7 +42,7 @@ module PagesCore
         site_name: PagesCore.config(:site_name),
         title: default_open_graph_title,
         image: (meta_image if meta_image?),
-        description: default_open_graph_description,
+        description: default_open_graph_description&.strip,
         url: request.url }
     end
   end

data/app/helpers/pages_core/page_path_helper.rb

@@ -30,7 +30,7 @@ module PagesCore
     private
 
     def page_redirect_url(locale, page)
-      redirect = page.redirect_path(locale: locale)
+      redirect = page.redirect_path(locale:)
       return redirect if redirect =~ %r{^https?://}
 
       base_page_url + redirect
@@ -54,7 +54,7 @@ module PagesCore
       ActiveSupport::Deprecation.warn(
         "Calling page_url without locale is deprecated"
       )
-      [(opts[:locale] || content_locale), page_or_locale]
+      [opts[:locale] || content_locale, page_or_locale]
     end
 
     def paginated_section(opts)

data/app/jobs/pages_core/autopublish_job.rb

@@ -4,6 +4,8 @@ module PagesCore
   class AutopublishJob < ApplicationJob
     queue_as :pages_core
 
+    retry_on StandardError, attempts: 10, wait: :polynomially_longer
+
     def perform
       Autopublisher.run!
     end

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

@@ -16,9 +16,9 @@ module PagesCore
     def role_names=(names)
       self.roles = names.map do |name|
         if role?(name)
-          roles.find_by(name: name)
+          roles.find_by(name:)
         else
-          roles.new(name: name)
+          roles.new(name:)
         end
       end
     end

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

@@ -90,7 +90,7 @@ module PagesCore
       def siblings_by_date
         siblings.reorder("starts_at ASC, pages.id DESC")
                 .where
-                .not(id: id)
+                .not(id:)
       end
     end
   end

data/app/models/concerns/pages_core/page_model/searchable.rb

@@ -8,7 +8,7 @@ module PagesCore
       def search_document_attributes
         super.merge(
           published: published?,
-          name: name,
+          name:,
           description: try(&:meta_description?) ? meta_description : excerpt,
           # content: "",
           tags: tag_names.join(" ")

data/app/models/concerns/pages_core/page_model/templateable.rb

@@ -7,6 +7,8 @@ module PagesCore
 
       included do
         before_validation :ensure_template
+
+        delegate :enabled_blocks, to: :template_config
       end
 
       def template_config
@@ -27,8 +29,28 @@ module PagesCore
           template
       end
 
+      def unconfigured_blocks
+        blocks = (localizations.where(locale:).pluck(:name)
+                               .map(&:to_sym) -
+                  configured_blocks) &
+                 PagesCore::Templates::TemplateConfiguration.all_blocks
+
+        if block_given?
+          blocks.each do |block_name|
+            yield block_name, template_config.block(block_name)
+          end
+        end
+
+        blocks
+      end
+
       private
 
+      def configured_blocks
+        enabled_blocks + %i[name path_segment meta_title meta_description
+                            open_graph_title open_graph_description]
+      end
+
       def singularized_subtemplate
         singularized = ActiveSupport::Inflector.singularize(base_template)
         return if base_template == singularized

data/app/models/concerns/pages_core/searchable_document.rb

@@ -18,7 +18,7 @@ module PagesCore
 
       class << self
         def index_all!(scope)
-          scope.all.find_each { |r| new(r).index! }
+          scope.find_each { |r| new(r).index! }
         end
       end
 
@@ -53,7 +53,7 @@ module PagesCore
       end
 
       def update_index(locale, attrs)
-        record.search_documents.create_or_find_by!(locale: locale).update(attrs)
+        record.search_documents.create_or_find_by!(locale:).update(attrs)
       end
     end
 
@@ -61,7 +61,7 @@ module PagesCore
       return {} unless respond_to?(:localized_attributes)
 
       content = localized_attributes.keys.map { |a| localizer.get(a) }.join(" ")
-      { content: content }
+      { content: }
     end
 
     def update_search_documents!

data/app/models/page.rb

@@ -78,7 +78,7 @@ class Page < ApplicationRecord
 
   def move(parent:, position:)
     Page.transaction do
-      update(parent: parent) unless self.parent == parent
+      update(parent:) unless self.parent == parent
       insert_at(position)
     end
   end

data/app/models/page_builder.rb

@@ -19,7 +19,7 @@ class PageBuilder
 
   class << self
     def build(user, locale: nil, parent: nil, &block)
-      new(user, locale: locale, parent: parent)
+      new(user, locale:, parent:)
         .run(&block)
     end
   end
@@ -30,20 +30,20 @@ class PageBuilder
     @parent = parent
   end
 
-  def page(name, options = {}, &block)
+  def page(name, options = {}, &)
     page = Page.create(
-      { name: name }.merge(default_options).merge(options)
+      { name: }.merge(default_options).merge(options)
     )
     if block_given?
       self.class
-          .new(user, locale: locale, parent: page)
-          .run(&block)
+          .new(user, locale:, parent: page)
+          .run(&)
     end
     page
   end
 
-  def run(&block)
-    instance_eval(&block)
+  def run(&)
+    instance_eval(&)
   end
 
   private
@@ -51,9 +51,9 @@ class PageBuilder
   def default_options
     {
       author: user,
-      parent: parent,
+      parent:,
       status: 2,
-      locale: locale
+      locale:
     }
   end
 end

data/app/models/page_exporter.rb

@@ -88,7 +88,7 @@ class PageExporter
   def text_page(page)
     PagesCore::Templates::TemplateConfiguration
       .all_blocks
-      .select { |attr| page.send("#{attr}?".to_sym) }
+      .select { |attr| page.send(:"#{attr}?") }
       .map { |attr| ["-- #{attr}: --", page.send(attr).strip].join("\n\n") }
       .join("\n\n\n")
   end

data/app/models/page_image.rb

@@ -15,7 +15,7 @@ class PageImage < ApplicationRecord
 
   class << self
     def cleanup!
-      all.find_each do |page_image|
+      find_each do |page_image|
         page_image.destroy unless page_image.image
       end
     end

data/app/models/page_path.rb

@@ -28,7 +28,7 @@ class PagePath < ApplicationRecord
     end
 
     def get(locale, path)
-      find_by(locale: locale, path: path)
+      find_by(locale:, path:)
     end
 
     def associate(page, locale: nil, path: nil)
@@ -39,14 +39,14 @@ class PagePath < ApplicationRecord
       raise NoPathError unless path
 
       page_path = get_or_create(locale, path, page)
-      page_path.update(page: page) unless page_path.page_id == page.id
+      page_path.update(page:) unless page_path.page_id == page.id
       page_path
     end
 
     private
 
     def get_or_create(locale, path, page)
-      get(locale, path) || create(locale: locale, path: path, page: page)
+      get(locale, path) || create(locale:, path:, page:)
     end
   end
 end

data/app/models/search_document.rb

@@ -15,12 +15,12 @@ class SearchDocument < ApplicationRecord
   pg_search_scope :full_text_search_scope, lambda { |query, dictionary|
     { against: %i[name description content tags],
       using: { tsearch: { prefix: true,
-                          dictionary: dictionary,
+                          dictionary:,
                           tsvector_column: "tsv" },
                trigram: { only: %i[name] } },
       ignoring: :accents,
       order_within_rank: "search_documents.record_updated_at DESC",
-      query: query }
+      query: }
   }
 
   class << self
@@ -31,7 +31,7 @@ class SearchDocument < ApplicationRecord
 
     def search(query, locale: nil)
       locale ||= I18n.locale
-      where(locale: locale)
+      where(locale:)
         .includes(:searchable)
         .full_text_search_scope(query, search_configuration(locale))
     end

data/app/models/tag.rb

@@ -57,7 +57,7 @@ class Tag < ApplicationRecord
   end
 
   def on(taggable)
-    taggings.create(taggable: taggable)
+    taggings.create(taggable:)
   end
 
   def ==(other)

data/app/services/pages_core/create_user_service.rb

@@ -11,7 +11,7 @@ module PagesCore
 
     class << self
       def call(attrs, invite: nil)
-        new(attrs, invite: invite).call
+        new(attrs, invite:).call
       end
     end
 
@@ -19,7 +19,7 @@ module PagesCore
       User.transaction do
         user = User.create(attributes.merge(invite_attributes))
         if user.valid?
-          PagesCore::PubSub.publish(:create_user, user: user, invite: invite)
+          PagesCore::PubSub.publish(:create_user, user:, invite:)
           invite&.destroy
         end
         user

data/app/services/pages_core/destroy_invite_service.rb

@@ -10,14 +10,14 @@ module PagesCore
 
     class << self
       def call(invite:)
-        new(invite: invite).call
+        new(invite:).call
       end
     end
 
     def call
       Invite.transaction do
         invite.destroy
-        PagesCore::PubSub.publish(:destroy_invite, invite: invite)
+        PagesCore::PubSub.publish(:destroy_invite, invite:)
         invite
       end
     end

data/app/services/pages_core/invite_service.rb

@@ -15,7 +15,7 @@ module PagesCore
 
     class << self
       def call(attrs, user:, host:, protocol: "http")
-        new(attrs, user: user, host: host, protocol: protocol).call
+        new(attrs, user:, host:, protocol:).call
       end
     end
 
@@ -36,7 +36,7 @@ module PagesCore
       AdminMailer.invite(
         invite,
         admin_invite_with_token_url(invite, invite.token,
-                                    host: host, protocol: protocol)
+                                    host:, protocol:)
       ).deliver_later
     end
   end

data/app/views/admin/pages/_edit_content.html.erb

@@ -1,4 +1,4 @@
-<% @page.template_config.enabled_blocks do |block_name, block_options| %>
+<% @page.enabled_blocks do |block_name, block_options| %>
   <%= page_block_field(f, block_name, block_options) %>
 <% end %>
 

data/app/views/admin/pages/_form.html.erb

@@ -2,6 +2,18 @@
   <%= render partial: "edit_content", locals: { f: f } %>
 <% end %>
 
+<% if @page.unconfigured_blocks.any? %>
+  <%= content_tab "Unconfigured content" do %>
+    <p>
+      This page has additional content fields not enabled by the
+      selected template.
+    </p>
+    <% @page.unconfigured_blocks do |block_name, block_options| %>
+      <%= page_block_field(f, block_name, block_options) %>
+    <% end %>
+  <% end %>
+<% end %>
+
 <% if @page.template_config.value(:images) || @page.template_config.value(:image) %>
   <%= content_tab "Images" do %>
     <%= render partial: "edit_images", locals: { f: f } %>

data/db/migrate/20111219033112_create_pages_tables.rb

@@ -21,20 +21,6 @@ class CreatePagesTables < ActiveRecord::Migration[5.0]
       t.index :slug
     end
 
-    create_table :delayed_jobs do |t|
-      t.integer :priority, default: 0
-      t.integer :attempts, default: 0
-      t.text :handler
-      t.text :last_error
-      t.datetime :run_at
-      t.datetime :locked_at
-      t.datetime :failed_at
-      t.string :locked_by
-      t.datetime :created_at, null: false
-      t.datetime :updated_at, null: false
-      t.string :queue
-    end
-
     create_table :images do |t|
       t.string :filename, null: false
       t.string :content_type, null: false

data/lib/pages_core/cache_sweeper.rb

@@ -5,15 +5,15 @@ module PagesCore
     class << self
       attr_accessor :enabled
 
-      def disable(&_block)
+      def disable(&)
         old_value = enabled
         self.enabled = false
         yield if block_given?
         self.enabled = old_value
       end
 
-      def once(&block)
-        disable(&block)
+      def once(&)
+        disable(&)
         PagesCore::StaticCache.handler.sweep!
       end
     end

data/lib/pages_core/extensions/string_extensions.rb

@@ -4,7 +4,7 @@ module PagesCore
   module Extensions
     module StringExtensions
       def to_html_with(append, options = {})
-        to_html(options.merge(append: append))
+        to_html(options.merge(append:))
       end
 
       def to_html(options = {})

data/lib/pages_core/templates/configuration.rb

@@ -149,7 +149,7 @@ module PagesCore
       def template_config(setting, value, options)
         value = true if value == :enabled
         value = false if value == :disabled
-        { setting => { value: value, options: options } }
+        { setting => { value:, options: } }
       end
 
       def template_path(name)

data/lib/pages_core/templates/template_configuration.rb

@@ -106,7 +106,7 @@ module PagesCore
     end
 
     class << self
-      def configure(options = {}, &_block)
+      def configure(options = {}, &)
         case options[:reset]
         when :defaults
           load_default_configuration

data/lib/pages_core.rb

@@ -21,7 +21,6 @@ require "acts_as_list"
 require "alba"
 require "bcrypt"
 require "country_select"
-require "delayed_job_active_record"
 require "dis"
 require "dynamic_image"
 require "healthcheck"
@@ -71,7 +70,7 @@ module PagesCore
       Pathname.new(File.dirname(__FILE__)).join("..").expand_path
     end
 
-    def configure(_options = {}, &_block)
+    def configure(_options = {}, &)
       yield configuration if block_given?
     end
 

data/lib/rails/generators/pages_core/install/install_generator.rb

@@ -22,11 +22,6 @@ module PagesCore
         nil
       end
 
-      def create_active_job_initializer
-        template("active_job_initializer.rb",
-                 File.join("config/initializers/active_job.rb"))
-      end
-
       def create_application_controller
         template("application_controller.rb",
                  File.join("app/controllers/application_controller.rb"))
@@ -57,16 +52,6 @@ module PagesCore
                   File.join("app/views/pages/templates/index.html.erb"))
       end
 
-      def create_delayed_job_script
-        template "delayed_job", File.join("bin/delayed_job")
-        File.chmod(0o755, Rails.root.join("bin/delayed_job"))
-      end
-
-      def create_delayed_job_initializer
-        template("delayed_job_initializer.rb",
-                 File.join("config/initializers/delayed_job.rb"))
-      end
-
       def create_initializer_file
         read_configuration!
         template("pages_initializer.rb",

data/lib/rails/generators/pages_core/rspec/templates/page_templates_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe "Page templates", type: :system do
 
   let(:page_model) do
     create(:page,
-           template: template,
+           template:,
            headline: "My headline",
            body: "My body",
            excerpt: "My excerpt")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pages_core
 version: !ruby/object:Gem::Version
-  version: 3.12.7
+  version: 3.13.0
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -332,48 +332,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: daemons
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: delayed_job
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.2
-- !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.1.1
 description: Pages Core
 email:
 - inge@anyone.no
@@ -700,12 +658,9 @@ files:
 - lib/rails/generators/pages_core/frontend/templates/stylesheets/global/grid.css
 - lib/rails/generators/pages_core/frontend/templates/stylesheets/global/typography.css
 - lib/rails/generators/pages_core/install/install_generator.rb
-- lib/rails/generators/pages_core/install/templates/active_job_initializer.rb
 - lib/rails/generators/pages_core/install/templates/application_controller.rb
 - lib/rails/generators/pages_core/install/templates/application_helper.rb
 - lib/rails/generators/pages_core/install/templates/default_page_template.html.erb
-- lib/rails/generators/pages_core/install/templates/delayed_job
-- lib/rails/generators/pages_core/install/templates/delayed_job_initializer.rb
 - lib/rails/generators/pages_core/install/templates/frontend_controller.rb
 - lib/rails/generators/pages_core/install/templates/frontend_helper.rb
 - lib/rails/generators/pages_core/install/templates/gitignore.erb
@@ -736,14 +691,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Pages Core

data/lib/rails/generators/pages_core/install/templates/active_job_initializer.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-ActiveJob::Base.queue_adapter = :delayed_job

data/lib/rails/generators/pages_core/install/templates/delayed_job

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "config",
-                                   "environment"))
-require "delayed/command"
-Delayed::Command.new(ARGV).daemonize

data/lib/rails/generators/pages_core/install/templates/delayed_job_initializer.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-Delayed::Worker.backend = :active_record
-
-if Object.const_defined?("Postmark")
-  class InvalidRecipientsPlugin < Delayed::Plugin
-    callbacks do |lifecycle|
-      lifecycle.around(:invoke_job) do |job, *args, &block|
-        # Forward the call to the next callback in the callback chain
-        block.call(job, *args)
-      rescue Postmark::InactiveRecipientError => e
-        Rails.logger.error "#{e.class}: #{e.message}"
-      end
-    end
-  end
-
-  Delayed::Worker.plugins << InvalidRecipientsPlugin
-end