plunk 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 415238ed2768b6c3ed2b3cd04ee6afdde5063b52
-  data.tar.gz: 6434160f7f1b6ae51fffe281ca807b3ff3cff057
+  metadata.gz: 433f6b1bcee2104491679b8b3ba1e1a40bb901a8
+  data.tar.gz: c36dcaf88b8f4bae8f866b55d79cecd0b386340f
 SHA512:
-  metadata.gz: 33c94b760bc8c0a50b209583758d1bda31f09a8b78c59d24015c9d94c326820064b502794168b4e7503bd04d8e4f9688b9d09aec9e444422479c98a02c95ff02
-  data.tar.gz: 234db2df01d4ce243aa67a874324c7746fec1a720a5c5bd4ff3d6428978253cc7a2cd8354b8b5a22f02169c029c241507c45c18748d625aede7e2336184fed5d
+  metadata.gz: d87cf99d218b6154e3a8c368ce517f4f6eefe9021eb86e5fbb6b4440bd664663054b059900c50e9022bf7eb3214cdb5e02f53642062188aa8b510ee016af2263
+  data.tar.gz: 8c2f64b11c8b1163278206b8f957c8e1a044ba84fca59d79a1618b58c6eb62262534312d2106f85fbe23ee4f90c1593b6fac9ed298f5926287f8f95617c7ac11

data/lib/plunk/elasticsearch.rb

@@ -81,30 +81,15 @@ class Plunk::Elasticsearch
   end
 
   def build_ES_validator(query)
-    if Plunk::Elasticsearch.valid_json? query
-      # Strip the top-level "query" paramter since ES doesn't expect it
-      JSON.parse(query)['query'].to_json
-    else
-      <<-END
-        { "filtered": {
-            "query": {
-              "query_string": {
-                "query": "#{query}"
-              }
-            }
+    {
+      filtered: {
+        query: {
+          query_string: {
+            query: query
           }
         }
-      END
-    end
-  end
-
-  def self.valid_json?(json)
-    begin
-      JSON.parse json
-      true
-    rescue JSON::ParserError
-      false
-    end
+      }
+    }.to_json
   end
 end
 

data/plunk.gemspec

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

data/spec/field_value_spec.rb

@@ -17,7 +17,6 @@ describe 'field / value searches' do
 
   it 'should parse _foo.@fields.@bar="bar baz"' do
     result = @transformer.apply @parser.parse '_foo.@fields.@bar="bar baz"'
-    puts result.query.to_json
     expect(result.query).to eq({query:{filtered:{query:{query_string:{
       query: '_foo.@fields.@bar:"bar baz"'
     }}}}})

metadata

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