alchemy-pg_search 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a799a278783ba0529bff4fe80e0b2125de5b126dcd5b64791adfc0b54c6e157e
-  data.tar.gz: 8aefcd02fb869d1d1eea9e16b0777f204a74e0c18331501374b3004edc993054
+  metadata.gz: 1029db6a692ffa903d9b8a7324b5cb6a8e473dcbbbf2fee8d5cc57df1ce79149
+  data.tar.gz: 171e050f9ca7de014c3c0089fc768c436318524d832df8175a14ba41389b2509
 SHA512:
-  metadata.gz: 10d52b3ad7a394f7d1835087d15552cf0f280b85ef5521dc6066fce35685a2bf5cbd25b0850135852a5d2de0333a4c6ec6d63c3b46e5b0b8e97eab3a46f97cc9
-  data.tar.gz: 6ecc6d9b7827167b43a110c39261a568002b57eaf87b1618aabb8d5272e803ed1e97a9cf2591cd71dac9a09970bbfe2b0946c9018cc2739f1cdd766f730a8cd3
+  metadata.gz: 47da2d377ca0a1e28fe679bef4b3322cda015e38e48a362008afeb73ddd11c16c676db8d8f046092ccefb300031b5a2efd518e570234130370ed93d0631214f5
+  data.tar.gz: 70e8cb496e368053f4702baa20eadc39dc3c3d318df1f458b618f32851db41b047a03833ba62b225caff08a4f99dd4aa1e58357c50214ccb8817d81036b62fe1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.0 (2021-09-25)
+
+- Alchemy 4.3 [#21](https://github.com/AlchemyCMS/alchemy-pg_search/pull/21) by [tvdeyen](https://github.com/tvdeyen)
+
 ## 2.1.0 (2021-09-25)
 
 - Do not allow Alchemy 4.3 and above [#22](https://github.com/AlchemyCMS/alchemy-pg_search/pull/22) by [tvdeyen](https://github.com/tvdeyen)

data/Gemfile

@@ -3,7 +3,9 @@ source "https://rubygems.org"
 gemspec
 
 gem "rails", "~> 5.1.0"
-gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: "4.0-stable"
+ENV.fetch("ALCHEMY_BRANCH", "4.3-stable").tap do |branch|
+  gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: branch
+end
 gem "sassc-rails"
 gem "sassc", "< 2.2.0"
 gem "pg", "< 1.0"

data/alchemy-pg_search.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "alchemy_cms", [">= 4.0", "< 4.3"]
+  spec.add_runtime_dependency "alchemy_cms", [">= 4.3", "< 5.0"]
   spec.add_runtime_dependency "pg_search", ["~> 2.1"]
   spec.add_runtime_dependency "pg"
 

data/lib/alchemy/pg_search/content_extension.rb

@@ -1,7 +1,8 @@
 module Alchemy::PgSearch::ContentExtension
   module ClassMethods
-    def build(element, essence_hash)
-      definition = content_definition(element, essence_hash)
+    def new(attributes)
+      element = attributes[:element]
+      definition = element.content_definition_for(attributes[:name])
       super.tap do |content|
         content.searchable = definition.key?(:searchable) ? definition[:searchable] : true
       end

data/lib/alchemy/pg_search/page_extension.rb

@@ -1,58 +1,54 @@
-Alchemy::Page.class_eval do
-  include PgSearch::Model
+# Enable Postgresql full text indexing.
+#
+module Alchemy::PgSearch::PageExtension
+  def self.extended(base)
+    base.include InstanceMethods
+    base.include PgSearch::Model
 
-  # Enable Postgresql full text indexing.
-  #
-  pg_search_scope :full_text_search,
-    against: {
-      meta_description: "B",
-      meta_keywords: "B",
-      title: "B",
-      name: "A",
-    },
-    associated_against: {
-      searchable_essence_texts: :body,
-      searchable_essence_richtexts: :stripped_body,
-      searchable_essence_pictures: :caption,
-    },
-    using: {
-      tsearch: { prefix: true },
-    }
+    base.pg_search_scope(
+      :full_text_search,
+      against: {
+        meta_description: "B",
+        meta_keywords: "B",
+        title: "B",
+        name: "A",
+      },
+      associated_against: {
+        searchable_essence_texts: :body,
+        searchable_essence_richtexts: :stripped_body,
+        searchable_essence_pictures: :caption,
+      },
+      using: {
+        tsearch: { prefix: true },
+      },
+    )
 
-  has_many :searchable_essence_texts,
-    -> {
-      includes(:element)
-        .where(alchemy_contents: { searchable: true })
-        .where(alchemy_elements: { public: true })
-    },
-    class_name: "Alchemy::EssenceText",
-    source_type: "Alchemy::EssenceText",
-    through: :descendent_contents,
-    source: :essence
+    base.has_many(
+      :searchable_contents,
+      -> {
+        where(alchemy_elements: { public: true })
+          .where(searchable: true)
+      },
+      class_name: "Alchemy::Content",
+      through: :all_elements,
+    )
 
-  has_many :searchable_essence_richtexts,
-    -> {
-      includes(:element)
-        .where(alchemy_contents: { searchable: true })
-        .where(alchemy_elements: { public: true })
-    },
-    class_name: "Alchemy::EssenceRichtext",
-    source_type: "Alchemy::EssenceRichtext",
-    through: :descendent_contents,
-    source: :essence
-
-  has_many :searchable_essence_pictures,
-    -> {
-      includes(:element)
-        .where(alchemy_contents: { searchable: true })
-        .where(alchemy_elements: { public: true })
-    },
-    class_name: "Alchemy::EssencePicture",
-    source_type: "Alchemy::EssencePicture",
-    through: :descendent_contents,
-    source: :essence
+    Alchemy::PgSearch::SEARCHABLE_ESSENCES.each do |klass|
+      base.has_many(
+        :"searchable_#{klass.underscore.pluralize}",
+        class_name: "Alchemy::#{klass}",
+        source_type: "Alchemy::#{klass}",
+        through: :searchable_contents,
+        source: :essence,
+      )
+    end
+  end
 
-  def element_search_results(query)
-    descendent_elements.full_text_search(query)
+  module InstanceMethods
+    def element_search_results(query)
+      all_elements.full_text_search(query)
+    end
   end
+
+  Alchemy::Page.extend self
 end

data/lib/alchemy/pg_search/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module PgSearch
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-pg_search
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pg_search
   requirement: !ruby/object:Gem::Requirement