scoped_search 4.3.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdc9b9ee45ee99807b1c22a0da4cef71c6ce539292213ee47c012c020f866368
-  data.tar.gz: 5b4b0acd6e86a3f3e3c940f537a854c193983ebf57019687eac6bf5b33728b42
+  metadata.gz: b246204885d3b4432baebaa00e7dea9407e8938dc078fa0bc726e587f4a12122
+  data.tar.gz: 81f9dd75acb77c0d9eb6165528493bdb1e93fbd8ccf71c91bacbe6e2585d3ef7
 SHA512:
-  metadata.gz: 395e4bf94443d76d67c642fe27f92eaf14b2d240b23c5f784e412cfec811cb1900041ea04388ea4c086a2184cb1c771c6f1f4bf6a1ede7a8065920c2fbb7ab41
-  data.tar.gz: 3662b759dde0bb5c9584de7e9fc2cfdf22ae2244c6889f1c88b343950ad5ff0b8ad51b2b07505e05d0eb59a51efbb887ef6dabd80343fbceb99859528f8c6cb0
+  metadata.gz: 714a96861d37c99dac22c3e6d33dccbf18d2287191944abc112048942d2dbef04957ce932ba0f645b3e53e00f702ba70b379512485b0ce96a09d414010d4bf54
+  data.tar.gz: 62d2fdfbd14f777db4c0f0f090d061ddcdd775108d948a6c3d796927b7b840b9622197d4e416c46dbbc7ce9d1ad8fdcf35eae5817183e7b48ee481808e7071dc

data/.github/workflows/ruby.yml

@@ -7,7 +7,8 @@
 
 name: Ruby
 
-on: [pull_request]
+on:  # yamllint disable-line rule:truthy
+  - pull_request
 
 env:
   TESTOPTS: --verbose
@@ -19,31 +20,18 @@ jobs:
       fail-fast: false
       matrix:
         ruby_version:
-          - 2.7.1
-          - 3.0.0
+          - '2.7'
+          - '3.0'
+          - '3.3'
           - ruby-head
           - jruby-head
-        gemfile:
-          - Gemfile.activerecord52
-          - Gemfile.activerecord52_with_activesupport52
-          - Gemfile.activerecord60
-          - Gemfile.activerecord60_with_activesupport60
-          - Gemfile.activerecord61
-          - Gemfile.activerecord61_with_activesupport61
-
-        exclude:
-          - ruby_version: 2.7.1
-            gemfile: Gemfile.activerecord52
-          - ruby_version: 2.7.1
-            gemfile: Gemfile.activerecord52_with_activesupport52
-          - ruby_version: 3.0.0
-            gemfile: Gemfile.activerecord52
-          - ruby_version: 3.0.0
-            gemfile: Gemfile.activerecord52_with_activesupport52
-          - ruby_version: ruby-head
-            gemfile: Gemfile.activerecord52
-          - ruby_version: ruby-head
-            gemfile: Gemfile.activerecord52_with_activesupport52
+        appraisal:
+          - rails-6.0
+          - rails-6.0-activesupport
+          - rails-6.1
+          - rails-6.1-activesupport
+          - rails-7.0
+          - rails-7.0-activesupport
     services:
       postgres:
         image: postgres:12.1
@@ -59,18 +47,18 @@ jobs:
           MYSQL_DATABASE: scoped_search_test
 
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
+      BUNDLE_GEMFILE: appraisal.gemfile
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby_version }}
-        bundler-cache: true
-    # - name: Install dependencies
-    #   run: bundle install
-    - name: Run tests
-      run: bundle exec rake
+      - uses: actions/checkout@v6
+      - name: Set up Ruby ${{ matrix.ruby_version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
+      - name: Generate gemfiles
+        run: bundle exec appraisal generate
+      - name: Appraisal for ${{ matrix.ruby_version }} ${{ matrix.appraisal }}
+        run: bundle exec appraisal ${{ matrix.appraisal }} bundle
+      - name: Tests for ${{ matrix.ruby_version }} ${{ matrix.appraisal }}
+        run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec rake

data/.gitignore

@@ -6,7 +6,8 @@ scoped_search-*.gem
 /coverage
 /classes
 /files
+/gemfiles/*.gemfile
 /spec/database.yml
 .bundle/
-Gemfile*.lock
+*.lock
 .idea/

data/Appraisals

@@ -0,0 +1,16 @@
+['6.0', '6.1', '7.0'].each do |version|
+  appraise "rails-#{version}" do
+    gem 'actionview', "~> #{version}.0"
+    gem 'activerecord', "~> #{version}.0"
+    eval_gemfile 'modular/rails-6'
+    eval_gemfile 'modular/rspec'
+  end
+
+  appraise "rails-#{version}-activesupport" do
+    gem 'actionview', "~> #{version}.0"
+    gem 'activerecord', "~> #{version}.0"
+    gem 'activesupport', "~> #{version}.0"
+    eval_gemfile 'modular/rails-6'
+    eval_gemfile 'modular/rspec'
+  end
+end

data/CHANGELOG.rdoc

@@ -6,6 +6,15 @@ Please add an entry to the "Unreleased changes" section in your pull requests.
 
 === Unreleased changes
 
+=== Version 5.0.0
+
+- Drop Rails versions older than 6.0
+- Add support for Ruby 3.3 and Rails 7.0
+- Add virtual field check to to_null_sql method in query builder
+
+=== Version 4.3.1
+- Autocomplete now offers only relevant options available through scopes set on associations (#233)
+
 === Version 4.3.0
 
 - Prevent scoped_search from modifying an empty string on newer rubies (#229)

data/Gemfile

@@ -4,7 +4,7 @@ gemspec
 gem 'actionview'
 gem 'activerecord'
 
-gem 'nokogiri', '~> 1.6.0' if RUBY_VERSION.start_with?('2.0')
+gem 'appraisal2'
 
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'

data/README.rdoc

@@ -22,8 +22,8 @@ Add the following line in your Gemfile, and run <tt>bundle install</tt>:
 
   gem "scoped_search"
 
-Scoped search 4.x supports Rails 4.2 to 5.0, with Ruby 2.0.0 or higher. Use
-previous versions, e.g. 3.x to support older versions of Rails or Ruby.
+Scoped search 5.x supports Rails 6.
+Use previous versions to support older versions of Rails or Ruby.
 
 == Usage
 

data/appraisal.gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'appraisal2'

data/gemfiles/modular/rails-6

@@ -0,0 +1,25 @@
+# Ruby 3 has moved various gems from default gems to bundled gems
+# Prior to activesupport 7.0.9 these were not listed
+# See https://stdgems.org/ for more
+if RUBY_VERSION >= '3.4'
+  gem 'base64'
+  gem 'benchmark'
+  gem 'bigdecimal'
+  gem 'logger'
+  gem 'mutex_m'
+end
+
+group :mysql do
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'mysql2', '> 0.5', platforms: :ruby
+end
+
+group :postgresql do
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'pg', '>= 0.18', '< 2.0', platforms: :ruby
+end
+
+group :sqlite do
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+  gem 'sqlite3', '~> 1.4', platforms: :ruby
+end

data/gemfiles/modular/rspec

@@ -0,0 +1 @@
+gem 'rspec', '~> 3.0'

data/lib/scoped_search/auto_complete_builder.rb

@@ -207,6 +207,7 @@ module ScopedSearch
 
     def complete_value_from_db(field, special_values, val)
       count = 20 - special_values.count
+
       completer_scope(field)
         .where(@options[:value_filter])
         .where(value_conditions(field.quoted_field, val))
@@ -224,7 +225,9 @@ module ScopedSearch
 
       if field.klass != field.definition.klass
         reflection = field.definition.reflection_by_name(field.definition.klass, field.relation)
-        scope = scope.instance_exec(&reflection.scope) if reflection.try(:has_scope?)
+        sub_scope = reflection.active_record.joins(reflection.name)
+        sub_scope = sub_scope.select("#{field.klass.table_name}.#{field.klass.primary_key}")
+        scope = scope.where(field.klass.primary_key => sub_scope)
       end
 
       scope.respond_to?(:reorder) ? scope.reorder(Arel.sql(field.quoted_field)) : scope.scoped(:order => field.quoted_field)

data/lib/scoped_search/query_builder.rb

@@ -307,8 +307,7 @@ module ScopedSearch
 
       join_reflections.zip(table_names.zip(join_reflections.drop(1))).reduce(sql) do |acc, (reflection, (previous_table, next_reflection))|
         fk1, pk1 = if reflection.respond_to?(:join_keys)
-                     klass = reflection.method(:join_keys).arity == 1 ? [reflection.klass] : [] # ActiveRecord <5.2 workaround
-                     reflection.join_keys(*klass).values # We are joining the tables "in reverse", so the PK and FK are swapped
+                     reflection.join_keys.values # We are joining the tables "in reverse", so the PK and FK are swapped
                    else
                      [reflection.join_primary_key, reflection.join_foreign_key] #ActiveRecord 6.1
                    end
@@ -426,8 +425,7 @@ module ScopedSearch
       def reflection_keys(reflection)
         pk = reflection.klass.primary_key
         fk = reflection.options[:foreign_key]
-        # activerecord prior to 3.1 doesn't respond to foreign_key method and hold the key name in the reflection primary key
-        fk ||= reflection.respond_to?(:foreign_key) ? reflection.foreign_key : reflection.primary_key_name
+        fk ||= reflection.foreign_key
         reflection.macro == :belongs_to ? [fk, pk] : [pk, fk]
       end
 
@@ -495,6 +493,11 @@ module ScopedSearch
           field = definition.field_by_name(rhs.value)
           raise ScopedSearch::QueryNotSupported, "Field '#{rhs.value}' not recognized for searching!" unless field
 
+          if field.virtual?
+            sql_operator = operator == :notnull ? 'IS NOT NULL' : 'IS NULL'
+            return field.to_ext_method_sql(rhs.value, sql_operator, nil, &block)
+          end
+
           if field.key_field
             yield(:parameter, rhs.value.to_s.sub(/^.*\./,''))
           end

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "4.3.0"
+  VERSION = "5.0.0"
 end

data/scoped_search.gemspec

@@ -29,8 +29,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = '>= 2.0.0'
-  gem.add_runtime_dependency('activerecord', '>= 4.2.0')
+  # https://www.fastruby.io/blog/ruby/rails/versions/compatibility-table.html
+  gem.required_ruby_version = '>= 2.5.0'
+  gem.add_runtime_dependency('activerecord', '>= 6.0')
   gem.add_development_dependency('rspec', '~> 3.0')
   gem.add_development_dependency('rake')
 

data/spec/integration/auto_complete_spec.rb

@@ -45,6 +45,16 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         t.integer :foo_id
       end
 
+      ActiveRecord::Migration.create_table(:asds, :force => true) do |t|
+        t.integer :baz_id
+        t.string :string
+      end
+
+      ActiveRecord::Migration.create_table(:qwes, :force => true) do |t|
+        t.integer :asd_id
+        t.string :string
+      end
+
       class ::Bar < ActiveRecord::Base
         belongs_to :foo
       end
@@ -71,34 +81,61 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
       class ::Baz < ActiveRecord::Base
         belongs_to :foo, -> { where(string: 'foo') }
+        has_one :asd, -> { where(string: 'foo') }
+        has_one :qwe, through: :asd
 
-        scoped_search :on => :string, :relation => :foo, :complete_value => true
+        scoped_search :on => :string, :relation => :foo, :complete_value => true, :rename => 'foos.string'.to_sym
+        scoped_search :on => :string, :relation => :asd, :complete_value => true, :rename => 'asds.string'.to_sym
+        scoped_search :on => :string, :relation => :qwe, :complete_value => true, :rename => 'qwes.string'.to_sym
       end
 
       class ::Infoo < ::Foo
       end
 
+      class ::Asd < ActiveRecord::Base
+        belongs_to :baz
+        has_one :qwe
+      end
+
+      class ::Qwe < ActiveRecord::Base
+        belongs_to :asd
+      end
+
       @qux_1 = Qux.create!()
       @qux_2 = Qux.create!()
       @foo_1 = Foo.create!(:string => 'foo', :another => 'temp 1', :explicit => 'baz', :int => 9  , :date => 'February 8, 2011' , :unindexed => 10, :qux => @qux_1)
       @foo_2 = Foo.create!(:string => 'foo', :another => 'temp 2', :explicit => 'baz', :int => 10  , :date => 'February 8, 2011' , :unindexed => 10, :qux => @qux_2)
-      Foo.create!(:string => 'bar', :another => 'temp "2"', :explicit => 'baz', :int => 22  , :date => 'February 10, 2011', :unindexed => 10)
+      @foo_3 = Foo.create!(:string => 'bar', :another => 'temp "2"', :explicit => 'baz', :int => 22  , :date => 'February 10, 2011', :unindexed => 10)
       Foo.create!(:string => 'baz', :another => nil,      :explicit => nil  , :int => nil, :date => nil                 , :unindexed => nil)
       20.times { Foo.create!(:explicit => "aaa") }
 
+      @baz_1 = Baz.create!(:foo => @foo_1)
+      @baz_2 = Baz.create!(:foo => @foo_2)
+      Baz.create!(:foo => @foo_3)
+
       Bar.create!(:related => 'lala',         :foo => @foo_1)
       Bar.create!(:related => 'another lala', :foo => @foo_1)
+
+      @asd_1 = Asd.create!(:string => 'foo', :baz => @baz_1)
+      @asd_2 = Asd.create!(:string => 'bar', :baz => @baz_2)
+      Qwe.create!(:asd => @asd_1, :string => 'qwe1')
+      Qwe.create!(:asd => @asd_2, :string => 'qwe2')
     end
 
     after(:all) do
       ActiveRecord::Migration.drop_table(:foos)
       ActiveRecord::Migration.drop_table(:bars)
       ActiveRecord::Migration.drop_table(:bazs)
+      ActiveRecord::Migration.drop_table(:asds)
+      ActiveRecord::Migration.drop_table(:qwes)
 
       Object.send :remove_const, :Foo
       Object.send :remove_const, :Bar
       Object.send :remove_const, :Baz
+      Object.send :remove_const, :Qux
       Object.send :remove_const, :Infoo
+      Object.send :remove_const, :Asd
+      Object.send :remove_const, :Qwe
 
       ScopedSearch::RSpec::Database.close_connection
     end
@@ -282,7 +319,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
     context 'autocompleting with scopes' do
       it 'should honor the scope' do
-        ::Baz.complete_for('string =').should == ['string = foo']
+        Baz.complete_for('foos.string =').should == ['foos.string = "foo"']
+      end
+
+      it 'should honor scope on the through relation' do
+        Baz.complete_for('qwes.string =').should == ['qwes.string = "qwe1"']
       end
     end
   end

data/spec/integration/ext_method_spec.rb

@@ -46,4 +46,131 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       @class.search_for('beta = 42').should == [@two]
     end
   end
+
+  describe ScopedSearch, "ext_method with has/not has on a #{db} database" do
+
+    before(:all) do
+      ScopedSearch::RSpec::Database.establish_named_connection(db)
+    end
+
+    after(:all) do
+      ScopedSearch::RSpec::Database.close_connection
+    end
+
+    context 'on a direct field' do
+      before(:all) do
+        @class = ScopedSearch::RSpec::Database.create_model(alpha: :integer) do |klass|
+          klass.send(:define_singleton_method, :test_ext_has) do |key, operator, value|
+            if value.nil?
+              case operator
+              when 'IS NOT NULL'
+                { conditions: "#{klass.table_name}.alpha > 1" }
+              when 'IS NULL'
+                { conditions: "#{klass.table_name}.alpha IS NULL OR #{klass.table_name}.alpha <= 1" }
+              end
+            else
+              { conditions: "#{klass.table_name}.alpha = ?", parameter: [value.to_i] }
+            end
+          end
+          klass.scoped_search on: :alpha, ext_method: :test_ext_has
+        end
+
+        @included = @class.create!(alpha: 2)
+        @excluded = @class.create!(alpha: 1)
+        @null_record = @class.create!(alpha: nil)
+      end
+
+      after(:all) do
+        ScopedSearch::RSpec::Database.drop_model(@class)
+      end
+
+      it 'should delegate set? to ext_method' do
+        @class.search_for('set? alpha').should == [@included]
+      end
+
+      it 'should delegate null? to ext_method' do
+        results = @class.search_for('null? alpha')
+        results.should include(@excluded)
+        results.should include(@null_record)
+        results.length.should == 2
+      end
+
+      it 'should still find records via value search' do
+        @class.search_for('alpha = 2').should == [@included]
+      end
+    end
+
+    context 'on a relation field' do
+      before(:all) do
+        @main = ScopedSearch::RSpec::Database.create_model(name: :string) {}
+
+        @related = ScopedSearch::RSpec::Database.create_model(
+          value: :string,
+          promoted: :boolean,
+          main_id: :integer
+        ) do |klass|
+        end
+
+        related_table = @related.table_name
+        main_table = @main.table_name
+        related_class = @related
+        main_class = @main
+
+        @related.belongs_to main_table.to_sym, foreign_key: :main_id
+        @main.has_many related_table.to_sym, foreign_key: :main_id
+
+        @main.send(:define_singleton_method, :test_ext_promoted) do |key, operator, value|
+          if value.nil?
+            subquery = related_class.where(promoted: true).select(:main_id).to_sql
+            case operator
+            when 'IS NOT NULL'
+              { conditions: "#{main_table}.id IN (#{subquery})" }
+            when 'IS NULL'
+              { conditions: "#{main_table}.id NOT IN (#{subquery})" }
+            end
+          else
+            { joins: related_table.to_sym,
+              conditions: "#{related_table}.value #{operator} ? AND #{related_table}.promoted = ?",
+              parameter: [value, true] }
+          end
+        end
+
+        @main.scoped_search(
+          relation: related_table.to_sym,
+          on: :value,
+          rename: :promoted_items,
+          ext_method: :test_ext_promoted
+        )
+
+        @record_a = @main.create!(name: 'a')
+        @related.create!(value: 'item1', promoted: true, main_id: @record_a.id)
+
+        @record_b = @main.create!(name: 'b')
+        @related.create!(value: 'item2', promoted: false, main_id: @record_b.id)
+
+        @record_c = @main.create!(name: 'c')
+      end
+
+      after(:all) do
+        ScopedSearch::RSpec::Database.drop_model(@related)
+        ScopedSearch::RSpec::Database.drop_model(@main)
+      end
+
+      it 'should delegate set? to ext_method, not raw relation' do
+        @main.search_for('set? promoted_items').should == [@record_a]
+      end
+
+      it 'should delegate null? to ext_method, not raw relation' do
+        results = @main.search_for('null? promoted_items')
+        results.should include(@record_b)
+        results.should include(@record_c)
+        results.length.should == 2
+      end
+
+      it 'should still use ext_method for value search' do
+        @main.search_for('promoted_items = item1').should == [@record_a]
+        @main.search_for('promoted_items = item2').should == []
+      end
+    end
+  end
 end

data/spec/integration/relation_querying_spec.rb

@@ -249,13 +249,13 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       before do
 
         # Create some tables
-        ActiveRecord::Migration.create_table(:mars) { |t| t.integer :koo_id; t.integer :baz_id }
-        ActiveRecord::Migration.create_table(:bazs) { |t| t.string :related }
+        ActiveRecord::Migration.create_table(:mars) { |t| t.integer :koo_id; t.integer :zab_id }
+        ActiveRecord::Migration.create_table(:zabs) { |t| t.string :related }
         ActiveRecord::Migration.create_table(:koos) { |t| t.string :foo }
 
         # The related classes
-        class Mar < ActiveRecord::Base; belongs_to :baz; belongs_to :koo; end
-        class Baz < ActiveRecord::Base; has_many :mars; end
+        class Mar < ActiveRecord::Base; belongs_to :zab; belongs_to :koo; end
+        class Zab < ActiveRecord::Base; has_many :mars; end
 
         # The class on which to call search_for
         class Koo < ActiveRecord::Base
@@ -263,38 +263,38 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
           # having the source option here is not needed for the statement correctness.
           # It is here to fail the code introduced in 2.6.2 that wrongly detected source instead of source_type
           # as an indication for a polymorphic relation.
-          has_many :bazs, :through => :mars, :source => :baz
+          has_many :zabs, :through => :mars, :source => :zab
 
-          scoped_search :relation => :bazs, :on => :related
+          scoped_search :relation => :zabs, :on => :related
         end
 
         @koo_1 = Koo.create!(:foo => 'foo')
         @koo_2 = Koo.create!(:foo => 'foo too')
         @koo_3 = Koo.create!(:foo => 'foo three')
 
-        @baz_1 = Baz.create(:related => 'baz')
-        @baz_2 = Baz.create(:related => 'baz too!')
+        @zab_1 = Zab.create(:related => 'zab')
+        @zab_2 = Zab.create(:related => 'zab too!')
 
-        @bar_1 = Mar.create!(:koo => @koo_1, :baz => @baz_1)
+        @bar_1 = Mar.create!(:koo => @koo_1, :zab => @zab_1)
         @bar_2 = Mar.create!(:koo => @koo_1)
-        @bar_3 = Mar.create!(:koo => @koo_2, :baz => @baz_1)
-        @bar_3 = Mar.create!(:koo => @koo_2, :baz => @baz_2)
-        @bar_3 = Mar.create!(:koo => @koo_2, :baz => @baz_2)
+        @bar_3 = Mar.create!(:koo => @koo_2, :zab => @zab_1)
+        @bar_3 = Mar.create!(:koo => @koo_2, :zab => @zab_2)
+        @bar_3 = Mar.create!(:koo => @koo_2, :zab => @zab_2)
         @bar_4 = Mar.create!(:koo => @koo_3)
       end
 
       after do
-        ActiveRecord::Migration.drop_table(:bazs)
+        ActiveRecord::Migration.drop_table(:zabs)
         ActiveRecord::Migration.drop_table(:mars)
         ActiveRecord::Migration.drop_table(:koos)
       end
 
-      it "should find the two records that are related to a baz record" do
-        Koo.search_for('baz').length.should == 2
+      it "should find the two records that are related to a zab record" do
+        Koo.search_for('zab').length.should == 2
       end
 
-      it "should find the two records that are related to a baz record" do
-        Koo.search_for('related=baz AND related="baz too!"').length.should == 1
+      it "should find the two records that are related to a zab record" do
+        Koo.search_for('related=zab AND related="zab too!"').length.should == 1
       end
     end
 
@@ -303,27 +303,27 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       before do
 
         # Create some tables
-        ActiveRecord::Migration.create_table(:zars) { |t| t.integer :baz_id }
-        ActiveRecord::Migration.create_table(:bazs) { |t| t.string :related }
+        ActiveRecord::Migration.create_table(:zars) { |t| t.integer :zab_id }
+        ActiveRecord::Migration.create_table(:zabs) { |t| t.string :related }
         ActiveRecord::Migration.create_table(:zoos) { |t| t.integer :zar_id; t.string :foo }
 
         # The related classes
-        class Zar < ActiveRecord::Base; belongs_to :baz; has_many :zoos; end
-        class Baz < ActiveRecord::Base; has_many :zars; end
+        class Zar < ActiveRecord::Base; belongs_to :zab; has_many :zoos; end
+        class Zab < ActiveRecord::Base; has_many :zars; end
 
         # The class on which to call search_for
         class Zoo < ActiveRecord::Base
           belongs_to :zar
-          has_many :bazs, :through => :zar
+          has_many :zabs, :through => :zar
 
-          scoped_search :relation => :bazs, :on => :related
+          scoped_search :relation => :zabs, :on => :related
         end
 
-        baz_1 = Baz.create(:related => 'baz')
-        baz_2 = Baz.create(:related => 'baz too!')
+        zab_1 = Zab.create(:related => 'zab')
+        zab_2 = Zab.create(:related => 'zab too!')
 
-        zar_1 = Zar.create!( :baz => baz_1)
-        zar_2 = Zar.create!( :baz => baz_2)
+        zar_1 = Zar.create!( :zab => zab_1)
+        zar_2 = Zar.create!( :zab => zab_2)
 
         Zoo.create!(:zar => zar_1, :foo => 'foo')
         Zoo.create!(:zar => zar_1, :foo => 'foo too')
@@ -331,17 +331,17 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       after do
-        ActiveRecord::Migration.drop_table(:bazs)
+        ActiveRecord::Migration.drop_table(:zabs)
         ActiveRecord::Migration.drop_table(:zars)
         ActiveRecord::Migration.drop_table(:zoos)
       end
 
-      it "should find the three records that are related to a baz record" do
-        Zoo.search_for('baz').length.should == 3
+      it "should find the three records that are related to a zab record" do
+        Zoo.search_for('zab').length.should == 3
       end
 
-      it "should find no records that are related to a baz record" do
-        Zoo.search_for('related=baz AND related="baz too!"').length.should == 0
+      it "should find no records that are related to a zab record" do
+        Zoo.search_for('related=zab AND related="zab too!"').length.should == 0
       end
     end
 
@@ -392,8 +392,8 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @tag_2 = Tag.create!(:foo => 'foo too')
         @tag_3 = Tag.create!(:foo => 'foo three')
 
-        @dog_1 = Dog.create(:related => 'baz')
-        @dog_2 = Dog.create(:related => 'baz too!')
+        @dog_1 = Dog.create(:related => 'zab')
+        @dog_2 = Dog.create(:related => 'zab too!')
         @cat_1 = Cat.create(:related => 'mitzi')
 
         @owner_1 = Owner.create(:name => 'Fred', :dogs => [@dog_1])
@@ -429,11 +429,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should find the two tags that are related to a dog record" do
-        Tag.search_for('dog=baz').length.should == 2
+        Tag.search_for('dog=zab').length.should == 2
       end
 
       it "should find the 3 tags that are related to dogs record" do
-        Tag.search_for('baz').length.should == 3
+        Tag.search_for('zab').length.should == 3
       end
     end
 
@@ -547,22 +547,22 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       before do
 
         # Create some tables with namespaces
-        ActiveRecord::Migration.create_table(:zan_mars) { |t| t.integer :koo_id; t.integer :baz_id }
-        ActiveRecord::Migration.create_table(:zan_bazs) { |t| t.string :related }
+        ActiveRecord::Migration.create_table(:zan_mars) { |t| t.integer :koo_id; t.integer :zab_id }
+        ActiveRecord::Migration.create_table(:zan_zabs) { |t| t.string :related }
         ActiveRecord::Migration.create_table(:zan_koos) { |t| t.string :foo }   
 
         # The related classes
-        module Zan; class Mar < ActiveRecord::Base; belongs_to :baz; belongs_to :koo; self.table_name = "zan_mars"; end; end
-        module Zan; class Baz < ActiveRecord::Base; has_many :mars; self.table_name = "zan_bazs"; end; end
+        module Zan; class Mar < ActiveRecord::Base; belongs_to :zab; belongs_to :koo; self.table_name = "zan_mars"; end; end
+        module Zan; class Zab < ActiveRecord::Base; has_many :mars; self.table_name = "zan_zabs"; end; end
 
         # The class on which to call search_for
         module Zan
           class Koo < ActiveRecord::Base
             has_many :mars, :class_name => "Zan::Mar"
-            has_many :bazs, :through => :mars
+            has_many :zabs, :through => :mars
             self.table_name = "zan_koos"
 
-            scoped_search :relation => :bazs, :on => :related
+            scoped_search :relation => :zabs, :on => :related
           end
         end
 
@@ -570,29 +570,29 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @koo_2 = Zan::Koo.create!(:foo => 'foo too')
         @koo_3 = Zan::Koo.create!(:foo => 'foo three')
 
-        @baz_1 = Zan::Baz.create(:related => 'baz')
-        @baz_2 = Zan::Baz.create(:related => 'baz too!')
+        @zab_1 = Zan::Zab.create(:related => 'zab')
+        @zab_2 = Zan::Zab.create(:related => 'zab too!')
 
-        @bar_1 = Zan::Mar.create!(:koo => @koo_1, :baz => @baz_1)
+        @bar_1 = Zan::Mar.create!(:koo => @koo_1, :zab => @zab_1)
         @bar_2 = Zan::Mar.create!(:koo => @koo_1)
-        @bar_3 = Zan::Mar.create!(:koo => @koo_2, :baz => @baz_1)
-        @bar_3 = Zan::Mar.create!(:koo => @koo_2, :baz => @baz_2)
-        @bar_3 = Zan::Mar.create!(:koo => @koo_2, :baz => @baz_2)
+        @bar_3 = Zan::Mar.create!(:koo => @koo_2, :zab => @zab_1)
+        @bar_3 = Zan::Mar.create!(:koo => @koo_2, :zab => @zab_2)
+        @bar_3 = Zan::Mar.create!(:koo => @koo_2, :zab => @zab_2)
         @bar_4 = Zan::Mar.create!(:koo => @koo_3)
       end
 
       after do
-        ActiveRecord::Migration.drop_table(:zan_bazs)
+        ActiveRecord::Migration.drop_table(:zan_zabs)
         ActiveRecord::Migration.drop_table(:zan_mars)
         ActiveRecord::Migration.drop_table(:zan_koos)
       end
 
-      it "should find the two records that are related to a baz record" do
-        Zan::Koo.search_for('baz').length.should == 2
+      it "should find the two records that are related to a zab record" do
+        Zan::Koo.search_for('zab').length.should == 2
       end
 
-      it "should find the one record that is related to two baz records" do
-        Zan::Koo.search_for('related=baz AND related="baz too!"').length.should == 1
+      it "should find the one record that is related to two zab records" do
+        Zan::Koo.search_for('related=zab AND related="zab too!"').length.should == 1
       end
     end
 

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'bundler/setup'
-
 require 'rspec'
 require 'scoped_search'
 

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Amos Benari
 - Willem van Bergen
 - Wes Hays
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-01 00:00:00.000000000 Z
+date: 2026-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -141,32 +142,27 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
+- README.rdoc
 - CHANGELOG.rdoc
 - CONTRIBUTING.rdoc
 - LICENSE
-- README.rdoc
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.rdoc
 - CONTRIBUTING.rdoc
 - Gemfile
-- Gemfile.activerecord42
-- Gemfile.activerecord50
-- Gemfile.activerecord51
-- Gemfile.activerecord52
-- Gemfile.activerecord52_with_activesupport52
-- Gemfile.activerecord60
-- Gemfile.activerecord60_with_activesupport60
-- Gemfile.activerecord61
-- Gemfile.activerecord61_with_activesupport61
 - LICENSE
 - README.rdoc
 - Rakefile
 - app/assets/images/spinner.gif
 - app/assets/javascripts/scoped_search.js
 - app/assets/stylesheets/scoped_search.scss
+- appraisal.gemfile
+- gemfiles/modular/rails-6
+- gemfiles/modular/rspec
 - lib/scoped_search.rb
 - lib/scoped_search/auto_complete_builder.rb
 - lib/scoped_search/compass.rb
@@ -213,6 +209,7 @@ homepage: https://github.com/wvanbergen/scoped_search/wiki
 licenses:
 - MIT
 metadata: {}
+post_install_message:
 rdoc_options:
 - "--title"
 - scoped_search
@@ -226,14 +223,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using
   a named scope

data/Gemfile.activerecord42

@@ -1,19 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'actionview', '~> 4.2.0'
-gem 'activerecord', '~> 4.2.0'
-
-gem 'nokogiri', '~> 1.6.0' if RUBY_VERSION.start_with?('2.0')
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-end
-
-platforms :ruby do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'mysql2', '>= 0.3.13', '< 0.5'
-  gem 'pg', '~> 0.15'
-end

data/Gemfile.activerecord50

@@ -1,17 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'actionview', '~> 5.0.0'
-gem 'activerecord', '~> 5.0.0'
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-end
-
-platforms :ruby do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'mysql2', '>= 0.3.18', '< 0.5'
-  gem 'pg', '~> 0.18'
-end

data/Gemfile.activerecord51

@@ -1,17 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'actionview', '~> 5.1.0'
-gem 'activerecord', '~> 5.1.0'
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-end
-
-platforms :ruby do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'mysql2', '>= 0.3.18', '< 0.5'
-  gem 'pg', '~> 0.18'
-end

data/Gemfile.activerecord52

@@ -1,17 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'actionview', '~> 5.2.0'
-gem 'activerecord', '~> 5.2.0'
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-end
-
-platforms :ruby do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'mysql2', '>= 0.3.18', '< 0.5'
-  gem 'pg', '~> 0.18'
-end

data/Gemfile.activerecord52_with_activesupport52

@@ -1,18 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'actionview', '~> 5.2.0'
-gem 'activerecord', '~> 5.2.0'
-gem 'activesupport', '~> 5.2.0'
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-end
-
-platforms :ruby do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'mysql2', '>= 0.3.18', '< 0.5'
-  gem 'pg', '~> 0.18'
-end

data/Gemfile.activerecord60

@@ -1,17 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'actionview', '~> 6.0.0'
-gem 'activerecord', '~> 6.0.0'
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-end
-
-platforms :ruby do
-  gem 'sqlite3', '~> 1.4'
-  gem 'mysql2', '> 0.5'
-  gem 'pg', '>= 0.18', '< 2.0'
-end

data/Gemfile.activerecord60_with_activesupport60

@@ -1,18 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'actionview', '~> 6.0.0'
-gem 'activerecord', '~> 6.0.0'
-gem 'activesupport', '~> 6.0.0'
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-end
-
-platforms :ruby do
-  gem 'sqlite3', '~> 1.4'
-  gem 'mysql2', '> 0.5'
-  gem 'pg', '>= 0.18', '< 2.0'
-end

data/Gemfile.activerecord61

@@ -1,17 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'actionview', '~> 6.1.0'
-gem 'activerecord', '~> 6.1.0'
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-end
-
-platforms :ruby do
-  gem 'sqlite3', '~> 1.4'
-  gem 'mysql2', '> 0.5'
-  gem 'pg', '>= 0.18', '< 2.0'
-end

data/Gemfile.activerecord61_with_activesupport61

@@ -1,18 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'actionview', '~> 6.1.0'
-gem 'activerecord', '~> 6.1.0'
-gem 'activesupport', '~> 6.1.0'
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'activerecord-jdbcmysql-adapter'
-  gem 'activerecord-jdbcpostgresql-adapter'
-end
-
-platforms :ruby do
-  gem 'sqlite3', '~> 1.4'
-  gem 'mysql2', '> 0.5'
-  gem 'pg', '>= 0.18', '< 2.0'
-end