arelastic 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92131dd2729b5be9ad302a31d33db3482ecc47dee0b97681b3cca050cf627ba
-  data.tar.gz: d2c3fa9dc8ffe7c8f1c268c030964f23281b15dcba1655bc845d6c5ce8a91862
+  metadata.gz: '0984b722326d3ec3a60b11114a249eba54399ba4a28a5f05635ec3c6570b16dc'
+  data.tar.gz: 7f4451aa328ab073bc7aa66818bcb98b28ac6d2354c8d086213fdad1a441532d
 SHA512:
-  metadata.gz: 3e1e3bbdb544e0ee9b39b8c48100339e4340a0adf5985c5a524187ca7758798f596fdf2f7fb3ed221a5334f9f882e037d740267fa29a5cd434c3c13c015fdc3c
-  data.tar.gz: 7e3578aa3af4ca0efb60fe148a0cd611144d76c9e18b5a78623f43778b3b792e5987a8745dde2e175002e50a4781227bf86500f72716efab76b26387392a4337
+  metadata.gz: 01d68d3d7669ab860e232fdb6723b70460ddb103e2c8a4b3d4597a49d090b24da4ef25f3a6a847ee76e459e00b8b6f983499216aa9aa672bef80fe0141913af1
+  data.tar.gz: 1a866d2a4b7129a7b59c44ed7c030748937f70bd0539afe9ed45fb6e10ca6a672d1fa4795672b5b9569b34c327764a8a1c798572e49090ebd017a631370430e9

data/lib/arelastic/aggregations/bucket_selector.rb

@@ -1,22 +1,8 @@
 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
-          }
-        }
+        { 'bucket_selector' => options }
       end
     end
   end

data/lib/arelastic/aggregations/bucket_sort.rb

@@ -1,37 +1,18 @@
 module Arelastic
   module Aggregations
     class BucketSort < Arelastic::Aggregations::Aggregation
-      attr_accessor :from, :size, :sort
+      attr_accessor :sort
 
       def initialize(name, options = {})
-        options = options.dup
-        @from = read_option! options, 'from'
-        @size = read_option! options, 'size'
+        super
         @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 }
+        params = options
+        params = params.merge('sort' => convert_to_elastic(sort)) if sort
+        { 'bucket_sort' => params }
       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

@@ -1,22 +1,22 @@
-require 'helper'
+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'
+    aggregation = Arelastic::Aggregations::BucketSelector.new("foo_agg",
+      "buckets_path" => {
+        "foo_bucket" => "foo_bucket_path",
+        "bar_bucket" => "bar_bucket_path"
       },
-      script: "params.foo_bucket > 10 && params.bar_bucket < 100"
+      "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'
+      "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'
+          "script" => "params.foo_bucket > 10 && params.bar_bucket < 100"
         }
       }
     }

data/test/arelastic/aggregations/bucket_sort_test.rb

@@ -1,25 +1,45 @@
-require 'helper'
+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'})
+  def test_as_elastic
+    aggregation = Arelastic::Aggregations::BucketSort.new("foo_agg", "size" => 3, "from" => 5, "sort" => "price")
+
+    expected = {
+      "foo_agg" => {
+        "bucket_sort" => {
+          "sort" => "price",
+          "from" => 5,
+          "size" => 3
+        }
+      }
+    }
+    assert_equal expected, aggregation.as_elastic
   end
 
-  def test_size_and_from
-    aggregation = Arelastic::Aggregations::BucketSort.new('foo_agg', 'size' => 3, 'from' => 5)
+  def test_arelastic_sort
+    sort = Arelastic::Sorts::Field.new("price" => "desc")
+    aggregation = Arelastic::Aggregations::BucketSort.new("foo_agg", "sort" => sort)
+
     expected = {
-      'foo_agg' => {
-        'bucket_sort' => {
-          'from' => 5,
-          'size' => 3
+      "foo_agg" => {
+        "bucket_sort" => {
+          "sort" => {"price" => "desc"}
         }
       }
     }
     assert_equal expected, aggregation.as_elastic
   end
 
-  def parse_sort(sort)
-    Arelastic::Aggregations::BucketSort.new('foosort', sort: sort).as_elastic['foosort']['bucket_sort']['sort']
+  def test_optional_sort
+    aggregation = Arelastic::Aggregations::BucketSort.new("foo_agg", "size" => 3)
+
+    expected = {
+      "foo_agg" => {
+        "bucket_sort" => {
+          "size" => 3
+        }
+      }
+    }
+    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: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com