effective_pages 3.10.0 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27068cf38aee344c7a13bfca4c21f5c5076c65df506085efc3c51c7ed3ebb88c
-  data.tar.gz: ccc55fbf35ace55fa7243f3236305e5a847287a8397874e737513f33fdde1f24
+  metadata.gz: 1fd5033b1c1e0aeb36a9d35216a9f47e7e5f68de94dbe8688f8a4cf6e606a690
+  data.tar.gz: 3512cfb9bba19e4a2c71c56c86f05efe574bc7dbe0e924f138f2873b4da20c7a
 SHA512:
-  metadata.gz: e5cfd09bc93c3caa960614850e26e877db3a754d4136ef427d645f376108cf5a5797deb4b089694865b618769344705481b9451aa22e5b848eeb5bd55239326b
-  data.tar.gz: 4a3b0af8da3d99f927a18322e7aefce5b080c4d22e2c8cd1633d1000093f3e0a4b6ecfc26c73e9aedfbb5789191902afa75ab4feb72aaefb8120abc0092512b3
+  metadata.gz: 3e8b8bba6f888898cc7e6ba2508b4d0cacd97881011c57e0dafe1ddb63f22b74c6da0db650f8e0bbd9b4b182f6f836c5167f6da95a764b31b1c5b590cb6e86b6
+  data.tar.gz: 01bba194d58a6d6faae7cd5cfa2773f92e165d13c2984015709905475328b019b5ec68b1072d6467ba5249e425ecc9a2d9f89c8276c550d5be2bb28feea7432a

data/app/helpers/effective_carousels_helper.rb

@@ -1,23 +1,14 @@
 # frozen_string_literal: true
 module EffectiveCarouselsHelper
 
-  def render_carousel(name, options = {}, &block)
-    name = name.to_s
-    carousel = Array(EffectivePages.carousels).find { |carousel| carousel.to_s == name }
+  def render_carousel(name, carousel_options = {})
+    carousel = Array(EffectivePages.carousels).find { |carousel| carousel.to_s == name.to_s }
 
     if carousel.blank?
       raise("unable to find carousel #{name}. Please add it to config/initializers/effective_pages.rb")
     end
 
-    carousel_items = Effective::CarouselItem.sorted.deep.where(carousel: carousel)
-    return if carousel_items.blank?
-
-    if block_given?
-      yield(carousel_items); nil
-    else
-      render('effective/carousels/carousel', carousel: carousel, carousel_items: carousel_items, carousel_options: options)
-    end
-
+    render('effective/carousels/carousel', carousel: carousel, carousel_options: carousel_options)
   end
 
 end

data/app/views/effective/carousels/_carousel.html.haml

@@ -1,27 +1,27 @@
-- uid = "effective-carousel-#{carousel}-#{Time.zone.now.to_i}"
-- options = carousel_options
+= cache([carousel, Effective::CarouselItem.all.cache_key]) do
+  - carousel_items = Effective::CarouselItem.sorted.deep.where(carousel: carousel).to_a
+  - uid = "effective-carousel-#{carousel}-#{Time.zone.now.to_i}"
 
-- raise('expected one or more carousel items') unless carousel_items.present?
+  - if carousel_items.present?
+    .carousel.slide{id: uid, 'data-ride': 'carousel', **carousel_options}
+      %ol.carousel-indicators
+        - carousel_items.each_with_index do |item, index|
+          %li{'data-target': '#' + uid, 'data-slide-to': index, class: ('active' if index == 0)}
 
-.carousel.slide{id: uid, 'data-ride': 'carousel', **options}
-  %ol.carousel-indicators
-    - carousel_items.each_with_index do |item, index|
-      %li{'data-target': '#' + uid, 'data-slide-to': index, class: ('active' if index == 0)}
+      .carousel-inner
+        - carousel_items.each_with_index do |item, index|
+          .carousel-item{class: ('active' if index == 0)}
+            - if item.caption.blank?
+            = image_tag(item.file, class: 'd-block w-100', alt: "Slide #{index+1}")
+            - else
+              = image_tag(item.file, alt: item.caption)
+              .carousel-caption.d-none.d-md-block
+                %p= item.caption
 
-  .carousel-inner
-    - carousel_items.each_with_index do |item, index|
-      .carousel-item{class: ('active' if index == 0)}
-        - if item.caption.blank?
-          = image_tag(item.file, class: 'd-block w-100', alt: "Slide #{index+1}")
-        - else
-          = image_tag(item.file, alt: item.caption)
-          .carousel-caption.d-none.d-md-block
-            %p= item.caption
+      %button.carousel-control-prev{'data-target': '#' + uid, type: 'button', 'data-slide': 'prev'}
+        %span.carousel-control-prev-icon{'aria-hidden': true}
+        %span.sr-only Previous
 
-  %button.carousel-control-prev{'data-target': '#' + uid, type: 'button', 'data-slide': 'prev'}
-    %span.carousel-control-prev-icon{'aria-hidden': true}
-    %span.sr-only Previous
-
-  %button.carousel-control-next{'data-target': '#' + uid, type: 'button', 'data-slide': 'next'}
-    %span.carousel-control-next-icon{'aria-hidden': true}
-    %span.sr-only Next
+      %button.carousel-control-next{'data-target': '#' + uid, type: 'button', 'data-slide': 'next'}
+        %span.carousel-control-next-icon{'aria-hidden': true}
+        %span.sr-only Next

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

@@ -1,7 +1,7 @@
 - raise('expected a menu') unless menu.present?
 - menu = menu.to_s
 
-= cache([menu, current_user, Effective::Page.for_menu(menu).maximum(:updated_at)]) do
+= cache([menu, current_user, Effective::Page.all.cache_key]) do
   - # Renders menu_root? level pages and their immediate children
   - Effective::Page.for_menu_root(menu).each do |page|
     - next unless EffectiveResources.authorized?(self, :show, page)

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.10.0'.freeze
+  VERSION = '3.10.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-05 00:00:00.000000000 Z
+date: 2024-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails