search_flip 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb8e67eac92f6f39f78dcc6770ea46d397ab7ec26b1e461b76634367a558f734
-  data.tar.gz: 04e8445e8039e72eac4344cb67de22c04107020b63112f01c9ed76512942c314
+  metadata.gz: 51aeb6ec190e4ee6ff8d291d46e038e55bec7eb2b09cfc5eb410b9f523b75f8a
+  data.tar.gz: 89882033f77adf5c29104ae35e5c0ee2fd4d4222111ba98ad76cfb508a92da8d
 SHA512:
-  metadata.gz: 429bacd5e7d64f922bb2c20d82d8e2ead32340f8e85abacfd55f0034791cc13c7557a5973dadf7fb19681364f56f899830aecefd7ddedab58b06c9cb8c8a13bd
-  data.tar.gz: f60dfa7d6396971dadd0d960442074a1702493e8149ba885fb84a09f77031b4450603a9ece5391e55d5e747a917b95a4708a0bad3232610c4d4a75ddebc88cd0
+  metadata.gz: 5fd5f110807947f0a1bc9906ced03be0c20a1c79a792321cd472d24b0c50a68e6ed88927f1db087ce64f45fd1544d85a5b434b25365f90f2ef83f9d06a8cb6db
+  data.tar.gz: cf8e8c77ec27b895249d39e8498207f4a4484776d9f3aefb79f163f5c9e262c80516e4ff99573e833f83ad1de96659a1b2707c1ae7d2786bd72d5d59631ba00b

data/.travis.yml

@@ -5,7 +5,7 @@ env:
   - ES_IMAGE=elasticsearch:5.4
   - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:6.7.0
   - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:7.0.0
-  - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:7.8.0
+  - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:7.9.0
 rvm:
   - ruby-2.5.3
   - ruby-2.6.2

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 
 # CHANGELOG
 
+## v3.1.2
+
+* Fix ignored false value for source when merging criterias
+
 ## v3.1.1
 
 * Make `SearchFlip::Result.from_hit` work with the `_source` being disabled

data/lib/search_flip/criteria.rb

@@ -44,35 +44,25 @@ module SearchFlip
       other = other.criteria
 
       fresh.tap do |criteria|
-        criteria.profile_value = other.profile_value unless other.profile_value.nil?
-        criteria.failsafe_value = other.failsafe_value unless other.failsafe_value.nil?
-        criteria.terminate_after_value = other.terminate_after_value unless other.terminate_after_value.nil?
-        criteria.timeout_value = other.timeout_value unless other.timeout_value.nil?
-        criteria.offset_value = other.offset_value if other.offset_value
-        criteria.limit_value = other.limit_value if other.limit_value
-        criteria.scroll_args = other.scroll_args if other.scroll_args
-        criteria.source_value = other.source_value if other.source_value
-        criteria.preference_value = other.preference_value if other.preference_value
-        criteria.search_type_value = other.search_type_value if other.search_type_value
-        criteria.routing_value = other.routing_value if other.routing_value
-        criteria.track_total_hits_value = other.track_total_hits_value unless other.track_total_hits_value.nil?
-        criteria.explain_value = other.explain_value unless other.explain_value.nil?
-
-        criteria.sort_values = (criteria.sort_values || []) + other.sort_values if other.sort_values
-        criteria.includes_values = (criteria.includes_values || []) + other.includes_values if other.includes_values
-        criteria.preload_values = (criteria.preload_values || []) + other.preload_values if other.preload_values
-        criteria.eager_load_values = (criteria.eager_load_values || []) + other.eager_load_values if other.eager_load_values
-        criteria.must_values = (criteria.must_values || []) + other.must_values if other.must_values
-        criteria.must_not_values = (criteria.must_not_values || []) + other.must_not_values if other.must_not_values
-        criteria.filter_values = (criteria.filter_values || []) + other.filter_values if other.filter_values
-        criteria.post_must_values = (criteria.post_must_values || []) + other.post_must_values if other.post_must_values
-        criteria.post_must_not_values = (criteria.post_must_not_values || []) + other.post_must_not_values if other.post_must_not_values
-        criteria.post_filter_values = (criteria.post_filter_values || []) + other.post_filter_values if other.post_filter_values
-
-        criteria.highlight_values = (criteria.highlight_values || {}).merge(other.highlight_values) if other.highlight_values
-        criteria.suggest_values = (criteria.suggest_values || {}).merge(other.suggest_values) if other.suggest_values
-        criteria.custom_value = (criteria.custom_value || {}).merge(other.custom_value) if other.custom_value
-        criteria.aggregation_values = (criteria.aggregation_values || {}).merge(other.aggregation_values) if other.aggregation_values
+        [
+          :profile_value, :failsafe_value, :terminate_after_value, :timeout_value, :offset_value,
+          :limit_value, :scroll_args, :source_value, :preference_value, :search_type_value,
+          :routing_value, :track_total_hits_value, :explain_value
+        ].each do |name|
+          criteria.send(:"#{name}=", other.send(name)) unless other.send(name).nil?
+        end
+
+        [
+          :sort_values, :includes_values, :preload_values, :eager_load_values, :must_values,
+          :must_not_values, :filter_values, :post_must_values, :post_must_not_values,
+          :post_filter_values
+        ].each do |name|
+          criteria.send(:"#{name}=", (criteria.send(name) || []) + other.send(name)) if other.send(name)
+        end
+
+        [:highlight_values, :suggest_values, :custom_value, :aggregation_values].each do |name|
+          criteria.send(:"#{name}=", (criteria.send(name) || {}).merge(other.send(name))) if other.send(name)
+        end
       end
     end
 

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "3.1.1"
+  VERSION = "3.1.2"
 end

data/spec/search_flip/criteria_spec.rb

@@ -110,6 +110,16 @@ RSpec.describe SearchFlip::Criteria do
 
           expect(criteria1.merge(criteria2).send(method)).to eq("value2")
         end
+
+        it "handles false values correctly" do
+          criteria1 = SearchFlip::Criteria.new(target: TestIndex)
+          criteria1.send("#{method}=", true)
+
+          criteria2 = SearchFlip::Criteria.new(target: TestIndex)
+          criteria2.send("#{method}=", false)
+
+          expect(criteria1.merge(criteria2).send(method)).to eq(false)
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord