alchemy-pg_search 2.1.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a799a278783ba0529bff4fe80e0b2125de5b126dcd5b64791adfc0b54c6e157e
-  data.tar.gz: 8aefcd02fb869d1d1eea9e16b0777f204a74e0c18331501374b3004edc993054
+  metadata.gz: 9549e748d89548023d9df7829e219fa3b6a407d3b5ad002029b4ec36b26301a1
+  data.tar.gz: 615172e174163bd0edc420040750e849d9b8655277c9b7d6418187e5442fde22
 SHA512:
-  metadata.gz: 10d52b3ad7a394f7d1835087d15552cf0f280b85ef5521dc6066fce35685a2bf5cbd25b0850135852a5d2de0333a4c6ec6d63c3b46e5b0b8e97eab3a46f97cc9
-  data.tar.gz: 6ecc6d9b7827167b43a110c39261a568002b57eaf87b1618aabb8d5272e803ed1e97a9cf2591cd71dac9a09970bbfe2b0946c9018cc2739f1cdd766f730a8cd3
+  metadata.gz: dbbb491dc844fedaf74efbebfa67f4ae03d6288e18b70dae0d6cdac0e2a5664bc756fcd1f47ed236c3abc959703ee183f8b643f0d4698f7c1a3e1430cd216628
+  data.tar.gz: c3870c31a905d108a9f4faf39335ab9ad59bd5246962671c570c93ab8d4d1ea50da35c6bc12491db76b021cc403e5ec11938716c41d61b9de26647850a36f665

data/.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  RSpec:
+    runs-on: ubuntu-latest
+    env:
+      RAILS_ENV: test
+    services:
+      postgres:
+        image: postgres:11
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: alchemy_pg_search_test
+        ports: ["5432:5432"]
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+    steps:
+      - uses: actions/checkout@v2.3.4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+      - name: Prepare database
+        run: bundle exec rake alchemy:spec:prepare
+      - name: Run tests
+        run: bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 2.4.0 (2022-06-06)
+
+- Add support for Alchemy 5.2 [#25](https://github.com/AlchemyCMS/alchemy-pg_search/pull/25) by [kulturbande](https://github.com/kulturbande)
+
+## 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)

data/Gemfile

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

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy-pg_search.svg?branch=main)](https://travis-ci.org/AlchemyCMS/alchemy-pg_search)
+[![CI](https://github.com/AlchemyCMS/alchemy-pg_search/actions/workflows/ci.yml/badge.svg)](https://github.com/AlchemyCMS/alchemy-pg_search/actions/workflows/ci.yml)
 
 # Alchemy CMS Postgresql Fulltext Search
 

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", "< 6"]
   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.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-pg_search
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2022-06-06 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: '4.3'
+        version: '6'
   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: '6'
 - !ruby/object:Gem::Dependency
   name: pg_search
   requirement: !ruby/object:Gem::Requirement
@@ -107,8 +107,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: This gem provides PostgreSQL full text search to Alchemy 4.0

data/.travis.yml

@@ -1,13 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5
-services:
-  - postgresql
-cache:
-  - bundler
-branches:
-  only:
-    - main
-before_script: bundle exec rake alchemy:spec:prepare
-script: bundle exec rspec