arelastic 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19fd422e32ed10c3b06cf42899be823aa572f3f4
-  data.tar.gz: 788eb544a81da91a65167e9c191e32accddc4e01
+  metadata.gz: b7e6147284908ea72345b434db648ed51a887286
+  data.tar.gz: a992f57aee01a9b9541ceb4f844c0ca8a7ee1318
 SHA512:
-  metadata.gz: dff41431f73015db002c064f520afbc9ab0cd356001b096771b715017780633aa0ebee51c9b34ee49ff255f3ce3d4b48ad09b55dcd536914bf0c86620f2c0af8
-  data.tar.gz: d4f20c2d662d0d91b0f0041c211df3ef7c7d8d1027de11792a1071ea0e5c06f6e4457ea749da018bb6774e8a97683dd7fa320f14076e0e2a5448d528eab32bee
+  metadata.gz: 8bf09de6b0fabf1834878b3ee0e7194a952e60f0a2b99ba177e4c399af754ccc46ca69a437a5503aacf555221a74f479b5b03f392f18aaab69dc84defca5d9aa
+  data.tar.gz: 274c22454a4a8b1646e2a71069dc004671ee87d363b988701f9cb11d553b97114c9b58d2b8719163000e5c4ae57b86ba6e9b4e0b3109080f22f2e5e79214dec6

data/lib/arelastic/builders/query.rb

@@ -10,8 +10,8 @@ module Arelastic
           query Arelastic::Queries::ConstantScore.new(search)
         end
 
-        def filtered(query, filter)
-          query Arelastic::Queries::Filtered.new(query, filter)
+        def filtered(query: nil, filter: nil)
+          query Arelastic::Queries::Filtered.new(query: query, filter: filter)
         end
 
         def match_all

data/lib/arelastic/queries/filtered.rb

@@ -2,19 +2,18 @@ module Arelastic
   module Queries
     class Filtered < Arelastic::Queries::Query
       attr_accessor :query, :filter
-      def initialize(query, filter)
+      def initialize(query: nil, filter: nil)
         @query = query
         @filter = filter
       end
 
       def as_elastic
-        {
-          "filtered" => {
-            "query"   => convert_to_elastic(query),
-            "filter"  => convert_to_elastic(filter)
-          }
-        }
+        searches = {}
+        searches['query']  = convert_to_elastic(query)  if query
+        searches['filter'] = convert_to_elastic(filter) if filter
+
+        { "filtered" => searches }
       end
     end
   end
-end
+end

data/test/arelastic/builders/query_test.rb

@@ -9,7 +9,10 @@ class Arelastic::Builders::QueryTest < MiniTest::Unit::TestCase
   end
 
   def test_filtered
-    query = Arelastic::Builders::Query.filtered({"query_string" => "foo"}, {"term" => "bar"})
+    query = Arelastic::Builders::Query.filtered(
+      query: {"query_string" => "foo"},
+      filter: {"term" => "bar"}
+    )
     expected = {"query" => {"filtered" => {"query" => {"query_string" => "foo"}, "filter" => {"term" => "bar"}}}}
 
     assert_equal expected, query.as_elastic
@@ -43,14 +46,14 @@ class Arelastic::Builders::QueryTest < MiniTest::Unit::TestCase
   def test_terms
     query = Arelastic::Builders::Query['tags'].terms ['blue', 'pill']
     expected = {"terms" => { "tags" => ["blue", "pill"] }}
-    
+
     assert_equal expected, query.as_elastic
   end
 
   def test_match
     query = Arelastic::Builders::Query['message'].match "hello"
     expected = {"match" => { "message" => "hello" }}
-    
+
     assert_equal expected, query.as_elastic
   end
-end
+end

data/test/arelastic/queries/filtered_test.rb

@@ -2,9 +2,19 @@ require 'helper'
 
 class Arelastic::Queries::FilteredTest < MiniTest::Unit::TestCase
   def test_as_elastic
-    filtered = Arelastic::Queries::Filtered.new({"query_string" => "bar"}, {"term" => "baz"})
+    filtered = Arelastic::Queries::Filtered.new(
+      query: {"query_string" => "bar"},
+      filter: {"term" => "baz"}
+    )
     expected = {"filtered" => {"query" => {"query_string" => "bar"}, "filter" => {"term" => "baz"}}}
 
     assert_equal expected, filtered.as_elastic
   end
-end
+
+  def test_as_elastic_with_query_node
+    filtered = Arelastic::Queries::Filtered.new(query: Arelastic::Queries::QueryString.new("bar"))
+    expected = {"filtered" => {"query" => {"query_string" => {"query"=>"bar"}}}}
+
+    assert_equal expected, filtered.as_elastic
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com