scoped_search 4.1.4 → 4.1.9

data/spec/spec_helper.rb

@@ -10,6 +10,9 @@ require "#{File.dirname(__FILE__)}/lib/matchers"
 require "#{File.dirname(__FILE__)}/lib/database"
 require "#{File.dirname(__FILE__)}/lib/mocks"
 
+def on_postgresql?
+  ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+end
 
 RSpec.configure do |config|
   config.include ScopedSearch::RSpec::Mocks

data/spec/unit/auto_complete_builder_spec.rb

@@ -2,11 +2,15 @@ require "spec_helper"
 
 describe ScopedSearch::AutoCompleteBuilder do
 
+  let(:klass) { Class.new(ActiveRecord::Base) }
+
   before(:each) do
     @definition = double('ScopedSearch::Definition')
-    @definition.stub(:klass).and_return(Class.new(ActiveRecord::Base))
+    @definition.stub(:klass).and_return(klass)
     @definition.stub(:profile).and_return(:default)
     @definition.stub(:profile=).and_return(true)
+    @definition.klass.stub(:connection).and_return(double())
+    @definition.stub(:default_order).and_return(nil)
   end
 
   it "should return empty suggestions if the search query is nil" do
@@ -17,4 +21,31 @@ describe ScopedSearch::AutoCompleteBuilder do
     ScopedSearch::AutoCompleteBuilder.auto_complete(@definition, "").should == []
   end
 
+  it 'should suggest special values' do
+    field = double('field')
+    [:temporal?, :set?, :key_field, :validator, :virtual?, :relation, :offset, :value_translation, :to_sql].each { |key| field.stub(key) }
+    field.stub(:special_values).and_return %w(foo bar baz)
+    field.stub(:complete_value).and_return(true)
+    @definition.stub(:default_fields_for).and_return([])
+    @definition.stub(:field_by_name).and_return(field)
+    @definition.stub(:fields).and_return [field]
+    ScopedSearch::AutoCompleteBuilder.any_instance.stub(:complete_value_from_db).and_return([])
+    ScopedSearch::AutoCompleteBuilder.auto_complete(@definition, "custom_field =").should eq(['custom_field = foo', 'custom_field = bar', 'custom_field = baz'])
+    ScopedSearch::AutoCompleteBuilder.auto_complete(@definition, "custom_field = f").should eq(['custom_field =  foo'])
+  end
+
+  context "with ext_method" do
+    before do
+      @definition = ScopedSearch::Definition.new(klass)
+      @definition.define(:test_field, ext_method: :ext_test)
+      @definition.klass.stub(:connection).and_return(double())
+      @definition.klass.stub(:columns_hash).and_return({})
+    end
+
+    it "should support operator auto-completion on a virtual field" do
+      klass.should_receive(:ext_test).with('', '=', 'test_field').and_return(conditions: '')
+      ScopedSearch::AutoCompleteBuilder.auto_complete(@definition, 'test_field ').should eq(["test_field  = ", "test_field  != ", "test_field  > ", "test_field  < ", "test_field  <= ", "test_field  >= ", "test_field  ~ ", "test_field  !~ ", "test_field  ^ ", "test_field  !^ "])
+    end
+  end
+
 end

data/spec/unit/query_builder_spec.rb

@@ -38,9 +38,11 @@ describe ScopedSearch::QueryBuilder do
 
   it "should validate value if validator selected" do
     field = double('field')
+    field.stub(:virtual?).and_return(false)
     field.stub(:only_explicit).and_return(true)
     field.stub(:field).and_return(:test_field)
     field.stub(:validator).and_return(->(_value) { false })
+    field.stub(:special_values).and_return([])
 
     @definition.stub(:field_by_name).and_return(field)
 
@@ -49,6 +51,9 @@ 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)
@@ -56,6 +61,8 @@ describe ScopedSearch::QueryBuilder do
     field.stub(:set?).and_return(false)
     field.stub(:to_sql).and_return('')
     field.stub(:validator).and_return(->(value) { value =~ /^\d+$/ })
+    field.stub(:value_translation).and_return(nil)
+    field.stub(:special_values).and_return([])
 
     @definition.stub(:field_by_name).and_return(field)
 
@@ -65,15 +72,52 @@ describe ScopedSearch::QueryBuilder do
 
   it "should display custom error from validator" do
     field = double('field')
+    field.stub(:virtual?).and_return(false)
     field.stub(:only_explicit).and_return(true)
     field.stub(:field).and_return(:test_field)
     field.stub(:validator).and_return(->(_value) { raise ScopedSearch::QueryNotSupported, 'my custom message' })
+    field.stub(:special_values).and_return([])
 
     @definition.stub(:field_by_name).and_return(field)
 
     lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = test_val') }.should raise_error('my custom message')
   end
 
+  context 'with value_translation' do
+    let(:translator) do
+      ->(value) do
+        if %w(a b c).include?(value)
+          'good'
+        end
+      end
+    end
+    let(:special_values) { %w(a b c) }
+    before do
+      field = double('field')
+      field.stub(:field).and_return(:test_field)
+      field.stub(:key_field).and_return(nil)
+      field.stub(:to_sql).and_return('test_field')
+      [:virtual?, :set?, :temporal?, :relation, :offset].each { |key| field.stub(key).and_return(false) }
+      field.stub(:validator).and_return(->(value) { value == 'x' }) # Nothing except for special_values and x is valid
+      field.stub(:special_values).and_return(special_values)
+      field.stub(:value_translation).and_return(translator)
+      @definition.stub(:field_by_name).and_return(field)
+    end
+
+    it 'should translate the value' do
+      ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = a').should eq(conditions: ['(test_field = ?)', 'good'])
+      ScopedSearch::QueryBuilder.build_query(@definition, 'test_field ^ (a, b, c)').should eq(conditions: ['(test_field IN (?,?,?))', 'good', 'good', 'good'])
+    end
+
+    it 'should validate before translation' do
+      proc { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = d') }.should raise_error(ScopedSearch::QueryNotSupported, /Value 'd' is not valid for field/)
+    end
+
+    it 'should raise an error if translated value is nil' do
+      proc { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = x') }.should raise_error(ScopedSearch::QueryNotSupported, /Translation from any value to nil is not allowed/)
+    end
+  end
+
   context "with ext_method" do
     before do
       @definition = ScopedSearch::Definition.new(klass)
@@ -90,7 +134,7 @@ 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
+    it "should support LIKE query on a virtual field" 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
@@ -100,7 +144,7 @@ describe ScopedSearch::QueryBuilder do
       lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = test_val') }.should raise_error(ScopedSearch::QueryNotSupported, /should return hash/)
     end
 
-    it "should raise error when method doesn't exist" do
+    it "should raise error when ext_method doesn't exist" do
       lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = test_val') }.should raise_error(ScopedSearch::QueryNotSupported, /doesn't respond to 'ext_test'/)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.9
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -85,6 +85,10 @@ files:
 - Gemfile.activerecord42
 - Gemfile.activerecord50
 - Gemfile.activerecord51
+- Gemfile.activerecord52
+- Gemfile.activerecord52_with_activesupport52
+- Gemfile.activerecord60
+- Gemfile.activerecord60_with_activesupport60
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -112,6 +116,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
@@ -120,6 +125,7 @@ files:
 - spec/integration/set_query_spec.rb
 - spec/integration/sti_querying_spec.rb
 - spec/integration/string_querying_spec.rb
+- spec/integration/uuid_query_spec.rb
 - spec/lib/database.rb
 - spec/lib/matchers.rb
 - spec/lib/mocks.rb
@@ -156,8 +162,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
@@ -169,6 +174,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
@@ -177,6 +183,7 @@ test_files:
 - spec/integration/set_query_spec.rb
 - spec/integration/sti_querying_spec.rb
 - spec/integration/string_querying_spec.rb
+- spec/integration/uuid_query_spec.rb
 - spec/lib/database.rb
 - spec/lib/matchers.rb
 - spec/lib/mocks.rb