arelastic 3.0.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41849e76c34d20f19af86422794c1c7c5245d8355cb6a453decc6c87934dbb66
-  data.tar.gz: a32b6ef72a9a28bccba585a0f93e04586a42b18f2ec23bb79134c59a618ea2d0
+  metadata.gz: 825228d447713a690e532c0865608f0e6c7800039bd04bdb12f03f3a3ef95d46
+  data.tar.gz: ec3aca5096dfec14ff7a40b4f4ef7240f05490934248021185909617ba9289ed
 SHA512:
-  metadata.gz: c109a5bd0a2a6e10aa9e9da405574d86b9d0e74795fd61101b0966aab00c57c41043043b268c94f004127f78b5bc6e6f45116fa1f8ca8f962e41ebeb3ff31d43
-  data.tar.gz: 1f5da97d3217067aac0963b059dff48083da71c02d116b8d3e7a3e4ead1c9786833c5218b84a69fb96b4858447417e5c252aa965ad3bd08925f821493931a8c8
+  metadata.gz: 206daea5938e2afa572aeb59c9894edd5a6b27b776242b55db93d6fd760677195d2c065717b2f36212e83a40440767e03736521ed44c5fc8d68c2dbbe82c1a8f
+  data.tar.gz: d8684847e83b09a05255ba4223f0e3bf1fcea2fc02af33d466220fe45150267e3d9e78d1ac27dab35ec046f018e2bf8b97175503110f84ae134d5ef9255cc5aa

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

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

data/lib/arelastic/aggregations/bucket_sort.rb

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

@@ -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'
@@ -12,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

@@ -0,0 +1,25 @@
+require "helper"
+
+class Arelastic::Aggregations::BucketSelectorTest < Minitest::Test
+  def test_as_elastic
+    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"
+    )
+    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,45 @@
+require "helper"
+
+class Arelastic::Aggregations::BucketSortTest < Minitest::Test
+  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_arelastic_sort
+    sort = Arelastic::Sorts::Field.new("price" => "desc")
+    aggregation = Arelastic::Aggregations::BucketSort.new("foo_agg", "sort" => sort)
+
+    expected = {
+      "foo_agg" => {
+        "bucket_sort" => {
+          "sort" => {"price" => "desc"}
+        }
+      }
+    }
+    assert_equal expected, aggregation.as_elastic
+  end
+
+  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.0.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Matthew Higgins
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-23 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
@@ -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
@@ -33,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
@@ -69,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
@@ -101,6 +105,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
@@ -111,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
@@ -132,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
@@ -156,7 +164,7 @@ homepage: http://github.com/matthuhiggins/arelastic
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,8 +179,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.3.6
+signing_key:
 specification_version: 4
 summary: Elastic Search query builder
 test_files: []