elasticated 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6637480a40d6c018f1edc45efa103df9c836f81f
-  data.tar.gz: a65c27a00654dd7616e9f8086441f4365f616d24
+  metadata.gz: 7e134bcdf377161ed5a1909006e3c595a9e1a135
+  data.tar.gz: 0764431bff33cb0cf4b8ab04aaaee3641856bfce
 SHA512:
-  metadata.gz: 1cda536b17d2dddb5d62be83cb2f2ae15555569df1fe7086574f1605c379897f12f9952e0047be486d4fc5b59f35f891544d7d466975b87ab4068a57b1b4b553
-  data.tar.gz: 904e56da96d375422ac0951ffababf82f262e7afb68dd6a2cde125f1f9b2954bcc6d4eabb41bf4b3448132e352fcd451c462db4975cb597a5d9050acb07f396b
+  metadata.gz: affa393e491f7f3f89514a5485b2631cf573ecd09936b993328787f9ff5d4347c5ef9f2b87afc6203da63074de0e4038cd7be34d3f9f482df03c7329948286c1
+  data.tar.gz: 87a460bc7cef535d7c80a5071bdefd64de5ecd2101bb2fb6218cdc43ad4ab489b19625765374870183c4b37c9054036a79624b09f0c6f998a9593f9ee94a6441

data/lib/elasticated/term_delimiter_factory.rb

@@ -40,13 +40,15 @@ module Elasticated
     private
 
     def extract_aggregation_delimiters(delimiters, field)
-      delimiters.inject(delimiters.first) do |mcd_acum, delimiter|
+      first_delimiter = delimiters.first || {}
+      delimiters.inject(first_delimiter) do |mcd_acum, delimiter|
         merge_aggregation_repeated_keys(mcd_acum, delimiter, field)
       end
     end
 
     def extract_condition_delimiters(delimiters, field)
-      delimiters.inject(delimiters.first) do |mcd_acum, delimiter|
+      first_delimiter = delimiters.first || {}
+      delimiters.inject(first_delimiter) do |mcd_acum, delimiter|
         merge_condition_repeated_keys(mcd_acum, delimiter, field)
       end
     end

data/lib/version.rb

@@ -1,9 +1,12 @@
 module Elasticated
-  VERSION = '2.5.0'
+  VERSION = '2.5.1'
 end
 
 # Changelog
 
+# 2.5.1
+# Se agregaron test para el merge delimiters en term delimiter factory que ahora considera arrays de delimiters vacios
+
 # 2.5.0
 # Ahora los delimiters son inmutables
 # Se puede delimitar por aggregations

data/spec/delimiter_factory_spec.rb

@@ -72,9 +72,41 @@ module Elasticated
       expect(actual.build_strategy_params).to eq(expected.build_strategy_params)
     end
 
+    it 'should create term delimiter with two account from aggregation delimiter when delimiting by aggregations' do
+      options = {delimit_by: [:aggregations]}
+      query_delimiters = { conditions: [], aggregations: [{account: [39]}, {account: [40]}] }
+      expected = Elasticated::Delimiters::TermFieldDelimiter.new(field: :account, as: :accounts, values: [39,40])
+      actual = Elasticated.term_delimiter_factory.create(empty_delimiter, query_delimiters, options)
+      expect(actual.build_strategy_params).to eq(expected.build_strategy_params)
+    end
+
+    it 'should create term delimiter with no accounts from aggregation delimiter when there are at least one condition delimiters' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      query_delimiters = { conditions: [{account: [31]}], aggregations: [{account: [39]}, {account: [40]}] }
+      expected = Elasticated::Delimiters::TermFieldDelimiter.new(field: :account, as: :accounts, values: [31])
+      actual = Elasticated.term_delimiter_factory.create(empty_delimiter, query_delimiters, options)
+      expect(actual.build_strategy_params).to eq(expected.build_strategy_params)
+    end
+
+    it 'should create term delimiter with two accounts from aggregation delimiter when there are no condition delimiters' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      query_delimiters = { conditions: [], aggregations: [{account: [39]}, {account: [40]}] }
+      expected = Elasticated::Delimiters::TermFieldDelimiter.new(field: :account, as: :accounts, values: [39,40])
+      actual = Elasticated.term_delimiter_factory.create(empty_delimiter, query_delimiters, options)
+      expect(actual.build_strategy_params).to eq(expected.build_strategy_params)
+    end
+
+    it 'should create term delimiter with two accounts from condition delimiters when there are not aggregation delimiters' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      query_delimiters = { conditions: [{account: [39]}, {account: [40]}], aggregations: [] }
+      expected = Elasticated::Delimiters::TermFieldDelimiter.new(field: :account, as: :accounts, values: [39,40])
+      actual = Elasticated.term_delimiter_factory.create(empty_delimiter, query_delimiters, options)
+      expect(actual.build_strategy_params).to eq(expected.build_strategy_params)
+    end
+
     it 'should merge empty delimiters' do
-      condition_delimiters = [{}]
-      aggregation_delimiters = [{}]
+      condition_delimiters = []
+      aggregation_delimiters = []
       field = :account
       expected = {}
       actual = Elasticated.term_delimiter_factory.merge_delimiters(condition_delimiters, aggregation_delimiters, field)
@@ -82,7 +114,7 @@ module Elasticated
     end
 
     it 'should merge empty condition delimiter with one aggregation delimiter' do
-      condition_delimiters = [{}]
+      condition_delimiters = []
       aggregation_delimiters = [{account: [39]}]
       field = :account
       expected = {account: [39]}
@@ -91,7 +123,7 @@ module Elasticated
     end
 
     it 'should merge empty condition delimiter with two aggregation delimiters' do
-      condition_delimiters = [{}]
+      condition_delimiters = []
       aggregation_delimiters = [{account: [39]}, {account: [40]}]
       field = :account
       expected = {account: [39, 40]}
@@ -100,7 +132,7 @@ module Elasticated
     end
 
     it 'should merge empty condition delimiter with two different aggregation delimiters' do
-      condition_delimiters = [{}]
+      condition_delimiters = []
       aggregation_delimiters = [{account: [39]}, {tags: ["a_tag"]}]
       field = :account
       expected = {}
@@ -362,5 +394,6 @@ module Elasticated
       actual = Elasticated.date_delimiter_factory.create(empty_delimiter, query_delimiters, options)
       expect(actual.build_strategy_params).to eq(expected.build_strategy_params)
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticated
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Pablo Fernandez