arelastic 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0a7a0a703d0ab5dd36a676449fc8bfa2cdc20b7
-  data.tar.gz: 8f79e245f42b144533d1fa2c17883c824b091cf2
+  metadata.gz: d96135e275fd9ab247666893b15e684ee782dead
+  data.tar.gz: cdc3cd878e4c5f71a0f90d9c3337e9b4611e3df3
 SHA512:
-  metadata.gz: 660f7f84062fab516fea41a0e7b0e35365c5032d6c955ca799f199917ed98bd5e9bb4b7b3305d0a415e5332c4354eb578dbc02761f9f4e9e332487d9c10615a6
-  data.tar.gz: 2ddf09ade0864e340bda0f6a4e5e865e345acd15fe5ba428b32babc35f9c6e06e74bad220186629a63194afd5588651d098d1e79cabf40e50613ddee953ff319
+  metadata.gz: 82a9a205c20da2f7aa6908faa80073c1ed170173580436eac6b92b3e2903bdb88b1fa016cc5d89e3e1f256e979a48cf8e372d41f904cf3f40e698fb117a52c1b
+  data.tar.gz: 93736e6182ddfdfefabf2680e94c2d4e65d9fff3de38d02ce94827758d444d9c8ec56b2d8dd52c40aba5fe1c7af8697eb82f95e55d421ab3eb81946e094b6296

data/lib/arelastic/aggregations.rb

@@ -1,7 +1,9 @@
 require 'arelastic/aggregations/aggregation'
+require 'arelastic/aggregations/bucket'
 
 require 'arelastic/aggregations/date_histogram'
 require 'arelastic/aggregations/filter'
 require 'arelastic/aggregations/min'
 require 'arelastic/aggregations/nested'
+require 'arelastic/aggregations/reverse_nested'
 require 'arelastic/aggregations/terms'

data/lib/arelastic/aggregations/aggregation.rb

@@ -4,7 +4,7 @@ module Arelastic
       attr_accessor :name, :options
 
       def initialize(name, options = {})
-        @name = name
+        @name    = name
         @options = options
       end
 
@@ -16,6 +16,10 @@ module Arelastic
         Arelastic::Aggregations::Nested.new(name, path, [self])
       end
 
+      def reverse_nested(path = nil)
+        Arelastic::Aggregations::ReverseNested.new(name, path, [self])
+      end
+
       def as_elastic_aggregation
         raise 'not implemented'
       end

data/lib/arelastic/aggregations/bucket.rb

@@ -0,0 +1,25 @@
+module Arelastic
+  module Aggregations
+    class Bucket < Arelastic::Aggregations::Aggregation
+      attr_accessor :aggs
+
+      def initialize(name, options = {})
+        options = options.dup
+        @aggs = options.delete(:aggs) || options.delete('aggs')
+        super(name, options)
+      end
+
+      def as_elastic
+        {name => as_elastic_aggregation.merge(sub_aggregations_as_elastic)}
+      end
+
+      def sub_aggregations_as_elastic
+        if aggs
+          {'aggs' => Arelastic::Nodes::HashGroup.new(aggs).as_elastic}
+        else
+          {}
+        end
+      end
+    end
+  end
+end

data/lib/arelastic/aggregations/date_histogram.rb

@@ -1,9 +1,9 @@
 module Arelastic
   module Aggregations
-    class DateHistogram < Arelastic::Aggregations::Aggregation
+    class DateHistogram < Arelastic::Aggregations::Bucket
       def as_elastic_aggregation
         {'date_histogram' => options}
       end
     end
   end
-end
+end

data/lib/arelastic/aggregations/filter.rb

@@ -1,10 +1,10 @@
 module Arelastic
   module Aggregations
-    class Filter < Arelastic::Aggregations::Aggregation
+    class Filter < Arelastic::Aggregations::Bucket
       attr_accessor :filter
 
-      def initialize name, filter
-        super name
+      def initialize(name, filter, options = {})
+        super name, options
         @filter = filter
       end
 

data/lib/arelastic/aggregations/min.rb

@@ -2,7 +2,7 @@ module Arelastic
   module Aggregations
     class Min < Arelastic::Aggregations::Aggregation
       def as_elastic_aggregation
-        {"min" => options}
+        {'min' => options}
       end
     end
   end

data/lib/arelastic/aggregations/nested.rb

@@ -1,23 +1,15 @@
 module Arelastic
   module Aggregations
-    class Nested < Arelastic::Aggregations::Aggregation
-      attr_accessor :path, :aggregations
+    class Nested < Arelastic::Aggregations::Bucket
+      attr_accessor :path
 
-      # HashGroup
-      def initialize name, path, aggregations
-        super name
+      def initialize(name, path, aggs)
+        super name, aggs: aggs
         @path = path
-        @aggregations = aggregations
       end
 
-      def as_elastic
-        grouping = Arelastic::Nodes::HashGroup.new aggregations
-        {
-          name => {
-            "nested" => {"path" => path},
-            "aggs"   => grouping.as_elastic
-          }
-        }
+      def as_elastic_aggregation
+        { "nested" => { "path" => path } }
       end
     end
   end

data/lib/arelastic/aggregations/reverse_nested.rb

@@ -0,0 +1,18 @@
+module Arelastic
+  module Aggregations
+    class ReverseNested < Arelastic::Aggregations::Bucket
+      attr_accessor :path
+
+      def initialize(name, path = nil, aggs)
+        super name, aggs: aggs
+        @path = path
+      end
+
+      def as_elastic_aggregation
+        params = path ? { "path" => path } : {}
+
+        { "reverse_nested" => params }
+      end
+    end
+  end
+end

data/lib/arelastic/aggregations/terms.rb

@@ -1,6 +1,6 @@
 module Arelastic
   module Aggregations
-    class Terms < Arelastic::Aggregations::Aggregation
+    class Terms < Arelastic::Aggregations::Bucket
       def as_elastic_aggregation
         {'terms' => options}
       end

data/lib/arelastic/builders/aggregation.rb

@@ -8,7 +8,7 @@ module Arelastic
       end
 
       def terms options = {}
-        Arelastic::Aggregations::Terms.new name, options
+        Arelastic::Aggregations::Terms.new(name, options)
       end
 
       def histogram options

data/lib/arelastic/nodes/hash_group.rb

@@ -7,12 +7,10 @@ module Arelastic
       end
 
       def as_elastic
-        result = {}
-        nodes.each do |node|
+        nodes.each_with_object({}) do |node, result|
           result.merge! convert_to_elastic(node)
         end
-        result
       end
     end
   end
-end
+end

data/lib/arelastic/searches/aggregations.rb

@@ -1,19 +1,16 @@
 module Arelastic
   module Searches
     class Aggregations < Arelastic::Searches::Search
-      attr_accessor :aggregations
-      def initialize *aggregations
-        @aggregations = aggregations.flatten
+      attr_accessor :aggs
+
+      def initialize *aggs
+        @aggs = aggs.flatten
       end
 
       def as_elastic
-        grouping = Arelastic::Nodes::HashGroup.new aggregations.flatten
+        grouping = Arelastic::Nodes::HashGroup.new(aggs)
         { "aggs" => grouping.as_elastic }
       end
-
-      def nested(name, path)
-        Arelastic::Aggregations::Nested.new name, path, aggregations
-      end
     end
   end
 end

data/test/arelastic/aggregations/aggregation_test.rb

@@ -4,19 +4,14 @@ class Arelastic::Aggregations::AggregationTest < Minitest::Test
   def test_nested
     aggregation = Arelastic::Aggregations::Min.new('smallest', 'field' => 'pets.weight').nested('pets')
 
-    expected = {
-      "smallest" => {
-        "nested" => {
-          "path" => "pets"
-        },
-        "aggs" => {
-          "smallest" => {
-            "min" => { "field" => "pets.weight" }
-          }
-        }
-      }
-    }
+    expected = Arelastic::Aggregations::Nested.new('smallest', 'pets', [aggregation])
+    assert_equal expected, aggregation.nested('pets')
+  end
+
+  def test_reverse_nested
+    aggregation = Arelastic::Aggregations::Min.new('smallest', 'field' => 'pets.weight').reverse_nested('pets')
 
-    assert_equal expected, aggregation.as_elastic
+    expected = Arelastic::Aggregations::ReverseNested.new('smallest', 'pets', [aggregation])    
+    assert_equal expected, aggregation.reverse_nested('pets')
   end
-end
+end

data/test/arelastic/aggregations/bucket_test.rb

@@ -0,0 +1,30 @@
+require 'helper'
+
+class Arelastic::Aggregations::BucketTest < Minitest::Test
+  def test_as_elastic_with_sub_aggregations
+    aggregation = Arelastic::Aggregations::Terms.new('foo',
+      'field' => 'tags',
+      'size' => 10,
+      'aggs' => [
+        Arelastic::Aggregations::Terms.new('colors', 'field' => 'color')
+      ]
+    )
+
+    expected = {
+      "foo" => {
+        "terms" => {
+          "field" => "tags",
+          "size"  => 10,
+        },
+        "aggs"  => {
+          "colors" => {
+            "terms" => {
+              "field" => "color"
+            }
+          }
+        }
+      }
+    }
+    assert_equal expected, aggregation.as_elastic
+  end
+end

data/test/arelastic/aggregations/nested_test.rb

@@ -3,7 +3,24 @@ require 'helper'
 class Arelastic::Aggregations::NestedTest < Minitest::Test
   def test_as_elastic
     aggregation = Arelastic::Aggregations::Nested.new('favorite', 'movies', [
-
+      Arelastic::Aggregations::Terms.new('foo', 'field' => 'tags', 'size' => 10)
     ])
+
+    expected = {
+      "favorite" => {
+        "nested" => {
+          "path" => "movies"
+        },
+        "aggs" => {
+          "foo" => {
+            "terms" => {
+              "field" => "tags",
+              "size" => 10
+            }
+          }
+        }
+      }
+    }
+    assert_equal expected, aggregation.as_elastic
   end
-end
+end

data/test/arelastic/aggregations/reverse_nested_test.rb

@@ -0,0 +1,44 @@
+require 'helper'
+
+class Arelastic::Aggregations::ReverseNestedTest < Minitest::Test
+  def test_as_elastic
+    aggregation = Arelastic::Aggregations::ReverseNested.new(
+      'smallest',
+      'pets',
+      [Arelastic::Aggregations::Min.new('smallest', 'field' => 'pets.weight')]
+    )
+
+    expected = {
+      "smallest" => {
+        "reverse_nested" => {
+          "path" => "pets"
+        },
+        "aggs" => {
+          "smallest" => {
+            "min" => { "field" => "pets.weight" }
+          }
+        }
+      }
+    }
+    assert_equal expected, aggregation.as_elastic
+  end
+
+  def test_as_elastic_without_path
+    aggregation = Arelastic::Aggregations::ReverseNested.new(
+      'youngest',
+      [Arelastic::Aggregations::Min.new('youngest', 'field' => 'age')]
+    )
+
+    expected = {
+      "youngest" => {
+        "reverse_nested" => {},
+        "aggs" => {
+          "youngest" => {
+            "min" => { "field" => "age" }
+          }
+        }
+      }
+    }
+    assert_equal expected, aggregation.as_elastic
+  end
+end

data/test/arelastic/aggregations/terms_test.rb

@@ -3,6 +3,7 @@ require 'helper'
 class Arelastic::Aggregations::TermsTest < Minitest::Test
   def test_as_elastic
     aggregation = Arelastic::Aggregations::Terms.new('foo', 'field' => 'tags', 'size' => 10)
+
     expected = {
       "foo" => {
         "terms" => {
@@ -11,7 +12,6 @@ class Arelastic::Aggregations::TermsTest < Minitest::Test
         }
       }
     }
-
     assert_equal expected, aggregation.as_elastic
   end
 end

data/test/arelastic/filters/filter_test.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 class Arelastic::FilterTest < Minitest::Test
-  def test_or
+  def test_and
     filter = Arelastic::Filters::Filter.new
 
     and_filter = filter.and(filter)
@@ -10,7 +10,7 @@ class Arelastic::FilterTest < Minitest::Test
     assert_equal [filter, filter], and_filter.children
   end
 
-  def test_and
+  def test_or
     filter = Arelastic::Filters::Filter.new
 
     and_filter = filter.or(filter)

data/test/arelastic/searches/aggregations_test.rb

@@ -26,26 +26,4 @@ class Arelastic::Searches::AggregationsTest < MiniTest::Spec
     }
     assert_equal expected, aggregations.as_elastic
   end
-
-  def test_nested
-    aggregations = Arelastic::Searches::Aggregations.new "favorites" => {"terms" => {"field" => "pencils.color"}}
-    nested = aggregations.nested("pencil_colors", "pencils")
-
-    expected = {
-      "pencil_colors" => {
-        "nested" => {
-          "path" => "pencils"
-        },
-        "aggs" => {
-          "favorites" => {
-            "terms" => {
-              "field"=>"pencils.color"
-            }
-          }
-        }
-      }
-    }
-
-    assert_equal expected, nested.as_elastic
-  end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2017-07-09 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -21,11 +21,13 @@ files:
 - lib/arelastic.rb
 - lib/arelastic/aggregations.rb
 - lib/arelastic/aggregations/aggregation.rb
+- lib/arelastic/aggregations/bucket.rb
 - lib/arelastic/aggregations/date_histogram.rb
 - lib/arelastic/aggregations/filter.rb
 - lib/arelastic/aggregations/histogram.rb
 - lib/arelastic/aggregations/min.rb
 - lib/arelastic/aggregations/nested.rb
+- lib/arelastic/aggregations/reverse_nested.rb
 - lib/arelastic/aggregations/terms.rb
 - lib/arelastic/arities.rb
 - lib/arelastic/arities/binary.rb
@@ -102,9 +104,11 @@ files:
 - lib/arelastic/sorts/geo_distance.rb
 - lib/arelastic/sorts/sort.rb
 - test/arelastic/aggregations/aggregation_test.rb
+- test/arelastic/aggregations/bucket_test.rb
 - test/arelastic/aggregations/date_histogram_test.rb
 - test/arelastic/aggregations/filter_test.rb
 - test/arelastic/aggregations/nested_test.rb
+- test/arelastic/aggregations/reverse_nested_test.rb
 - test/arelastic/aggregations/terms_test.rb
 - test/arelastic/arities/binary_test.rb
 - test/arelastic/arities/polyadic_test.rb
@@ -166,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Elastic Search query builder