scoped_search 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 958718e625d5bbb80f93ea868abebac96d29a54e712c6c0275f9e6a1e44e07d3
-  data.tar.gz: 90f57db3c2009746a0beb9d843bee7a46d55d1b0ef02d796c12490d7b3e7f1b8
+  metadata.gz: bdc9b9ee45ee99807b1c22a0da4cef71c6ce539292213ee47c012c020f866368
+  data.tar.gz: 5b4b0acd6e86a3f3e3c940f537a854c193983ebf57019687eac6bf5b33728b42
 SHA512:
-  metadata.gz: 2cc38b0ce04452df7b7205465621c0624d1173c9e9a95eb849f50eaa99fdcad9545a7411aec5fae2a3c787f348a3f440244c54e8623a3ed2589d47735110ef8b
-  data.tar.gz: 60ebb019e199a50505e0e934a1e2fd405a03c903350554c8f13ca62f85c5acc472b073a6bf1ebcdb1f44b15c54ec593dc31b9bf474782ff739803a0d94f43e81
+  metadata.gz: 395e4bf94443d76d67c642fe27f92eaf14b2d240b23c5f784e412cfec811cb1900041ea04388ea4c086a2184cb1c771c6f1f4bf6a1ede7a8065920c2fbb7ab41
+  data.tar.gz: 3662b759dde0bb5c9584de7e9fc2cfdf22ae2244c6889f1c88b343950ad5ff0b8ad51b2b07505e05d0eb59a51efbb887ef6dabd80343fbceb99859528f8c6cb0

data/CHANGELOG.rdoc

@@ -6,6 +6,13 @@ Please add an entry to the "Unreleased changes" section in your pull requests.
 
 === Unreleased changes
 
+=== Version 4.3.0
+
+- Prevent scoped_search from modifying an empty string on newer rubies (#229)
+- Autocomplete now wraps all strings in quotes, not just those containing whitespace (#230)
+- UUID search is now case insensitive (#232)
+- Autocomplete now honors scopes set on associations (#231)
+
 === Version 4.1.10
 
 - Fix querying through associations in Rails 6.1 (undefined method join_keys) (#201)

data/lib/scoped_search/auto_complete_builder.rb

@@ -215,12 +215,18 @@ module ScopedSearch
         .distinct
         .map(&field.field)
         .compact
-        .map { |v| v.to_s =~ /\s/ ? "\"#{v.gsub('"', '\"')}\"" : v }
+        .map { |v| v.is_a?(String) ? "\"#{v.gsub('"', '\"')}\"" : v }
     end
 
     def completer_scope(field)
-      klass = field.klass
-      scope = klass.respond_to?(:completer_scope) ? klass.completer_scope(@options) : klass
+      scope = field.klass
+      scope = scope.completer_scope(@options) if scope.respond_to?(:completer_scope)
+
+      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?)
+      end
+
       scope.respond_to?(:reorder) ? scope.reorder(Arel.sql(field.quoted_field)) : scope.scoped(:order => field.quoted_field)
     end
 

data/lib/scoped_search/definition.rb

@@ -260,7 +260,7 @@ module ScopedSearch
 
     NUMERICAL_REGXP = /^\-?\d+(\.\d+)?$/
     INTEGER_REGXP = /^\-?\d+$/
-    UUID_REGXP = /^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$/
+    UUID_REGXP = /^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$/i
 
     # Returns a list of appropriate fields to search in given a search keyword and operator.
     def default_fields_for(value, operator = nil)

data/lib/scoped_search/query_language/tokenizer.rb

@@ -69,7 +69,7 @@ module ScopedSearch::QueryLanguage::Tokenizer
   # Tokenizes a keyword that is quoted using double quotes. Allows escaping
   # of double quote characters by backslashes.
   def tokenize_quoted_keyword(&block)
-    keyword = ""
+    keyword = String.new
     until next_char.nil? || current_char == '"'
       keyword << (current_char == "\\" ? next_char : current_char)
     end

data/lib/scoped_search/version.rb

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

data/spec/integration/auto_complete_spec.rb

@@ -41,6 +41,10 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         end
       end
 
+      ActiveRecord::Migration.create_table(:bazs, :force => true) do |t|
+        t.integer :foo_id
+      end
+
       class ::Bar < ActiveRecord::Base
         belongs_to :foo
       end
@@ -65,6 +69,12 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         scoped_search :on => :other_c, :relation => :bars, :rename => 'bars.other_c'.to_sym
       end
 
+      class ::Baz < ActiveRecord::Base
+        belongs_to :foo, -> { where(string: 'foo') }
+
+        scoped_search :on => :string, :relation => :foo, :complete_value => true
+      end
+
       class ::Infoo < ::Foo
       end
 
@@ -83,9 +93,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
     after(:all) do
       ActiveRecord::Migration.drop_table(:foos)
       ActiveRecord::Migration.drop_table(:bars)
+      ActiveRecord::Migration.drop_table(:bazs)
 
       Object.send :remove_const, :Foo
       Object.send :remove_const, :Bar
+      Object.send :remove_const, :Baz
       Object.send :remove_const, :Infoo
 
       ScopedSearch::RSpec::Database.close_connection
@@ -169,10 +181,10 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should complete values should contain baz" do
-        Foo.complete_for('explicit = ').should contain('explicit =  baz')
+        Foo.complete_for('explicit = ').should contain('explicit =  "baz"')
       end
 
-      it "should complete values with quotes where required" do
+      it "should complete values with quotes where value is a string" do
         Foo.complete_for('alias = ').should contain('alias =  "temp \"2\""')
       end
     end
@@ -267,5 +279,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         Foo.complete_for('int =', value_filter: { qux_id: 99 }).should == []
       end
     end
+
+    context 'autocompleting with scopes' do
+      it 'should honor the scope' do
+        ::Baz.complete_for('string =').should == ['string = foo']
+      end
+    end
   end
 end

data/spec/integration/uuid_query_spec.rb

@@ -43,8 +43,9 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @class.search_for("uuid != #{@record3.uuid}").length.should == 2
       end
 
-      it "should find a record by just specifying the uuid" do
+      it "should find a record by just specifying the uuid (case insensitive)" do
         @class.search_for(@record1.uuid).first.uuid.should == @record1.uuid
+        @class.search_for(@record1.uuid.upcase).first.uuid.should == @record1.uuid
       end
 
       it "should not find a record if the uuid is not a valid uuid" do

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Amos Benari
 - Willem van Bergen
 - Wes Hays
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-18 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -142,10 +141,10 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
 - CHANGELOG.rdoc
 - CONTRIBUTING.rdoc
 - LICENSE
+- README.rdoc
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
@@ -214,7 +213,6 @@ homepage: https://github.com/wvanbergen/scoped_search/wiki
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--title"
 - scoped_search
@@ -235,8 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using
   a named scope