arelastic 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 461f0c1c4638378978028848fa4b076be47c2e2f
-  data.tar.gz: 08a45801e8a532840076b49315029a4984ba0632
+  metadata.gz: 70bfaded4af81b93d4ab0548c586a128a790a794
+  data.tar.gz: cadf4637b3c585aa297ded7ada84535c8455911f
 SHA512:
-  metadata.gz: 80d59ba50365fb2902826794e215114d6c28b93d1772328aba566ff18921665f83ec76865863febdda8a7d5e6c0b173a98af2e2cc30e5bdbf68113997c829567
-  data.tar.gz: 6c6d9e6b38e7d1717a50a1850aa94f8d4796434f7ada756deaf380e9830093a0a8135fc13aafea999571283f3bdc56d4bc13495a9b93c3cc933224cf41fa0753
+  metadata.gz: 336c9c1902878d897cfb09d2ca0fdcdbe5e02c6241e6c15de160a3727868160f5102f9ef3f00d174e3df43c26477e26e705bd07a021cbdc746173d8171cf8a51
+  data.tar.gz: ef592219177802e984bc79c0cc3378e2aaa230fa089503ea616f3bbb69677530c2a9200f0175bffbe483ce5ce0ec0286969001f1fc8e5eee921acf3162a3389c

data/lib/arelastic/facets.rb

@@ -2,4 +2,5 @@ require 'arelastic/facets/facet'
 
 require 'arelastic/facets/histogram'
 require 'arelastic/facets/range'
-require 'arelastic/facets/terms'
+require 'arelastic/facets/terms'
+require 'arelastic/facets/nested'

data/lib/arelastic/facets/facet.rb

@@ -1,6 +1,9 @@
 module Arelastic
   module Facets
     class Facet < Arelastic::Nodes::Node
+      def nested path
+        Facets::Nested.new path, self
+      end
     end
   end
 end

data/lib/arelastic/facets/nested.rb

@@ -0,0 +1,9 @@
+module Arelastic
+  module Facets
+    class Nested < Struct.new :path, :facet
+      def as_elastic
+        facet.as_elastic.merge("nested" => path)
+      end
+    end
+  end
+end

data/lib/arelastic/filters/filter.rb

@@ -12,6 +12,10 @@ module Arelastic
       def negate
         Arelastic::Filters::Not.new self
       end
+
+      def nested path
+        Arelastic::Filters::Nested.new path, self
+      end
     end
   end
 end

data/lib/arelastic/nodes/node.rb

@@ -13,6 +13,10 @@ module Arelastic
         end
       end
 
+      def as_elastic
+        {}
+      end
+
       def ==(other)
         as_elastic == other.as_elastic
       end

data/test/arelastic/builders/facet_test.rb

@@ -0,0 +1,9 @@
+require 'helper'
+
+class Arelastic::Builders::FacetTest < MiniTest::Unit::TestCase
+  def test_terms
+    expected = {"name"=>{"terms"=>{"field"=>"term"}}}
+    actual = Arelastic::Builders::Facet['name'].terms('term').as_elastic
+    assert_equal expected, actual
+  end
+end

data/test/arelastic/facets/facet_test.rb

@@ -0,0 +1,31 @@
+require 'helper'
+
+class Arelastic::Facets::FacetTest < MiniTest::Unit::TestCase
+  def test_nested
+    facet = Arelastic::Facets::Facet.new
+    expected = {
+      "nested" => "links"
+    }
+
+    nested = facet.nested "links"
+
+    assert_equal expected, nested.as_elastic
+  end
+
+  def test_nested_terms
+    facet = Arelastic::Facets::Terms.new('foo', 'links.name', "size" => 10)
+    expected = {
+      "foo" => {
+        "terms" => {
+          "field" => "links.name",
+          "size"  => 10,
+        }
+      },
+      "nested" => "links"
+    }
+
+    nested = facet.nested "links"
+
+    assert_equal expected, nested.as_elastic
+  end
+end

data/test/arelastic/facets/histogram_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class Arelastic::Facets::TermsTest < MiniTest::Unit::TestCase
+class Arelastic::Facets::HistogramTest < MiniTest::Unit::TestCase
   def test_as_elastic
     facet = Arelastic::Facets::Histogram.new('histo', "field" => "field_name", "interval" => 100)
     expected = {

data/test/arelastic/filters/filter_test.rb

@@ -27,4 +27,13 @@ class Arelastic::FilterTest < MiniTest::Unit::TestCase
     assert negated_filter.is_a?(Arelastic::Filters::Not)
     assert_equal filter, negated_filter.expr
   end
+
+  def test_nested
+    filter = Arelastic::Filters::Term.new('foo', 'bar').nested('links')
+
+    nested_filter = filter.nested 'links'
+
+    assert nested_filter.is_a?(Arelastic::Filters::Nested)
+    assert_equal filter, nested_filter.expr
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -30,6 +30,7 @@ files:
 - lib/arelastic/builders.rb
 - lib/arelastic/facets/facet.rb
 - lib/arelastic/facets/histogram.rb
+- lib/arelastic/facets/nested.rb
 - lib/arelastic/facets/range.rb
 - lib/arelastic/facets/terms.rb
 - lib/arelastic/facets.rb
@@ -91,11 +92,13 @@ files:
 - test/arelastic/arities/binary_test.rb
 - test/arelastic/arities/polyadic_test.rb
 - test/arelastic/arities/unary_test.rb
+- test/arelastic/builders/facet_test.rb
 - test/arelastic/builders/filter_test.rb
 - test/arelastic/builders/mapping_test.rb
 - test/arelastic/builders/query_test.rb
 - test/arelastic/builders/search_test.rb
 - test/arelastic/builders/sort_test.rb
+- test/arelastic/facets/facet_test.rb
 - test/arelastic/facets/histogram_test.rb
 - test/arelastic/facets/terms_test.rb
 - test/arelastic/filters/exists_test.rb
@@ -143,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Elastic Search query builder