arelastic 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41849e76c34d20f19af86422794c1c7c5245d8355cb6a453decc6c87934dbb66
-  data.tar.gz: a32b6ef72a9a28bccba585a0f93e04586a42b18f2ec23bb79134c59a618ea2d0
+  metadata.gz: b92131dd2729b5be9ad302a31d33db3482ecc47dee0b97681b3cca050cf627ba
+  data.tar.gz: d2c3fa9dc8ffe7c8f1c268c030964f23281b15dcba1655bc845d6c5ce8a91862
 SHA512:
-  metadata.gz: c109a5bd0a2a6e10aa9e9da405574d86b9d0e74795fd61101b0966aab00c57c41043043b268c94f004127f78b5bc6e6f45116fa1f8ca8f962e41ebeb3ff31d43
-  data.tar.gz: 1f5da97d3217067aac0963b059dff48083da71c02d116b8d3e7a3e4ead1c9786833c5218b84a69fb96b4858447417e5c252aa965ad3bd08925f821493931a8c8
+  metadata.gz: 3e1e3bbdb544e0ee9b39b8c48100339e4340a0adf5985c5a524187ca7758798f596fdf2f7fb3ed221a5334f9f882e037d740267fa29a5cd434c3c13c015fdc3c
+  data.tar.gz: 7e3578aa3af4ca0efb60fe148a0cd611144d76c9e18b5a78623f43778b3b792e5987a8745dde2e175002e50a4781227bf86500f72716efab76b26387392a4337

data/lib/arelastic/aggregations.rb

@@ -1,6 +1,8 @@
 require 'arelastic/aggregations/aggregation'
 require 'arelastic/aggregations/bucket'
 
+require 'arelastic/aggregations/bucket_sort'
+require 'arelastic/aggregations/bucket_selector'
 require 'arelastic/aggregations/cardinality'
 require 'arelastic/aggregations/date_histogram'
 require 'arelastic/aggregations/filter'

data/lib/arelastic/aggregations/bucket_selector.rb

@@ -0,0 +1,23 @@
+module Arelastic
+  module Aggregations
+    class BucketSelector < Arelastic::Aggregations::Aggregation
+      attr_accessor :script_params, :script
+
+      def initialize(name, options = {})
+        options = options.dup
+        @script_params = read_option! options, 'script_params'
+        @script = read_option! options, 'script'
+        super(name, options)
+      end
+
+      def as_elastic_aggregation
+        {
+          'bucket_selector' => {
+            'buckets_path' => script_params,
+            'script' => script
+          }
+        }
+      end
+    end
+  end
+end

data/lib/arelastic/aggregations/bucket_sort.rb

@@ -0,0 +1,37 @@
+module Arelastic
+  module Aggregations
+    class BucketSort < Arelastic::Aggregations::Aggregation
+      attr_accessor :from, :size, :sort
+
+      def initialize(name, options = {})
+        options = options.dup
+        @from = read_option! options, 'from'
+        @size = read_option! options, 'size'
+        @sort = read_option! options, 'sort'
+        super(name, options)
+      end
+
+      def as_elastic_aggregation
+        bucket_sort = {}
+        bucket_sort['sort'] = parse_sort if sort
+        bucket_sort['from'] = from if from
+        bucket_sort['size'] = size if size
+        { 'bucket_sort' => bucket_sort }
+      end
+
+      private
+
+        def parse_sort
+          if sort.is_a?(Hash)
+            sort.map { |bucket_path, order| { bucket_path => order } }
+          elsif sort.is_a?(String)
+            [sort]
+          elsif sort.is_a?(Array)
+            sort
+          else
+            raise TypeError.new('Expecting a hash, string, or array as the "sort" argument')
+          end
+        end
+    end
+  end
+end

data/test/arelastic/aggregations/bucket_selector_test.rb

@@ -0,0 +1,25 @@
+require 'helper'
+
+class Arelastic::Aggregations::BucketSelectorTest < Minitest::Test
+  def test_as_elastic
+    aggregation = Arelastic::Aggregations::BucketSelector.new('foo_agg',
+      script_params: {
+        'foo_bucket' => 'foo_bucket_path',
+        'bar_bucket' => 'bar_bucket_path'
+      },
+      script: "params.foo_bucket > 10 && params.bar_bucket < 100"
+    )
+    expected = {
+      'foo_agg' => {
+        'bucket_selector' => {
+          'buckets_path' => {
+            'foo_bucket' => 'foo_bucket_path',
+            'bar_bucket' => 'bar_bucket_path'
+          },
+          'script' => 'params.foo_bucket > 10 && params.bar_bucket < 100'
+        }
+      }
+    }
+    assert_equal expected, aggregation.as_elastic
+  end
+end

data/test/arelastic/aggregations/bucket_sort_test.rb

@@ -0,0 +1,25 @@
+require 'helper'
+
+class Arelastic::Aggregations::BucketSortTest < Minitest::Test
+  def test_parse_sort
+    assert_equal ['foo'], parse_sort('foo')
+    assert_equal [{'foo' => 'desc'}, {'bar' => 'asc'}], parse_sort({'foo' => 'desc', 'bar' => 'asc'})
+  end
+
+  def test_size_and_from
+    aggregation = Arelastic::Aggregations::BucketSort.new('foo_agg', 'size' => 3, 'from' => 5)
+    expected = {
+      'foo_agg' => {
+        'bucket_sort' => {
+          'from' => 5,
+          'size' => 3
+        }
+      }
+    }
+    assert_equal expected, aggregation.as_elastic
+  end
+
+  def parse_sort(sort)
+    Arelastic::Aggregations::BucketSort.new('foosort', sort: sort).as_elastic['foosort']['bucket_sort']['sort']
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Matthew Higgins
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -22,6 +22,8 @@ files:
 - lib/arelastic/aggregations.rb
 - lib/arelastic/aggregations/aggregation.rb
 - lib/arelastic/aggregations/bucket.rb
+- lib/arelastic/aggregations/bucket_selector.rb
+- lib/arelastic/aggregations/bucket_sort.rb
 - lib/arelastic/aggregations/cardinality.rb
 - lib/arelastic/aggregations/date_histogram.rb
 - lib/arelastic/aggregations/filter.rb
@@ -101,6 +103,8 @@ files:
 - lib/arelastic/sorts/geo_distance.rb
 - lib/arelastic/sorts/sort.rb
 - test/arelastic/aggregations/aggregation_test.rb
+- test/arelastic/aggregations/bucket_selector_test.rb
+- test/arelastic/aggregations/bucket_sort_test.rb
 - test/arelastic/aggregations/bucket_test.rb
 - test/arelastic/aggregations/cardinality_test.rb
 - test/arelastic/aggregations/date_histogram_test.rb
@@ -156,7 +160,7 @@ homepage: http://github.com/matthuhiggins/arelastic
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,8 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Elastic Search query builder
 test_files: []