plunk 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9783fb61da735628ac2266ff16fd4234d146bed
-  data.tar.gz: 8fa8d01bffed0cc5351afef868a2e22caa3ddf88
+  metadata.gz: f86c017a01538aeca399e39459d80f8939fe394c
+  data.tar.gz: 1b238425837d802c816c9184b2a5e7b050182d0b
 SHA512:
-  metadata.gz: aaf0493c53bfee8441676b7e72697fb72d47e32b5e6abd8e505e6ef89483a7976bc6ec3a5fb5b34b5959fff0a4d5074cb836b9acde565417737589c704c0fb54
-  data.tar.gz: 3767a5c241aa94a9c55faef62742f6e57862377cb2e662cc0c58cd7a952dd1ac5716f3ddea6a894adf73f806c0db5481c95e4f99c1804033a59d9f1875a7a2bf
+  metadata.gz: d51573bbf2390d9c28ad3a8108fde498ebef50dcff3e494e5f2b4020dabc4fd7cc49ab973575c0a4c7ed658f20a62f57c3eb44e4a90a1386a415251e3215fe2a
+  data.tar.gz: a934a1a3eab5fbf5e86884fa5b386619caf6e069e44225622ea5cb8faf5df4598f4556b1e998239f4b115426ad67e3c67bafc87e6495255d01c3afd0c337bed8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plunk (0.3.2)
+    plunk (0.3.4)
       activesupport (~> 4.0, >= 4.0.0)
       chronic (~> 0.10, >= 0.10.0)
       elasticsearch (~> 0.4, >= 0.4.3)

data/bin/plunk

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+$LOAD_PATH << './lib'
+require './lib/plunk'
+
+host = ARGV[ARGV.index('-h')+1]
+
+Plunk.configure do |c|
+  c.elasticsearch_client = Elasticsearch::Client.new(
+    host: host,
+    randomize_hosts: true
+  )
+end
+
+puts Plunk.search($stdin.read)

data/lib/plunk/helper.rb

@@ -52,8 +52,18 @@ module Plunk
     def self.regexp_builder(field, regexp, flags=nil)
       {
         regexp: {
-          field => regexp,
-          flags: flags || 'ALL'
+          field => {
+            value: regexp,
+            flags: flags || 'ALL'
+          }
+        }
+      }
+    end
+
+    def self.indices_builder(list)
+      {
+        indices: {
+          indices: list
         }
       }
     end

data/lib/plunk/parser.rb

@@ -54,6 +54,9 @@ module Plunk
     # COMMANDS
 
     # Command parts
+    rule(:enclosed_string) { 
+      string | match('[^\s]').repeat
+    }
     rule(:identifier) { match('[^=\s)(|]').repeat(1) >> match('[^=\s]').repeat }
     rule(:wildcard)   {
       (lparen >> wildcard >> rparen) |
@@ -64,15 +67,12 @@ module Plunk
     rule(:rhs) {
       regexp | query_value
     }
-    rule(:chronic_time) {
-      string | match('[^\s]').repeat
-    }
     rule(:relative_time) {
       integer.as(:quantity) >>
       match('s|m|h|d|w').as(:quantifier)
     }
     rule(:absolute_time) {
-      datetime.as(:datetime) | chronic_time.as(:chronic_time)
+      datetime.as(:datetime) | enclosed_string.as(:chronic_time)
     }
 
     # Field = Value
@@ -96,6 +96,17 @@ module Plunk
       (relative_time | absolute_time).as(:window_end)
     }
 
+    # Indices
+    rule(:indices) {
+      str('indices') >>
+      space >>
+      (enclosed_string >>
+        (space? >>
+          str(',') >>
+          space? >>
+          enclosed_string).repeat).as(:indices)
+    }
+
     # Limit
     rule(:limit) {
       str('limit') >> space >> positive_integer.as(:limit)
@@ -124,10 +135,11 @@ module Plunk
     # NOTE: order matters!
     rule(:command) {
       (
+        field_value |
         window      |
         last        |
         limit       |
-        field_value |
+        indices     |
         value_only
       ).as(:command) >> space?
     }
@@ -141,6 +153,7 @@ module Plunk
     }
     rule(:primary) { lparen >> or_operation >> rparen | negated_command }
 
+    # borrowed from Parslet's boolean algebra example
     rule(:negated_and) {
       (not_operator >> and_operation.as(:not)) |
       and_operation

data/lib/plunk/transformer.rb

@@ -38,6 +38,12 @@ module Plunk
       Helper.query_builder(String(value))
     end
 
+    # Indices
+    rule(indices: simple(:indices)) do
+      list = String(indices).split(',').collect { |s| s.strip }
+      Helper.indices_builder(list)
+    end
+
     # Last
     rule(last: subtree(:last)) do
       start_time = last

data/lib/plunk.rb

@@ -9,7 +9,7 @@ require 'plunk/result_set'
 module Plunk
   class << self
     attr_accessor :elasticsearch_options, :elasticsearch_client,
-      :parser, :transformer, :max_number_of_hits, :timestamp_field
+      :parser, :transformer, :max_number_of_hits, :timestamp_field, :logger
   end
 
   def self.configure(&block)
@@ -33,10 +33,14 @@ module Plunk
   end
 
   def self.search(query_string)
-    ResultSet.new(
-      transformer.apply(
-        parser.parse(query_string)
-      )
-    ).eval
+    parsed = parser.parse query_string
+    transformed = transformer.apply parsed
+
+    if self.logger
+      self.logger.debug "Query String: #{query_string}"
+      self.logger.debug "Parsed Output: #{transformed}" 
+    end
+
+    ResultSet.new(transformed).eval
   end
 end

data/plunk.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                    = "plunk"
-  s.version                 = "0.3.3"
+  s.version                 = "0.3.5"
   s.add_runtime_dependency  "json", "~> 1.8", ">= 1.8.0"
   s.add_runtime_dependency  "parslet", "~> 1.5", ">= 1.5.0"
   s.add_runtime_dependency  "elasticsearch", "~> 0.4", ">= 0.4.3"

data/spec/indices_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe 'the indices command' do
+  it 'should parse indices foo,bar,baz' do
+    result = Plunk.search 'indices foo,bar,baz'
+    expected = Plunk::Helper.filter_builder(
+      Plunk::Helper.indices_builder(%w(foo bar baz))
+    )
+    expect(result).to eq(expected)
+  end
+
+  it 'should parse indices foo , bar , baz' do
+    result = Plunk.search 'indices foo , bar , baz'
+    expected = Plunk::Helper.filter_builder(
+      Plunk::Helper.indices_builder(%w(foo bar baz))
+    )
+    expect(result).to eq(expected)
+  end
+
+  it 'should parse indices foo , bar , baz & key = value' do
+    result = Plunk.search 'indices foo , bar , baz & key = value'
+    expected = Plunk::Helper.filter_builder(
+      and: [
+        Plunk::Helper.indices_builder(%w(foo bar baz)),
+        Plunk::Helper.query_builder('key:value')
+      ]
+    )
+    expect(result).to eq(expected)
+  end
+
+  it 'should parse key = value & indices foo , bar , baz' do
+    result = Plunk.search 'key = value & indices foo , bar , baz'
+    expected = Plunk::Helper.filter_builder(
+      and: [
+        Plunk::Helper.query_builder('key:value'),
+        Plunk::Helper.indices_builder(%w(foo bar baz))
+      ]
+    )
+    expect(result).to eq(expected)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plunk
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Ram Mehta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -169,6 +169,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/plunk
 - lib/plunk.rb
 - lib/plunk/helper.rb
 - lib/plunk/parser.rb
@@ -180,6 +181,7 @@ files:
 - spec/boolean_spec.rb
 - spec/chained_search_spec.rb
 - spec/field_value_spec.rb
+- spec/indices_spec.rb
 - spec/last_spec.rb
 - spec/limit_spec.rb
 - spec/nested_search_spec.rb