arelastic 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 381463ecf4f97102d56a12e6cfba3aaaa5f9610b7f6d8c622793d99a464ec47a
-  data.tar.gz: f679b942408ee54fd00c9d40a2fd85f5995da569b874bd7411b71d9866f7a3b3
+  metadata.gz: ef3b1158d5db01fba4396abb65ef1e2aa54bdd25282136ab10a3b8e3abf3be9e
+  data.tar.gz: 80bdddc3f1f37e3568f56f204f272649edbd03470f44dbff77081e8263e36c9c
 SHA512:
-  metadata.gz: 79b6b446d60712c50da8e668d0280f5c740c8edbac75fbc246ccc54e96bac3c0f034806f58dbe46ddaf61ea412b562b14b9c5f3c88a0456ae574d37dc27689a9
-  data.tar.gz: 7b794ddfd65dbe44b27042eaebb9e240708fc6cc8b003f628ae3353d8bdf2b638b953b69dae652bdf542d3d55da80acb9a4b05d1c393ab429d2978ec637184f3
+  metadata.gz: 5c7e5caf0cf662e3cffb03b07485a73fe5fcfc49e49b1d93377858df81fbb22d5002f91f409b0ea65d9b37e5343c399387367b6db6fc6bcf95d1cfb35b64147e
+  data.tar.gz: b85604fb9a3165447112476b72895bef64a583c689668df2707dedecd733f40156314a2fd3bb654a026fc1e02891e2bea0b07720ab00defa36b646a7668413ec

data/lib/arelastic/aggregations.rb

@@ -3,6 +3,7 @@ require 'arelastic/aggregations/bucket'
 
 require 'arelastic/aggregations/date_histogram'
 require 'arelastic/aggregations/filter'
+require 'arelastic/aggregations/filters'
 require 'arelastic/aggregations/histogram'
 require 'arelastic/aggregations/min'
 require 'arelastic/aggregations/missing'

data/lib/arelastic/aggregations/filters.rb

@@ -0,0 +1,16 @@
+module Arelastic
+  module Aggregations
+    class Filters < Arelastic::Aggregations::Bucket
+      attr_accessor :filters
+
+      def initialize(name, filters, options = {})
+        super name, options
+        @filters = filters
+      end
+
+      def as_elastic_aggregation
+        {'filters' => convert_to_elastic(filters)}.merge(super)
+      end
+    end
+  end
+end

data/lib/arelastic/nodes/node.rb

@@ -8,6 +8,8 @@ module Arelastic
       def convert_to_elastic(expr)
         if expr.is_a?(Array)
           expr.map { |e| convert_to_elastic(e) }
+        elsif expr.is_a?(Hash)
+          expr.transform_values { |e| convert_to_elastic(e) }
         else
           expr.respond_to?(:as_elastic) ? expr.as_elastic : expr
         end

data/test/arelastic/aggregations/filters_test.rb

@@ -0,0 +1,55 @@
+require 'helper'
+
+class Arelastic::Aggregations::FiltersTest < Minitest::Test
+  def test_as_elastic_with_array
+    aggregation = Arelastic::Aggregations::Filters.new 'foo', [
+      {'exists' => {'field' => 'color'}},
+      Arelastic::Queries::Exists.new('price')
+    ]
+
+    expected = {
+      "foo" => {
+        "filters" => [
+          {
+            "exists" => {
+              "field" => "color"
+            },
+          },
+          {
+            "exists" => {
+              "field" => "price"
+            }
+          }
+        ]
+      }
+    }
+
+    assert_equal expected, aggregation.as_elastic
+  end
+
+  def test_as_elastic_with_hash
+    aggregation = Arelastic::Aggregations::Filters.new 'foo', {
+      'color_count' => {'exists' => {'field' => 'color'}},
+      'price_count' => Arelastic::Queries::Exists.new('price')
+    }
+
+    expected = {
+      "foo" => {
+        "filters" => {
+          "color_count" => {
+            "exists" => {
+              "field" => "color"
+            }
+          },
+          "price_count" => {
+            "exists" => {
+              "field" => "price"
+            }
+          }
+        }
+      }
+    }
+
+    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.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-13 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -24,6 +24,7 @@ files:
 - lib/arelastic/aggregations/bucket.rb
 - lib/arelastic/aggregations/date_histogram.rb
 - lib/arelastic/aggregations/filter.rb
+- lib/arelastic/aggregations/filters.rb
 - lib/arelastic/aggregations/histogram.rb
 - lib/arelastic/aggregations/min.rb
 - lib/arelastic/aggregations/missing.rb
@@ -101,6 +102,7 @@ files:
 - test/arelastic/aggregations/bucket_test.rb
 - test/arelastic/aggregations/date_histogram_test.rb
 - test/arelastic/aggregations/filter_test.rb
+- test/arelastic/aggregations/filters_test.rb
 - test/arelastic/aggregations/missing_test.rb
 - test/arelastic/aggregations/nested_test.rb
 - test/arelastic/aggregations/range_test.rb