alchemy-pg_search 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '009bedc83da970afa4e20ea64375695711b50ef37027b4e4cbe08a7add274070'
-  data.tar.gz: c324b6915704b0ef189d539510d57ff80962be5f6244907bbfd9d82e0d13eec8
+  metadata.gz: c1ae33c7df0a9edd59d4582f0570418ddef3c60b5cd51dfade9da06fff5c5ccf
+  data.tar.gz: 6790580e147d7fe1153593d5a9c7c7fe73d7f0f49ebf0fb86caca618dba785f2
 SHA512:
-  metadata.gz: 0eda59775b10f840a97362c244beb387e259e104d18f03e855984ea15437649d78c1a397a4a2f443e62c62bbd74f42288b77ce7ede6401d090ae28b1d3844d06
-  data.tar.gz: 6245d3b156a31fe0459fc9372de9c3ffc8ab7f123dd717402a7dc3aeb206876912069f88ae4d20a127039ee1754d45f87c6391633490f8363dde101a2cb8fb10
+  metadata.gz: c9f7c4b91444eb8aed240c104fd7c44a1b12f6751128586a7aa310be5565996bd0e60e2bf874a57c2fcbb38b2e094c4d56fa8db5ed2f4256dfc98ddb50815dc7
+  data.tar.gz: 49296c5f3ed08f8dceedc9fd77664757c9096fa92898c40db6e7714c88c2802491c21a58e2d6f80a86b946b36347ce7c0e41ac50c83a35be4a4cb19345a455fd

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v6.1.0](https://github.com/AlchemyCMS/alchemy-pg_search/tree/v6.1.0) (2024-12-13)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-pg_search/compare/v6.0.0...v6.1.0)
+
+**Merged pull requests:**
+
+- Use PgSearch::Document.rebuild for page reindex [\#63](https://github.com/AlchemyCMS/alchemy-pg_search/pull/63) ([sascha-karnatz](https://github.com/sascha-karnatz))
+
 ## [v6.0.0](https://github.com/AlchemyCMS/alchemy-pg_search/tree/v6.0.0) (2024-12-03)
 
 [Full Changelog](https://github.com/AlchemyCMS/alchemy-pg_search/compare/v5.2.0...v6.0.0)

data/app/extensions/alchemy/pg_search/page_extension.rb

@@ -6,24 +6,18 @@ module Alchemy::PgSearch::PageExtension
     base.after_save :remove_unpublished_page
     base.multisearchable(
       against: [
-        :meta_description,
-        :meta_keywords,
         :name,
+        :searchable_content
       ],
       additional_attributes: ->(page) { { page_id: page.id, searchable_created_at: page.public_on } },
       if: :searchable?,
     )
   end
 
-  def searchable?
-    (definition.key?(:searchable) ? definition[:searchable] : true) &&
-      searchable && public? && !layoutpage?
-  end
-
   private
 
   def remove_unpublished_page
-    Alchemy::PgSearch.remove_page(self) unless searchable?
+    ::PgSearch::Document.delete_by(page_id: id) unless searchable?
   end
 end
 

data/app/extensions/alchemy/search/element_extension.rb

@@ -10,6 +10,10 @@ module Alchemy::Search::ElementExtension
   def searchable?
     searchable && public? && page.searchable? && page_version.public?
   end
+
+  def searchable_content
+    ingredients.select(&:searchable?).map(&:searchable_content).join(" ").squish
+  end
 end
 
 Alchemy::Element.prepend(Alchemy::Search::ElementExtension)

data/app/extensions/alchemy/search/page_extension.rb

@@ -5,6 +5,10 @@ module Alchemy::Search::PageExtension
     (definition.key?(:searchable) ? definition[:searchable] : true) &&
       searchable && public? && !layoutpage?
   end
+
+  def searchable_content
+    all_elements.includes(ingredients: {element: :page}).map(&:searchable_content).join(" ")
+  end
 end
 
 Alchemy::Page.prepend(Alchemy::Search::PageExtension)

data/app/jobs/alchemy/pg_search/index_page_job.rb

@@ -2,7 +2,7 @@ module Alchemy
   module PgSearch
     class IndexPageJob < BaseJob
       def perform(page)
-        PgSearch.index_page(page)
+        page.update_pg_search_document
       end
     end
   end

data/lib/alchemy/pg_search/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module PgSearch
-    VERSION = "6.0.0"
+    VERSION = "6.1.0"
   end
 end

data/lib/alchemy-pg_search.rb

@@ -17,37 +17,13 @@ module Alchemy
     extend Config
 
     ##
-    # index all supported Alchemy pages
-    def self.rebuild
-      ActiveRecord::Base.transaction do
-        ::PgSearch::Document.delete_all
-        Alchemy::Page.all.each{ |page| index_page(page) }
-      end
-    end
-
-    ##
-    # remove the whole index for the page
-    #
-    # @param page [Alchemy::Page]
-    def self.remove_page(page)
-      ::PgSearch::Document.delete_by(page_id: page.id)
-    end
-
-    ##
-    # index a single page and indexable ingredients
-    #
-    # @param page [Alchemy::Page]
-    def self.index_page(page)
-      page.update_pg_search_document
-
-      document = page.pg_search_document
-      return if document.nil?
-
-      ingredient_content = page.all_elements.includes(ingredients: {element: :page}).map do |element|
-        element.ingredients.select { |i| i.searchable? }.map(&:searchable_content).join(" ")
-      end.join(" ")
-
-      document.update_column(:content, "#{document.content} #{ingredient_content}".squish)
+    # Reindex all supported Alchemy pages
+    def self.rebuild(clean_up: true, transactional: true)
+      ::PgSearch::Multisearch.rebuild(
+        Alchemy::Page,
+        clean_up: clean_up,
+        transactional: transactional
+      )
     end
 
     ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-pg_search
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms