arelastic 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed83fdd7af7f94209a516bc4438b0eabdf384cd
-  data.tar.gz: 899e033e443cfd575043fe6d937f18c15cc63ef5
+  metadata.gz: 87aa4611a9b69484f792da345e91c2fa81c0f3be
+  data.tar.gz: 8163a78df33b8ec32a31afef6c39c676bd4e2432
 SHA512:
-  metadata.gz: dd9786cc2bc4e10fe3c783cd807845321c35632a40d0a696f6a0f7fbb479e96410228c3fc004b4be8dca68b29225d7d333947f2baa13e94b2123622d029cb654
-  data.tar.gz: 836bce0d0430f3338ac5ff4ab02b72c135770648ed0da4d2e8e338ef334bbaeddaa575d9617e99282b4463b92de07dd74c89b830d0642760ea91a409744ac729
+  metadata.gz: 5b3f37121f550f07d5f2832266adb731f180ff1212118351ec6acd891bde04568511fb7cc9ebc5126c79ee59a832b2f746ae551ed55c621da4fcf1ed9029e652
+  data.tar.gz: 955fe1ee727cc071585c8a6ff7d0b482496cfe8a6f62d4f97fd423e4c3336b88194304316b230a4f795067bc89acdfcc29570f3d5d1f806a9bc4b1dac16f0a16

data/lib/arelastic/filters/nested.rb

@@ -1,17 +1,7 @@
 module Arelastic
   module Filters
     class Nested < Arelastic::Filters::Filter
-      attr_accessor :path, :expr
-      def initialize(path, expr)
-        @path = path
-        @expr = expr
-      end
-
-      def as_elastic
-        params = {'path' => path}.update(convert_to_elastic(expr))
-
-        { 'nested' => params }
-      end
+      include Arelastic::Nodes::Nested
     end
   end
 end

data/lib/arelastic/nodes.rb

@@ -1,2 +1,4 @@
 require 'arelastic/nodes/node'
+
+require 'arelastic/nodes/nested'
 require 'arelastic/nodes/hash_group'

data/lib/arelastic/nodes/nested.rb

@@ -0,0 +1,22 @@
+module Arelastic
+  module Nodes
+    module Nested
+      def self.included(klass)
+        klass.class_eval do
+          attr_accessor :path, :expr
+        end
+      end
+
+      def initialize(path, expr)
+        @path = path
+        @expr = expr
+      end
+
+      def as_elastic
+        params = {'path' => path}.update(convert_to_elastic(expr))
+
+        { 'nested' => params }
+      end
+    end
+  end
+end

data/lib/arelastic/queries.rb

@@ -7,6 +7,7 @@ require 'arelastic/queries/filtered'
 require 'arelastic/queries/match'
 require 'arelastic/queries/match_all'
 require 'arelastic/queries/multi_match'
+require 'arelastic/queries/nested'
 require 'arelastic/queries/prefix'
 require 'arelastic/queries/query_string'
 require 'arelastic/queries/terms'

data/lib/arelastic/queries/nested.rb

@@ -0,0 +1,7 @@
+module Arelastic
+  module Queries
+    class Nested < Arelastic::Queries::Query
+      include Arelastic::Nodes::Nested
+    end
+  end
+end

data/lib/arelastic/queries/query.rb

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

data/test/arelastic/queries/query_test.rb

@@ -1,6 +1,18 @@
 require 'helper'
 
 class Arelastic::Queries::QueryTest < Minitest::Test
-  def test_as_elastic
+  def test_nested
+    query = Arelastic::Queries::Term.new('foo', 'bar')
+
+    nested_query = query.nested 'links'
+
+    assert nested_query.is_a?(Arelastic::Queries::Nested)
+    expected = {
+      "nested" => {
+        "path" => "links",
+        "query" => query.as_elastic
+      }
+    }
+    assert_equal(expected, nested_query.as_elastic)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -68,6 +68,7 @@ files:
 - lib/arelastic/mappings/types/string.rb
 - lib/arelastic/nodes.rb
 - lib/arelastic/nodes/hash_group.rb
+- lib/arelastic/nodes/nested.rb
 - lib/arelastic/nodes/node.rb
 - lib/arelastic/queries.rb
 - lib/arelastic/queries/bool.rb
@@ -77,6 +78,7 @@ files:
 - lib/arelastic/queries/match.rb
 - lib/arelastic/queries/match_all.rb
 - lib/arelastic/queries/multi_match.rb
+- lib/arelastic/queries/nested.rb
 - lib/arelastic/queries/prefix.rb
 - lib/arelastic/queries/query.rb
 - lib/arelastic/queries/query_string.rb