elasticated 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e134bcdf377161ed5a1909006e3c595a9e1a135
-  data.tar.gz: 0764431bff33cb0cf4b8ab04aaaee3641856bfce
+  metadata.gz: d2fa674580a112dd0787b528d87f5972fb5335b0
+  data.tar.gz: e2c8f224ee29f65c339e0c3560af9690e30f0254
 SHA512:
-  metadata.gz: affa393e491f7f3f89514a5485b2631cf573ecd09936b993328787f9ff5d4347c5ef9f2b87afc6203da63074de0e4038cd7be34d3f9f482df03c7329948286c1
-  data.tar.gz: 87a460bc7cef535d7c80a5071bdefd64de5ecd2101bb2fb6218cdc43ad4ab489b19625765374870183c4b37c9054036a79624b09f0c6f998a9593f9ee94a6441
+  metadata.gz: feff50fbec4f0740a807e9d4901e9c8813722fcca388d7b43d9506d302864c8e2042dfbe5dcf9405e0812e3d67abc238280834b0a4ce7cabe599226fe7f04cca
+  data.tar.gz: 359623772d4c733a50bd9c2cdc16afd860c36a8b7012e62b8429e9c281c667ab9b0dda8aae9be07e96404556f927cee807263f62ea2e6f3f39f5d29461d933dd

data/lib/elasticated/delimiter_visitor.rb

@@ -36,7 +36,9 @@ module Elasticated
     end
 
     def visit_query_aggregations(query_aggregations)
-      query_aggregations._aggregations.flat_map { |agg| agg.accept_visitor(self) }
+      query_aggregations._aggregations.inject([]) do |acum, aggregation|
+        acum + [aggregation.accept_visitor(self).inject(:merge)].compact
+      end
     end
 
     def visit_aggregation(aggregation)
@@ -44,7 +46,7 @@ module Elasticated
     end
 
     def visit_filter_aggregation(filter_aggregation)
-      filter_aggregation._subaggregations._conditions.accept_visitor(self)
+      filter_aggregation._subaggregations._conditions.accept_visitor(self).flatten(1)
     end
 
   end

data/lib/version.rb

@@ -1,9 +1,12 @@
 module Elasticated
-  VERSION = '2.5.1'
+  VERSION = '2.5.2'
 end
 
 # Changelog
 
+# 2.5.2
+# Se corrige el visitor para que los filtros de subaggregations se representen en conjuntos por aggregation y no por filtro
+
 # 2.5.1
 # Se agregaron test para el merge delimiters en term delimiter factory que ahora considera arrays de delimiters vacios
 

data/spec/strategy_params_for_query_service_spec.rb

@@ -323,6 +323,23 @@ module Elasticated
       expect(actual).to eq expected
     end
 
+    it 'should not delimit by non-delimiters' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {equal :date, ['2017-05-23', '2017-06-01']}
+      query.aggregations do
+        filter :nothing_to_do do
+          conditions { equal :primary_keywords, ["hello"] }
+          filter :another_filter do
+            conditions { equal :secondary_keywords, ["bye"] }
+          end
+        end
+      end
+      expected = {date_since: '2017-05-23', date_until: '2017-06-01'}
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expect(actual).to eq expected
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticated
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Pablo Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler