scoped_search 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8e71c1616716946f906c72f741b5e9b1950fdd8
-  data.tar.gz: d9386d5cc2fca4d418bc9a3d7a96d5b18601659b
+  metadata.gz: cf2c98d3eed66905e04497673572661d98ca832a
+  data.tar.gz: 5cda23768c0ffef857dc038d74abd2539bf8881c
 SHA512:
-  metadata.gz: cc2400a7f26ef7f1bfed7273094a7cac04c5cb09b35509a4d2e3464b543f9f1413214c9100117d0d356620b9df8ed47fd504a0d5a208ec087ec5742f0d9c3afe
-  data.tar.gz: 3715276e0f495f13f1fd9158d6f4032c0a949682843e235e4b4dea8c035c33ad52de21427d894e1e4109f732299b5d5c8336e7cf9a6f20c70eeb2b29790ba580
+  metadata.gz: 96425ef732825dfb333d977f55a55be95ef3ac9dfda0ba9c4353fc97227d5caebfc4977b8cbdb786eb5929db84885f74435b7ca8795e449dcd2f7b432b0abbf5
+  data.tar.gz: '068d65cd7fe9e1d4e58b0080d92a22a9216ed879e17275aec5bce2651ce6cced96251803f062113c6ab66135a3ae90e478cf7b90bd2ea7b0437f5f83a96516ce'

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.4
+
+- Bugfix related to LIKE queries on virtual fields (#178)
+- Add an "onClear" option to scopedSearch (#176)
+
 === Version 4.1.3
 
 - Bugfix related to default fields for sets when using ext_method (#174)

data/app/assets/javascripts/scoped_search.js

@@ -25,6 +25,7 @@ $.widget( "custom.catcomplete", $.ui.autocomplete, {
     var options = arguments[0] || {};
     $(this).each(function(i,el){
       var target = $(el);
+      var clearFn = options.onClear || function(){ target.val(''); };
 
       target.catcomplete({
         source: options.source || function( request, response ) {
@@ -50,6 +51,6 @@ $.widget( "custom.catcomplete", $.ui.autocomplete, {
         $(this).catcomplete( target.attr('id'));
       });
       target.after('<a class="autocomplete-clear" tabindex="-1" title="Clear">&times;</a>')
-      target.next().on("click",function(){ target.val(''); })
+      target.next().on("click", clearFn)
     })
-  };
+  };

data/lib/scoped_search/query_builder.rb

@@ -113,7 +113,7 @@ module ScopedSearch
     # By default, it will simply look up the correct SQL operator in the SQL_OPERATORS
     # hash, but this can be overridden by a database adapter.
     def sql_operator(operator, field)
-      raise ScopedSearch::QueryNotSupported, "the operator '#{operator}' is not supported for field type '#{field.type}'" if [:like, :unlike].include?(operator) and !field.textual?
+      raise ScopedSearch::QueryNotSupported, "the operator '#{operator}' is not supported for field type '#{field.type}'" if !field.ext_method and [:like, :unlike].include?(operator) and !field.textual?
       SQL_OPERATORS[operator]
     end
 
@@ -554,7 +554,7 @@ module ScopedSearch
       # Switches out the default LIKE operator in the default <tt>sql_operator</tt>
       # method for ILIKE or @@ if full text searching is enabled.
       def sql_operator(operator, field)
-        raise ScopedSearch::QueryNotSupported, "the operator '#{operator}' is not supported for field type '#{field.type}'" if [:like, :unlike].include?(operator) and !field.textual?
+        raise ScopedSearch::QueryNotSupported, "the operator '#{operator}' is not supported for field type '#{field.type}'" if !field.ext_method and [:like, :unlike].include?(operator) and !field.textual?
         return '@@' if [:like, :unlike].include?(operator) && field.full_text_search
         case operator
           when :like   then 'ILIKE'

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "4.1.3"
+  VERSION = "4.1.4"
 end

data/spec/unit/query_builder_spec.rb

@@ -90,6 +90,11 @@ describe ScopedSearch::QueryBuilder do
       ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = test_val').should eq(include: ['test1'], joins: ['test2'])
     end
 
+    it "should support LIKE query even if database field doesn't exist" do
+      klass.should_receive(:ext_test).with('test_field', 'LIKE', 'test_val').and_return(conditions: 'field LIKE ?', parameter: ['%test_val%'])
+      ScopedSearch::QueryBuilder.build_query(@definition, 'test_field ~ test_val').should eq(conditions: ['(field LIKE ?)', '%test_val%'])
+    end
+
     it "should raise error when non-hash returned" do
       klass.should_receive(:ext_test).and_return('test')
       lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = test_val') }.should raise_error(ScopedSearch::QueryNotSupported, /should return hash/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord