pages_core 3.12.6 → 3.13.0

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.6
+  version: 3.13.0
 platform: ruby
 authors:
 - Inge Jørgensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-15 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