plunk 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5505fcd0ad4d40a7f6194b21fb79117bafd55ff
-  data.tar.gz: 77bab32e0ebb6e0abf15f77878b12741e2e1f4fe
+  metadata.gz: 4aa7d1a015e39272fa148c9fa5c1444c54d73ef2
+  data.tar.gz: 25dc10cf92e207b31ffaf872ecff020c9c9f2b5e
 SHA512:
-  metadata.gz: 754126eedfa73415b97280dc2aba93c54d359b721adac035563ed3d98e2820698c57a8ca64e7c5c05d6fb729a9452f8d503ffd6e1b5534d9da66b0615c82f21a
-  data.tar.gz: f400be0e7a58b4cd1b39381e167fd2a96941b26a617cef3b8dcdcd0d36e16f8e64025ed9f85a1890c9e6752f84b02f84d07482a8b27c6c496f3a252b729327c4
+  metadata.gz: ec0e2b28fa9734eac3a1e4c20e5e0234da7584d92630415f9f005d7fb31f9c1a76ec2c34ee2f5d472ff926628c74a40581350bdf9a5d21c35d1f4ddbe64f1cde
+  data.tar.gz: db9072977470120635367f40d576206c5d67e8b190a4a32a42b128ae4cbcd2271a674ece6a51c0579043e6dcf80ba77990fd3d6f117e453034e5347ca025f77e

data/Gemfile.lock

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

data/lib/plunk/parser.rb

@@ -44,14 +44,16 @@ module Plunk
     }
 
     # Field / value
-    rule(:identifier) { match('[^=\s]').repeat(1) }
+    rule(:identifier) { match('[^=\s)(|]').repeat(1) >> match('[^=\s]').repeat }
     # possible right-hand side values
     rule(:wildcard)   { match('[^=\s)(|]').repeat(1) }
     rule(:searchop)   { match('[=]').as(:op) }
+
     rule(:query_value) { string | wildcard | datetime | number }
 
     # boolean operators search
     rule(:concatop)   { (str('OR') | str('AND')) >> space? }
+    rule(:negateop)   { str('NOT') >> space? }
     rule(:operator)   { match('[|]').as(:op) >> space? }
     rule(:timerange)  {
       integer.as(:quantity) >> match('s|m|h|d|w').as(:quantifier)
@@ -63,13 +65,18 @@ module Plunk
     }
 
     rule(:boolean_value) {
-      booleanparen | query_value
+      booleanparen | (negateop.maybe >> query_value)
     }
 
-    rule(:booleanop) {
-      boolean_value >> (space >> concatop >> boolean_value).repeat
+    # AND, OR
+    rule(:boolean_logic) {
+      space >> concatop >> boolean_value
     }
 
+    # handles recursion for parentheses and values
+    rule(:booleanop) {
+      boolean_value >> boolean_logic.repeat
+    }
     rule(:booleanparen) {
       lparen >> space? >> booleanop >> space? >> rparen
     }
@@ -88,10 +95,6 @@ module Plunk
         rhs.as(:value) | rhs.as(:match)
     }
 
-    rule(:binaryop) {
-      (search | paren).as(:left) >> space? >> operator >> job.as(:right)
-    }
-
     rule(:subsearch) {
       str('`') >> space? >> nested_search >> str('`')
     }
@@ -106,7 +109,7 @@ module Plunk
     }
 
     rule(:job) {
-      last | search | binaryop | paren
+      last | search | paren
     }
 
     rule(:plunk_query) {

data/plunk.gemspec

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

data/spec/boolean_spec.rb

@@ -14,4 +14,29 @@ describe 'boolean searches' do
       query: '(foo OR (bar AND baz))'
     }}}}})
   end
+
+  pending 'should parse (foo=bar OR foo=bar)' do
+    result = @transformer.apply @parser.parse '(foo=bar OR foo=bar)'
+    expect(result.query).to eq({query:{filtered:{query:{query_string:{
+      query: '(foo:bar OR foo:bar)'
+    }}}}})
+  end
+
+  pending 'should parse foo=bar OR baz=fez' do
+    result = @transformer.apply @parser.parse 'foo=bar OR baz=fez'
+    expect(result.query).to eq({query:{filtered:{query:{
+      query_string:{
+        query: 'foo:bar OR baz:fez'
+      }},
+    }}})
+  end
+
+  pending 'should parse (foo=bar AND baz=fez) OR ham=cheese' do
+    result = @transformer.apply @parser.parse '(foo=bar AND baz=fez) OR ham=cheese'
+    expect(result.query).to eq({query:{filtered:{query:{
+      query_string:{
+        query: '(foo:bar AND baz:fez) OR ham:cheese'
+      }},
+    }}})
+  end
 end

data/spec/field_value_spec.rb

@@ -35,4 +35,11 @@ describe 'field / value searches' do
       query: 'foo:bar-baz'
     }}}}})
   end
+
+  it 'should parse foo=(NOT bar)' do
+    result = @transformer.apply @parser.parse 'foo=(NOT bar)'
+    expect(result.query).to eq({query:{filtered:{query:{query_string:{
+      query: 'foo:(NOT bar)'
+    }}}}})
+  end
 end

data/spec/regexp_spec.rb

@@ -14,4 +14,11 @@ describe 'regexp searches' do
       query: 'foo:/blah\/ foo/'
     }}}}})
   end
+
+  it 'should parse foo=/blah\. foo/' do
+    result = @transformer.apply @parser.parse('foo=/blah\. foo/')
+    expect(result.query).to eq({query:{filtered:{query:{query_string:{
+      query: 'foo:/blah\. foo/'
+    }}}}})
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plunk
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Ram Mehta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json