good_job 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a413bcbddac29378e8fb0de0cc9305b57bd2e31041973f5db2a9dac6f04b7b1
-  data.tar.gz: d99f0e37ad2c99ac0d69337fefccff11bc522ad370f02ae1ac12d59adab619d8
+  metadata.gz: 6815620f600cf3f925daf7a5f13074f79ee26d7ab16b28b28c3be9e1ac2b9ac9
+  data.tar.gz: b7befdf977e9bebe94ac2707bea503c9e60e112045838885ee398a319026af9c
 SHA512:
-  metadata.gz: 3d6cddf9581a852f72f4c8b337149afc7fc4d2189d6304e510f19ca101cb661c1452b3eca3a123e28750c9729d9f6ca9224855a020296f68693246104864eb4f
-  data.tar.gz: a042a1f1c29525e4c101b512f74a06cb4f2405a790d5e199e1dac87029e220b404d1b310683a151ef67ed7c50c8d94ae8e28c578b270175085d4c7e60f9040d3
+  metadata.gz: ba25873794f78d9e7081a0ae387d4e2c8cf6de96eaa28859e7fe565d85261de57538680f00d172f6eadcb91c157c1d2f34d66df2a630e94440b55fdd1f8ded05
+  data.tar.gz: 76a0d3cd4b76758f72a81f99a04aff2ea50396828b7fa4c440a3d401c01fc4accfb9d821f333b3ff71d517be565f9f9376ad27da5742611ff1744bc70c7d2f16

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [v2.6.2](https://github.com/bensheldon/good_job/tree/v2.6.2) (2021-11-05)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.6.1...v2.6.2)
+
+**Fixed bugs:**
+
+- Rename Filterable\#search to Filterable\#search\_text to avoid name collision [\#451](https://github.com/bensheldon/good_job/pull/451) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- v2.6.1 is incompatible with gem thinking-sphinx [\#450](https://github.com/bensheldon/good_job/issues/450)
+
 ## [v2.6.1](https://github.com/bensheldon/good_job/tree/v2.6.1) (2021-11-05)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.6.0...v2.6.1)

data/engine/app/filters/good_job/executions_filter.rb

@@ -14,7 +14,7 @@ module GoodJob
       query = base_query
       query = query.job_class(params[:job_class]) if params[:job_class].present?
       query = query.where(queue_name: params[:queue_name]) if params[:queue_name].present?
-      query = query.search(params['query']) if params[:query].present?
+      query = query.search_text(params[:query]) if params[:query].present?
 
       if params[:state]
         case params[:state]

data/engine/app/filters/good_job/jobs_filter.rb

@@ -18,7 +18,7 @@ module GoodJob
 
       query = query.job_class(params[:job_class]) if params[:job_class].present?
       query = query.where(queue_name: params[:queue_name]) if params[:queue_name].present?
-      query = query.search(params['query']) if params[:query].present?
+      query = query.search_text(params[:query]) if params[:query].present?
 
       if params[:state]
         case params[:state]

data/lib/good_job/filterable.rb

@@ -24,12 +24,12 @@ module GoodJob
       end)
 
       # Search records by text query.
-      # @!method search(query)
+      # @!method search_text(query)
       # @!scope class
       # @param query [String]
       #   Search Query
       # @return [ActiveRecord::Relation]
-      scope :search, (lambda do |query|
+      scope :search_text, (lambda do |query|
         query = query.to_s.strip
         next if query.blank?
 

data/lib/good_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '2.6.1'
+  VERSION = '2.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Ben Sheldon