elasticated 2.5.3 → 2.5.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/elasticated/date_delimiter_factory.rb +2 -2
- data/lib/version.rb +4 -1
- data/spec/strategy_params_for_query_service_spec.rb +42 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8239614cf1dec2c993df191abcbf33655ed6e8c6
|
4
|
+
data.tar.gz: 2ac59bbbbf48bf96b32eff4d5e5ab9df5be6d095
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f2b2bf1daea86fc97a4d2a1a0d50cbae69c0ff8b5e3691b76d60ef6dff7c4bf651a123e3a4ba41544d3fc41c3a19476d7a9ef3d85e8a8257961868715a4ddd2e
|
7
|
+
data.tar.gz: 8cce6508ed6613ba19205a46aef86a359fc179ecf5738e8a39be820b093566ab6aad96605f0d5f1b2670760df05ef293bd67cf7123d089a0250ffbf1c1bfb4ac
|
@@ -36,8 +36,8 @@ module Elasticated
|
|
36
36
|
if has_terms?(query_delimiters, :conditions, field_term)
|
37
37
|
_since = since_condition_delimiters(query_delimiters.fetch(:conditions, []), field_term)
|
38
38
|
_until = until_condition_delimiters(query_delimiters.fetch(:conditions, []), field_term)
|
39
|
-
_since = since_aggregation_delimiters(query_delimiters.fetch(:aggregations, []), field_term) if _since.
|
40
|
-
_until = until_aggregation_delimiters(query_delimiters.fetch(:aggregations, []), field_term) if _until.
|
39
|
+
_since = since_aggregation_delimiters(query_delimiters.fetch(:aggregations, []), field_term) if _since.nil?
|
40
|
+
_until = until_aggregation_delimiters(query_delimiters.fetch(:aggregations, []), field_term) if _until.nil?
|
41
41
|
else
|
42
42
|
condition_since = since_condition_delimiters(query_delimiters.fetch(:conditions, []), field_since)
|
43
43
|
condition_until = until_condition_delimiters(query_delimiters.fetch(:conditions, []), field_until)
|
data/lib/version.rb
CHANGED
@@ -340,6 +340,48 @@ module Elasticated
|
|
340
340
|
expect(actual).to eq expected
|
341
341
|
end
|
342
342
|
|
343
|
+
it 'should create date delimiter with different objects (test insights - part 1)' do
|
344
|
+
options = {delimit_by: [:conditions, :aggregations]}
|
345
|
+
delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
|
346
|
+
query.filter {equal :date, [Date.today]}
|
347
|
+
query.aggregations do
|
348
|
+
filter :terms_over_date do
|
349
|
+
conditions { equal :date, '2017-01-05'}
|
350
|
+
end
|
351
|
+
end
|
352
|
+
actual = service.strategy_params_for_query(delimiters, query, options)
|
353
|
+
expected = {date: Date.today}
|
354
|
+
expect(actual).to eq expected
|
355
|
+
end
|
356
|
+
|
357
|
+
it 'should create date delimiter with different objects (test insights - part 2)' do
|
358
|
+
options = {delimit_by: [:conditions, :aggregations]}
|
359
|
+
delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
|
360
|
+
query.filter {equal :date, '2017-01-05'}
|
361
|
+
query.aggregations do
|
362
|
+
filter :terms_over_date do
|
363
|
+
conditions { equal :date, [Date.today]}
|
364
|
+
end
|
365
|
+
end
|
366
|
+
actual = service.strategy_params_for_query(delimiters, query, options)
|
367
|
+
expected = {date: '2017-01-05'}
|
368
|
+
expect(actual).to eq expected
|
369
|
+
end
|
370
|
+
|
371
|
+
it 'should create date delimiter with different objects (test insights - part 3)' do
|
372
|
+
options = {delimit_by: [:conditions, :aggregations]}
|
373
|
+
delimiters = [Elasticated::Delimiters::DateFieldDelimiter.new(field: :date)]
|
374
|
+
query.filter {equal :date, [Date.parse('2017-05-01')]}
|
375
|
+
query.aggregations do
|
376
|
+
filter :terms_over_date do
|
377
|
+
conditions { equal :date, [Date.today]}
|
378
|
+
end
|
379
|
+
end
|
380
|
+
actual = service.strategy_params_for_query(delimiters, query, options)
|
381
|
+
expected = {date: Date.parse('2017-05-01')}
|
382
|
+
expect(actual).to eq expected
|
383
|
+
end
|
384
|
+
|
343
385
|
end
|
344
386
|
|
345
387
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: elasticated
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.5.
|
4
|
+
version: 2.5.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Pablo Fernandez
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-06-
|
11
|
+
date: 2017-06-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|