plunk 0.2.7 → 0.2.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3408599e2af768132c73ca5baaee9e664a3a4e7d
4
- data.tar.gz: ae781102e75198bbcc8645fd1ae16e6bcd5e00b2
3
+ metadata.gz: d1df030ee7ffb629c5a935786caa66cf0ccec422
4
+ data.tar.gz: 0569af2f42d44ae588f16fb757a779b403221c66
5
5
  SHA512:
6
- metadata.gz: 8c82d20b434eb7a3e37272ea66ed0f70476469e8ee1b6871676f0aca673a6e21152fc2d59e75b8856ca160ce15778f05458616e7299de5c50bc9f97594de011a
7
- data.tar.gz: b457cc61a5efa0b7aa7b926a5f8fefe3accc6bc7036955ed604494c71d1709caa66fd1b131c6f58e0d0dde741a4f8b229ad28bf695a9a95b9022484e9016950e
6
+ metadata.gz: 966f3eda9a63ac9bfb2ce2f86ac5b3cbd8d2ab6881d27a8633995f0d4dfb00b7d2e70abbeab19ba7c9458c4c736c482aab594e8d9ffa884dccea4d09949571ca
7
+ data.tar.gz: c68a239707d1222dc8e05dbcd9437e769f0f7be44bc078c5e08fb9d4124a5b05a5208d4fece4e8067d22f9514ba49c5f75c8864e75ea900df354f478218dce6d
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- plunk (0.2.6)
4
+ plunk (0.2.7)
5
5
  activesupport
6
6
  elasticsearch
7
7
  json
@@ -47,7 +47,7 @@ module Plunk
47
47
 
48
48
  result_sets.each do |result_set|
49
49
  first.query[:query][:filtered][:filter][:and] <<
50
- result_set.query[:query][:filtered][:query]
50
+ result_set.query[:query][:filtered]
51
51
 
52
52
  if result_set.query[:query][:filtered][:filter]
53
53
  first.query[:query][:filtered][:filter][:and] +=
data/plunk.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "plunk"
3
- s.version = "0.2.7"
3
+ s.version = "0.2.8"
4
4
  s.add_runtime_dependency "json"
5
5
  s.add_runtime_dependency "parslet"
6
6
  s.add_runtime_dependency "elasticsearch"
@@ -6,11 +6,6 @@ describe 'chained searches' do
6
6
  include_context "time stubs"
7
7
  include_context "plunk stubs"
8
8
 
9
- before :each do
10
- @time = Time.parse("01/01/2010 10:00")
11
- Time.any_instance.stub(:now).and_return(@time)
12
- end
13
-
14
9
  it 'should parse last 24h foo_type=bar baz="fez" host=27.224.123.110' do
15
10
  parsed = @parser.parse 'last 24h foo_type=bar baz="fez" host=27.224.123.110'
16
11
  result = @transformer.apply parsed
@@ -21,17 +16,17 @@ describe 'chained searches' do
21
16
  filter: {
22
17
  and: [{
23
18
  range: {
24
- :timestamp => {
25
- gte: @time - 24.hours,
26
- lte: @time
19
+ :@timestamp => {
20
+ gte: (@time - 24.hours).utc.to_datetime.iso8601(3),
21
+ lte: @time.utc.to_datetime.iso8601(3)
27
22
  }
28
23
  }},
29
- {query_string: {
30
- query: 'baz:fez'
31
- }},
32
- {query_string: {
24
+ {query:{query_string: {
25
+ query: 'baz:"fez"'
26
+ }}},
27
+ {query:{query_string: {
33
28
  query: 'host:27.224.123.110'
34
- }}
29
+ }}}
35
30
  ]}}}})
36
31
  end
37
32
 
@@ -46,16 +41,16 @@ describe 'chained searches' do
46
41
  and: [{
47
42
  range: {
48
43
  :timestamp => {
49
- gte: 1.day.ago.utc.iso8601(3),
50
- lte: @time
44
+ gte: (@time - 1.day).utc.to_datetime.iso8601(3),
45
+ lte: @time.utc.to_datetime.iso8601(3)
51
46
  }
52
47
  }},
53
- {query_string: {
48
+ {query:{query_string: {
54
49
  query: 'baz:fez'
55
- }},
56
- {query_string: {
50
+ }}},
51
+ {query:{query_string: {
57
52
  query: 'host:27.224.123.110'
58
- }}
53
+ }}}
59
54
  ]}}}})
60
55
  end
61
56
  end
data/spec/last_spec.rb CHANGED
@@ -11,8 +11,8 @@ describe 'the last command' do
11
11
  expect(result.query.to_s).to eq({query:{filtered:{query:{
12
12
  range: {
13
13
  Plunk.timestamp_field => {
14
- gte: @time - 24.hours,
15
- lte: @time
14
+ gte: (@time - 24.hours).utc.to_datetime.iso8601(3),
15
+ lte: @time.utc.to_datetime.iso8601(3)
16
16
  }}}}}}.to_s)
17
17
  end
18
18
 
@@ -21,8 +21,8 @@ describe 'the last command' do
21
21
  expect(result.query.to_s).to eq({query:{filtered:{query:{
22
22
  range: {
23
23
  Plunk.timestamp_field => {
24
- gte: @time - 24.days,
25
- lte: @time
24
+ gte: (@time - 24.days).utc.to_datetime.iso8601(3),
25
+ lte: @time.utc.to_datetime.iso8601(3)
26
26
  }}}}}}.to_s)
27
27
  end
28
28
 
@@ -31,8 +31,8 @@ describe 'the last command' do
31
31
  expect(result.query.to_s).to eq({query:{filtered:{query:{
32
32
  range: {
33
33
  Plunk.timestamp_field => {
34
- gte: @time - 24.weeks,
35
- lte: @time
34
+ gte: (@time - 24.weeks).utc.to_datetime.iso8601(3),
35
+ lte: @time.utc.to_datetime.iso8601(3)
36
36
  }}}}}}.to_s)
37
37
  end
38
38
 
@@ -41,8 +41,8 @@ describe 'the last command' do
41
41
  expect(result.query.to_s).to eq({query:{filtered:{query:{
42
42
  range: {
43
43
  Plunk.timestamp_field => {
44
- gte: @time - 24.seconds,
45
- lte: @time
44
+ gte: (@time - 24.seconds).utc.to_datetime.iso8601(3),
45
+ lte: @time.utc.to_datetime.iso8601(3)
46
46
  }}}}}}.to_s)
47
47
  end
48
48
 
@@ -51,8 +51,8 @@ describe 'the last command' do
51
51
  expect(result.query.to_s).to eq({query:{filtered:{query:{
52
52
  range: {
53
53
  Plunk.timestamp_field => {
54
- gte: @time - 24.minutes,
55
- lte: @time
54
+ gte: (@time - 24.minutes).utc.to_datetime.iso8601(3),
55
+ lte: @time.utc.to_datetime.iso8601(3)
56
56
  }}}}}}.to_s)
57
57
  end
58
58
 
@@ -61,14 +61,14 @@ describe 'the last command' do
61
61
  expect(result.query.to_s).to eq({query:{filtered:{
62
62
  query:{
63
63
  query_string: {
64
- query: '@fields.foo.field:bar'
64
+ query: '@fields.foo.@field:bar'
65
65
  }},
66
66
  filter: {
67
67
  and: [
68
68
  range: {
69
69
  Plunk.timestamp_field => {
70
- gte: @time - 1.hour,
71
- lte: @time
70
+ gte: (@time - 1.hour).utc.to_datetime.iso8601(3),
71
+ lte: @time.utc.to_datetime.iso8601(3)
72
72
  }}]}}}}.to_s)
73
73
  end
74
74
  end
@@ -11,7 +11,7 @@ describe 'nested searches' do
11
11
  foo: 'bar',
12
12
  baz: 5,
13
13
  arr: [ 0, 1, 2, 3 ],
14
- :timestamp => @time
14
+ :timestamp => @time.utc.to_datetime.iso8601(3)
15
15
  }.to_json
16
16
  Plunk::ResultSet.any_instance.stub(:eval).and_return(fake_results)
17
17
  end
@@ -1,5 +1,5 @@
1
1
  shared_context "plunk stubs" do
2
2
  before :each do
3
- Plunk.any_instance.stub(:timestamp_field).and_return(:@timestamp)
3
+ Plunk.stub(:timestamp_field).and_return(:@timestamp)
4
4
  end
5
5
  end
@@ -1,6 +1,6 @@
1
1
  shared_context "time stubs" do
2
2
  before :each do
3
- @time = Time.parse("01/01/2010 10:00")
4
- Time.any_instance.stub(:now).and_return(@time)
3
+ @time = Time.parse("11/11/2011 11:11")
4
+ Time.stub(:now).and_return(@time)
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: plunk
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.7
4
+ version: 0.2.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ram Mehta