plunk 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3408599e2af768132c73ca5baaee9e664a3a4e7d
-  data.tar.gz: ae781102e75198bbcc8645fd1ae16e6bcd5e00b2
+  metadata.gz: d1df030ee7ffb629c5a935786caa66cf0ccec422
+  data.tar.gz: 0569af2f42d44ae588f16fb757a779b403221c66
 SHA512:
-  metadata.gz: 8c82d20b434eb7a3e37272ea66ed0f70476469e8ee1b6871676f0aca673a6e21152fc2d59e75b8856ca160ce15778f05458616e7299de5c50bc9f97594de011a
-  data.tar.gz: b457cc61a5efa0b7aa7b926a5f8fefe3accc6bc7036955ed604494c71d1709caa66fd1b131c6f58e0d0dde741a4f8b229ad28bf695a9a95b9022484e9016950e
+  metadata.gz: 966f3eda9a63ac9bfb2ce2f86ac5b3cbd8d2ab6881d27a8633995f0d4dfb00b7d2e70abbeab19ba7c9458c4c736c482aab594e8d9ffa884dccea4d09949571ca
+  data.tar.gz: c68a239707d1222dc8e05dbcd9437e769f0f7be44bc078c5e08fb9d4124a5b05a5208d4fece4e8067d22f9514ba49c5f75c8864e75ea900df354f478218dce6d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plunk (0.2.6)
+    plunk (0.2.7)
       activesupport
       elasticsearch
       json

data/lib/plunk/result_set.rb

@@ -47,7 +47,7 @@ module Plunk
 
       result_sets.each do |result_set|
         first.query[:query][:filtered][:filter][:and] <<
-          result_set.query[:query][:filtered][:query]
+          result_set.query[:query][:filtered]
 
         if result_set.query[:query][:filtered][:filter]
           first.query[:query][:filtered][:filter][:and] +=

data/plunk.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                    = "plunk"
-  s.version                 = "0.2.7"
+  s.version                 = "0.2.8"
   s.add_runtime_dependency  "json"
   s.add_runtime_dependency  "parslet"
   s.add_runtime_dependency  "elasticsearch"

data/spec/chained_search_spec.rb

@@ -6,11 +6,6 @@ describe 'chained searches' do
   include_context "time stubs"
   include_context "plunk stubs"
 
-  before :each do
-    @time = Time.parse("01/01/2010 10:00")
-    Time.any_instance.stub(:now).and_return(@time)
-  end
-
   it 'should parse last 24h foo_type=bar baz="fez" host=27.224.123.110' do
     parsed = @parser.parse 'last 24h foo_type=bar baz="fez" host=27.224.123.110'
     result = @transformer.apply parsed
@@ -21,17 +16,17 @@ describe 'chained searches' do
       filter: {
         and: [{
           range: {
-            :timestamp => {
-              gte: @time - 24.hours,
-              lte: @time
+            :@timestamp => {
+              gte: (@time - 24.hours).utc.to_datetime.iso8601(3),
+              lte: @time.utc.to_datetime.iso8601(3)
             }
           }},
-          {query_string: {
-            query: 'baz:fez'
-          }},
-          {query_string: {
+          {query:{query_string: {
+            query: 'baz:"fez"'
+          }}},
+          {query:{query_string: {
             query: 'host:27.224.123.110'
-          }}
+          }}}
     ]}}}})
   end
 
@@ -46,16 +41,16 @@ describe 'chained searches' do
         and: [{
           range: {
             :timestamp => {
-              gte: 1.day.ago.utc.iso8601(3),
-              lte: @time
+              gte: (@time - 1.day).utc.to_datetime.iso8601(3),
+              lte: @time.utc.to_datetime.iso8601(3)
             }
           }},
-          {query_string: {
+          {query:{query_string: {
             query: 'baz:fez'
-          }},
-          {query_string: {
+          }}},
+          {query:{query_string: {
             query: 'host:27.224.123.110'
-          }}
+          }}}
     ]}}}})
   end
 end

data/spec/last_spec.rb

@@ -11,8 +11,8 @@ describe 'the last command' do
     expect(result.query.to_s).to eq({query:{filtered:{query:{
       range: {
         Plunk.timestamp_field => {
-          gte: @time - 24.hours,
-          lte: @time
+          gte: (@time - 24.hours).utc.to_datetime.iso8601(3),
+          lte: @time.utc.to_datetime.iso8601(3)
     }}}}}}.to_s)
   end
 
@@ -21,8 +21,8 @@ describe 'the last command' do
     expect(result.query.to_s).to eq({query:{filtered:{query:{
       range: {
         Plunk.timestamp_field => {
-          gte: @time - 24.days,
-          lte: @time
+          gte: (@time - 24.days).utc.to_datetime.iso8601(3),
+          lte: @time.utc.to_datetime.iso8601(3)
     }}}}}}.to_s)
   end
 
@@ -31,8 +31,8 @@ describe 'the last command' do
     expect(result.query.to_s).to eq({query:{filtered:{query:{
       range: {
         Plunk.timestamp_field => {
-          gte: @time - 24.weeks,
-          lte: @time
+          gte: (@time - 24.weeks).utc.to_datetime.iso8601(3),
+          lte: @time.utc.to_datetime.iso8601(3)
     }}}}}}.to_s)
   end
 
@@ -41,8 +41,8 @@ describe 'the last command' do
     expect(result.query.to_s).to eq({query:{filtered:{query:{
       range: {
         Plunk.timestamp_field => {
-          gte: @time - 24.seconds,
-          lte: @time
+          gte: (@time - 24.seconds).utc.to_datetime.iso8601(3),
+          lte: @time.utc.to_datetime.iso8601(3)
     }}}}}}.to_s)
   end
 
@@ -51,8 +51,8 @@ describe 'the last command' do
     expect(result.query.to_s).to eq({query:{filtered:{query:{
       range: {
         Plunk.timestamp_field => {
-          gte: @time - 24.minutes,
-          lte: @time
+          gte: (@time - 24.minutes).utc.to_datetime.iso8601(3),
+          lte: @time.utc.to_datetime.iso8601(3)
     }}}}}}.to_s)
   end
 
@@ -61,14 +61,14 @@ describe 'the last command' do
     expect(result.query.to_s).to eq({query:{filtered:{
       query:{
         query_string: {
-          query: '@fields.foo.field:bar'
+          query: '@fields.foo.@field:bar'
       }},
       filter: {
         and: [
           range: {
             Plunk.timestamp_field => {
-              gte: @time - 1.hour,
-              lte: @time
+              gte: (@time - 1.hour).utc.to_datetime.iso8601(3),
+              lte: @time.utc.to_datetime.iso8601(3)
     }}]}}}}.to_s)
   end
 end

data/spec/nested_search_spec.rb

@@ -11,7 +11,7 @@ describe 'nested searches' do
       foo: 'bar',
       baz: 5,
       arr: [ 0, 1, 2, 3 ],
-      :timestamp => @time
+      :timestamp => @time.utc.to_datetime.iso8601(3)
     }.to_json
     Plunk::ResultSet.any_instance.stub(:eval).and_return(fake_results)
   end

data/spec/shared/plunk_stubs.rb

@@ -1,5 +1,5 @@
 shared_context "plunk stubs" do
   before :each do
-    Plunk.any_instance.stub(:timestamp_field).and_return(:@timestamp)
+    Plunk.stub(:timestamp_field).and_return(:@timestamp)
   end
 end

data/spec/shared/time_stubs.rb

@@ -1,6 +1,6 @@
 shared_context "time stubs" do
   before :each do
-    @time = Time.parse("01/01/2010 10:00")
-    Time.any_instance.stub(:now).and_return(@time)
+    @time = Time.parse("11/11/2011 11:11")
+    Time.stub(:now).and_return(@time)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plunk
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Ram Mehta