searchkick 6.1.0 → 6.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/lib/searchkick/relation.rb +3 -3
- data/lib/searchkick/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fc3f9143aa914fc0c55104f5d42a0c38af508d959091ed4e6ad394f375f452cf
|
|
4
|
+
data.tar.gz: a0a331a5547e6cb3471510f2d0b719678e51b15a8afe80983a49872a2a5486be
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ba2be5ab1ec12434ade9cc29dfb7bdea05d8af02295936374184e570629736f13a6ee3ec022ab3792891a835e7b470bd88668c5dbfc7dc4893d860553370ea6d
|
|
7
|
+
data.tar.gz: a6dc2610a4870916b12c510c11da956b9822e80800fa369e9437aefb92034c380e499815735c9e0a19db798f59f11b9f08fb0484ea712011dca689ce3e281df2
|
data/CHANGELOG.md
CHANGED
data/lib/searchkick/relation.rb
CHANGED
|
@@ -575,11 +575,11 @@ module Searchkick
|
|
|
575
575
|
check_loaded
|
|
576
576
|
value = ensure_permitted(value)
|
|
577
577
|
if @options[:where]
|
|
578
|
-
if @options[:where][:_and].is_a?(Array)
|
|
579
|
-
merge_option(:where, {_and: @options[:where][:_and] + [value]})
|
|
580
578
|
# keep simple when possible for smart aggs
|
|
581
|
-
|
|
579
|
+
if !@options[:where].keys.intersect?(value.keys)
|
|
582
580
|
merge_option(:where, value)
|
|
581
|
+
elsif @options[:where][:_and].is_a?(Array)
|
|
582
|
+
merge_option(:where, {_and: @options[:where][:_and] + [value]})
|
|
583
583
|
else
|
|
584
584
|
@options[:where] = {_and: [@options[:where], value]}
|
|
585
585
|
end
|
data/lib/searchkick/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: searchkick
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 6.1.
|
|
4
|
+
version: 6.1.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Andrew Kane
|
|
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
77
77
|
- !ruby/object:Gem::Version
|
|
78
78
|
version: '0'
|
|
79
79
|
requirements: []
|
|
80
|
-
rubygems_version: 4.0.
|
|
80
|
+
rubygems_version: 4.0.10
|
|
81
81
|
specification_version: 4
|
|
82
82
|
summary: Intelligent search made easy with Rails and Elasticsearch or OpenSearch
|
|
83
83
|
test_files: []
|