alchemy-pg_search 2.0.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7e0df77f37c90847ca65e06e9e857b1ce34c3967a5f4ad2b49b5b628a92216
-  data.tar.gz: f090bfccc9e38990d60047eaa41f7752ee6e96dbb9b80c7c7d0c747ab7296535
+  metadata.gz: b9b68ff72c39fd21b51251b0d47919016fd3d59a8e32a0358ce4c4b48170cd4d
+  data.tar.gz: afb71a844327fe5f9a07a2a8b91edbab57da267e514e9d3fc51a32d2369c3465
 SHA512:
-  metadata.gz: e753341799782ba728dfffd808f0b8dfd3e4c224973858d6e04a0bcba28f234cff4f1bca64e7b74ef2f6f179523cfbc75df2824c3bab6fa2d09e31e59d836d7d
-  data.tar.gz: 612150eac4dba1e71277a325617ae84ae138eaec33b3ae7d330065255cd7f98a05f0094c508f5650f70edb981a716e664b919f43641f9a1dedfcaef1f39d5cd8
+  metadata.gz: 60d7d211907766eee70dd946ac8c5dca0bc535a562feda995d441e0872e3a418337ec0060502aa32b45fbf432709e6380541b233fda1f152c3f56444a2bff6b7
+  data.tar.gz: e90ff5b03757e72b6ef471470ee972dc615fa54cac75803c9c6000284e19cb20ac557a1b3b2453aea0e8eaa985254086d4ad1698e10f9fe27ccb2140bf2cdce6

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 2.3.0 (2022-03-04)
+
+- Add support for Alchemy 5.1 [#24](https://github.com/AlchemyCMS/alchemy-pg_search/pull/24) by [kulturbande](https://github.com/kulturbande)
+
+## 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)
+- Add Rails 5.1 support [#19](https://github.com/AlchemyCMS/alchemy-pg_search/pull/19) by [tvdeyen](https://github.com/tvdeyen)
+
 ## 2.0.0 (2021-09-23)
 
 - Move searchable attribute to contents table [#20](https://github.com/AlchemyCMS/alchemy-pg_search/pull/20) by [tvdeyen](https://github.com/tvdeyen)

data/Gemfile

@@ -2,11 +2,14 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rails", "~> 5.0.0"
-gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: "4.0-stable"
+gem "rails", "~> 6.0.0"
+ENV.fetch("ALCHEMY_BRANCH", "5.1-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"
+gem "sassc", "~> 2.4.0"
+gem "webpacker"
+gem "pg", "~> 1.0"
 gem "puma"
 
 group :test do

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", "< 5.0"]
+  spec.add_runtime_dependency "alchemy_cms", [">= 4.3", "< 5.2"]
   spec.add_runtime_dependency "pg_search", ["~> 2.1"]
   spec.add_runtime_dependency "pg"
 

data/db/migrate/20141211105526_add_searchable_to_alchemy_essence_texts.rb

@@ -1,4 +1,4 @@
-class AddSearchableToAlchemyEssenceTexts < ActiveRecord::Migration
+class AddSearchableToAlchemyEssenceTexts < ActiveRecord::Migration[5.1]
   def change
     add_column :alchemy_essence_texts, :searchable, :boolean, default: true
   end

data/db/migrate/20141211105942_add_searchable_to_alchemy_essence_richtexts.rb

@@ -1,4 +1,4 @@
-class AddSearchableToAlchemyEssenceRichtexts < ActiveRecord::Migration
+class AddSearchableToAlchemyEssenceRichtexts < ActiveRecord::Migration[5.1]
   def change
     add_column :alchemy_essence_richtexts, :searchable, :boolean, default: true
   end

data/db/migrate/20141211110126_add_searchable_to_alchemy_essence_pictures.rb

@@ -1,4 +1,4 @@
-class AddSearchableToAlchemyEssencePictures < ActiveRecord::Migration
+class AddSearchableToAlchemyEssencePictures < ActiveRecord::Migration[5.1]
   def change
     add_column :alchemy_essence_pictures, :searchable, :boolean, default: true
   end

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.0.0"
+    VERSION = "2.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-pg_search
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-23 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   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: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: pg_search
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.27
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: This gem provides PostgreSQL full text search to Alchemy 4.0