arelastic 0.9.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87aa4611a9b69484f792da345e91c2fa81c0f3be
-  data.tar.gz: 8163a78df33b8ec32a31afef6c39c676bd4e2432
+  metadata.gz: 8ceb8425c2ce46af3710cc15cb83790e2969b99e
+  data.tar.gz: 5080a642884136bb0e155e52402b5be358bf9797
 SHA512:
-  metadata.gz: 5b3f37121f550f07d5f2832266adb731f180ff1212118351ec6acd891bde04568511fb7cc9ebc5126c79ee59a832b2f746ae551ed55c621da4fcf1ed9029e652
-  data.tar.gz: 955fe1ee727cc071585c8a6ff7d0b482496cfe8a6f62d4f97fd423e4c3336b88194304316b230a4f795067bc89acdfcc29570f3d5d1f806a9bc4b1dac16f0a16
+  metadata.gz: f6bfc5f1b46adde62c89080bb10bb8121ffef428aeb531118c031d986d882af6fcc498cd5feff9f424a29fb0ece6c29cb7809fd58bed8d8b520943efc00d57bb
+  data.tar.gz: 06a292844f4acc59eb8d11a6db636544a81cbbb97068afe36e7cdfaba3ef41431ca76319f1327d7397278fb4ac074cf7509fd4c2be9f863e930386ab8c97ec6a

data/lib/arelastic/filters/filter.rb

@@ -14,7 +14,7 @@ module Arelastic
       end
 
       def nested path
-        Arelastic::Filters::Nested.new path, "filter" => self.as_elastic
+        Arelastic::Filters::Nested.new path, self
       end
     end
   end

data/lib/arelastic/nodes/nested.rb

@@ -12,8 +12,15 @@ module Arelastic
         @expr = expr
       end
 
+      def search_context
+        is_a?(Arelastic::Filters::Filter) ? 'filter' : 'query'
+      end
+
       def as_elastic
-        params = {'path' => path}.update(convert_to_elastic(expr))
+        params = {
+          'path'          => path,
+          search_context  => convert_to_elastic(expr)
+        }
 
         { 'nested' => params }
       end

data/lib/arelastic/queries/query.rb

@@ -2,7 +2,7 @@ module Arelastic
   module Queries
     class Query < Arelastic::Nodes::Node
       def nested path
-        Arelastic::Queries::Nested.new path, "query" => self.as_elastic
+        Arelastic::Queries::Nested.new path, self
       end
     end
   end

data/test/arelastic/filters/nested_test.rb

@@ -5,7 +5,7 @@ class Arelastic::Filters::NestedTest < Minitest::Test
     expected = {
       "nested" => {
         "path"  => "bunnies",
-        "query" => {
+        "filter" => {
           "match" => {
             "name" => "Harry"
           }
@@ -13,7 +13,7 @@ class Arelastic::Filters::NestedTest < Minitest::Test
       }
     }
 
-    assert_equal expected, Arelastic::Filters::Nested.new('bunnies', Arelastic::Searches::Query.new(Arelastic::Queries::Match.new('name', 'Harry'))).as_elastic
+    assert_equal expected, Arelastic::Filters::Nested.new('bunnies', Arelastic::Queries::Match.new('name', 'Harry')).as_elastic
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com