arelastic 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7dd07c79d390e3b2c840edaa9a075901818e0db63f9445b9df8be621a3f9128
-  data.tar.gz: 0fcccd8fb4fa7c24d76749986a65a20697bb51d93992c90d2e4b37d3dbfeec32
+  metadata.gz: eecf4e946c5a80dbd67b631bc501c709f7f675a5cdf361fd1ca70720316e988f
+  data.tar.gz: 8cdb5255aabd05b3cebfbdaa2b14ee4bda3ed92f35165a6d6d263b823b1b6e79
 SHA512:
-  metadata.gz: 72836ec160d987f8fc5d648c0b2f82f10bc9c92e3b16ed002f8c9be189e3566aed31869f9f9c6f47bebd3507457415b50851af6371279abe9e86f82b0ac519c7
-  data.tar.gz: e1f8e296c26dacb529cd14858e06a2e69cd98af08261b3f62fe88c76bb86b0d46234145585925e7d30e72fa9ea23e98441d1cbac4d0121731dbe76dd51826868
+  metadata.gz: 7be8e99832a66885f1a073b6001dc845d7a9ce1908376c9b4ca367715a18fc0353b89e7122a4c2e2e001322ad37fd25677396ebbd05af796e23b79a54f765a48
+  data.tar.gz: 57dcd466e35b9531536dd3b9e6ec12e039f7843ae98faa19b0f1fdc342ae22ef8996afb537555ee85af6f77ba4bd58436e68bcf766d81903c2c28e166e351b15

data/lib/arelastic/aggregations/aggregation.rb

@@ -1,15 +1,20 @@
 module Arelastic
   module Aggregations
     class Aggregation < Arelastic::Nodes::Node
-      attr_accessor :name, :options
+      attr_accessor :name, :meta, :options
 
       def initialize(name, options = {})
         @name    = name
+
+        options  = options.dup
+        @meta    = read_option! options, 'meta'
         @options = options
       end
 
       def as_elastic
-        {name => as_elastic_aggregation}
+        params = as_elastic_aggregation
+        params['meta'] = meta if meta
+        {name => params}
       end
 
       def nested(path)
@@ -19,10 +24,6 @@ module Arelastic
       def reverse_nested(path = nil)
         Arelastic::Aggregations::ReverseNested.new(name, path, [self])
       end
-
-      def as_elastic_aggregation
-        raise 'not implemented'
-      end
     end
   end
 end

data/lib/arelastic/aggregations/bucket.rb

@@ -9,11 +9,7 @@ module Arelastic
         super(name, options)
       end
 
-      def as_elastic
-        {name => as_elastic_aggregation.merge(sub_aggregations_as_elastic)}
-      end
-
-      def sub_aggregations_as_elastic
+      def as_elastic_aggregation
         if aggs
           {'aggs' => Arelastic::Nodes::HashGroup.new(aggs).as_elastic}
         else

data/lib/arelastic/aggregations/date_histogram.rb

@@ -2,7 +2,7 @@ module Arelastic
   module Aggregations
     class DateHistogram < Arelastic::Aggregations::Bucket
       def as_elastic_aggregation
-        {'date_histogram' => options}
+        {'date_histogram' => options}.merge(super)
       end
     end
   end

data/lib/arelastic/aggregations/filter.rb

@@ -9,7 +9,7 @@ module Arelastic
       end
 
       def as_elastic_aggregation
-        {'filter' => convert_to_elastic(filter)}
+        {'filter' => convert_to_elastic(filter)}.merge(super)
       end
     end
   end

data/lib/arelastic/aggregations/histogram.rb

@@ -0,0 +1,9 @@
+module Arelastic
+  module Aggregations
+    class Histogram < Arelastic::Aggregations::Bucket
+      def as_elastic_aggregation
+        {'histogram' => options}.merge(super)
+      end
+    end
+  end
+end

data/lib/arelastic/aggregations/nested.rb

@@ -9,7 +9,7 @@ module Arelastic
       end
 
       def as_elastic_aggregation
-        { "nested" => { "path" => path } }
+        {"nested" => { "path" => path }}.merge(super)
       end
     end
   end

data/lib/arelastic/aggregations/reverse_nested.rb

@@ -11,7 +11,7 @@ module Arelastic
       def as_elastic_aggregation
         params = path ? { "path" => path } : {}
 
-        { "reverse_nested" => params }
+        {"reverse_nested" => params}.merge(super)
       end
     end
   end

data/lib/arelastic/aggregations/sampler.rb

@@ -1,12 +1,14 @@
 module Arelastic
   module Aggregations
     class Sampler < Bucket
+      attr_accessor :shard_size
       def initialize(name, shard_size, aggs)
-        super(name, aggs: aggs, shard_size: shard_size)
+        super(name, aggs: aggs)
+        @shard_size = shard_size
       end
 
       def as_elastic_aggregation
-        { 'sampler' => { 'shard_size' => options[:shard_size] } }
+        {'sampler' => { 'shard_size' => shard_size}}.merge(super)
       end
     end
   end

data/lib/arelastic/aggregations/terms.rb

@@ -2,7 +2,7 @@ module Arelastic
   module Aggregations
     class Terms < Arelastic::Aggregations::Bucket
       def as_elastic_aggregation
-        {'terms' => options}
+        {'terms' => options}.merge(super)
       end
     end
   end

data/lib/arelastic/builders/aggregation.rb

@@ -7,13 +7,25 @@ module Arelastic
         end
       end
 
-      def terms options = {}
-        Arelastic::Aggregations::Terms.new(name, options)
+      def date_histogram options
+        Arelastic::Aggregations::DateHistogram.new name, options
+      end
+
+      def filter filter, options
+        Arelastic::Aggregations::Filter.new name, filter, options
       end
 
       def histogram options
         Arelastic::Aggregations::Histogram.new name, options
       end
+
+      def sample shard_size, aggs
+        Arelastic::Aggregations::Sampler.new(name, sample_size, aggs)
+      end
+
+      def terms options = {}
+        Arelastic::Aggregations::Terms.new(name, options)
+      end
     end
   end
 end

data/test/arelastic/aggregations/aggregation_test.rb

@@ -11,7 +11,19 @@ class Arelastic::Aggregations::AggregationTest < Minitest::Test
   def test_reverse_nested
     aggregation = Arelastic::Aggregations::Min.new('smallest', 'field' => 'pets.weight').reverse_nested('pets')
 
-    expected = Arelastic::Aggregations::ReverseNested.new('smallest', 'pets', [aggregation])    
+    expected = Arelastic::Aggregations::ReverseNested.new('smallest', 'pets', [aggregation])
     assert_equal expected, aggregation.reverse_nested('pets')
   end
+
+  def test_meta
+    aggregation = Arelastic::Aggregations::Min.new('smallest', 'field' => 'pets.weight', 'meta' => {'color' => 'blue'})
+
+    expected = {
+      "smallest" => {
+        "min" => {"field" => "pets.weight"},
+        "meta" => {"color" => "blue"}
+      },
+    }
+    assert_equal expected, aggregation.as_elastic
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com