plunk 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 384ac77eadf37f80bedaf8f661047d33d45cb82f
-  data.tar.gz: bf08baf12099add5dd94678de046e036e0b451ab
+  metadata.gz: c5efb7de164143cec1cad9a463333777a36d30e3
+  data.tar.gz: 4aca7635698f180d0510ddd8e89a78c5d71b75cf
 SHA512:
-  metadata.gz: 1679121e3c9518e4c871f767835cb1ae02d04f5d209e7ace67ad3c934da0393114524a015c3714dda0db97b3f132b0c4b0430238ebbdc3d2e3952d65dfc3e1af
-  data.tar.gz: 35184a93a49971e613e80d0711c56324a6163f3380038da9b34a26b6bb19184f97a88f2d90cc1d73f56baa5ec18c8eacf37f52bd1e190acdeae9585e9401926c
+  metadata.gz: 9c411eb71aee6b4495c5939d9bb58e12d421b227a97d3ce2ac33fb5c939bacfe933f883879097ba526f8d02e027b146f7ee774ab53c797f2c695e8853a3f2151
+  data.tar.gz: 58a3d1155ae86ab62be314f16f9c013600c7704e9f67e75f7abf8b4ca69b15c352ee5226d55aa28d4bfdd054d21009f6776a4b39d4b1b9809a15773c987acbf7

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    plunk (0.0.0)
+    plunk (0.0.5)
+      active_support
       json
       parslet
       rest-client
@@ -9,6 +10,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    active_support (3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
     blankslate (2.1.2.4)
     diff-lcs (1.2.5)
     json (1.8.1)

data/lib/plunk/result_set.rb

@@ -1,5 +1,3 @@
-require_relative 'elasticsearch'
-
 class Plunk::ResultSet
   attr_accessor :query
 
@@ -7,7 +5,7 @@ class Plunk::ResultSet
     if opts
       @query = { query: { }}
       
-      if opts[:query_string]
+      if @query_string = opts[:query_string]
         @query[:query][:query_string] = { query: opts[:query_string] }
       end
 
@@ -22,12 +20,8 @@ class Plunk::ResultSet
     end
   end
 
-  def *(rs)
-    self.join(rs)
-  end
-
-  def join(rs)
-    Plunk::ResultSet.new("[ #{@query} * #{rs.query} ]")
+  def raw_query
+    @query_string
   end
 
   def eval(elasticsearch_recursor)
@@ -35,4 +29,3 @@ class Plunk::ResultSet
     elasticsearch_recursor.search(@query.to_json)
   end
 end
-

data/lib/plunk/transformer.rb

@@ -1,4 +1,5 @@
 require 'parslet'
+require 'active_support/core_ext'
 
 class Plunk::Transformer < Parslet::Transform
 
@@ -31,7 +32,7 @@ class Plunk::Transformer < Parslet::Transform
   end
 
   rule(
-    search: simple(:query),
+    search: simple(:result_set),
     timerange: {
       quantity: simple(:quantity),
       quantifier: simple(:quantifier)
@@ -53,10 +54,10 @@ class Plunk::Transformer < Parslet::Transform
         int_quantity.weeks.ago
       end
 
-    end_time = Time.now.utc.to_datetime
+    end_time = Time.now
 
     Plunk::ResultSet.new(
-      query_string: query,
+      query_string: result_set.raw_query,
       start_time: start_time,
       end_time: end_time)
   end

data/plunk.gemspec

@@ -1,10 +1,11 @@
 Gem::Specification.new do |s|
   s.name                    = "plunk"
-  s.version                 = "0.0.5"
+  s.version                 = "0.0.6"
   s.date                    = "2013-12-03"
   s.add_runtime_dependency  "json"
   s.add_runtime_dependency  "parslet"
   s.add_runtime_dependency  "rest-client"
+  s.add_runtime_dependency  "active_support"
   s.add_development_dependency "rspec"
   s.summary                 = "Elasticsearch query language"
   s.description             = "Human-friendly query language for Elasticsearch"

data/spec/parser_spec.rb

@@ -15,6 +15,7 @@ end
 describe Plunk::Parser do
   before :all do
     @parser = Plunk::ParserWrapper.new
+    @transformer = Plunk::Transformer.new
   end
 
   context 'single-query searches' do
@@ -56,13 +57,39 @@ describe Plunk::Parser do
     end
 
     context 'the last command' do
-      it 'should parse last command with a search' do
+      before :each do
         @parsed = @parser.parse 'last 24w tshark.@src_ip = bar'
+      end
+
+      it 'should parse last command with a search' do
         expect(@parsed[:timerange][:quantity].to_s).to eq '24'
         expect(@parsed[:timerange][:quantifier].to_s).to eq 'w'
         expect(@parsed[:search][:field].to_s).to eq 'tshark.@src_ip'
         expect(@parsed[:search][:value].to_s).to eq 'bar'
       end
+
+      context 'transformation' do
+        before :each do
+          @result_set = @transformer.apply(@parsed)
+        end
+
+        it 'should have the proper result set' do
+          @result_set.should be_a Plunk::ResultSet
+          @result_set.query.should be_present
+
+          query = { query: {
+            query_string: {
+              query: "tshark.@src_ip:bar"
+              },
+            range: {
+              '@timestamp' => {
+                gte: 24.weeks.ago,
+                lte: Time.now 
+            }}}}
+
+          @result_set.query.to_json.should eq query.to_json
+        end
+      end
     end
 
     context 'chained searches' do

data/spec/result_set_spec.rb

@@ -0,0 +1,4 @@
+require 'plunk/result_set'
+
+describe Plunk::ResultSet do
+end

data/spec/transformer_spec.rb

@@ -1,10 +1,4 @@
+require 'plunk/transformer'
 
-#   after :each do
-#     transformed = @transformer.apply(@parsed)
-#     if transformed.is_a? Array
-#       transformed.map(&:class).uniq.should =~ Array(ResultSet)
-#     else
-#       transformed.should be_a ResultSet
-#     end
-#   end
-
+describe Plunk::Transformer do
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plunk
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ram Mehta
@@ -53,6 +53,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement