elasticated 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b646a8a9a01bc11dbc9caaae1441438f8acdb816
-  data.tar.gz: a217828e790247a361cfe6f605074ffece28525e
+  metadata.gz: 8239614cf1dec2c993df191abcbf33655ed6e8c6
+  data.tar.gz: 2ac59bbbbf48bf96b32eff4d5e5ab9df5be6d095
 SHA512:
-  metadata.gz: 5360493d15426523b0125cd197fa763115c44a6b35e4537e0e0e183efdacc428e9476dafd2dee01936eddd627565d369d813ad8b6070cb4e2f2f62acd1d7be99
-  data.tar.gz: 723e54330eea9dce25d4e4d1787058d1458c10edb08b3e6591deac59e1b1648ff638364ca9a41edb8663e6151195e6521c7a7fbeb22df2654e7425f540947429
+  metadata.gz: f2b2bf1daea86fc97a4d2a1a0d50cbae69c0ff8b5e3691b76d60ef6dff7c4bf651a123e3a4ba41544d3fc41c3a19476d7a9ef3d85e8a8257961868715a4ddd2e
+  data.tar.gz: 8cce6508ed6613ba19205a46aef86a359fc179ecf5738e8a39be820b093566ab6aad96605f0d5f1b2670760df05ef293bd67cf7123d089a0250ffbf1c1bfb4ac

data/lib/elasticated/date_delimiter_factory.rb

@@ -36,8 +36,8 @@ module Elasticated
         if has_terms?(query_delimiters, :conditions, field_term)
           _since = since_condition_delimiters(query_delimiters.fetch(:conditions, []), field_term)
           _until = until_condition_delimiters(query_delimiters.fetch(:conditions, []), field_term)
-          _since = since_aggregation_delimiters(query_delimiters.fetch(:aggregations, []), field_term) if _since.empty?
-          _until = until_aggregation_delimiters(query_delimiters.fetch(:aggregations, []), field_term) if _until.empty?
+          _since = since_aggregation_delimiters(query_delimiters.fetch(:aggregations, []), field_term) if _since.nil?
+          _until = until_aggregation_delimiters(query_delimiters.fetch(:aggregations, []), field_term) if _until.nil?
         else
           condition_since = since_condition_delimiters(query_delimiters.fetch(:conditions, []), field_since)
           condition_until = until_condition_delimiters(query_delimiters.fetch(:conditions, []), field_until)

data/lib/version.rb

@@ -1,9 +1,12 @@
 module Elasticated
-  VERSION = '2.5.3'
+  VERSION = '2.5.4'
 end
 
 # Changelog
 
+# 2.5.4
+# Se corrige un bug del date delimiter
+
 # 2.5.3
 # Se corrige un bug en el delimiter visitor
 

data/spec/strategy_params_for_query_service_spec.rb

@@ -340,6 +340,48 @@ module Elasticated
       expect(actual).to eq expected
     end
 
+    it 'should create date delimiter with different objects (test insights - part 1)' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {equal :date, [Date.today]}
+      query.aggregations do
+        filter :terms_over_date do
+          conditions { equal :date, '2017-01-05'}
+        end
+      end
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expected = {date: Date.today}
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with different objects (test insights - part 2)' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {equal :date, '2017-01-05'}
+      query.aggregations do
+        filter :terms_over_date do
+          conditions { equal :date, [Date.today]}
+        end
+      end
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expected = {date: '2017-01-05'}
+      expect(actual).to eq expected
+    end
+
+    it 'should create date delimiter with different objects (test insights - part 3)' do
+      options = {delimit_by: [:conditions, :aggregations]}
+      delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
+      query.filter {equal :date, [Date.parse('2017-05-01')]}
+      query.aggregations do
+        filter :terms_over_date do
+          conditions { equal :date, [Date.today]}
+        end
+      end
+      actual = service.strategy_params_for_query(delimiters, query, options)
+      expected = {date: Date.parse('2017-05-01')}
+      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.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Pablo Fernandez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler