scoped_search 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31cbd8d30fd85c320926ca1ee4719f98e2860211
-  data.tar.gz: c502bfc5ef2f14ad4aec19b253b6e9942d316236
+  metadata.gz: f8e71c1616716946f906c72f741b5e9b1950fdd8
+  data.tar.gz: d9386d5cc2fca4d418bc9a3d7a96d5b18601659b
 SHA512:
-  metadata.gz: 018d005d707959d03cabee90cca7c17450e719fe0e6a32124d153e21f709980b7aae8f98be22a2620531d3c07ebacc32e8de8889ef13165e98de4c9162ef9cf0
-  data.tar.gz: 4b6997024cb1e5ee01d3c7bc41a34b1ac31f77eae6e09ce885087645f5b530f264baeab5fd74c302ac7a42b38c45fc2740f81741ad03f6cc0ee39adda9cc89bd
+  metadata.gz: cc2400a7f26ef7f1bfed7273094a7cac04c5cb09b35509a4d2e3464b543f9f1413214c9100117d0d356620b9df8ed47fd504a0d5a208ec087ec5742f0d9c3afe
+  data.tar.gz: 3715276e0f495f13f1fd9158d6f4032c0a949682843e235e4b4dea8c035c33ad52de21427d894e1e4109f732299b5d5c8336e7cf9a6f20c70eeb2b29790ba580

data/CHANGELOG.rdoc

@@ -8,6 +8,12 @@ Please add an entry to the "Unreleased changes" section in your pull requests.
 
 *Nothing yet*
 
+=== Version 4.1.3
+
+- Bugfix related to default fields for sets when using ext_method (#174)
+- Improved error reporting for exceptions raised in ext_method (#173)
+- Bugfix related to validtions of values used with :in operator (#171)
+
 === Version 4.1.2
 
 - Bugfix related to using polymorphic relations introduced in 4.1.1 (#170)

data/Gemfile.activerecord51

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'actionview', '>= 5.1.0.beta1', '< 5.2'
-gem 'activerecord', '>= 5.1.0.beta1', '< 5.2'
+gem 'actionview', '~> 5.1.0'
+gem 'activerecord', '~> 5.1.0'
 
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'

data/lib/scoped_search/definition.rb

@@ -251,7 +251,7 @@ module ScopedSearch
       column_types += [:integer]                      if value =~ INTEGER_REGXP
       column_types += [:datetime, :date, :timestamp]  if (parse_temporal(value))
 
-      default_fields.select { |field| column_types.include?(field.type) && !field.set? }
+      default_fields.select { |field| !field.set? && column_types.include?(field.type) }
     end
 
     # Try to parse a string as a datetime.

data/lib/scoped_search/query_builder.rb

@@ -402,7 +402,11 @@ module ScopedSearch
 
       def to_ext_method_sql(key, operator, value, &block)
         raise ScopedSearch::QueryNotSupported, "'#{definition.klass}' doesn't respond to '#{ext_method}'" unless definition.klass.respond_to?(ext_method)
-        conditions = definition.klass.send(ext_method.to_sym,key, operator, value) rescue {}
+        begin
+          conditions = definition.klass.send(ext_method.to_sym, key, operator, value) 
+        rescue StandardError => e
+          raise ScopedSearch::QueryNotSupported, "external method '#{ext_method}' failed with error: #{e}"
+        end
         raise ScopedSearch::QueryNotSupported, "external method '#{ext_method}' should return hash" unless conditions.kind_of?(Hash)
         sql = ''
         conditions.map do |notification, content|
@@ -484,7 +488,11 @@ module ScopedSearch
           raise ScopedSearch::QueryNotSupported, "Field '#{lhs.value}' not recognized for searching!" unless field
 
           # see if the value passes user defined validation
-          validate_value(field, rhs.value)
+          if operator == :in
+            rhs.value.split(',').each { |v| validate_value(field, v) }
+          else
+            validate_value(field, rhs.value)
+          end
 
           builder.sql_test(field, operator, rhs.value,lhs.value, &block)
         end

data/lib/scoped_search/version.rb

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

data/spec/unit/definition_spec.rb

@@ -124,4 +124,11 @@ describe ScopedSearch::Definition do
       @subdefinition.fields.should eq(foo: field2, bar: field3)
     end
   end
+
+  describe '#default_fields_for' do
+    it "finds fields when there's a field not directly mapped to a DB column" do
+      @definition.define(:on => :custom_flag, :complete_value => { :true => true, :false => false }, :ext_method => :search_by_custom_flag)
+      @definition.default_fields_for("").should eq([])
+    end
+  end
 end

data/spec/unit/query_builder_spec.rb

@@ -47,6 +47,22 @@ describe ScopedSearch::QueryBuilder do
     lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = test_val') }.should raise_error(ScopedSearch::QueryNotSupported)
   end
 
+  it "should validate value if validator selected" do
+    field = double('field')
+    field.stub(:only_explicit).and_return(true)
+    field.stub(:field).and_return(:test_field)
+    field.stub(:ext_method).and_return(nil)
+    field.stub(:key_field).and_return(nil)
+    field.stub(:set?).and_return(false)
+    field.stub(:to_sql).and_return('')
+    field.stub(:validator).and_return(->(value) { value =~ /^\d+$/ })
+
+    @definition.stub(:field_by_name).and_return(field)
+
+    lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field ^ (1,2)') }.should_not raise_error
+    lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field ^ (1,a)') }.should raise_error(ScopedSearch::QueryNotSupported)
+  end
+
   it "should display custom error from validator" do
     field = double('field')
     field.stub(:only_explicit).and_return(true)
@@ -83,9 +99,9 @@ describe ScopedSearch::QueryBuilder do
       lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = test_val') }.should raise_error(ScopedSearch::QueryNotSupported, /doesn't respond to 'ext_test'/)
     end
 
-    it "should ignore exceptions" do
+    it "should raise error when method raises exception" do
       klass.should_receive(:ext_test).and_raise('test')
-      ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = test_val').should eq({})
+      lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = test_val') }.should raise_error(ScopedSearch::QueryNotSupported, /failed with error: test/)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Amos Benari
@@ -10,48 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -77,8 +77,8 @@ extra_rdoc_files:
 - CONTRIBUTING.rdoc
 - LICENSE
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - CONTRIBUTING.rdoc
 - Gemfile
@@ -137,27 +137,27 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - scoped_search
-- --main
+- "--main"
 - README.rdoc
-- --line-numbers
-- --inline-source
+- "--line-numbers"
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using