effective_pages 3.7.2 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 257ab7fcba7fb0d142a7d89b296a08f32edb7e5746d6a446286c72e0e7722c3d
-  data.tar.gz: ec621b15d2fb2ca809f31648d9503defd0ae78967a5f32ace4bd6305f44b6de3
+  metadata.gz: 609cb873f8ee7b06289d1b6a892e5dfdf31d331fec0e70524193966b8dae6fb5
+  data.tar.gz: e931912e980cf36b614deae0cf70f729f3e6e98fa78d6b415de4ccd5f13d687d
 SHA512:
-  metadata.gz: '0316868455b2cc7e8b85573bef25e91eb91b89e9d90c7b48a798bdc1235ab903ba53ab96b7cb405eee0aacc8efedd993c84d52f8c72a4a2c3047b6fa4cc80290'
-  data.tar.gz: 65eb909d2ea534e5e7c88d4639042a365bd797695cc755c522b4d78139300e164d877da84785e3bfd4c1fc517d16e38b03a41aeb7bb63d6fe0702e5d8bce0e8e
+  metadata.gz: ed4f370e424c4fa6d03146b15f2b15e67f747202009c4b264bad9b2fa1debc398a5fdb322ff4cabe1dc5fd7220bdd33a2effa4ccb4f72ee9df12be97695187f2
+  data.tar.gz: 5678d59ab27e06eb7320710462451917512e91f6c8010087dcea656b745f80442b5a4b9ca17f06d29f2818e910c32feaffc7dce464b7f76aad440e81ba4f3499

data/app/models/concerns/acts_as_tagged.rb

@@ -18,11 +18,11 @@ module ActsAsTagged
     #
     # Create or assign tags based on the input
     #
-    # @param [Array<String, Integer>] input An array of tag names and/or tag ids, with a possible blank string
+    # @param [Array<String, Integer>] input An array of tag names and/or tag ids, with possible blank strings
     #
     # @return [void]
     #
-    def tags=(input)
+    def tag_ids=(input) # named after the field name in `effective_pages/app/views/effective/tags/_fields.html.haml`
       input = (input - ['']).group_by { |value| value.gsub(/\D/, '').to_i > 0 }
 
       ids = (input[true] || []).map(&:to_i)
@@ -33,7 +33,7 @@ module ActsAsTagged
 
       # Create any new Tags
       ids.each do |tag_id|
-        taggings.find { |tagging| tagging.tag_id == tag_id } || self.tags << Effective::Tag.where(id: tag_id).first!
+        taggings.find { |tagging| tagging.tag_id == tag_id } || self.tags << Effective::Tag.find(tag_id)
       end
 
       names.each { |name| self.tags.build(name: name) }

data/app/models/effective/page.rb

@@ -3,22 +3,11 @@ 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: [:search_content]
 
+      def search_content
+        title + '|' + body.to_plain_text
+      end
     end
 
     attr_accessor :current_user
@@ -99,6 +88,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/config/locales/effective_pages.en.yml

@@ -5,4 +5,4 @@ en:
 
   activerecord:
     models:
-      effective/tagging: 'Tagged content'
+      effective/tagging: 'Taggings'

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.7.2'.freeze
+  VERSION = '3.7.4'.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.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-16 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails