scoped_search 4.1.7 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4d5d5ddd90a25434d39644b46bf7ff531a4c3b9f
-  data.tar.gz: c6f84e3fa52f86b25d03b0ec6a0cb61fb0be79e9
+SHA256:
+  metadata.gz: 76592b4cfe81be4cef968ea35cd9659957af349738fb799ce5e34608247b320a
+  data.tar.gz: 43e889676986012a6827d6904c616e66e73eecd7a4381ed4e4eb573da270f3f1
 SHA512:
-  metadata.gz: e798cdc07468120499ae613122e4a96d6e300998cf3868af27e4df65204af23a28aed861cb3144a7b7bdf44097b5024684b91d0db1a9becdb0397c73d0e39cc6
-  data.tar.gz: 0da17cd812a2ca5f2802e3cff5835317117426530707d6af6dc1d1d093a9efac13378d1d781b8a1512fd86ca6ab969ef6fe10be6ac6e30356ec988a040cd49d4
+  metadata.gz: 6d0d6000ce3a827d33c24591548fcbc6c477c0a9d878dfa39c4a92c5eaaa9bdfe619a5df6c410b2469ebfff4c88a41aef7669afeb591e5d5d6e9a47704bf873c
+  data.tar.gz: d9a20afd3c5328f2195b694a3c305a4f00e4a104680fcf8292afb2b1e7cd838da86ce07c03648312d670d010ec7cda38684bc5be24e9841ffbc445dfc5e9e6d8

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 cache: bundler
 sudo: false
+services:
+  - postgresql
+  - mysql
 
 install:
 - bundle install
@@ -16,7 +19,7 @@ rvm:
 - "2.2.2"
 - "2.3.7"
 - "2.4.0"
-- "2.5.0"
+- "2.5.1"
 - "2.6.0"
 - ruby-head
 - jruby-19mode
@@ -28,6 +31,8 @@ gemfile:
 - Gemfile.activerecord51
 - Gemfile.activerecord52
 - Gemfile.activerecord52_with_activesupport52
+- Gemfile.activerecord60
+- Gemfile.activerecord60_with_activesupport60
 
 matrix:
   allow_failures:
@@ -51,4 +56,23 @@ matrix:
       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

data/CHANGELOG.rdoc

@@ -8,6 +8,11 @@ Please add an entry to the "Unreleased changes" section in your pull requests.
 
 - Nothing yet
 
+=== 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

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/lib/scoped_search/auto_complete_builder.rb

@@ -220,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

@@ -326,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

@@ -137,7 +137,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 +149,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 +167,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 +202,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 +218,45 @@ 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)
-
-      elsif field.set?
-        return set_test(field, operator, value, &block)
-
-      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)
+      if field.relation && definition.reflection_by_name(field.definition.klass, field.relation).macro == :has_many
         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
-
-      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)} ?"
+        key, join_table = if definition.reflection_by_name(field.definition.klass, field.relation).options.has_key?(:through)
+                            [primary_key, has_many_through_join(field)]
+                          else
+                            [connection.quote_column_name(field.reflection_keys(definition.reflection_by_name(field.definition.klass, field.relation))[1]),
+                             connection.quote_table_name(field.klass.table_name)]
+                          end
+
+        condition = "#{primary_key} IN (SELECT #{key} FROM #{join_table} WHERE #{condition} )"
       end
+      condition
+    end
+
+    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
+
+    def value_placeholders(operator, value)
+      return '?' unless [:in, :notin].include?(operator)
+
+      '(' + value.split(',').map { '?' }.join(',') + ')'
     end
 
     def find_has_many_through_association(field, through)

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "4.1.7"
+  VERSION = "4.1.8"
 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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 4.1.7
+  version: 4.1.8
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -87,6 +87,8 @@ files:
 - Gemfile.activerecord51
 - Gemfile.activerecord52
 - Gemfile.activerecord52_with_activesupport52
+- Gemfile.activerecord60
+- Gemfile.activerecord60_with_activesupport60
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -159,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using