Merge remote-tracking branch 'upstream/master'

.github/workflows/ci.yml

@@ -0,0 +1,80 @@
+name: build
+
+on:
+  push:
+    branches:
+      - master
+      - github-actions
+  pull_request:
+    branches:
+      - master
+  schedule:
+    - cron: "0 18 * * 6" # Saturdays at 12pm CST
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+    env:
+      CI: true
+      PGHOST: 127.0.0.1
+      PGUSER: postgres
+      PGPASS: postgres
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.0', '3.1', '3.2', '3.3']
+        active-record-version-env:
+          - ACTIVE_RECORD_VERSION="~> 6.1.0"
+          - ACTIVE_RECORD_VERSION="~> 7.0.0"
+          - ACTIVE_RECORD_VERSION="~> 7.1.0"
+          - ACTIVE_RECORD_VERSION="~> 7.2.0"
+        allow-failure: [false]
+        exclude:
+          - ruby-version: '3.0'
+            active-record-version-env: ACTIVE_RECORD_VERSION="~> 7.2.0"
+        include:
+          - ruby-version: '3.3'
+            active-record-version-env: ACTIVE_RECORD_BRANCH="main"
+            allow-failure: true
+          - ruby-version: '3.3'
+            active-record-version-env: ACTIVE_RECORD_BRANCH="7-2-stable"
+            allow-failure: true
+          - ruby-version: '3.3'
+            active-record-version-env: ACTIVE_RECORD_BRANCH="7-1-stable"
+            allow-failure: true
+          - ruby-version: '3.3'
+            active-record-version-env: ACTIVE_RECORD_BRANCH="7-0-stable"
+            allow-failure: true
+          - ruby-version: '3.3'
+            active-record-version-env: ACTIVE_RECORD_BRANCH="6-1-stable"
+            allow-failure: true
+    continue-on-error: ${{ matrix.allow-failure }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Set up test database
+      env:
+        PGPASSWORD: postgres
+      run: createdb pg_search_test
+    - name: Update bundle
+      run: ${{ matrix.active-record-version-env }} bundle update
+    - name: Run tests
+      run: ${{ matrix.active-record-version-env }} bundle exec rake

.standard.yml

@@ -0,0 +1,6 @@
+ruby_version: 3.0
+
+plugins:
+  - standard-performance
+  - standard-rails:
+      target_rails_version: 6.1

CHANGELOG.md

@@ -1,5 +1,25 @@
 # pg_search changelog
 
+## 2.3.7
+
+* Drop support for Ruby 2.6 and 2.7
+* Drop support for Active Record 6.0 and earlier
+* Support Ruby 3.2 and 3.3
+* Support Active Record 7.1
+* Support Active Record 7.2 (fatkodima)
+* Add U+02BB/U+02BC to disallowed tsquery characters (Vital Ryabchinskiy)
+* add support for Arel::Nodes::SqlLiteral columns (Kyle Fazzari)
+* Improve documentation (Prima Aulia Gusta, Ross Baird, Andy Atkinson)
+
+## 2.3.6
+
+* Drop support for Ruby 2.5
+* Support Ruby 3.1
+* Support Active Record 7.0
+* Don't require `:against` if `:tsvector_column` is specified (Travis Hunter)
+* Optionally disable transaction when rebuilding documents (Travis Hunter)
+* Preserve columns when chaining ::with_pg_search_highlight (jcsanti)
+
 ## 2.3.5
 
 * Add table of contents to README (Barry Woolgar)

Gemfile

@@ -1,15 +1,28 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-gem 'pg', '>= 0.21.0', platform: :ruby
+gem "pg", ">= 0.21.0", platform: :ruby
 gem "activerecord-jdbcpostgresql-adapter", ">= 1.3.1", platform: :jruby
 
-if ENV['ACTIVE_RECORD_BRANCH']
-  gem 'activerecord', git: 'https://github.com/rails/rails.git', branch: ENV['ACTIVE_RECORD_BRANCH']
-  gem 'arel', git: 'https://github.com/rails/arel.git' if ENV['ACTIVE_RECORD_BRANCH'] == 'master'
+if ENV["ACTIVE_RECORD_BRANCH"]
+  gem "activerecord", git: "https://github.com/rails/rails.git", branch: ENV.fetch("ACTIVE_RECORD_BRANCH", nil)
+  gem "arel", git: "https://github.com/rails/arel.git" if ENV.fetch("ACTIVE_RECORD_BRANCH", nil) == "master"
 end
 
-gem 'activerecord', ENV['ACTIVE_RECORD_VERSION'] if ENV['ACTIVE_RECORD_VERSION']
+gem "activerecord", ENV.fetch("ACTIVE_RECORD_VERSION", nil) if ENV["ACTIVE_RECORD_VERSION"] # standard:disable Bundler/DuplicatedGem
+
+gem "debug"
+gem "irb"
+gem "rake"
+gem "rspec"
+gem "simplecov"
+gem "simplecov-lcov"
+gem "standard", require: false
+gem "standard-rails", require: false
+gem "standard-rspec", require: false
+gem "undercover"
+gem "warning"
+gem "with_model"

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2021 Casebook, PBC <http://www.casebook.net>
+Copyright (c) 2010–2022 Casebook, PBC <http://www.casebook.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal