scoped_search 4.1.6 → 4.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c94c65fc191d2afdddd82f3177121d2ade7e6238
-  data.tar.gz: 36dd864d06aafd40bd3015184a17222a92d5627f
+SHA256:
+  metadata.gz: f0f6f98982cba23ec69f2b1adaf0c44832abb19adad7a347d4d78c4b0fbb63a8
+  data.tar.gz: 114ea022f87208dc89b92247687d64c2a0146119afa33f2106b69507271ba210
 SHA512:
-  metadata.gz: 2a41edacae0b5140f56dc60bc921c8afb3349132b9ad3453313fc407abbda58b251c08d1da8d56706f9307520882e9e8006f18147833c91b7e3d0995962d843e
-  data.tar.gz: 31932dcd317193df257a4d0fd0c46fea28866e7670a0cfbd1d840d4477ada8381906d5f83b9289b322de3bbc44048ec249d9bf6af67f605bfc76589be9ccc7e3
+  metadata.gz: 6a87832ba5990fd45b7116d374a9c2505c7f9fcf62b4364859986ae497b2aa6d3a0890b222b1ad6c07ea999d48b25fbc42303a63cdc8ce3f4ea3a23e1f049eeb
+  data.tar.gz: a5cd950d77712004cb649261f08a8e8e04169622b346de7c3b15b422dbae7343bf8211febbdb988cf390a43c5f4794c93e820b9bc440d4cc9130d7f3146464f9

data/.github/workflows/ruby.yml

@@ -0,0 +1,76 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on: [pull_request]
+
+env:
+  TESTOPTS: --verbose
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby_version:
+          - 2.7.1
+          - 3.0.0
+          - 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
+    services:
+      postgres:
+        image: postgres:12.1
+        ports: ['5432:5432']
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+        env:
+          POSTGRES_DB: scoped_search_test
+      mariadb:
+        image: mariadb:10
+        ports: ['3306:3306']
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+          MYSQL_DATABASE: scoped_search_test
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.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

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 cache: bundler
 sudo: false
+services:
+  - postgresql
+  - mysql
 
 install:
 - bundle install
@@ -14,8 +17,12 @@ rvm:
 - "2.0"
 - "2.1"
 - "2.2.2"
-- "2.3.1"
+- "2.3.7"
 - "2.4.0"
+- "2.5.1"
+- "2.6.0"
+- "2.7.1"
+- "3.0.2"
 - ruby-head
 - jruby-19mode
 - jruby-head
@@ -24,6 +31,12 @@ 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
 
 matrix:
   allow_failures:
@@ -39,3 +52,71 @@ matrix:
       gemfile: Gemfile.activerecord51
     - rvm: "2.1"
       gemfile: Gemfile.activerecord51
+    - rvm: "2.0"
+      gemfile: Gemfile.activerecord52
+    - rvm: "2.1"
+      gemfile: Gemfile.activerecord52
+    - rvm: "2.0"
+      gemfile: Gemfile.activerecord52_with_activesupport52
+    - rvm: "2.1"
+      gemfile: Gemfile.activerecord52_with_activesupport52
+    - rvm: "2.0"
+      gemfile: Gemfile.activerecord60
+    - rvm: "2.1"
+      gemfile: Gemfile.activerecord60
+    - rvm: "2.2.2"
+      gemfile: Gemfile.activerecord60
+    - rvm: "2.3.7"
+      gemfile: Gemfile.activerecord60
+    - rvm: "2.4.0"
+      gemfile: Gemfile.activerecord60
+    - rvm: "2.0"
+      gemfile: Gemfile.activerecord60_with_activesupport60
+    - rvm: "2.1"
+      gemfile: Gemfile.activerecord60_with_activesupport60
+    - rvm: "2.2.2"
+      gemfile: Gemfile.activerecord60_with_activesupport60
+    - rvm: "2.3.7"
+      gemfile: Gemfile.activerecord60_with_activesupport60
+    - rvm: "2.4.0"
+      gemfile: Gemfile.activerecord60_with_activesupport60
+    - rvm: "2.0"
+      gemfile: Gemfile.activerecord61
+    - rvm: "2.1"
+      gemfile: Gemfile.activerecord61
+    - rvm: "2.2.2"
+      gemfile: Gemfile.activerecord61
+    - rvm: "2.3.7"
+      gemfile: Gemfile.activerecord61
+    - rvm: "2.4.0"
+      gemfile: Gemfile.activerecord61
+    - rvm: "2.0"
+      gemfile: Gemfile.activerecord61_with_activesupport61
+    - rvm: "2.1"
+      gemfile: Gemfile.activerecord61_with_activesupport61
+    - rvm: "2.2.2"
+      gemfile: Gemfile.activerecord61_with_activesupport61
+    - rvm: "2.3.7"
+      gemfile: Gemfile.activerecord61_with_activesupport61
+    - rvm: "2.4.0"
+      gemfile: Gemfile.activerecord61_with_activesupport61
+    - rvm: "2.7.1"
+      gemfile: Gemfile.activerecord42
+    - rvm: "2.7.1"
+      gemfile: Gemfile.activerecord50
+    - rvm: "2.7.1"
+      gemfile: Gemfile.activerecord51
+    - rvm: "2.7.1"
+      gemfile: Gemfile.activerecord52
+    - rvm: "2.7.1"
+      gemfile: Gemfile.activerecord52_with_activesupport52
+    - rvm: "3.0.2"
+      gemfile: Gemfile.activerecord42
+    - rvm: "3.0.2"
+      gemfile: Gemfile.activerecord50
+    - rvm: "3.0.2"
+      gemfile: Gemfile.activerecord51
+    - rvm: "3.0.2"
+      gemfile: Gemfile.activerecord52
+    - rvm: "3.0.2"
+      gemfile: Gemfile.activerecord52_with_activesupport52

data/CHANGELOG.rdoc

@@ -6,7 +6,27 @@ Please add an entry to the "Unreleased changes" section in your pull requests.
 
 === Unreleased changes
 
-- Nothing yet
+=== Version 4.1.10
+
+- Fix querying through associations in Rails 6.1 (undefined method join_keys) (#201)
+- Fix query generation when going through STI associations (#211)
+- Properly support Ruby 3
+- Add support for postgres citext type
+
+=== Version 4.1.9
+- Fix querying on nested has-many associations (#196)
+- Abide "has_many ..., primary_key" overrides in relation searches
+
+=== Version 4.1.8
+
+- Fix querying in associations by set, datetime or IN searches
+- Add support for ActiveRecord 6.0 and Rails 6.1
+
+=== Version 4.1.7
+
+- When Active Support is available, we parse time respecting current time zone
+- Allow dots in rename definitions
+- Accept extra value_filter in `complete_for`
 
 === Version 4.1.6
 

data/Gemfile.activerecord52

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,18 @@
+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

data/lib/scoped_search/auto_complete_builder.rb

@@ -208,6 +208,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))
         .select(field.quoted_field)
         .limit(count)
@@ -219,8 +220,8 @@ module ScopedSearch
 
     def completer_scope(field)
       klass = field.klass
-      scope =  klass.respond_to?(:completer_scope) ? klass.completer_scope(@options) : klass
-      scope.respond_to?(:reorder) ? scope.reorder(field.quoted_field) : scope.scoped(:order => field.quoted_field)
+      scope = klass.respond_to?(:completer_scope) ? klass.completer_scope(@options) : klass
+      scope.respond_to?(:reorder) ? scope.reorder(Arel.sql(field.quoted_field)) : scope.scoped(:order => field.quoted_field)
     end
 
     # set value completer

data/lib/scoped_search/definition.rb

@@ -157,7 +157,7 @@ module ScopedSearch
 
       # Returns true if this is a textual column.
       def textual?
-        [:string, :text].include?(type)
+        [:string, :text, :citext].include?(type)
       end
 
       def uuid?
@@ -172,7 +172,7 @@ module ScopedSearch
       # Returns the default search operator for this field.
       def default_operator
         @default_operator ||= case type
-          when :string, :text then :like
+          when :string, :text, :citext then :like
           else :eq
         end
       end
@@ -238,6 +238,9 @@ module ScopedSearch
       if field.nil?
         dotted = name.to_s.split('.')[0]
         field = fields[dotted.to_sym] unless dotted.blank?
+        if field && field.key_relation.nil?
+          return nil
+        end
       end
       field
     end
@@ -263,7 +266,7 @@ module ScopedSearch
     def default_fields_for(value, operator = nil)
 
       column_types  = [:virtual]
-      column_types += [:string, :text]                if [nil, :like, :unlike, :ne, :eq].include?(operator)
+      column_types += [:string, :text, :citext]       if [nil, :like, :unlike, :ne, :eq].include?(operator)
       column_types += [:double, :float, :decimal]     if value =~ NUMERICAL_REGXP
       column_types += [:integer]                      if value =~ INTEGER_REGXP
       column_types += [:uuid]                         if value =~ UUID_REGXP
@@ -275,6 +278,8 @@ module ScopedSearch
     # Try to parse a string as a datetime.
     # Supported formats are Today, Yesterday, Sunday, '1 day ago', '2 hours ago', '3 months ago', '4 weeks from now', 'Jan 23, 2004'
     # And many more formats that are documented in Ruby DateTime API Doc.
+    # In case Time responds to #zone, we know this is Rails environment and we can use Time.zone.parse. The benefit is that the
+    # current timezone is respected and does not have to be specified explicitly. That way even relative dates work as expected.
     def parse_temporal(value)
       return Date.current if value =~ /\btoday\b/i
       return 1.day.ago.to_date if value =~ /\byesterday\b/i
@@ -283,7 +288,12 @@ module ScopedSearch
       return (eval($1.strip.gsub(/\s+/,'.').downcase)).to_date     if value =~ /\A\s*(\d+\s+\b(?:days?|weeks?|months?|years?)\b\s+\bago)\b\s*\z/i
       return (eval($1.strip.gsub(/from\s+now/i,'from_now').gsub(/\s+/,'.').downcase)).to_datetime if value =~ /\A\s*(\d+\s+\b(?:hours?|minutes?)\b\s+\bfrom\s+now)\b\s*\z/i
       return (eval($1.strip.gsub(/from\s+now/i,'from_now').gsub(/\s+/,'.').downcase)).to_date     if value =~ /\A\s*(\d+\s+\b(?:days?|weeks?|months?|years?)\b\s+\bfrom\s+now)\b\s*\z/i
-      DateTime.parse(value, true) rescue nil
+      if Time.respond_to?(:zone) && !Time.zone.nil?
+        parsed = Time.zone.parse(value) rescue nil
+        parsed && parsed.to_datetime
+      else
+        DateTime.parse(value, true) rescue nil
+      end
     end
 
     # Returns a list of fields that should be searched on by default.
@@ -295,8 +305,8 @@ module ScopedSearch
     end
 
     # Defines a new search field for this search definition.
-    def define(*args)
-      Field.new(self, *args)
+    def define(*args, **kwargs)
+      Field.new(self, *args, **kwargs)
     end
 
     # Returns a reflection for a given klass and name
@@ -316,11 +326,11 @@ module ScopedSearch
 
         search_scope = klass.all
         find_options = ScopedSearch::QueryBuilder.build_query(definition, query || '', options)
-        search_scope = search_scope.where(find_options[:conditions])   if find_options[:conditions]
-        search_scope = search_scope.includes(find_options[:include])   if find_options[:include]
-        search_scope = search_scope.joins(find_options[:joins])        if find_options[:joins]
-        search_scope = search_scope.reorder(find_options[:order])      if find_options[:order]
-        search_scope = search_scope.references(find_options[:include]) if find_options[:include]
+        search_scope = search_scope.where(find_options[:conditions])        if find_options[:conditions]
+        search_scope = search_scope.includes(find_options[:include])        if find_options[:include]
+        search_scope = search_scope.joins(find_options[:joins])             if find_options[:joins]
+        search_scope = search_scope.reorder(Arel.sql(find_options[:order])) if find_options[:order]
+        search_scope = search_scope.references(find_options[:include])      if find_options[:include]
 
         search_scope
       end

data/lib/scoped_search/query_builder.rb

@@ -38,7 +38,9 @@ module ScopedSearch
 
     # Initializes the instance by setting the relevant parameters
     def initialize(definition, ast, profile)
-      @definition, @ast, @definition.profile = definition, ast, profile
+      @definition = definition
+      @ast = ast
+      @definition.profile = profile
     end
 
     # Actually builds the find parameters hash that should be used in the search_for
@@ -137,7 +139,7 @@ module ScopedSearch
 
       # Parse the value as a date/time and ignore invalid timestamps
       timestamp = definition.parse_temporal(value)
-      return nil unless timestamp
+      return [] unless timestamp
 
       timestamp = timestamp.to_date if field.date?
       # Check for the case that a date-only value is given as search keyword,
@@ -149,11 +151,9 @@ module ScopedSearch
         if [:eq, :ne].include?(operator)
           # Instead of looking for an exact (non-)match, look for dates that
           # fall inside/outside the range of timestamps of that day.
-          yield(:parameter, timestamp)
-          yield(:parameter, timestamp + span)
           negate    = (operator == :ne) ? 'NOT ' : ''
           field_sql = field.to_sql(operator, &block)
-          return "#{negate}(#{field_sql} >= ? AND #{field_sql} < ?)"
+          return ["#{negate}(#{field_sql} >= ? AND #{field_sql} < ?)", timestamp, timestamp + span]
 
         elsif operator == :gt
           # Make sure timestamps on the given date are not included in the results
@@ -169,9 +169,8 @@ module ScopedSearch
         end
       end
 
-      # Yield the timestamp and return the SQL test
-      yield(:parameter, timestamp)
-      "#{field.to_sql(operator, &block)} #{sql_operator(operator, field)} ?"
+      # return the SQL test
+      ["#{field.to_sql(operator, &block)} #{sql_operator(operator, field)} ?", timestamp]
     end
 
     # Validate the key name is in the set and translate the value to the set value.
@@ -205,8 +204,7 @@ module ScopedSearch
           set_value = false
         end
       end
-      yield(:parameter, set_value)
-      return "#{negate}(#{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ?)"
+      ["#{negate}(#{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ?)", set_value]
     end
 
     # Generates a simple SQL test expression, for a field and value using an operator.
@@ -222,41 +220,47 @@ module ScopedSearch
 
       yield(:keyparameter, lhs.sub(/^.*\./,'')) if field.key_field
 
-      if [:like, :unlike].include?(operator)
-        yield(:parameter, (value !~ /^\%|\*/ && value !~ /\%|\*$/) ? "%#{value}%" : value.tr_s('%*', '%'))
-        return "#{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ?"
+      condition, *values = if field.temporal?
+                             datetime_test(field, operator, value, &block)
+                           elsif field.set?
+                             set_test(field, operator, value, &block)
+                           else
+                             ["#{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} #{value_placeholders(operator, value)}", value]
+                           end
+      values.each { |value| preprocess_parameters(field, operator, value, &block) }
 
-      elsif [:in, :notin].include?(operator)
-        value.split(',').collect { |v| yield(:parameter, map_value(field, field.set? ? translate_value(field, v) : v.strip)) }
-        value = value.split(',').collect { "?" }.join(",")
-        return "#{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} (#{value})"
-
-      elsif field.temporal?
-        return datetime_test(field, operator, value, &block)
+      if field.relation && definition.reflection_by_name(field.definition.klass, field.relation).macro == :has_many
+        connection = field.definition.klass.connection
+        reflection = definition.reflection_by_name(field.definition.klass, field.relation)
+        primary_key_col = reflection.options[:primary_key] || field.definition.klass.primary_key
+        primary_key = "#{connection.quote_table_name(field.definition.klass.table_name)}.#{connection.quote_column_name(primary_key_col)}"
+        key, join_table = if reflection.options.has_key?(:through)
+                            [primary_key, has_many_through_join(field)]
+                          else
+                            [connection.quote_column_name(field.reflection_keys(reflection)[1]),
+                             connection.quote_table_name(field.klass.table_name)]
+                          end
+
+        condition = "#{primary_key} IN (SELECT #{key} FROM #{join_table} WHERE #{condition} )"
+      end
+      condition
+    end
 
-      elsif field.set?
-        return set_test(field, operator, value, &block)
+    def preprocess_parameters(field, operator, value, &block)
+      values = if [:in, :notin].include?(operator)
+                 value.split(',').map { |v| map_value(field, field.set? ? translate_value(field, v) : v.strip) }
+               elsif [:like, :unlike].include?(operator)
+                 [(value !~ /^\%|\*/ && value !~ /\%|\*$/) ? "%#{value}%" : value.tr_s('%*', '%')]
+               else
+                 [map_value(field, field.offset ? value.to_i : value)]
+               end
+      values.each { |value| yield(:parameter, value) }
+    end
 
-      elsif field.relation && definition.reflection_by_name(field.definition.klass, field.relation).macro == :has_many
-        value = value.to_i if field.offset
-        value = map_value(field, value)
-        yield(:parameter, value)
-        connection = field.definition.klass.connection
-        primary_key = "#{connection.quote_table_name(field.definition.klass.table_name)}.#{connection.quote_column_name(field.definition.klass.primary_key)}"
-        if definition.reflection_by_name(field.definition.klass, field.relation).options.has_key?(:through)
-          join = has_many_through_join(field)
-          return "#{primary_key} IN (SELECT #{primary_key} FROM #{join} WHERE #{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ? )"
-        else
-          foreign_key = connection.quote_column_name(field.reflection_keys(definition.reflection_by_name(field.definition.klass, field.relation))[1])
-          return "#{primary_key} IN (SELECT #{foreign_key} FROM #{connection.quote_table_name(field.klass.table_name)} WHERE #{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ? )"
-        end
+    def value_placeholders(operator, value)
+      return '?' unless [:in, :notin].include?(operator)
 
-      else
-        value = value.to_i if field.offset
-        value = map_value(field, value)
-        yield(:parameter, value)
-        return "#{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ?"
-      end
+      '(' + value.split(',').map { '?' }.join(',') + ')'
     end
 
     def find_has_many_through_association(field, through)
@@ -269,46 +273,51 @@ module ScopedSearch
       middle_table_association
     end
 
+    # Walk the chain of has-many-throughs, collecting all tables we will need to join
+    def nested_has_many(many_class, relation)
+      acc = [relation]
+      while (reflection = definition.reflection_by_name(many_class, relation))
+        break if reflection.nil? || reflection.options[:through].nil?
+        relation = reflection.options[:through]
+        acc.unshift(relation)
+      end
+      acc.map { |relation| definition.reflection_by_name(many_class, relation) }
+    end
+
     def has_many_through_join(field)
       many_class = field.definition.klass
-      through = definition.reflection_by_name(many_class, field.relation).options[:through]
-      through_class = definition.reflection_by_name(many_class, through).klass
-
       connection = many_class.connection
-
-      # table names
-      endpoint_table_name = field.klass.table_name
-      many_table_name = many_class.table_name
-      middle_table_name = through_class.table_name
-
-      # primary and foreign keys + optional conditions for the joins
-      pk1, fk1   = field.reflection_keys(definition.reflection_by_name(many_class, through))
-      condition_many_to_middle = if with_polymorphism?(many_class, field.klass, through, through_class)
-                                   field.reflection_conditions(definition.reflection_by_name(field.klass, many_table_name))
-                                 else
-                                   ''
-                                 end
-      condition_middle_to_end = field.reflection_conditions(definition.reflection_by_name(field.klass, middle_table_name))
-
-      # primary and foreign keys + optional condition for the endpoint to middle join
-      middle_table_association = find_has_many_through_association(field, through) || middle_table_name
-      pk2, fk2   = field.reflection_keys(definition.reflection_by_name(field.klass, middle_table_association))
-      condition2 = field.reflection_conditions(definition.reflection_by_name(many_class, field.relation))
-
-      <<-SQL
-        #{connection.quote_table_name(many_table_name)}
-        INNER JOIN #{connection.quote_table_name(middle_table_name)}
-        ON #{connection.quote_table_name(many_table_name)}.#{connection.quote_column_name(pk1)} = #{connection.quote_table_name(middle_table_name)}.#{connection.quote_column_name(fk1)} #{condition_many_to_middle} #{condition_middle_to_end}
-        INNER JOIN #{connection.quote_table_name(endpoint_table_name)}
-        ON #{connection.quote_table_name(middle_table_name)}.#{connection.quote_column_name(fk2)} = #{connection.quote_table_name(endpoint_table_name)}.#{connection.quote_column_name(pk2)} #{condition2}
-      SQL
+      sql = connection.quote_table_name(many_class.table_name)
+      join_reflections = nested_has_many(many_class, field.relation)
+      table_names = [[many_class.table_name, many_class.sti_name.tableize]] + join_reflections.map(&:table_name)
+
+      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
+                   else
+                     [reflection.join_primary_key, reflection.join_foreign_key] #ActiveRecord 6.1
+                   end
+
+        previous_table, sti_name = previous_table
+        # primary and foreign keys + optional conditions for the joins
+        join_condition = if with_polymorphism?(reflection)
+                           field.reflection_conditions(definition.reflection_by_name(next_reflection.klass, sti_name || previous_table))
+                         else
+                           ''
+                         end
+
+        acc + <<-SQL
+          INNER JOIN #{connection.quote_table_name(reflection.table_name)}
+          ON #{connection.quote_table_name(previous_table)}.#{connection.quote_column_name(pk1)} = #{connection.quote_table_name(reflection.table_name)}.#{connection.quote_column_name(fk1)} #{join_condition}
+        SQL
+      end
     end
 
-    def with_polymorphism?(many_class, endpoint_class, through, through_class)
-      reflections = [definition.reflection_by_name(endpoint_class, through), definition.reflection_by_name(many_class, through)].compact
-      as = reflections.map(&:options).compact.map { |opt| opt[:as] }.compact
-      return false if as.empty?
-      definition.reflection_by_name(through_class, as.first).options[:polymorphic]
+    def with_polymorphism?(reflection)
+      as = reflection.options[:as]
+      return unless as
+      definition.reflection_by_name(reflection.klass, as).options[:polymorphic]
     end
 
     # This module gets included into the Field class to add SQL generation.

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "4.1.6"
+  VERSION = "4.1.10"
 end

data/lib/scoped_search.rb

@@ -34,9 +34,9 @@ module ScopedSearch
 
       definitions.each do |definition|
         if definition[:on].kind_of?(Array)
-          definition[:on].each { |field| self.scoped_search_definition.define(definition.merge(:on => field)) }
+          definition[:on].each { |field| self.scoped_search_definition.define(**definition.merge(:on => field)) }
         else
-          self.scoped_search_definition.define(definition)
+          self.scoped_search_definition.define(**definition)
         end
       end
       return self.scoped_search_definition

data/spec/database.jruby.yml

@@ -4,7 +4,7 @@ sqlite:
 
 mysql:
   adapter: jdbcmysql
-  host: localhost
+  host: 127.0.0.1
   username: root
   database: scoped_search_test
 

data/spec/database.ruby.yml

@@ -4,7 +4,7 @@ sqlite:
 
 mysql:
   adapter: mysql2
-  host: localhost
+  host: 127.0.0.1
   port: 3306
   username: root
   database: scoped_search_test

data/spec/integration/auto_complete_spec.rb

@@ -17,6 +17,13 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         t.string :other_c
       end
 
+      ActiveRecord::Migration.create_table(:quxes, :force => true) do |t|
+        t.string :related
+        t.string :other_a
+        t.string :other_b
+        t.string :other_c
+      end
+
       ActiveRecord::Migration.create_table(:foos, :force => true) do |t|
         t.string  :string
         t.string  :another
@@ -25,6 +32,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         t.integer :int
         t.date    :date
         t.integer :unindexed
+        t.integer :qux_id
 
         if on_postgresql?
           t.uuid :uuid
@@ -37,8 +45,13 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         belongs_to :foo
       end
 
+      class ::Qux < ActiveRecord::Base
+        has_many :foos
+      end
+
       class ::Foo < ActiveRecord::Base
         has_many :bars
+        belongs_to :qux
         default_scope { order(:string) }
 
         scoped_search :on => [:string, :date, :uuid]
@@ -55,7 +68,10 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       class ::Infoo < ::Foo
       end
 
-      @foo_1 = Foo.create!(:string => 'foo', :another => 'temp 1', :explicit => 'baz', :int => 9  , :date => 'February 8, 2011' , :unindexed => 10)
+      @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.create!(:string => 'baz', :another => nil,      :explicit => nil  , :int => nil, :date => nil                 , :unindexed => nil)
       20.times { Foo.create!(:explicit => "aaa") }
@@ -242,5 +258,14 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         Foo.complete_for('int > 2').first.should match(/22/)
       end
     end
+
+    context 'autocompleting with value_filter' do
+      it 'should return filtered values' do
+        Foo.complete_for('int =', value_filter: { qux_id: @qux_1.id }).should == ['int = 9']
+      end
+      it 'should return filtered for invalid value' do
+        Foo.complete_for('int =', value_filter: { qux_id: 99 }).should == []
+      end
+    end
   end
 end

data/spec/integration/key_value_querying_spec.rb

@@ -33,6 +33,7 @@ require "spec_helper"
             has_many :keys, :through => :facts
 
             scoped_search :relation => :facts, :on => :value, :rename => :facts, :in_key => :keys, :on_key => :name, :complete_value => true
+            scoped_search :relation => :facts, :on => :value, :rename => 'myfacts.value', :aliases => ['prefixed', 'prefixed.value']
           end
           class ::MyItem < ::Item
           end
@@ -102,6 +103,20 @@ require "spec_helper"
         it "should find all bars with a fact name color and fact value gold of descendant class" do
           MyItem.search_for('facts.color = gold').first.name.should eql('barbary')
         end
+
+        describe 'with prefixed aliases' do
+          it 'should search by the prefix' do
+            Item.search_for('prefixed = green').length.should == 1
+          end
+
+          it 'should search by the full length variant' do
+            Item.search_for('prefixed.value = green').length.should == 1
+          end
+
+          it 'should not search by just any key with common prefix' do
+            proc { Item.search_for('prefixed.something_which_is_not_defined = green') }.should raise_error(ScopedSearch::QueryNotSupported)
+          end
+        end
       end
     end
   end

data/spec/integration/nested_has_many_through_querying_spec.rb

@@ -0,0 +1,100 @@
+require "spec_helper"
+
+# These specs will run on all databases that are defined in the spec/database.yml file.
+# Comment out any databases that you do not have available for testing purposes if needed.
+ScopedSearch::RSpec::Database.test_databases.each do |db|
+
+  describe ScopedSearch, "using 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 'quering on associations which are behind multiple has-many-through associations' do
+
+      before(:all) do
+        ActiveRecord::Migration.create_table(:sources) { |t| t.string :name }
+        ActiveRecord::Migration.create_table(:first_jumps) { |t| t.string :name; t.integer :source_id }
+        ActiveRecord::Migration.create_table(:join_jumps) { |t| t.string :name; t.integer :first_jump_id; t.integer :destination_id }
+        ActiveRecord::Migration.create_table(:destinations) { |t| t.string :name; }
+
+        class Source < ActiveRecord::Base
+          has_many :first_jumps
+          has_many :join_jumps, :through => :first_jumps
+          has_many :destinations, :through => :join_jumps
+
+          scoped_search :relation => :first_jumps, :on => :name, :rename => 'first_jump.name'
+          scoped_search :relation => :join_jumps, :on => :name, :rename => 'join_jump.name'
+          scoped_search :relation => :destinations, :on => :name, :rename => 'destination.name'
+        end
+
+        class FirstJump < ActiveRecord::Base
+          belongs_to :source
+          has_many :join_jumps
+          has_many :destinations, :through => :join_jumps
+        end
+
+        class JoinJump < ActiveRecord::Base
+          has_one :source, :through => :first_jump
+          belongs_to :first_jump
+          belongs_to :destination
+        end
+
+        class Destination < ActiveRecord::Base
+          has_many :join_jumps
+          has_many :first_jumps, :through => :join_jumps
+          has_many :sources, :through => :first_jumps
+        end
+
+        @destination1 = Destination.create!(:name => 'dest-1')
+        @destination2 = Destination.create!(:name => 'dest-2')
+        @destination3 = Destination.create!(:name => 'dest-3')
+        @source1 = Source.create!(:name => 'src1')
+        @first_jump1 = FirstJump.create!(:name => 'jump-1-1', :source => @source1)
+        @first_jump2 = FirstJump.create!(:name => 'jump-1-2', :source => @source1)
+
+        @source2 = Source.create!(:name => 'src2')
+        @first_jump_2_1 = FirstJump.create!(:name => 'jump-2-1', :source => @source2)
+        @first_jump_2_2 = FirstJump.create!(:name => 'jump-2-2', :source => @source2)
+        @first_jump_2_3 = FirstJump.create!(:name => 'jump-2-3', :source => @source2)
+        @first_jump_2_4 = FirstJump.create!(:name => 'jump-2-4', :source => @source2)
+
+        JoinJump.create!(:name => 'join-1-1', :destination => @destination1, :first_jump => @first_jump1)
+        JoinJump.create!(:name => 'join-1-2', :destination => @destination2, :first_jump => @first_jump2)
+
+        JoinJump.create!(:name => 'join-2-1', :destination => @destination1, :first_jump => @first_jump_2_1)
+        JoinJump.create!(:name => 'join-2-2', :destination => @destination2, :first_jump => @first_jump_2_2)
+        JoinJump.create!(:name => 'join-2-3', :destination => @destination2, :first_jump => @first_jump_2_3)
+        JoinJump.create!(:name => 'join-2-4', :destination => @destination3, :first_jump => @first_jump_2_4)
+      end
+
+      after(:all) do
+        ScopedSearch::RSpec::Database.drop_model(Source)
+        ScopedSearch::RSpec::Database.drop_model(FirstJump)
+        ScopedSearch::RSpec::Database.drop_model(JoinJump)
+        ScopedSearch::RSpec::Database.drop_model(Destination)
+        Object.send :remove_const, :Source
+        Object.send :remove_const, :FirstJump
+        Object.send :remove_const, :JoinJump
+        Object.send :remove_const, :Destination
+      end
+
+      it "allows searching on has many through has many" do
+        Source.search_for("join_jump.name = join-1-1").should == [@source1]
+        Source.search_for("join_jump.name = join-2-1").should == [@source2]
+        Source.search_for("join_jump.name ^ (join-1-1, join-2-1)").order(:id).should == [@source1, @source2]
+      end
+
+      it "allows searching on has many through has one through has many" do
+        Source.search_for("destination.name = dest-1").order(:id).should == [@source1, @source2]
+        Source.search_for("destination.name = dest-3").order(:id).should == [@source2]
+        Source.search_for("destination.name = dest-3 or destination.name = dest-2").order(:id).should == [@source1, @source2]
+        Source.search_for("destination.name = dest-3 and destination.name = dest-2").should == [@source2]
+      end
+    end
+  end
+end

data/spec/integration/relation_querying_spec.rb

@@ -351,9 +351,10 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
         # Create some tables
         ActiveRecord::Migration.create_table(:taggables) { |t| t.integer :taggable_id; t.string :taggable_type; t.integer :tag_id }
-        ActiveRecord::Migration.create_table(:dogs) { |t| t.string :related }
+        ActiveRecord::Migration.create_table(:dogs) { |t| t.string :related; t.integer :owner_id }
         ActiveRecord::Migration.create_table(:cats) { |t| t.string :related }
         ActiveRecord::Migration.create_table(:tags) { |t| t.string :foo }
+        ActiveRecord::Migration.create_table(:owners) { |t| t.string :name }
 
         # The related classes
         class Taggable < ActiveRecord::Base; belongs_to :tag; belongs_to :taggable, :polymorphic => true; end
@@ -369,6 +370,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         class Dog < ActiveRecord::Base
           has_many :taggables, :as => :taggable
           has_many :tags, :through => :taggables
+          belongs_to :owner
 
           scoped_search :relation => :tags, :on => :foo
         end
@@ -378,6 +380,14 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
           has_many :tags, :through => :taggables
         end
 
+        class Owner < ActiveRecord::Base
+          has_many :dogs
+          has_many :taggables, :as => :taggable, :through => :dogs
+          has_many :tags, :through => :taggables
+
+          scoped_search :relation => :tags, :on => :foo
+        end
+
         @tag_1 = Tag.create!(:foo => 'foo')
         @tag_2 = Tag.create!(:foo => 'foo too')
         @tag_3 = Tag.create!(:foo => 'foo three')
@@ -386,6 +396,8 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @dog_2 = Dog.create(:related => 'baz too!')
         @cat_1 = Cat.create(:related => 'mitzi')
 
+        @owner_1 = Owner.create(:name => 'Fred', :dogs => [@dog_1])
+
         Taggable.create!(:tag => @tag_1, :taggable => @dog_1, :taggable_type => 'Dog' )
         Taggable.create!(:tag => @tag_1)
         Taggable.create!(:tag => @tag_2, :taggable => @dog_1 , :taggable_type => 'Dog')
@@ -400,12 +412,18 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         ActiveRecord::Migration.drop_table(:taggables)
         ActiveRecord::Migration.drop_table(:tags)
         ActiveRecord::Migration.drop_table(:cats)
+        ActiveRecord::Migration.drop_table(:owners)
       end
 
       it "should find the two records that are related to a tag that contains foo record" do
         Dog.search_for('foo').length.should == 2
       end
 
+      it "should find the only record that is related to a tag" do
+        Owner.search_for('foo').length.should == 1
+        Owner.search_for('foo').to_sql.should =~ /taggable_type = 'Dog'/
+      end
+
       it "should find one records that is related to both tags" do
         Dog.search_for('foo=foo AND foo="foo too"').length.should == 1
       end
@@ -720,5 +738,49 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         result.first.username.should == @usermat_1.username
       end
     end
+
+    context "querying on :has_many with primary key override" do
+
+      before do
+        ActiveRecord::Migration.create_table(:books) { |t| t.string :title; t.string :isbn }
+        ActiveRecord::Migration.create_table(:comments) { |t| t.string :comment; t.string :isbn }
+
+        class Book < ActiveRecord::Base
+          has_many :comments, foreign_key: 'isbn', primary_key: 'isbn'
+
+          scoped_search on: [:title]
+          scoped_search relation: :comments, on: [:comment]
+        end
+
+        class Comment < ActiveRecord::Base
+          belongs_to :book, foreign_key: 'isbn', primary_key: 'isbn'
+        end
+
+        @book1 = Book.create(:title => 'Eloquent Ruby', :isbn => '978-0321584106')
+        @book2 = Book.create(:title => 'The Well-Grounded Rubyist', :isbn => '978-1617295218')
+        Comment.create(:comment => 'Definitely worth a read', :isbn => @book1.isbn)
+        Comment.create(:comment => 'Wait what? I expected a book about gemstones', :isbn => @book1.isbn)
+        Comment.create(:comment => 'Cool book about ruby', :isbn => @book2.isbn)
+      end
+
+      after do
+        ActiveRecord::Migration.drop_table :comments
+        ActiveRecord::Migration.drop_table :books
+      end
+
+      it "correctly joins the tables" do
+        query = Book.search_for("test").to_sql
+        # On PostgreSQL and SQLite we use double quotes, on MySQL we use backticks
+        query.should =~ /LEFT OUTER JOIN ["`]comments["`] ON ["`]comments["`]\.["`]isbn["`] = ["`]books["`]\.["`]isbn["`]/
+        query.should =~ /["`]books["`]\.["`]isbn["`] IN \(SELECT ["`]isbn["`]/
+      end
+
+      it "finds the right results" do
+        Book.search_for('python').should == []
+        Book.search_for('comment ~ Wait').should == [@book1]
+        Book.search_for('comment ~ book').pluck(:id).sort.uniq.should == [@book1, @book2].map(&:id).sort
+        Book.search_for('comment ~ Cool').should == [@book2]
+      end
+    end
   end
 end

data/spec/integration/sti_querying_spec.rb

@@ -13,15 +13,18 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
       @parent_class = ScopedSearch::RSpec::Database.create_model(int: :integer, type: :string, related_id: :integer) do |klass|
         klass.scoped_search on: :int
+        klass.belongs_to @related_class.table_name.to_sym, foreign_key: :related_id
       end
       @subclass1 = ScopedSearch::RSpec::Database.create_sti_model(@parent_class)
       @subclass2 = ScopedSearch::RSpec::Database.create_sti_model(@parent_class) do |klass|
-        klass.belongs_to @related_class.table_name.to_sym, foreign_key: :related_id
         klass.scoped_search on: :int, rename: :other_int
         klass.scoped_search relation: @related_class.table_name, on: :int, rename: :related_int
       end
 
-      @related_class.has_many @subclass1.table_name.to_sym
+      @related_class.has_many @subclass1.table_name.to_sym, :foreign_key => :related_id
+      @related_class.has_many @subclass2.table_name.to_sym, :foreign_key => :related_id
+      @related_class.scoped_search :relation => @subclass1.table_name.to_sym, :on => :int, :rename => 'subclass1.id'
+      @related_class.scoped_search :relation => @subclass2.table_name.to_sym, :on => :int, :rename => 'subclass2.id'
 
       @record1 = @subclass1.create!(int: 7)
       @related_record1 = @related_class.create!(int: 42)
@@ -79,5 +82,12 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @subclass2.search_for('related_int = 42').should eq([@record2])
       end
     end
+
+    context 'querying related records' do
+      it 'shuld find only relevant instances of STI subclasses' do
+        @related_class.search_for("subclass1.id ^ (#{@record1.int})").should eq([])
+        @related_class.search_for("subclass2.id ^ (#{@record1.int}, #{@record2.int})").should eq([@related_record1])
+      end
+    end
   end
 end

data/spec/lib/database.rb

@@ -48,7 +48,7 @@ module ScopedSearch::RSpec::Database
     ActiveRecord::Migration.create_table(table_name) do |t|
       fields.each do |name, field_type|
         options = (field_type == :decimal) ? { :scale => 2, :precision => 10 } : {}
-        t.send(field_type.to_s.gsub(/^unindexed_/, '').to_sym, name, options)
+        t.send(field_type.to_s.gsub(/^unindexed_/, '').to_sym, name, **options)
       end
     end
 

data/spec/unit/query_builder_spec.rb

@@ -52,6 +52,8 @@ describe ScopedSearch::QueryBuilder do
   it "should validate value if validator selected" do
     field = double('field')
     field.stub(:virtual?).and_return(false)
+    field.stub(:temporal?).and_return(false)
+    field.stub(:relation).and_return(nil)
     field.stub(:only_explicit).and_return(true)
     field.stub(:field).and_return(:test_field)
     field.stub(:ext_method).and_return(nil)

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.1.10
 platform: ruby
 authors:
 - Amos Benari
 - Willem van Bergen
 - Wes Hays
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -77,6 +77,7 @@ extra_rdoc_files:
 - CONTRIBUTING.rdoc
 - LICENSE
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.rdoc
@@ -85,6 +86,12 @@ files:
 - 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
@@ -112,6 +119,7 @@ files:
 - spec/integration/auto_complete_spec.rb
 - spec/integration/ext_method_spec.rb
 - spec/integration/key_value_querying_spec.rb
+- spec/integration/nested_has_many_through_querying_spec.rb
 - spec/integration/ordinal_querying_spec.rb
 - spec/integration/profile_querying_spec.rb
 - spec/integration/rails_helper_spec.rb
@@ -136,7 +144,7 @@ homepage: https://github.com/wvanbergen/scoped_search/wiki
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - scoped_search
@@ -157,9 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using
   a named scope
@@ -170,6 +177,7 @@ test_files:
 - spec/integration/auto_complete_spec.rb
 - spec/integration/ext_method_spec.rb
 - spec/integration/key_value_querying_spec.rb
+- spec/integration/nested_has_many_through_querying_spec.rb
 - spec/integration/ordinal_querying_spec.rb
 - spec/integration/profile_querying_spec.rb
 - spec/integration/rails_helper_spec.rb