arelastic 3.1.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92131dd2729b5be9ad302a31d33db3482ecc47dee0b97681b3cca050cf627ba
-  data.tar.gz: d2c3fa9dc8ffe7c8f1c268c030964f23281b15dcba1655bc845d6c5ce8a91862
+  metadata.gz: 2795d56fffdc0a61f805e08103f757e3d9d6733e494cb6f6483439b105fc23e4
+  data.tar.gz: 7812934cd5319e2404c80fd55fbfdccf5fed51c951c3f4a2659624772b668514
 SHA512:
-  metadata.gz: 3e1e3bbdb544e0ee9b39b8c48100339e4340a0adf5985c5a524187ca7758798f596fdf2f7fb3ed221a5334f9f882e037d740267fa29a5cd434c3c13c015fdc3c
-  data.tar.gz: 7e3578aa3af4ca0efb60fe148a0cd611144d76c9e18b5a78623f43778b3b792e5987a8745dde2e175002e50a4781227bf86500f72716efab76b26387392a4337
+  metadata.gz: c5d90ef13123ff1a5eb7e03b7abd2839767697b6cf6905932eafc08fed5e92423da48f7b2111b82633514fea062563d658a60a06e110a7673474aa9145357f20
+  data.tar.gz: 7ae6737a2b74e4081d8a4202a7c01e7e10d8b037cb3b4b238dbf4602faa8a2b55e0e49b143ceb0e2df80de02cf831be15f69bdb183c1ea95dfd71b25c6bb780f

data/README.md

@@ -1,11 +1,9 @@
 [![Build Status](https://travis-ci.org/matthuhiggins/arelastic.svg?branch=master)](https://travis-ci.org/matthuhiggins/arelastic) [![Code Climate](https://codeclimate.com/github/matthuhiggins/arelastic/badges/gpa.svg)](https://codeclimate.com/github/matthuhiggins/arelastic)
 # Arelastic
 
-Arelastic is a Elasticsearch AST manager for Ruby. It simplifies the generation complex of Elasticsearch queries
+Arelastic is a ElasticSearch AST manager for Ruby. It simplifies the generation complex of Elasticsearch queries.
 
-It is intended to be a framework framework; that is, you can build your own ORM with it.
-
-One example is [Elastic Record](https://github.com/data-axle/elastic_record)
+It was extracted from my [Elastic Record](https://github.com/data-axle/elastic_record) project.
 
 ## Usage
 

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/lib/arelastic/aggregations/sum.rb

@@ -0,0 +1,9 @@
+module Arelastic
+  module Aggregations
+    class Sum < Arelastic::Aggregations::Aggregation
+      def as_elastic_aggregation
+        {'sum' => options}
+      end
+    end
+  end
+end

data/lib/arelastic/aggregations.rb

@@ -14,5 +14,6 @@ require 'arelastic/aggregations/nested'
 require 'arelastic/aggregations/range'
 require 'arelastic/aggregations/reverse_nested'
 require 'arelastic/aggregations/sampler'
+require 'arelastic/aggregations/sum'
 require 'arelastic/aggregations/terms'
 require 'arelastic/aggregations/value_count'

data/lib/arelastic/builders/queries.rb

@@ -14,6 +14,7 @@ module Arelastic
         geo_distance:        Arelastic::Queries::GeoDistance,
         geo_polygon:         Arelastic::Queries::GeoPolygon,
         has_child:           Arelastic::Queries::HasChild,
+        has_parent:          Arelastic::Queries::HasParent,
         ids:                 Arelastic::Queries::Ids,
         limit:               Arelastic::Queries::Limit,
         match:               Arelastic::Queries::Match,

data/lib/arelastic/queries/has_parent.rb

@@ -0,0 +1,21 @@
+module Arelastic
+  module Queries
+    class HasParent < Arelastic::Queries::Query
+      attr_reader :parent_type, :query
+
+      def initialize parent_type, query
+        @parent_type = parent_type
+        @query = query
+      end
+
+      def as_elastic
+        {
+          "has_parent" => {
+            "parent_type" => parent_type,
+            "query"       => convert_to_elastic(query)
+          }
+        }
+      end
+    end
+  end
+end

data/lib/arelastic/queries/query.rb

@@ -5,6 +5,14 @@ module Arelastic
         Arelastic::Queries::Nested.new path, self
       end
 
+      def has_child path
+        Arelastic::Queries::HasChild.new path, self
+      end
+
+      def has_parent path
+        Arelastic::Queries::HasParent.new path, self
+      end
+
       def negate
         Arelastic::Queries::Bool.new must_not: self
       end

data/lib/arelastic/queries.rb

@@ -12,6 +12,7 @@ require 'arelastic/queries/geo_bounding_box'
 require 'arelastic/queries/geo_distance'
 require 'arelastic/queries/geo_polygon'
 require 'arelastic/queries/has_child'
+require 'arelastic/queries/has_parent'
 require 'arelastic/queries/ids'
 require 'arelastic/queries/limit'
 require 'arelastic/queries/match'

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

data/test/arelastic/aggregations/sum_test.rb

@@ -0,0 +1,16 @@
+require 'helper'
+
+class Arelastic::Aggregations::SumTest < Minitest::Test
+  def test_as_elastic
+    aggregation = Arelastic::Aggregations::Sum.new('foo', 'field' => 'bar_count')
+
+    expected = {
+      "foo" => {
+        "sum" => {
+          "field" => "bar_count"
+        }
+      }
+    }
+    assert_equal expected, aggregation.as_elastic
+  end
+end

data/test/arelastic/queries/has_parent_test.rb

@@ -0,0 +1,9 @@
+require 'helper'
+
+class Arelastic::Queries::HasParentTest < Minitest::Test
+  def test_as_elastic
+    expected = {"has_parent" => {"parent_type" => "user", "query" => {"query_string" => "foo"}}}
+
+    assert_equal expected, Arelastic::Queries::HasParent.new("user", {"query_string" => "foo"}).as_elastic
+  end
+end

data/test/arelastic/queries/query_test.rb

@@ -16,6 +16,36 @@ class Arelastic::Queries::QueryTest < Minitest::Test
     assert_equal(expected, nested_query.as_elastic)
   end
 
+  def test_has_child
+    query = Arelastic::Queries::Term.new('foo', 'bar')
+
+    nested_query = query.has_child 'links'
+
+    assert nested_query.is_a?(Arelastic::Queries::HasChild)
+    expected = {
+      "has_child" => {
+        "type" => "links",
+        "query" => query.as_elastic
+      }
+    }
+    assert_equal(expected, nested_query.as_elastic)
+  end
+
+  def test_has_parent
+    query = Arelastic::Queries::Term.new('foo', 'bar')
+
+    nested_query = query.has_parent 'links'
+
+    assert nested_query.is_a?(Arelastic::Queries::HasParent)
+    expected = {
+      "has_parent" => {
+        "parent_type" => "links",
+        "query" => query.as_elastic
+      }
+    }
+    assert_equal(expected, nested_query.as_elastic)
+  end
+
   def test_negate
     filter = Arelastic::Queries::Term.new 'foo', 'bar'
 

data/test/helper.rb

@@ -1,3 +1,5 @@
+require 'simplecov'
+
 require 'bundler/setup'
 Bundler.require
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.2
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -35,6 +35,7 @@ files:
 - lib/arelastic/aggregations/range.rb
 - lib/arelastic/aggregations/reverse_nested.rb
 - lib/arelastic/aggregations/sampler.rb
+- lib/arelastic/aggregations/sum.rb
 - lib/arelastic/aggregations/terms.rb
 - lib/arelastic/aggregations/value_count.rb
 - lib/arelastic/arities.rb
@@ -71,6 +72,7 @@ files:
 - lib/arelastic/queries/geo_distance.rb
 - lib/arelastic/queries/geo_polygon.rb
 - lib/arelastic/queries/has_child.rb
+- lib/arelastic/queries/has_parent.rb
 - lib/arelastic/queries/ids.rb
 - lib/arelastic/queries/limit.rb
 - lib/arelastic/queries/match.rb
@@ -115,6 +117,7 @@ files:
 - test/arelastic/aggregations/range_test.rb
 - test/arelastic/aggregations/reverse_nested_test.rb
 - test/arelastic/aggregations/sampler_test.rb
+- test/arelastic/aggregations/sum_test.rb
 - test/arelastic/aggregations/terms_test.rb
 - test/arelastic/arities/binary_test.rb
 - test/arelastic/arities/polyadic_test.rb
@@ -136,6 +139,7 @@ files:
 - test/arelastic/queries/geo_distance_test.rb
 - test/arelastic/queries/geo_polygon_test.rb
 - test/arelastic/queries/has_child_test.rb
+- test/arelastic/queries/has_parent_test.rb
 - test/arelastic/queries/ids_test.rb
 - test/arelastic/queries/match_all_test.rb
 - test/arelastic/queries/match_none_test.rb
@@ -175,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.6
 signing_key:
 specification_version: 4
 summary: Elastic Search query builder