effective_pages 3.7.2 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 257ab7fcba7fb0d142a7d89b296a08f32edb7e5746d6a446286c72e0e7722c3d
-  data.tar.gz: ec621b15d2fb2ca809f31648d9503defd0ae78967a5f32ace4bd6305f44b6de3
+  metadata.gz: 70925d39994d0941e75bece5c0b240134d2b32470d31199c513a2e25faddc840
+  data.tar.gz: 6c8effd26cf0f030a293adb9c1542bd13fb3dd294e553544a23370d2ec6648f5
 SHA512:
-  metadata.gz: '0316868455b2cc7e8b85573bef25e91eb91b89e9d90c7b48a798bdc1235ab903ba53ab96b7cb405eee0aacc8efedd993c84d52f8c72a4a2c3047b6fa4cc80290'
-  data.tar.gz: 65eb909d2ea534e5e7c88d4639042a365bd797695cc755c522b4d78139300e164d877da84785e3bfd4c1fc517d16e38b03a41aeb7bb63d6fe0702e5d8bce0e8e
+  metadata.gz: 0a538fa3618b3b1faf92f7ca4e8dad13ce41656e1b4327c7ff14813c9760127bbec87f3bfae4c929ddbacd8ae7a2bd4f3cc236e31860203c5a97dc2d61d4cc7f
+  data.tar.gz: f69803876b65edbd994fc7056903520a81f26907fbc8131260188e2fadcc32c4d7b22c62dd4677b468d996690b6011263e6140c2193477a8b2de3e329c3df776

data/app/models/effective/page.rb

@@ -3,22 +3,7 @@ module Effective
     if defined?(PgSearch)
       include PgSearch::Model
 
-      multisearchable against: [
-                        :title,
-                        :menu_title,
-                        :meta_description,
-                        :slug,
-                      ],
-                      associated_against: {
-                        rich_texts: [:body],
-                      },
-                      using: {
-                        trigram: {},
-                        tsearch: {
-                          highlight: true,
-                        }
-                      }
-
+      multisearchable against: [:title, :menu_title, :meta_description, :slug]
     end
 
     attr_accessor :current_user
@@ -99,6 +84,22 @@ module Effective
       published.where(menu: false).or(published.where(menu: true).where.not(id: menu_root_with_children))
     }
 
+    scope :pages, -> (user: nil, unpublished: false) {
+      scope = all.deep.sorted
+
+      if defined?(EffectiveRoles) && EffectivePages.use_effective_roles
+        if user.present? && user.respond_to?(:roles)
+          scope = scope.for_role(user.roles)
+        end
+      end
+
+      unless unpublished
+        scope = scope.published
+      end
+
+      scope
+    }
+
     before_validation(if: -> { menu? && menu_position.blank? }) do
       self.menu_position = (self.class.where(menu_parent: menu_parent).maximum(:menu_position) || -1) + 1
     end

data/app/models/effective/permalink.rb

@@ -1,5 +1,11 @@
 module Effective
   class Permalink < ApplicationRecord
+    if defined?(PgSearch)
+      include PgSearch::Model
+
+      multisearchable against: [:title, :summary]
+    end
+
     self.table_name = (EffectivePages.permalinks_table_name || :permalinks).to_s
 
     has_one_attached :attachment

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.7.2'.freeze
+  VERSION = '3.7.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails