arelastic 2.6.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87e0d3a33fb5774804affcdeaba8652d46064a8d3cff6e8d1e423ca7d7c43703
-  data.tar.gz: c0a30e25ca73dfdd542ada6d7109c595f8448c026e18485bb2618d5104a6eb39
+  metadata.gz: b92131dd2729b5be9ad302a31d33db3482ecc47dee0b97681b3cca050cf627ba
+  data.tar.gz: d2c3fa9dc8ffe7c8f1c268c030964f23281b15dcba1655bc845d6c5ce8a91862
 SHA512:
-  metadata.gz: f8f2f6138254768c4d708ca83000cd081bcedcde99e6b497c225c1050059be735c57513194a41f7e130579fb52d18899d818f355a315d642adfc9430b46f4263
-  data.tar.gz: 463e56264b0e1dc7f68e039c835432861e706cf60e619947cf60ce8b8e4e28b3cf480e1d6bd7047d2190c08fc7248cadb06cb4c73c518c61eae0028019cbf08e
+  metadata.gz: 3e1e3bbdb544e0ee9b39b8c48100339e4340a0adf5985c5a524187ca7758798f596fdf2f7fb3ed221a5334f9f882e037d740267fa29a5cd434c3c13c015fdc3c
+  data.tar.gz: 7e3578aa3af4ca0efb60fe148a0cd611144d76c9e18b5a78623f43778b3b792e5987a8745dde2e175002e50a4781227bf86500f72716efab76b26387392a4337

data/README.md

@@ -1 +1,59 @@
 [![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
+
+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)
+
+## Usage
+
+### Search
+```ruby
+search = Arelastic::Builders::Search['name']
+
+# Name equals red
+search.eq('red').as_elastic
+# => {"term"=>{"name"=>"red"}}
+
+# Negation
+search.eq("red").negate.as_elastic
+# => {"bool"=>{"must_not"=>{"term"=>{:name=>"red"}}}}
+```
+
+### Limit & Offset
+```ruby
+# Limit
+Arelastic::Searches::Size.new(20).as_elastic
+# => {"size"=>20}
+
+# Offset
+Arelastic::Searches::From.new(20).as_elastic
+# => {"from"=>20}
+```
+
+### Ordering
+```ruby
+sort_field = Arelastic::Sorts::Field.new('price' => 'asc')
+sort_field.as_elastic
+#  => {'price' => 'asc'}
+
+sort = Arelastic::Searches::Sort.new([sort_field])
+sort.as_elastic
+# => {"sort"=>[{"price"=>"asc"}]}
+```
+
+### Putting It All Together
+```ruby
+search = [
+ Arelastic::Searches::Query.new(Arelastic::Builders::Search['name'].eq('Fun')),
+ Arelastic::Searches::Size.new(20),
+ Arelastic::Searches::From.new(20),
+ Arelastic::Searches::Sort.new([Arelastic::Sorts::Field.new('price' => 'asc')])
+]
+Arelastic::Nodes::HashGroup.new(search).as_elastic
+# => {"query"=>{"term"=>{"name"=>"Fun"}}, "size"=>20, "from"=>20, "sort"=>[{"price"=>"asc"}]}
+```
+
+Some helpful Arel builders can be found [here](/lib/arelastic/builders/filter.rb).

data/lib/arelastic.rb

@@ -13,5 +13,13 @@ module Arelastic
     def queries
       Arelastic::Builders::Queries
     end
+
+    def [](field)
+      Arelastic::Builders::Queries[field]
+    end
+
+    def aggregations
+      Arelastic::Builders::Aggregations
+    end
   end
 end

data/lib/arelastic/aggregations.rb

@@ -1,6 +1,9 @@
 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'
 require 'arelastic/aggregations/filters'

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

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

data/lib/arelastic/builders.rb

@@ -1,6 +1,4 @@
-require 'arelastic/builders/aggregation'
-require 'arelastic/builders/filter'
+require 'arelastic/builders/aggregations'
 require 'arelastic/builders/mapping'
 require 'arelastic/builders/queries'
-require 'arelastic/builders/search'
 require 'arelastic/builders/sort'

data/lib/arelastic/builders/aggregations.rb

@@ -0,0 +1,28 @@
+module Arelastic
+  module Builders
+    class Aggregations
+      class << self
+        MACROS_TO_ARELASTIC = {
+          cardinality:   Arelastic::Aggregations::Cardinality,
+          date_histogram: Arelastic::Aggregations::DateHistogram,
+          filter:         Arelastic::Aggregations::Filter,
+          filters:        Arelastic::Aggregations::Filters,
+          histogram:      Arelastic::Aggregations::Histogram,
+          missing:        Arelastic::Aggregations::Missing,
+          nested:         Arelastic::Aggregations::Nested,
+          range:          Arelastic::Aggregations::Range,
+          reverse_nested: Arelastic::Aggregations::ReverseNested,
+          sampler:        Arelastic::Aggregations::Sampler,
+          terms:          Arelastic::Aggregations::Terms,
+          value_count:    Arelastic::Aggregations::ValueCount
+        }
+
+        MACROS_TO_ARELASTIC.each do |macro, klass|
+          define_method macro do |*args|
+            klass.new(*args)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/arelastic/builders/queries.rb

@@ -12,6 +12,7 @@ module Arelastic
         fuzzy:               Arelastic::Queries::Fuzzy,
         geo_bounding_box:    Arelastic::Queries::GeoBoundingBox,
         geo_distance:        Arelastic::Queries::GeoDistance,
+        geo_polygon:         Arelastic::Queries::GeoPolygon,
         has_child:           Arelastic::Queries::HasChild,
         ids:                 Arelastic::Queries::Ids,
         limit:               Arelastic::Queries::Limit,
@@ -51,6 +52,39 @@ module Arelastic
           klass.new(name, *args)
         end
       end
+
+      def in other, options = {}
+        case other
+        when Range
+          if other.exclude_end?
+            range 'gte' => other.begin, 'lt' => other.end
+          else
+            range 'gte' => other.begin, 'lte' => other.end
+          end
+        else
+          terms other, options
+        end
+      end
+
+      def missing(options = {})
+        exists(options).negate
+      end
+
+      def gte other
+        range 'gte' => other
+      end
+
+      def gt other
+        range 'gt' => other
+      end
+
+      def lte other
+        range 'lte' => other
+      end
+
+      def lt other
+        range 'lt' => other
+      end
     end
   end
 end

data/lib/arelastic/queries.rb

@@ -10,6 +10,7 @@ require 'arelastic/queries/function_score'
 require 'arelastic/queries/fuzzy'
 require 'arelastic/queries/geo_bounding_box'
 require 'arelastic/queries/geo_distance'
+require 'arelastic/queries/geo_polygon'
 require 'arelastic/queries/has_child'
 require 'arelastic/queries/ids'
 require 'arelastic/queries/limit'

data/lib/arelastic/queries/geo_polygon.rb

@@ -0,0 +1,18 @@
+module Arelastic
+  module Queries
+    class GeoPolygon < Arelastic::Queries::Query
+      attr_accessor :field, :points, :options
+      def initialize(field, points, options = {})
+        @field   = field
+        @points  = points
+        @options = options
+      end
+
+      def as_elastic
+        params = {field => {"points" => points}}.update(options)
+
+        { "geo_polygon" => params }
+      end
+    end
+  end
+end

data/lib/arelastic/queries/nested.rb

@@ -1,21 +1,22 @@
 module Arelastic
   module Queries
     class Nested < Arelastic::Queries::Query
-      attr_accessor :path, :expr
+      attr_accessor :path, :query, :options
 
-      def initialize(path, expr)
-        @path = path
-        @expr = expr
+      def initialize(path, query, options = {})
+        @path    = path
+        @query   = query
+        @options = options
       end
 
       def as_elastic
         params = {
           'path'   => path,
-          'query'  => convert_to_elastic(expr)
-        }
+          'query'  => convert_to_elastic(query)
+        }.update(options)
 
         { 'nested' => params }
       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

data/test/arelastic/aggregations/cardinality_test.rb

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

data/test/arelastic/builders/aggregations_test.rb

@@ -0,0 +1,10 @@
+require 'helper'
+
+class Arelastic::Builders::AggregationsTest < Minitest::Test
+  def test_terms
+    expected = {"name" => {"terms" => {"field" => "color"}}}
+    actual = Arelastic::Builders::Aggregations.terms('name', 'field' => 'color').as_elastic
+
+    assert_equal expected, actual
+  end
+end

data/test/arelastic/builders/queries_test.rb

@@ -50,10 +50,26 @@ class Arelastic::Builders::QueriesTest < Minitest::Test
     assert_equal expected, query.as_elastic
   end
 
-  def test_match
-    query = Arelastic::Builders::Queries['message'].match "hello"
-    expected = {"match" => { "message" => "hello" }}
+  def test_missing
+    expected = {"bool" => {"must_not" => {"exists" => {"field" => "color"}}}}
+    assert_equal expected, Arelastic::Builders::Queries['color'].missing.as_elastic
+  end
 
-    assert_equal expected, query.as_elastic
+  def test_in
+    expected = {"terms" => {"color" => ["blue"]}}
+    assert_equal expected, Arelastic::Builders::Queries['color'].in(['blue']).as_elastic
+  end
+
+  def test_in_with_options
+    expected = {"terms" => {"color" => ["blue"], "execution" => "bool"}}
+    assert_equal expected, Arelastic::Builders::Queries['color'].in(['blue'], "execution" => "bool").as_elastic
+  end
+
+  def test_in_with_range
+    expected = {"range" => {"color" => {"gte" => 1, "lte" => 3}}}
+    assert_equal expected, Arelastic::Builders::Queries['color'].in(1..3).as_elastic
+
+    expected = {"range" => {"color" => {"gte" => 1, "lt" => 3}}}
+    assert_equal expected, Arelastic::Builders::Queries['color'].in(1...3).as_elastic
   end
 end

data/test/arelastic/queries/geo_polygon_test.rb

@@ -0,0 +1,20 @@
+require 'helper'
+
+class Arelastic::Queries::GeoPolygonTest < Minitest::Test
+  def test_as_elastic
+    points = [
+      {"lat" => 47.15, "lon" => -124.33},
+      {"lat" => 46.63, "lon" => -124.42},
+      {"lat" => 46.15, "lon" => -123.84}
+    ]
+    expected = {
+      "geo_polygon" => {
+        "person.location" => {
+          "points" => points
+        }
+      }
+    }
+
+    assert_equal expected, Arelastic::Queries::GeoPolygon.new('person.location', points).as_elastic
+  end
+end

data/test/arelastic/queries/nested_test.rb

@@ -0,0 +1,20 @@
+require 'helper'
+
+class Arelastic::Queries::NestedTest < Minitest::Test
+  def test_as_elastic
+    expected = {
+      'nested' => {
+        'path'  => 'comments',
+        'query' => {
+          'match' => {
+            'author'=>'matt'
+          }
+        },
+        'inner_hits' => {}
+      }
+    }
+
+    query = Arelastic::Queries::Match.new('author', 'matt')
+    assert_equal expected, Arelastic::Queries::Nested.new('comments', query, 'inner_hits' => {}).as_elastic
+  end
+end

data/test/arelastic_test.rb

@@ -4,4 +4,9 @@ class ArelasticTest < Minitest::Test
   def test_queries
     assert_equal Arelastic::Builders::Queries, Arelastic.queries
   end
+
+  def test_lookup
+    expected =  { "term" => {"color" => "blue" }}
+    assert_equal expected, Arelastic.queries['color'].term('blue').as_elastic
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Matthew Higgins
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-04 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,9 @@ 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
 - lib/arelastic/aggregations/filters.rb
@@ -39,11 +42,9 @@ files:
 - lib/arelastic/arities/polyadic.rb
 - lib/arelastic/arities/unary.rb
 - lib/arelastic/builders.rb
-- lib/arelastic/builders/aggregation.rb
-- lib/arelastic/builders/filter.rb
+- lib/arelastic/builders/aggregations.rb
 - lib/arelastic/builders/mapping.rb
 - lib/arelastic/builders/queries.rb
-- lib/arelastic/builders/search.rb
 - lib/arelastic/builders/sort.rb
 - lib/arelastic/mappings.rb
 - lib/arelastic/mappings/type.rb
@@ -68,6 +69,7 @@ files:
 - lib/arelastic/queries/fuzzy.rb
 - lib/arelastic/queries/geo_bounding_box.rb
 - lib/arelastic/queries/geo_distance.rb
+- lib/arelastic/queries/geo_polygon.rb
 - lib/arelastic/queries/has_child.rb
 - lib/arelastic/queries/ids.rb
 - lib/arelastic/queries/limit.rb
@@ -101,7 +103,10 @@ 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
 - test/arelastic/aggregations/filter_test.rb
 - test/arelastic/aggregations/filters_test.rb
@@ -114,11 +119,9 @@ files:
 - test/arelastic/arities/binary_test.rb
 - test/arelastic/arities/polyadic_test.rb
 - test/arelastic/arities/unary_test.rb
-- test/arelastic/builders/aggregation_test.rb
-- test/arelastic/builders/filter_test.rb
+- test/arelastic/builders/aggregations_test.rb
 - test/arelastic/builders/mapping_test.rb
 - test/arelastic/builders/queries_test.rb
-- test/arelastic/builders/search_test.rb
 - test/arelastic/builders/sort_test.rb
 - test/arelastic/mappings/types/binary_test.rb
 - test/arelastic/mappings/types/multi_field_test.rb
@@ -131,6 +134,7 @@ files:
 - test/arelastic/queries/function_score_test.rb
 - test/arelastic/queries/geo_bounding_box_test.rb
 - test/arelastic/queries/geo_distance_test.rb
+- test/arelastic/queries/geo_polygon_test.rb
 - test/arelastic/queries/has_child_test.rb
 - test/arelastic/queries/ids_test.rb
 - test/arelastic/queries/match_all_test.rb
@@ -138,6 +142,7 @@ files:
 - test/arelastic/queries/match_phrase_test.rb
 - test/arelastic/queries/match_test.rb
 - test/arelastic/queries/multi_match_test.rb
+- test/arelastic/queries/nested_test.rb
 - test/arelastic/queries/percolate_test.rb
 - test/arelastic/queries/query_string_test.rb
 - test/arelastic/queries/query_test.rb
@@ -155,7 +160,7 @@ homepage: http://github.com/matthuhiggins/arelastic
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,9 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Elastic Search query builder
 test_files: []

data/lib/arelastic/builders/aggregation.rb

@@ -1,31 +0,0 @@
-module Arelastic
-  module Builders
-    class Aggregation < Struct.new :name
-      class << self
-        def [](name)
-          new(name)
-        end
-      end
-
-      def date_histogram options
-        Arelastic::Aggregations::DateHistogram.new name, options
-      end
-
-      def filter filter, options
-        Arelastic::Aggregations::Filter.new name, filter, options
-      end
-
-      def histogram options
-        Arelastic::Aggregations::Histogram.new name, options
-      end
-
-      def sample shard_size, aggs
-        Arelastic::Aggregations::Sampler.new(name, sample_size, aggs)
-      end
-
-      def terms options = {}
-        Arelastic::Aggregations::Terms.new(name, options)
-      end
-    end
-  end
-end

data/lib/arelastic/builders/filter.rb

@@ -1,81 +0,0 @@
-module Arelastic
-  module Builders
-    class Filter < Struct.new :field
-      class << self
-        def [](field)
-          new(field)
-        end
-
-        def ids *ids
-          Arelastic::Queries::Ids.new ids.flatten
-        end
-
-        def not expr
-          Arelastic::Queries::Bool.new must_not: expr
-        end
-      end
-
-      def eq other
-        Arelastic::Queries::Term.new field, other
-      end
-
-      def not_eq other
-        self.class.not eq(other)
-      end
-
-      def in other, options = {}
-        case other
-        when Range
-          if other.exclude_end?
-            range 'gte' => other.begin, 'lt' => other.end
-          else
-            range 'gte' => other.begin, 'lte' => other.end
-          end
-        else
-          Arelastic::Queries::Terms.new field, other, options
-        end
-      end
-
-      def not_in other, options = {}
-        self.class.not self.in(other, options)
-      end
-
-      def prefix other
-        Arelastic::Queries::Prefix.new field, other
-      end
-
-      def exists(options = {})
-        Arelastic::Queries::Exists.new field, options
-      end
-
-      def missing(options = {})
-        exists(options).negate
-      end
-
-      def regexp other
-        Arelastic::Queries::Regexp.new field, other
-      end
-
-      def gte other
-        range 'gte' => other
-      end
-
-      def gt other
-        range 'gt' => other
-      end
-
-      def lte other
-        range 'lte' => other
-      end
-
-      def lt other
-        range 'lt' => other
-      end
-
-      private
-        def range options
-          Arelastic::Queries::Range.new field, options
-        end
-    end
-  end
-end

data/lib/arelastic/builders/search.rb

@@ -1,27 +0,0 @@
-module Arelastic
-  module Builders
-    class Search
-      class << self
-        def filter
-          Arelastic::Builders::Filter
-        end
-
-        def [](field)
-          filter[field]
-        end
-
-        def aggregation
-          Arelastic::Builders::Aggregation
-        end
-
-        def queries
-          Arelastic::Builders::Queries
-        end
-
-        def sort
-          Arelastic::Builders::Sort
-        end
-      end
-    end
-  end
-end

data/test/arelastic/builders/aggregation_test.rb

@@ -1,10 +0,0 @@
-require 'helper'
-
-class Arelastic::Builders::AggregationTest < Minitest::Test
-  def test_terms
-    expected = {"name" => {"terms" => {"field" => "color"}}}
-    actual = Arelastic::Builders::Aggregation['name'].terms('field' => 'color').as_elastic
-
-    assert_equal expected, actual
-  end
-end

data/test/arelastic/builders/filter_test.rb

@@ -1,76 +0,0 @@
-require 'helper'
-
-class Arelastic::Builders::FilterTest < Minitest::Test
-  def test_ids
-    expected = {"ids" => {"values"=>["5", "6"]}}
-    assert_equal expected, Arelastic::Builders::Filter.ids('5', '6').as_elastic
-  end
-
-  def test_not
-    expected = {"bool" => {"must_not" => {"terms" => {"color" => "blue"}}}}
-    assert_equal expected, Arelastic::Builders::Filter.not({"terms" => {"color" => "blue"}}).as_elastic    
-  end
-
-  def test_eq
-    expected = {"term"=>{"color"=>"blue"}}
-    assert_equal expected, builder.eq('blue').as_elastic
-  end
-
-  def test_not_eq
-    expected = {"bool" => {"must_not" => {"term" => {"color" => "blue"}}}}
-    assert_equal expected, builder.not_eq('blue').as_elastic
-  end
-
-  def test_in
-    expected = {"terms" => {"color" => ["blue"]}}
-    assert_equal expected, builder.in(['blue']).as_elastic
-  end
-
-  def test_in_with_options
-    expected = {"terms" => {"color" => ["blue"], "execution" => "bool"}}
-    assert_equal expected, builder.in(['blue'], "execution" => "bool").as_elastic
-  end
-
-  def test_in_with_range
-    expected = {"range" => {"color" => {"gte"=>1, "lte"=>3}}}
-    assert_equal expected, builder.in(1..3).as_elastic
-
-    expected = {"range" => {"color" => {"gte"=>1, "lt"=>3}}}
-    assert_equal expected, builder.in(1...3).as_elastic
-  end
-
-  def test_not_in
-    expected = {"bool" => {"must_not" => {"terms" => {"color"=>["blue"]}}}}
-    assert_equal expected, builder.not_in(['blue']).as_elastic
-  end
-
-  def test_prefix
-    expected = {"prefix" => {"color" => "blu"}}
-    assert_equal expected, builder.prefix('blu').as_elastic
-  end
-
-  def test_exists
-    expected = {"exists" => {"field" => "color"}}
-    assert_equal expected, builder.exists.as_elastic
-  end
-
-  def test_missing
-    expected = {"bool" => {"must_not" => {"exists" => {"field" => "color"}}}}
-    assert_equal expected, builder.missing.as_elastic
-  end
-
-  def test_regexp
-    expected = {"regexp" => {"color" => "green(-blue)?"}}
-    assert_equal expected, builder.regexp("green(-blue)?").as_elastic
-  end
-
-  def test_range
-    expected = {"range" => {"color" => {"lt" => 5}}}
-    assert_equal expected, builder.lt(5).as_elastic
-  end
-
-  private
-    def builder
-      @builder ||= Arelastic::Builders::Filter['color']
-    end
-end

data/test/arelastic/builders/search_test.rb

@@ -1,23 +0,0 @@
-require 'helper'
-
-class Arelastic::Builders::SearchTest < Minitest::Test
-  def test_filter
-    assert_equal Arelastic::Builders::Filter, Arelastic::Builders::Search.filter
-  end
-
-  def test_field
-    assert_kind_of Arelastic::Builders::Filter, Arelastic::Builders::Search['poop']
-  end
-
-  def test_aggregation
-    assert_equal Arelastic::Builders::Aggregation, Arelastic::Builders::Search.aggregation
-  end
-
-  def test_query
-    assert_equal Arelastic::Builders::Queries, Arelastic::Builders::Search.queries
-  end
-
-  def test_sort
-    assert_equal Arelastic::Builders::Sort, Arelastic::Builders::Search.sort
-  end
-end