plunk 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47c7f2be3a089ccdd46d4a90f3c4daf103d8b0e2
-  data.tar.gz: f0295f181f0e4ddb39690e8c9ab3edb577aed630
+  metadata.gz: 1bc1207f69f06280c177f65cdce11a259502ac58
+  data.tar.gz: 909ee371c459abed454a019ac37f46fd48c3bfd5
 SHA512:
-  metadata.gz: f61912b33e14323fac6f3362ba668188d0753abdf864861868f031c1f53519114e394228871a82ba3c1c57fbade29f0b7f40680ba5bfd8c4939cefe7cbaf28eb
-  data.tar.gz: 8cb23366a7cbff74d9fd1e29647ce88deb976bc787c1d566f74a5fb454ea7b6e8c0e9852841b1576bec391276b57dafe7ba2d8367cdfd58be251423a8570e554
+  metadata.gz: b45c80c41996d29e5391ab23368e27e50de2c00780d1d652d95adbf60c20ef471830821f3bfd4e8e0a1f8d12ff5041edb7b8d90782f80380e4a7633aa0fede4a
+  data.tar.gz: 8a6d79f487a627265335408439504726f5293e7e1ec8f81e275da83110e8cf55ad0b80f35e0af25baba46c3cf6c63b2c09fcf8864a538e7e91f9a2b83eac5757

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/Gemfile.lock

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

data/README.md

@@ -3,6 +3,12 @@ Plunk
 
 Human-friendly query language for Elasticsearch
 
+## About
+
+Plunk is a ruby gem to take a human-friendly search command and translate it
+to something Elasticsearch understands. Currently it only supports a few
+commands, but the framework is in place
+
 ## Installation
 ```
 gem install plunk
@@ -31,7 +37,9 @@ Plunk.search 'foo.field = (bar OR baz)'
 ```
 
 
-## Translation:
+## Translation
+
+Plunk takes your command and translates
 
 ```last 24h _type=syslog```
 

data/lib/plunk.rb

@@ -8,11 +8,12 @@ require 'plunk/result_set'
 module Plunk
   class << self
     attr_accessor :elasticsearch_options, :elasticsearch_client,
-      :parser, :transformer, :max_number_of_hits
+      :parser, :transformer, :max_number_of_hits, :timestamp_field
   end
 
   def self.configure(&block)
     class_eval(&block)
+    self.timestamp_field ||= :timestamp
     initialize_parser
     initialize_transformer
     initialize_elasticsearch

data/lib/plunk/result_set.rb

@@ -13,7 +13,7 @@ module Plunk
         @query[:query][:filtered][:filter] = {
           and: [
             range: {
-              '@timestamp' => {
+              Plunk.timestamp_field => {
                 gte: opts[:start_time],
                 lte: opts[:end_time] }}]}
       else
@@ -24,7 +24,7 @@ module Plunk
         elsif opts[:start_time] and opts[:end_time]
           @query[:query][:filtered][:query] = {
             range: {
-              '@timestamp' => {
+              Plunk.timestamp_field => {
                 gte: opts[:start_time],
                 lte: opts[:end_time] }}}
         end

data/plunk.gemspec

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

data/spec/basic_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'basic searches' do
-  it 'should parse' do
+  it 'should parse bar' do
     result = @transformer.apply @parser.parse('bar')
     result.query.should eq({query:{filtered:{query:{query_string:{
       query: 'bar'

data/spec/chained_search_spec.rb

@@ -13,7 +13,7 @@ describe 'chained searches' do
       filter: {
         and: [{
           range: {
-            '@timestamp' => {
+            :timestamp => {
               gte: 1.day.ago.utc.iso8601(3),
               lte: Time.now.utc.iso8601(3)
             }

data/spec/last_spec.rb

@@ -5,7 +5,7 @@ describe 'the last command' do
     result = @transformer.apply @parser.parse('last 24h')
     expect(result.query.to_s).to eq({query:{filtered:{query:{
       range: {
-        '@timestamp' => {
+        Plunk.timestamp_field => {
           gte: 24.hours.ago.utc.to_datetime.iso8601(3),
           lte: Time.now.utc.to_datetime.iso8601(3)
     }}}}}}.to_s)
@@ -15,7 +15,7 @@ describe 'the last command' do
     result = @transformer.apply @parser.parse('last 24d')
     expect(result.query.to_s).to eq({query:{filtered:{query:{
       range: {
-        '@timestamp' => {
+        Plunk.timestamp_field => {
           gte: 24.days.ago.utc.to_datetime.iso8601(3),
           lte: Time.now.utc.to_datetime.iso8601(3)
     }}}}}}.to_s)
@@ -25,7 +25,7 @@ describe 'the last command' do
     result = @transformer.apply @parser.parse('last 24w')
     expect(result.query.to_s).to eq({query:{filtered:{query:{
       range: {
-        '@timestamp' => {
+        Plunk.timestamp_field => {
           gte: 24.weeks.ago.utc.to_datetime.iso8601(3),
           lte: Time.now.utc.to_datetime.iso8601(3)
     }}}}}}.to_s)
@@ -35,7 +35,7 @@ describe 'the last command' do
     result = @transformer.apply @parser.parse('last 24s')
     expect(result.query.to_s).to eq({query:{filtered:{query:{
       range: {
-        '@timestamp' => {
+        Plunk.timestamp_field => {
           gte: 24.seconds.ago.utc.to_datetime.iso8601(3),
           lte: Time.now.utc.to_datetime.iso8601(3)
     }}}}}}.to_s)
@@ -45,7 +45,7 @@ describe 'the last command' do
     result = @transformer.apply @parser.parse('last 24m')
     expect(result.query.to_s).to eq({query:{filtered:{query:{
       range: {
-        '@timestamp' => {
+        Plunk.timestamp_field => {
           gte: 24.minutes.ago.utc.to_datetime.iso8601(3),
           lte: Time.now.utc.to_datetime.iso8601(3)
     }}}}}}.to_s)
@@ -61,7 +61,7 @@ describe 'the last command' do
       filter: {
         and: [
           range: {
-            '@timestamp' => {
+            Plunk.timestamp_field => {
               gte: 1.hour.ago.utc.to_datetime.iso8601(3),
               lte: Time.now.utc.to_datetime.iso8601(3)
     }}]}}}}.to_s)

data/spec/nested_search_spec.rb

@@ -6,13 +6,13 @@ describe 'nested searches' do
       foo: 'bar',
       baz: 5,
       arr: [ 0, 1, 2, 3 ],
-      '@timestamp' => Time.now.utc.iso8601(3)
+      :timestamp => Time.now.utc.iso8601(3)
     }.to_json
     Plunk::ResultSet.any_instance.stub(:eval).and_return(fake_results)
   end
 
   it 'should transform' do
-    results = @transformer.apply @parser.parse('foo=`bar=baz|baz`')
+    results = @transformer.apply @parser.parse('foo=`bar=baz|baz,fass,fdsd`')
     expect(results.query).to eq({query:{filtered:{query:{query_string:{
       query: 'foo:(5)'
     }}}}})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plunk
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Ram Mehta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -90,6 +90,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - AUTHORS
 - Gemfile
 - Gemfile.lock