effective_pages 3.8.3 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93461d891693d48f4a9610dc33406c38620c9b8470ef64cd0953e7c31f45ef7c
-  data.tar.gz: 9f0ae01994f41320788d6b183be99860d23a4103cdff78a8314fcf610e65b28a
+  metadata.gz: de13a6ce9afb0cee9e8401e076c3416a159f9a64f4a5fb7cf70c890de442263f
+  data.tar.gz: dfa2b67769948a6e25c5c20e3b1520260f494d0722165cfd5a78eeff1aeb3ce8
 SHA512:
-  metadata.gz: c10f7ec96802a69effc73b984362c5147aeb1cc2f96e5a871b059542938b91de525f5cb42f06c0e58828b5eac966362f21ca8f0da0ff9dcc37b224cb05f44805
-  data.tar.gz: 47527c78afcf1dc278acf6ddd87db09bf319f6e7d36128fbe586e2c67d822316813b13d37377806d3cf8a78bf856b49ef7aa5016fd004d7dc6c2004f640ff2d2
+  metadata.gz: 11295b2af4904ad5469948123e4e910302fa4e3d7c29a79b55bd4500b7456f458e31f5f389c587725a7d534a21c4e138daff27b525fae74d874c8344948cd1d7
+  data.tar.gz: 5e2bbcef490e3b25c6ba565fd64fab7ee4a7091377fef64ca664a4be1edfa54d64b0810c2b5005a7e33e63c04e54ff65f2955c5e705f5ec9e03bb39ff513c654

data/README.md

@@ -6,6 +6,33 @@ Create content pages ontop of one or more templates -- just regular Rails views
 
 Use this gem to create a fully-functional CMS that provides full or restricted editing for your end users.
 
+## Upgrading to 3.9.0
+
+Add a migration
+
+```
+class UpgradeEffectivePagesThreeNine < ActiveRecord::Migration[7.0]
+  def change
+    # Add a counter cache
+    add_column :pages, :menu_children_count, :integer, default: 0
+  end
+end
+```
+
+Run a one time script
+
+```
+# rake upgrade_effective_pages_to_three_nine
+task upgrade_effective_pages_to_three_nine: :environment do
+  puts "Starting effective pages 3.9.0 upgrade"
+
+  Effective::Page.where(menu_children_count: 0).find_each do |page|
+    Effective::Page.reset_counters(page.slug, :menu_children)
+  end
+
+  puts 'All done'
+end
+```
 
 ## effective_pages 3.0
 

data/app/controllers/effective/pages_controller.rb

@@ -3,7 +3,7 @@ module Effective
     include Effective::CrudController
 
     def show
-      @pages = Effective::Page.all
+      @pages = Effective::Page.deep.all
       @pages = @pages.published unless EffectiveResources.authorized?(self, :admin, :effective_pages)
 
       @page = @pages.find(params[:id])

data/app/datatables/effective_pages_menu_datatable.rb

@@ -14,6 +14,8 @@ class EffectivePagesMenuDatatable < Effective::Datatable
     col :menu_url, label: 'Redirect Url'
     col :menu_position, label: 'Position', visible: false
 
+    col :menu_children_count, label: 'Children Count', visible: false
+
     # We only support depth 2 and 3.
     col :menu_children, label: 'Children' do |page|
       page.menu_children.group_by { |child| child.menu_group.presence }.values.flatten.map do |child|

data/app/helpers/effective_menus_helper.rb

@@ -28,7 +28,7 @@ module EffectiveMenusHelper
       (
         [content_tag(:li, link_to(root, root_path, title: root), class: 'breadcrumb-item')] +
         parents.map do |page|
-          next if page.menu_root_with_children? # Don't show root pages becaues they have no content
+          next if page.menu_root_with_children? # Don't show root pages because they have no content
 
           url = (page.menu_url.presence || effective_pages.page_path(page))
           content_tag(:li, link_to(page, url, title: page.title), class: 'breadcrumb-item')
@@ -60,7 +60,7 @@ module EffectiveMenusHelper
   def admin_menu_parent_collection(page = nil)
     raise('expected a page') if page.present? && !page.kind_of?(Effective::Page)
 
-    pages = Effective::Page.menuable.root_level.where.not(id: page)
+    pages = Effective::Page.deep_menuable.menuable.root_level.where.not(id: page)
 
     if EffectivePages.max_menu_depth == 2
       # You can only select root level pages

data/app/helpers/effective_page_banners_helper.rb

@@ -8,9 +8,9 @@ module EffectivePageBannersHelper
     return unless page.banner? || EffectivePages.banners_force_randomize
 
     # Always return a random banner if config.banners_force_randomize
-    page_banner = Effective::PageBanner.random.first if EffectivePages.banners_force_randomize
+    page_banner = Effective::PageBanner.deep.random.first if EffectivePages.banners_force_randomize
     page_banner ||= page.page_banner if page.banner? && page.page_banner.present?
-    page_banner ||= Effective::PageBanner.random.first if page.banner? && page.banner_random?
+    page_banner ||= Effective::PageBanner.deep.random.first if page.banner? && page.banner_random?
 
     return if page_banner.blank?
 

data/app/models/effective/page.rb

@@ -14,7 +14,7 @@ module Effective
     belongs_to :page_banner, optional: true
 
     # These parent / children are for the menu as well
-    belongs_to :menu_parent, class_name: 'Effective::Page', optional: true
+    belongs_to :menu_parent, class_name: 'Effective::Page', optional: true, touch: true, counter_cache: :menu_children_count
 
     has_many :menu_children, -> { Effective::Page.menuable }, class_name: 'Effective::Page',
       foreign_key: :menu_parent_id, inverse_of: :menu_parent
@@ -47,6 +47,8 @@ module Effective
       menu_url          :string         # Redirect to this url instead of the page url
       menu_position     :integer        # Position in the menu
 
+      menu_children_count :integer      # Counter cache
+
       # Banners
       banner            :boolean        # Should we display a banner?
       banner_random     :boolean        # Display a random banner
@@ -58,7 +60,14 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:page_banner, :menu_parent, menu_children: :menu_parent) }
+    scope :deep, -> { 
+      base = includes(:page_banner, :tags, :rich_texts) 
+      base = base.deep_menuable
+      base = base.includes(:pg_search_document) if defined?(PgSearch)
+      base
+    }
+
+    scope :deep_menuable, -> { includes(:menu_parent, menu_children: [:menu_parent, :menu_children]) }
 
     scope :draft, -> { where(draft: true) }
     scope :published, -> { where(draft: false) }
@@ -182,13 +191,21 @@ module Effective
     end
 
     def menu_parent?
-      menu? && menu_children.to_a.present?
+      menu? && menu_children_present?
     end
 
     def menu_child?
       menu? && menu_parent_id.present?
     end
 
+    def menu_children_present?
+      menu_children_count > 0
+    end
+
+    def menu_children_blank?
+      menu_children_count <= 0
+    end
+
   end
 
 end

data/app/models/effective/permalink.rb

@@ -16,7 +16,11 @@ module Effective
 
     log_changes if respond_to?(:log_changes)
 
-    scope :deep, -> { with_attached_attachment }
+    scope :deep, -> { 
+      base = with_attached_attachment
+      base = base.includes(:pg_search_document) if defined?(PgSearch)
+      base
+    }
 
     effective_resource do
       title        :string

data/app/views/effective/pages/_menu.html.haml

@@ -7,14 +7,11 @@
   - next if (page.authenticate_user || page.roles.present?) && current_user.blank?
   - next if page.roles.present? && (current_user.roles & page.roles).blank?
 
-  - menu_children = page.menu_children
-
-  - if menu_children.blank?
+  - if page.menu_children_blank?
     = nav_link_to(page.menu_to_s, (page.menu_url.presence || effective_pages.page_path(page)))
-
-  - if menu_children.present?
+  - else
     = nav_dropdown(page.menu_to_s, groups: true) do
-      - menu_children.group_by { |menu| menu.menu_group.presence }.each do |menu_group, pages|
+      - page.menu_children.group_by { |menu| menu.menu_group.presence }.each do |menu_group, pages|
         = nav_dropdown_group(menu_group || '') do
           - pages.each do |page|
             - next unless EffectiveResources.authorized?(self, :show, page)

data/app/views/effective/pages/_page_menu.html.haml

@@ -1,14 +1,17 @@
 - raise('expected a page') unless page.present?
 
-- children = page.menu_children
+- children = []
 
-- if page.menu_children.present?
+- if page.menu_children_present?
+  - children = page.menu_children
   = nav_link_to(page.menu_to_s, (page.menu_url.presence || effective_pages.page_path(page)))
 
 - # if this is a third depth page, show the parent and siblings
-- if !page.menu_children.present? && page.menu_parent.present? && page.menu_parent&.menu_children&.present? && page.menu_parent&.menu_parent.present?
-  - children = page.menu_parent.menu_children
-  = nav_link_to(page.menu_parent.menu_to_s, (page.menu_parent.menu_url.presence || effective_pages.page_path(page.menu_parent)))
+- if page.menu_children_blank? && page.menu_parent.try(:menu_parent_id).present?
+  - if page.menu_parent.menu_children_present?
+    - page.menu_parent.try(:strict_loading!, false)
+    - children = page.menu_parent.menu_children
+    = nav_link_to(page.menu_parent.menu_to_s, (page.menu_parent.menu_url.presence || effective_pages.page_path(page.menu_parent)))
 
 - children.each do |page|
   - next unless EffectiveResources.authorized?(self, :show, page)

data/db/migrate/101_create_effective_pages.rb

@@ -27,6 +27,8 @@ class CreateEffectivePages < ActiveRecord::Migration[6.0]
       t.string :menu_url
       t.integer :menu_position
 
+      t.integer :menu_children_count, default: 0
+
       t.boolean :banner, default: false
       t.boolean :banner_random, default: false
 

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.8.3'.freeze
+  VERSION = '3.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.9.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails