plunk 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aaa198f780c8d3c6f9538cd86a7ee20fbf4d44c
-  data.tar.gz: 4cb13fb58000bf09dca9fa3001077a2b46474c41
+  metadata.gz: 74d7ec1b508c064ddcbd215df0bfb9611b08d96f
+  data.tar.gz: 151a4fd9a9470f02fc0eb57322874c7fbecb3627
 SHA512:
-  metadata.gz: a994a69ca9c8557f07869aaff1eb468773346caa06d5676e68cdea867d0e6642cb3bd573e419f557a224beb11c6a386a7189851b2f166a3ce74884f5a8e0e802
-  data.tar.gz: bfbd1504b80387dd2b3695a030cbb9be35110052f9b5ec8857b4415d048219e9519e71d4f6849575c67b8d878da94dff80bd3fb52b39407385d3185f4170168a
+  metadata.gz: d7f16824dc828f397bc778d5cae699a5770fc7368d11c30f99da5645a6e9c406cc6beb33358e91537aee73bebd50813303a419c537280b7cbacbd93e276b5ba5
+  data.tar.gz: 3d66f23593c8854011275918c0d85b7f9f074cebfcd69efe25216e8ae2e88dd7f4ad708bdd4dfca5dd886e36136a646243fb954f94d340a8499ca1b429af632c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plunk (0.0.8)
+    plunk (0.1.5)
       activesupport
       json
       parslet

data/lib/plunk/parser.rb

@@ -20,13 +20,34 @@ class Plunk::Parser < Parslet::Parser
     str('-').maybe >> digit.repeat(1) >> str('.') >> digit.repeat(1) >> space?
   }
   rule(:number)     { integer | float }
+  rule(:datetime) {
+      # 1979-05-27T07:32:00Z
+    digit.repeat(4) >> str("-") >> 
+    digit.repeat(2) >> str("-") >> 
+    digit.repeat(2) >> str("T") >> 
+    digit.repeat(2) >> str(":") >> 
+    digit.repeat(2) >> str(":") >> 
+    digit.repeat(2) >> str("Z")
+  }
+  rule(:escaped_special) {
+    str("\\") >> match['0tnr"\\\\']
+  }
+
+  rule(:string_special) {
+    match['\0\t\n\r"\\\\']
+  }
+  rule(:string) {
+    str('"') >>
+    (escaped_special | string_special.absent? >> any).repeat >>
+    str('"')
+  }
 
   # Field / value
-  rule(:identifier) { match['_@a-zA-Z.'].repeat(1) }
+  # rule(:identifier) { match['_@a-zA-Z.'].repeat(1) }
+  rule(:identifier) { match('[^=\s]').repeat(1) }
   rule(:wildcard)   { match('[a-zA-Z0-9.*]').repeat(1) }
   rule(:searchop)   { match('[=]').as(:op) }
-
-  rule(:query_value) { wildcard | integer }
+  rule(:query_value) { number | string | datetime | wildcard }
 
   # boolean operators search
   rule(:concatop)   { (str('OR') | str('AND')) >> space? }
@@ -37,7 +58,8 @@ class Plunk::Parser < Parslet::Parser
 
   # Grammar parts
   rule(:rhs) {
-    regexp | subsearch | integer | wildcard | booleanop
+    regexp | subsearch | booleanop
+    # regexp | subsearch | integer | wildcard | booleanop
   }
 
   rule(:boolean_value) {
@@ -75,7 +97,6 @@ class Plunk::Parser < Parslet::Parser
   }
 
   rule(:nested_search) {
-    # match('[^|]').repeat.as(:initial_query) >> str('|') >> space? >>
     job.as(:initial_query) >> space? >> str('|') >> space? >>
     match('[^`]').repeat.as(:extractors)
   }

data/plunk.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                    = "plunk"
-  s.version                 = "0.1.4"
+  s.version                 = "0.1.5"
   s.date                    = "2013-12-03"
   s.add_runtime_dependency  "json"
   s.add_runtime_dependency  "parslet"

data/spec/chained_search_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'chained searches' do
-  it 'should parse last 24h foo=bar baz=fez' do
+  pending 'should parse last 24h foo=bar baz=fez' do
     result = @transformer.apply @parser.parse 'last 24h foo=bar baz=fez'
     puts result
     expect(result.query).to eq({query:{filtered:{query:{

data/spec/field_value_spec.rb

@@ -1,17 +1,32 @@
 require 'spec_helper'
 
 describe 'field / value searches' do
-  it 'should parse a single _foo.@bar=baz' do
+  it 'should parse a _foo.@bar=baz' do
     result = @transformer.apply @parser.parse('_foo.@bar=baz')
     expect(result.query).to eq({query:{filtered:{query:{query_string:{
       query: '_foo.@bar:baz'
     }}}}})
   end
 
-  it 'should parse a single _foo.@bar=(baz)' do
+  it 'should parse a _foo.@bar=(baz)' do
     result = @transformer.apply @parser.parse('_foo.@bar=(baz)')
     expect(result.query).to eq({query:{filtered:{query:{query_string:{
       query: '_foo.@bar:(baz)'
     }}}}})
   end
+
+  it 'should parse _foo.@fields.@bar="bar baz"' do
+    result = @transformer.apply @parser.parse '_foo.@fields.@bar="bar baz"'
+    expect(result.query).to eq({query:{filtered:{query:{query_string:{
+      query: '_foo.@fields.@bar:"bar baz"'
+    }}}}})
+  end
+
+  it 'should parse _foo-barcr@5Y_+f!3*(name=bar' do
+    result = @transformer.apply @parser.parse '_foo-barcr@5Y_+f!3*(name=bar'
+    expect(result.query).to eq({query:{filtered:{query:{query_string:{
+      query: '_foo-barcr@5Y_+f!3*(name:bar'
+    }}}}})
+
+  end
 end

data/spec/last_spec.rb

@@ -51,12 +51,12 @@ describe 'the last command' do
     }}}}}}.to_s)
   end
 
-  it 'should parse last 1h foo=bar' do
-    result = @transformer.apply @parser.parse('last 1h foo=bar')
+  it 'should parse last 1h @fields.foo.@field=bar' do
+    result = @transformer.apply @parser.parse('last 1h @fields.foo.@field=bar')
     expect(result.query.to_s).to eq({query:{filtered:{
       query:{
         query_string: {
-          query: 'foo:bar'
+          query: '@fields.foo.field:bar'
       }},
       filter: {
         and: [

metadata

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