search_flip 3.0.0.beta3 → 3.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 417bf711946ace4812485ea2efdfefdeb36414e7e8e8d8ed24b10b4807050be9
-  data.tar.gz: c8a9f7392d77f15c4714c40756c032a2bb3bc12c363a9e956a6b9e184c8e4c17
+  metadata.gz: ddb0dadc9a92281c24b5ce7f5ba911cf97a9a7d81caecc1da23febf6c497bf91
+  data.tar.gz: b0da1b7250010cdd555af7d4cc57ffd388bb2bb8d9b077d8660f2172d7ad15e8
 SHA512:
-  metadata.gz: c62c6d3bc17ec18da5b304dfbddbafc29e35013bcc6b0b906858380b01a263b2e534986cd41f9e90d13de99820f9cbf11a173802910737bf33d8ae5653230af1
-  data.tar.gz: 3b6ee6d16086e451f6f6e6d7c718d6a30c30115d91c6ba9e69113faa19b9abc35d04c8c179dc9ca5ac49418877c0c5828435d71c1dab7b71d4afe2e31da88762
+  metadata.gz: 00775bd514c07e991476927bafe5b9ba3696c6edda268188f2f54f8d08ce74456c2ecda08f66aaa510f21559428f35806d6311d7a5e16384cff68869feccd52c
+  data.tar.gz: b6eb35784a8c3f54c537340ca3ba7d33b81e683a59c9aa1356bddb1e2bcafe9052ccbc19b15628d19971ca0035fa34a28f1c05b75806b3347ab330d73a4ee28c

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  NewCops: enable
+
 Style/HashTransformValues:
   Enabled: false
 

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.4.0
+  - ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch:7.6.0
 rvm:
   - ruby-2.6.2
 before_install:

data/lib/search_flip/aggregatable.rb

@@ -58,10 +58,11 @@ module SearchFlip
           aggregation = yield(SearchFlip::Aggregation.new(target: target))
 
           if field_or_hash.is_a?(Hash)
-            value = field_or_hash.values.first
-            value = value.values.first if value.is_a?(Hash) && !value.empty?
+            aggregation_hash = field_or_hash.values.first
+            aggregation_hash = aggregation_hash[:top_hits] if aggregation_hash.is_a?(Hash) && aggregation_hash.key?(:top_hits)
+            aggregation_hash = aggregation_hash["top_hits"] if aggregation_hash.is_a?(Hash) && aggregation_hash.key?("top_hits")
 
-            value.merge!(aggregation.to_hash)
+            aggregation_hash.merge!(aggregation.to_hash)
           else
             hash[field_or_hash].merge!(aggregation.to_hash)
           end

data/lib/search_flip/version.rb

@@ -1,3 +1,3 @@
 module SearchFlip
-  VERSION = "3.0.0.beta3"
+  VERSION = "3.0.0.beta4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_flip
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta3
+  version: 3.0.0.beta4
 platform: ruby
 authors:
 - Benjamin Vetter