effective_pages 3.4.1 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33c7720dd14a75e375dffed5ae8c21e7390cfd93727886785c72d574fbe23376
-  data.tar.gz: 40ab7326b18be3a3a728461f604c4e2cfd827d75bacef55b2cd7bada79f5d513
+  metadata.gz: f5f3b0de9a5ca3fe12873d09d559072e5f29eab0857753c9fa7a16d91a4bdeea
+  data.tar.gz: dd73a0fedf8b38bc4f26b08dbad06b0e47a6cc7f073fc56e2574a31d074a374f
 SHA512:
-  metadata.gz: 4b9359a7b5c76c694ded55b524981df67e85f01e080c6ca2ae17c895762a52438d72d2c3b1ee508ff89d370eda0b921ea526af6b53800a353a8ad4ac5f79228e
-  data.tar.gz: 5ccdeb32c10e7920fa017a4f6d0d5ca8ba6416290de99d202a4f972092e20b3e18cb53dc4c1d26d6e38aafbeae6135073382d0029a9717d6aae61c99112adf89
+  metadata.gz: 564e7333cc97ad0810faa5ef6ceeda0ab36d83f80ad79856a89191e47a223d52d5be0068f0dc85705b1be27c8e6d54f3e3c409f6c6f4cd9b06756a32bdc688a0
+  data.tar.gz: 8c87830c81761b1449c4ff8e611d569edb12264d5caae05a213aa0c306638b8491d9f126f339dba6c96b0893976f89a297e1210a3d580e85bfc76dd23fd9a97b

data/app/helpers/effective_page_banners_helper.rb

@@ -5,13 +5,14 @@ module EffectivePageBannersHelper
   def render_page_banner(page, opts = {}, &block)
     raise('expected a page') unless page.kind_of?(Effective::Page)
 
-    # Do nothing if page.banner is false
-    return unless page.banner?
+    return unless page.banner? || EffectivePages.banners_force_randomize
 
-    page_banner = page.page_banner
-    page_banner ||= Effective::PageBanner.random.first if page.banner_random?
+    # Always return a random banner if config.banners_force_randomize
+    page_banner = Effective::PageBanner.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?
 
-    raise("unable to find page banner for page #{page}") unless page_banner.present?
+    return if page_banner.blank?
 
     if block_given?
       yield(page_banner); nil

data/app/helpers/effective_page_sections_helper.rb

@@ -12,7 +12,7 @@ module EffectivePageSectionsHelper
     name = name.to_s
 
     page_section = effective_page_sections.find { |ps| ps.name == name }
-    raise("unable to find page section with name #{name}") unless page_section.present?
+    return if page_section.blank?
 
     if block_given?
       yield(page_section); nil

data/app/models/effective/page.rb

@@ -97,7 +97,7 @@ module Effective
     validates :menu_group, absence: true, if: -> { menu_root? && EffectivePages.menus.present? }
 
     validate(if: -> { banner? && EffectivePages.banners? }) do
-      unless (page_banner.present? ^ banner_random?) # xor
+      unless (page_banner.present? ^ banner_random? ^ EffectivePages.banners_force_randomize) # xor
         self.errors.add(:page_banner_id, "please select a page banner or random")
         self.errors.add(:banner_random, "please select a page banner or random")
       end

data/app/views/admin/pages/_form_page.html.haml

@@ -24,15 +24,24 @@
     = f.text_field :slug, hint: "The slug controls this page's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This page is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
 
   - if EffectivePages.banners?
-    = f.check_box :banner, label: 'Yes, display a page banner on this page'
+    - if EffectivePages.banners_force_randomize
+      = f.check_box :banner, label: 'Choose a page banner'
+    - else
+      = f.check_box :banner, label: 'Display a page banner on this page'
 
     = f.show_if(:banner, true) do
-      = card('Page Banner') do
-        %p.text-muted Please visit #{link_to('Page Banners', effective_pages.admin_page_banners_path)} to add or update the page banners.
+      = card do
+        %p.text-muted
+          - if EffectivePages.banners_force_randomize
+            A random banner will always be displayed, or you may choose a specific banner below.
+
+          Please visit #{link_to('Page Banners', effective_pages.admin_page_banners_path)} to add or update the page banners.
+
+        - if !EffectivePages.banners_force_randomize
+          = f.check_box :banner_random, label: 'Display a random page banner. Ignored if you choose a page banner below.'
+
+        = f.select :page_banner_id, Effective::PageBanner.sorted.all, label: 'Choose a page banner'
 
-        = f.select :page_banner_id, Effective::PageBanner.sorted.all, label: 'Display this page banner'
-        %p - or -
-        = f.check_box :banner_random, label: 'Display a random page banner each time the page is refreshed'
 
   = render partial: '/admin/pages/additional_fields', locals: { page: page, form: f, f: f }
 

data/config/effective_pages.rb

@@ -63,6 +63,7 @@ EffectivePages.setup do |config|
   # Allow a page banner to be selected on the Admin::Pages#edit screen
   # Banners can be CRUD by the admin
   config.banners = false
+  config.banners_force_randomize = false # at least return a random banner with render_page_banner()
   config.banners_hint_text = 'Hint text that includes required image dimensions'
 
   # Page Carousels

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.4.1'.freeze
+  VERSION = '3.4.3'.freeze
 end

data/lib/effective_pages.rb

@@ -12,7 +12,7 @@ module EffectivePages
       :site_og_image, :site_og_image_width, :site_og_image_height,
       :site_title, :site_title_suffix, :fallback_meta_description,
       :silence_missing_page_title_warnings, :silence_missing_meta_description_warnings, :silence_missing_canonical_url_warnings,
-      :use_effective_roles, :layout, :max_menu_depth, :banners_hint_text, :carousels_hint_text,
+      :use_effective_roles, :layout, :max_menu_depth, :banners_hint_text, :carousels_hint_text, :banners_force_randomize,
 
       # Booleans
       :banners,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails