Merge branch 'ankane:master' into add-parent-job-config

.github/workflows/build.yml

@@ -6,74 +6,75 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - ruby: 3.1
-          gemfile: Gemfile
-          elasticsearch: 8.0.0
-        - ruby: 3.1
-          gemfile: gemfiles/opensearch.gemfile
-          opensearch: 1.2.4
-        - ruby: "3.0"
-          gemfile: gemfiles/activerecord61.gemfile
-          elasticsearch: 8.0.0
-        - ruby: 2.7
-          gemfile: gemfiles/activerecord60.gemfile
-          elasticsearch: 7.17.0
-        - ruby: 2.6
-          gemfile: gemfiles/activerecord52.gemfile
-          elasticsearch: 7.0.0
-        - ruby: 2.7
-          gemfile: gemfiles/mongoid7.gemfile
-          elasticsearch: 8
-          mongodb: true
-        - ruby: 2.6
-          gemfile: gemfiles/mongoid6.gemfile
-          elasticsearch: 7
-          mongodb: true
+          - ruby: 3.3
+            gemfile: Gemfile
+            elasticsearch: 8.12.0
+          - ruby: 3.2
+            gemfile: gemfiles/opensearch3.gemfile
+            opensearch: 2.12.0
+          - ruby: 3.1
+            gemfile: gemfiles/opensearch2.gemfile
+            opensearch: 2.0.0
+          - ruby: "3.0"
+            gemfile: gemfiles/opensearch1.gemfile
+            opensearch: 1.3.14
+          - ruby: "3.0"
+            gemfile: gemfiles/activerecord61.gemfile
+            elasticsearch: 7.17.16
+          - ruby: 3.1
+            gemfile: gemfiles/mongoid8.gemfile
+            elasticsearch: 8.0.0
+            mongodb: true
+          - ruby: "3.0"
+            gemfile: gemfiles/mongoid7.gemfile
+            elasticsearch: 7.0.0
+            mongodb: true
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - run: bundle update
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle update
 
-    - uses: actions/cache@v2
-      if: ${{ matrix.elasticsearch }}
-      with:
-        path: ~/elasticsearch
-        key: ${{ runner.os }}-elasticsearch-${{ matrix.elasticsearch }}
-    - uses: ankane/setup-elasticsearch@v1
-      if: ${{ matrix.elasticsearch }}
-      with:
-        elasticsearch-version: ${{ matrix.elasticsearch }}
-        plugins: |
-          analysis-kuromoji
-          analysis-smartcn
-          analysis-stempel
-          analysis-ukrainian
+      - uses: actions/cache@v3
+        if: ${{ matrix.elasticsearch }}
+        with:
+          path: ~/elasticsearch
+          key: ${{ runner.os }}-elasticsearch-${{ matrix.elasticsearch }}
+      - uses: ankane/setup-elasticsearch@v1
+        if: ${{ matrix.elasticsearch }}
+        with:
+          elasticsearch-version: ${{ matrix.elasticsearch }}
+          plugins: |
+            analysis-kuromoji
+            analysis-smartcn
+            analysis-stempel
+            analysis-ukrainian
 
-    - uses: actions/cache@v2
-      if: ${{ matrix.opensearch }}
-      with:
-        path: ~/opensearch
-        key: ${{ runner.os }}-opensearch-${{ matrix.opensearch }}
-    - uses: ankane/setup-opensearch@v1
-      if: ${{ matrix.opensearch }}
-      with:
-        opensearch-version: ${{ matrix.opensearch }}
-        plugins: |
-          analysis-kuromoji
-          analysis-smartcn
-          analysis-stempel
-          analysis-ukrainian
+      - uses: actions/cache@v3
+        if: ${{ matrix.opensearch }}
+        with:
+          path: ~/opensearch
+          key: ${{ runner.os }}-opensearch-${{ matrix.opensearch }}
+      - uses: ankane/setup-opensearch@v1
+        if: ${{ matrix.opensearch }}
+        with:
+          opensearch-version: ${{ matrix.opensearch }}
+          plugins: |
+            analysis-kuromoji
+            analysis-smartcn
+            analysis-stempel
+            analysis-ukrainian
 
-    - uses: ankane/setup-mongodb@v1
-      if: ${{ matrix.mongodb }}
+      - uses: ankane/setup-mongodb@v1
+        if: ${{ matrix.mongodb }}
 
-    - run: |
-        sudo apt-get install redis-server
-        sudo systemctl start redis
-    - run: bundle exec rake test
+      - run: |
+          sudo apt-get update
+          sudo apt-get install redis-server
+          sudo systemctl start redis-server
+      - run: bundle exec rake test

CHANGELOG.md

@@ -1,3 +1,74 @@
+## 5.3.1 (2023-11-28)
+
+- Fixed error with misspellings below and failed queries
+
+## 5.3.0 (2023-07-02)
+
+- Fixed error with `cutoff_frequency`
+- Dropped support for Ruby < 3 and Active Record < 6.1
+- Dropped support for Mongoid < 7
+
+## 5.2.4 (2023-05-11)
+
+- Fixed error with non-string routing and `:async` mode
+
+## 5.2.3 (2023-04-12)
+
+- Fixed error with missing records and multiple models
+
+## 5.2.2 (2023-04-01)
+
+- Fixed `total_docs` method
+- Fixed deprecation warning with Active Support 7.1
+
+## 5.2.1 (2023-02-21)
+
+- Added support for `redis-client` gem
+
+## 5.2.0 (2023-02-08)
+
+- Added model name to warning about missing records
+- Fixed unnecessary data loading when reindexing relations with `:async` and `:queue` modes
+
+## 5.1.2 (2023-01-29)
+
+- Fixed error with missing point in time
+
+## 5.1.1 (2022-12-05)
+
+- Added support for strings for `offset` and `per_page`
+
+## 5.1.0 (2022-10-12)
+
+- Added support for fractional search timeout
+- Fixed search timeout with `elasticsearch` 8+ and `opensearch-ruby` gems
+- Fixed search timeout not applying to `multi_search`
+
+## 5.0.5 (2022-10-09)
+
+- Added `model` method to `Searchkick::Relation`
+- Fixed deprecation warning with `redis` gem
+- Fixed `respond_to?` method on relation loading relation
+- Fixed `Relation loaded` error for non-mutating methods on relation
+
+## 5.0.4 (2022-06-16)
+
+- Added `max_result_window` option
+- Improved error message for unsupported versions of Elasticsearch
+
+## 5.0.3 (2022-03-13)
+
+- Fixed context for index name for inherited models
+
+## 5.0.2 (2022-03-03)
+
+- Fixed index name for inherited models
+
+## 5.0.1 (2022-02-27)
+
+- Prefer `mode: :async` over `async: true` for full reindex
+- Fixed instance method overriding with concerns
+
 ## 5.0.0 (2022-02-21)
 
 - Searches now use lazy loading (similar to Active Record)

Gemfile

@@ -4,14 +4,14 @@ gemspec
 
 gem "rake"
 gem "minitest", ">= 5"
-gem "activerecord", "~> 7.0.0"
-gem "activejob", "~> 7.0.0", require: "active_job"
-gem "actionpack", "~> 7.0.0"
-gem "elasticsearch", "~> 8"
 gem "sqlite3"
-gem "gemoji-parser"
-gem "typhoeus"
-gem "redis"
+gem "activerecord", "~> 7.1.0"
+gem "actionpack", "~> 7.1.0"
+gem "activejob", "~> 7.1.0", require: "active_job"
+gem "elasticsearch", "~> 8"
+gem "redis-client"
 gem "connection_pool"
 gem "kaminari"
+gem "gemoji-parser"
 gem "parallel_tests"
+gem "typhoeus"

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2021 Andrew Kane
+Copyright (c) 2013-2023 Andrew Kane
 
 MIT License