elasticband 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: d2a30bee92116c46bbf3eb5a39cb92be290a026d
-  data.tar.gz: 92dac622a6d60f5ab215112fa0e6ea0654c5dd73
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWNjYjdlNWNlYzIwZWRhMzg5M2YwOGNkNGI3MzE5ZjAwZjkxYjM1NA==
+  data.tar.gz: !binary |-
+    M2ViMmE2ZDNiY2VkOTg4ZGE2ODgyNTA0MjY1OGNkOGRjMDI3ZDUwMA==
 SHA512:
-  metadata.gz: 194f5bba732ba55c01c472a87b699c2f441e23715e562fdaea06747f52ac887ecca6b200ac3337a51aebc8a99ba7b0220340c41e35d7e8b7f16db9eba6901869
-  data.tar.gz: 8b5618650450007a892a32c484bf1d4478211a460d66128ab52416c776ef4a14b7450e4cfad48fadae5849e0a36242a26fffc91e236707d23f84b751e98b6c5e
+  metadata.gz: !binary |-
+    YzI3NDFiOGQ3ZTUxNDI1ZTY4ZjdmZDNkOTJiOGI1NmM0NTlmODFjYTk2NGM2
+    NTRkNTA3N2VjYTNlNTE1NjIzYTNiM2Q4ZDhhMGMyMWIwMGI0ODUwM2NiMzY5
+    MWI3NDBmY2YwMWNkZWE5NmExNzFhOTBlNjlkOTdiM2I4OTQ3MDA=
+  data.tar.gz: !binary |-
+    NDkyYjZkNzVlMTEwOTcwNzgxZTAxYTM1MDQzMzY2ZjZjYTcxMTI4YzgxZTJi
+    ODM2NzhiMjg3OTZhN2RhNjE0OGU0MGRmN2VlYzM5YTcwNGU1ZTA3OTBkYTVk
+    ZmI2ZWY1MTVlN2IyZWRiNzk3ZjY4ZTRjN2FiZmMwNzQzZmRiN2E=

data/.travis.yml

@@ -1,13 +1,23 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.2
-  - ruby-head
+- 2.2
+- ruby-head
 git:
   depth: 1
 script:
-  - bundle exec rspec
-  - bundle exec rubocop
-addons:
+- bundle exec rspec
+- bundle exec rubocop
+add_ons:
   code_climate:
-    repo_token: 217146fc082e87b5e4b2352141a8832d0da78d66a9d22cb0b5189344648e821e
+    repo_token:
+      secure: J7KZY6qcRup/D/m1v4dau0UZ4S1UQ5aW+PYago1jMvTZ/KqyPP36rAiRZhzCROjVaodbkwxhGfp+V9eLPGZG+CF3yFAZWCa+YaOR4ihbx7PI+o1KB5Rvo/LfoXTZ2ietGLSHf43ae617pp5uu6IF7scl5NQqaXraE/zQYce4wOWAYTQvxi+lnYHYbPWtAtsBoCNTyFdscHT5LPSGIINaGsPVwVp5WSoOe770vNLqnoPD/FAlB71scCfO5oOrPu1jeQf7kHXNuJGFeVCauSrC23oAcYs15RO8F5LZIH5ikR7wBpaK3TEv98GR27xZaMiP07IGiaXXG0AOWM1wxk4kUuy7jE7Rgd/Q5DU9HlO7pf1RWKRKeJTBocez2SmtGVQjQ1cIqhzmZI/QXipkYuSKUB4HZsKhQMCIZqW5dR9OomviJbrOHSQRNcGhtKWSzgxHAlhC8Fel57jgU/CTZyFoiaFL/qFvddo98CJriPsKGbQFtsXdOE2r5GyS0VOZW8XKpyhvH9E1RKaxnsopfL2Gh/BOZAh7ZI1XWTS7QJQMYHPLsxkf1gQa29T1GV+lo53fuv55HDrJHZ3dphAAngjCQRs6hNdB/m2KgqognwNXrnVRrpSlMq4yvyRHSmfiatXl10bw7iFzQ+h227PP+CzXtRwJlHj5FpUc/voNE0oOaeA=
+deploy:
+  provider: rubygems
+  api_key:
+    secure: GuPR9kqmSoQKhgh/SBpa2+zysNHv3n92hsuA7MyZ0ezgdN41qdZqYJb/w5hZLBuGyDJO8f+Ib1deKw8+3gQO6rsiFwlVW6nrPEcxCRjg/QQSxNk2FuPxh2FF7/n9Ce3ePeVhnmkCAw7++B7OLUo5Un8cR35WHPzChrprQ1RLpbSB6Qg8nwcW92aju6WqUkHrdYEyP/Q94oqzA09gamth8flCPYw8XKeklR8aQ6KkdD4w96Bu3AwBOYbUkIlNNXXj1CCvWwcJf5DQ+DR6JMk0KkaniLxrsSmiTBkVlUIJfEIJMUUuPiAUZ0tvwFtc5Puys987YwpNmqq4eqB3Hxp85FLDEEgxECtlBz5Ab8/rgUuJxlHI6kLPgOw6sseTmTYLG4NJkGj/icjP7LaQYSIry+LVnncM48YIC9nzuBNsF6XfFXfLAAq+u51FFJVF0SihqWYKFSk96d+UHuOtitVQ6Smte4ir+7ifclMgtxgYqBzX50Pv39uysvSpmFYpVkGXiGnVjHAffWhNOVJDJdF2K0BllJP2PyNF4fDrheFNS6lQj394aewCGkvLzyHIht903KC8+IvD4u4KQktA7q/ctn6dODfjXUn6eIaS5lXYeLNI7OHUR8fsMDJyiNEleBHKVs9KAVqjKJFsaH/ZY90VuAQ/3U/J3a3PsCHUZ2iDuTU=
+  gem: elasticband
+  on:
+    tags: true
+    repo: LoveMondays/elasticband
+    branch: master

data/lib/elasticband.rb

@@ -1,6 +1,7 @@
-require 'active_support'
-require 'active_support/core_ext/object'
 require 'active_support/core_ext/array'
+require 'active_support/core_ext/hash'
+require 'active_support/core_ext/object'
+require 'active_support/json'
 
 require 'elasticband/aggregation'
 require 'elasticband/filter'

data/lib/elasticband/aggregation.rb

@@ -1,3 +1,5 @@
+require 'elasticband/aggregation/field_based'
+require 'elasticband/aggregation/max'
 require 'elasticband/aggregation/nested'
 require 'elasticband/aggregation/terms'
 require 'elasticband/aggregation/top_hits'
@@ -7,7 +9,7 @@ module Elasticband
     attr_accessor :name
 
     def initialize(name)
-      self.name = name.to_sym
+      self.name = name.to_s.gsub(/\W/, '_').to_sym
     end
 
     def to_h(aggregation_hash = {})
@@ -15,40 +17,81 @@ module Elasticband
     end
 
     class << self
-      # Parses some options to a Elasticsearch syntax
+      PARSE_AGGREGATIONS = %i(group_by group_max top_hits)
+
+      # Parses some options to a Elasticsearch syntax, aggregations can be nested in another.
       #
       # #### Options
       #
       # * `group_by:` Count results by the value of an attribute using `terms` filter.
       #   It can receive an array with some attributes:
-      #   * `top_hits:` A number of results that should be return inside the group ranked by score.
       #   * `size:` Size of the results calculated in each shard (https://www.elastic.co/guide/en/elasticsearch/reference/1.x/search-aggregations-bucket-terms-aggregation.html#_size)
+      #   * `script:` Generates terms defined by the script
+      # * `group_max:` Group results by maximum value of a field
+      #   It can receive an array with some attributes:
+      #   * `script:` Generates max defined by the script
+      # * `top_hits:` A number of results that should be return inside the group ranked by score.
       #
       # #### Examples
       # ```
       # Aggregation.parse(group_by: :status)
       # => { status: { terms: { field: :status } } }
       #
+      # Aggregation.parse(group_max: :contents_count)
+      # => { status: { max: { field: :contents_count } } }
+      #
       # Aggregation.parse(group_by: [:status, size: 5, top_hits: 3])
       # => { status: { terms: { field: :status, size: 5 }, aggs: { top_status: { top_hits: 3 } } } }
       def parse(options)
-        parse_group_by(options[:group_by]).to_h
+        merge(*parse_aggregations(options))
+      end
+
+      def merge(*aggregations)
+        aggregations.each_with_object({}) { |a, h| h.merge!(a.to_h) }
       end
 
       private
 
-      def parse_group_by(options_group_by)
-        return {} if options_group_by.blank?
+      def parse_aggregations(options, root_aggregation = nil)
+        parse_options = options.slice(*PARSE_AGGREGATIONS)
+        return root_aggregation if parse_options.blank?
 
-        field, options = options_group_by
-        options ||= {}
+        aggregations = parse_options.map do |aggregation_name, aggregation_options|
+          parse_singular_aggregation(root_aggregation, aggregation_name, aggregation_options)
+        end
+
+        aggregations = Aggregation::Nested.new(root_aggregation, aggregations) if root_aggregation
+        aggregations
+      end
 
-        aggregation = Aggregation::Terms.new(field, field, options.except(:top_hits))
-        if options[:top_hits]
-          aggregation = Aggregation::TopHits.new(:"top_#{field}", aggregation, options[:top_hits])
+      def parse_singular_aggregation(root_aggregation, aggregation_name, aggregation_options)
+        case aggregation_name
+        when :group_by then parse_field_aggregation(Aggregation::Terms, :by, aggregation_options)
+        when :group_max then parse_field_aggregation(Aggregation::Max, :max, aggregation_options)
+        when :top_hits then parse_top_hits(root_aggregation, aggregation_options)
         end
+      end
+
+      def parse_field_aggregation(aggregation_class, prefix, options_aggregation)
+        return {} if options_aggregation.blank?
+
+        field, options = options_aggregation
+        options ||= {}
+
+        name = :"#{prefix}_#{field}"
+        aggregation = aggregation_class.new(name, field, options.except(*PARSE_AGGREGATIONS))
+        parse_aggregations(options, aggregation)
+      end
+
+      def parse_top_hits(root_aggregation, options_top_hits)
+        return {} if options_top_hits.blank?
+
+        size, options = options_top_hits
+        options ||= {}
 
-        aggregation
+        name = :"top_#{root_aggregation.name}"
+        aggregation = Aggregation::TopHits.new(name, size, options.except(*PARSE_AGGREGATIONS))
+        parse_aggregations(options, aggregation)
       end
     end
   end

data/lib/elasticband/aggregation/field_based.rb

@@ -0,0 +1,27 @@
+module Elasticband
+  class Aggregation
+    class FieldBased < Aggregation
+      attr_accessor :field, :options
+
+      def initialize(name, field, options = {})
+        super(name)
+        self.field = field && field.to_sym
+        self.options = options
+      end
+
+      def to_h
+        super(aggregation_hash)
+      end
+
+      def type
+        fail NotImplementedError
+      end
+
+      private
+
+      def aggregation_hash
+        { type => { field: field }.merge!(options).compact }
+      end
+    end
+  end
+end

data/lib/elasticband/aggregation/max.rb

@@ -0,0 +1,9 @@
+module Elasticband
+  class Aggregation
+    class Max < FieldBased
+      def type
+        :max
+      end
+    end
+  end
+end

data/lib/elasticband/aggregation/nested.rb

@@ -1,18 +1,24 @@
 module Elasticband
   class Aggregation
     class Nested < Aggregation
-      attr_accessor :root_aggregation, :nested_aggregation
+      attr_accessor :root_aggregation, :nested_aggregations
 
-      def initialize(root_aggregation, nested_aggregation)
+      def initialize(root_aggregation, nested_aggregations)
         self.root_aggregation = root_aggregation
-        self.nested_aggregation = nested_aggregation
+        self.nested_aggregations = Array.wrap(nested_aggregations)
       end
 
       def to_h
         root_aggregation.to_h.tap do |h|
-          h[root_aggregation.name].merge!(aggs: nested_aggregation.to_h)
+          h[root_aggregation.name].merge!(aggs: nested_hash)
         end
       end
+
+      private
+
+      def nested_hash
+        self.class.merge(*nested_aggregations)
+      end
     end
   end
 end

data/lib/elasticband/aggregation/terms.rb

@@ -1,22 +1,8 @@
 module Elasticband
   class Aggregation
-    class Terms < Aggregation
-      attr_accessor :field, :options
-
-      def initialize(name, field, options = {})
-        super(name)
-        self.field = field.to_sym
-        self.options = options
-      end
-
-      def to_h
-        super(aggregation_hash)
-      end
-
-      private
-
-      def aggregation_hash
-        { terms: { field: field }.merge!(options) }
+    class Terms < FieldBased
+      def type
+        :terms
       end
     end
   end

data/lib/elasticband/aggregation/top_hits.rb

@@ -1,19 +1,16 @@
 module Elasticband
   class Aggregation
     class TopHits < Aggregation
-      attr_accessor :root_aggregation, :size, :from, :options
+      attr_accessor :size, :options
 
-      def initialize(name, root_aggregation, size, options = {})
+      def initialize(name, size, options = {})
         super(name)
-        self.root_aggregation = root_aggregation
         self.size = size
         self.options = options
       end
 
       def to_h
-        root_aggregation.to_h.tap do |h|
-          h[root_aggregation.name].merge!(aggs: super(top_hits_hash))
-        end
+        super(top_hits_hash)
       end
 
       private

data/lib/elasticband/query.rb

@@ -139,7 +139,8 @@ module Elasticband
           filter = join_filters(parse_filters(boost_options[:boost_where]))
           ScoreFunction::Filtered.new(filter, ScoreFunction::BoostFactor.new(1_000))
         else
-          ScoreFunction::ScriptScore.new(boost_options[:boost_function])
+          boost_function, boost_function_params = boost_options[:boost_function]
+          ScoreFunction::ScriptScore.new(boost_function, boost_function_params || {})
         end
       end
     end

data/lib/elasticband/version.rb

@@ -1,3 +1,3 @@
 module Elasticband
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/aggregation/field_based_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+RSpec.describe Elasticband::Aggregation::FieldBased do
+  describe '#type' do
+    subject { described_class.new(:aggregation_name, :field_name).type }
+
+    it { expect { subject }.to raise_error(NotImplementedError) }
+  end
+
+  describe '#to_h' do
+    subject { aggregation.to_h }
+
+    before { allow(aggregation).to receive(:type) { :aggregation_type } }
+
+    context 'without options' do
+      let(:aggregation) { described_class.new(:aggregation_name, :field_name) }
+
+      it { is_expected.to eq(aggregation_name: { aggregation_type: { field: :field_name } }) }
+    end
+
+    context 'with options' do
+      context 'with field' do
+        let(:aggregation) { described_class.new(:aggregation_name, :field_name, size: 1) }
+
+        it { is_expected.to eq(aggregation_name: { aggregation_type: { field: :field_name, size: 1 } }) }
+      end
+
+      context 'without field' do
+        let(:aggregation) { described_class.new(:aggregation_name, nil, script: "doc['price'].value") }
+
+        it { is_expected.to eq(aggregation_name: { aggregation_type: { script: "doc['price'].value" } }) }
+      end
+    end
+  end
+end

data/spec/aggregation/max_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+RSpec.describe Elasticband::Aggregation::Max do
+  describe '#type' do
+    subject { described_class.new(:aggregation_name, :field_name).type }
+
+    it { is_expected.to eq(:max) }
+  end
+end

data/spec/aggregation/nested_spec.rb

@@ -2,27 +2,52 @@ require 'spec_helper'
 
 RSpec.describe Elasticband::Aggregation::Nested do
   describe '#to_h' do
-    subject { described_class.new(root_aggregation, nested_aggregation).to_h }
-
     let(:root_aggregation) { Elasticband::Aggregation.new(:root_aggregation) }
-    let(:nested_aggregation) { Elasticband::Aggregation.new(:nested_aggregation) }
+    let(:nested_aggregation_1) { Elasticband::Aggregation.new(:nested_aggregation_1) }
+    let(:nested_aggregation_2) { Elasticband::Aggregation.new(:nested_aggregation_2) }
+    let(:nested_aggregations) { [nested_aggregation_1, nested_aggregation_2] }
 
     before do
-      allow(root_aggregation).to receive(:to_h) { { root_aggregation: { key_1: :value_1 } } }
-      allow(nested_aggregation).to receive(:to_h) { { nested_aggregation: { key_2: :value_2 } } }
+      allow(nested_aggregation_1).to receive(:to_h) { { nested_aggregation_1: { key_1: :value_1 } } }
+      allow(nested_aggregation_2).to receive(:to_h) { { nested_aggregation_2: { key_2: :value_2 } } }
+      allow(root_aggregation).to receive(:to_h) { { root_aggregation: { key: :value } } }
     end
 
-    it 'returns a nested aggreagation hash' do
-      is_expected.to eq(
-        root_aggregation: {
-          key_1: :value_1,
-          aggs: {
-            nested_aggregation: {
-              key_2: :value_2
+    context 'with one aggregation' do
+      subject { described_class.new(root_aggregation, nested_aggregation_1).to_h }
+
+      it 'returns a nested aggreagation hash' do
+        is_expected.to eq(
+          root_aggregation: {
+            key: :value,
+            aggs: {
+              nested_aggregation_1: {
+                key_1: :value_1
+              }
+            }
+          }
+        )
+      end
+    end
+
+    context 'with two aggregations' do
+      subject { described_class.new(root_aggregation, nested_aggregations).to_h }
+
+      it 'returns a nested aggreagation hash' do
+        is_expected.to eq(
+          root_aggregation: {
+            key: :value,
+            aggs: {
+              nested_aggregation_1: {
+                key_1: :value_1
+              },
+              nested_aggregation_2: {
+                key_2: :value_2
+              }
             }
           }
-        }
-      )
+        )
+      end
     end
   end
 end

data/spec/aggregation/terms_spec.rb

@@ -1,17 +1,9 @@
 require 'spec_helper'
 
 RSpec.describe Elasticband::Aggregation::Terms do
-  describe '#to_h' do
-    context 'without options' do
-      subject { described_class.new(:aggregation_name, :field_name).to_h }
+  describe '#type' do
+    subject { described_class.new(:aggregation_name, :field_name).type }
 
-      it { is_expected.to eq(aggregation_name: { terms: { field: :field_name } }) }
-    end
-
-    context 'with options' do
-      subject { described_class.new(:aggregation_name, :field_name, size: 1).to_h }
-
-      it { is_expected.to eq(aggregation_name: { terms: { field: :field_name, size: 1 } }) }
-    end
+    it { is_expected.to eq(:terms) }
   end
 end

data/spec/aggregation/top_hits_spec.rb

@@ -2,25 +2,16 @@ require 'spec_helper'
 
 RSpec.describe Elasticband::Aggregation::TopHits do
   describe '#to_h' do
-    subject { described_class.new(:top_hits_aggregation, root_aggregation, 3).to_h }
+    context 'without options' do
+      subject { described_class.new(:top_hits_aggregation, 3).to_h }
 
-    let(:root_aggregation) { Elasticband::Aggregation.new(:root_aggregation) }
-
-    before do
-      allow(root_aggregation).to receive(:to_h) { { root_aggregation: { terms: { field: :field_name } } } }
+      it { is_expected.to eq(top_hits_aggregation: { top_hits: { size: 3 } }) }
     end
 
-    it 'returns a nested aggreagation hash' do
-      is_expected.to eq(
-        root_aggregation: {
-          terms: { field: :field_name },
-          aggs: {
-            top_hits_aggregation: {
-              top_hits: { size: 3 }
-            }
-          }
-        }
-      )
+    context 'with options' do
+      subject { described_class.new(:top_hits_aggregation, 3, cache: true).to_h }
+
+      it { is_expected.to eq(top_hits_aggregation: { top_hits: { size: 3, cache: true } }) }
     end
   end
 end

data/spec/aggregation_spec.rb

@@ -13,6 +13,12 @@ RSpec.describe Elasticband::Aggregation do
 
       it { is_expected.to eq(aggregation_name: { key: :value }) }
     end
+
+    context 'with special chars' do
+      subject { described_class.new('aggregation.name').to_h }
+
+      it { is_expected.to eq(aggregation_name: {}) }
+    end
   end
 
   describe '.parse' do
@@ -22,17 +28,17 @@ RSpec.describe Elasticband::Aggregation do
       context 'with the field_name' do
         let(:options) { { group_by: :status } }
 
-        it { is_expected.to eq(status: { terms: { field: :status } }) }
+        it { is_expected.to eq(by_status: { terms: { field: :status } }) }
       end
 
-      context 'with an array with field_name and :top_hits option' do
+      context 'with an array with field_name and other aggregation' do
         let(:options) { { group_by: [:status, top_hits: 3] } }
 
         it 'returns the `terms` aggregation with a `top_hits` nested' do
           is_expected.to eq(
-            status: {
+            by_status: {
               terms: { field: :status },
-              aggs: { top_status: { top_hits: { size: 3 } } }
+              aggs: { top_by_status: { top_hits: { size: 3 } } }
             }
           )
         end
@@ -41,8 +47,52 @@ RSpec.describe Elasticband::Aggregation do
       context 'with an array with field_name and other options' do
         let(:options) { { group_by: [:status, size: 3] } }
 
-        it { is_expected.to eq(status: { terms: { field: :status, size: 3 } }) }
+        it { is_expected.to eq(by_status: { terms: { field: :status, size: 3 } }) }
+      end
+    end
+
+    context 'with `:group_max` option' do
+      context 'with the field_name' do
+        let(:options) { { group_max: :price } }
+
+        it { is_expected.to eq(max_price: { max: { field: :price } }) }
+      end
+
+      context 'with an array with field_name and options' do
+        let(:options) { { group_max: [:price, script: '_value * 1.2'] } }
+
+        it { is_expected.to eq(max_price: { max: { field: :price, script: '_value * 1.2' } }) }
       end
     end
+
+    context 'with more than one aggregation' do
+      let(:options) { { group_by: :status, group_max: :price } }
+
+      it 'returns a hash with all aggregations' do
+        is_expected.to eq(
+          by_status: { terms: { field: :status } },
+          max_price: { max: { field: :price } }
+        )
+      end
+    end
+  end
+
+  describe '.merge' do
+    subject { described_class.merge(aggregation_1, aggregation_2) }
+
+    let(:aggregation_1) { Elasticband::Aggregation.new(:aggregation_1) }
+    let(:aggregation_2) { Elasticband::Aggregation.new(:aggregation_2) }
+
+    before do
+      allow(aggregation_1).to receive(:to_h) { { aggregation_1: { key_1: :value_1 } } }
+      allow(aggregation_2).to receive(:to_h) { { aggregation_2: { key_2: :value_2 } } }
+    end
+
+    it 'returns a hash with all aggregations' do
+      is_expected.to eq(
+        aggregation_1: { key_1: :value_1 },
+        aggregation_2: { key_2: :value_2 }
+      )
+    end
   end
 end

data/spec/query_spec.rb

@@ -219,17 +219,37 @@ RSpec.describe Elasticband::Query do
       end
 
       context 'with `:boost_function` option' do
-        let(:options) { { boost_function: "_score * doc['users_count'].value" } }
+        context 'without params' do
+          let(:options) { { boost_function: "_score * doc['users_count'].value" } }
 
-        it 'returns a function score query with a `script_score` function' do
-          is_expected.to eq(
-            function_score: {
-              query: { match: { _all: 'foo' } },
-              script_score: {
-                script: "_score * doc['users_count'].value"
+          it 'returns a function score query with a `script_score` function' do
+            is_expected.to eq(
+              function_score: {
+                query: { match: { _all: 'foo' } },
+                script_score: {
+                  script: "_score * doc['users_count'].value"
+                }
               }
-            }
-          )
+            )
+          end
+        end
+
+        context 'with params' do
+          let(:options) { { boost_function: ['_score * test_param', params: { test_param: 1 }] } }
+
+          it 'returns a function score query with a `script_score` function and params' do
+            is_expected.to eq(
+              function_score: {
+                query: { match: { _all: 'foo' } },
+                script_score: {
+                  script: '_score * test_param',
+                  params: {
+                    test_param: 1
+                  }
+                }
+              }
+            )
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticband
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Glauber Campinho
@@ -15,84 +15,84 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -103,10 +103,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .travis.yml
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -115,6 +115,8 @@ files:
 - elasticband.gemspec
 - lib/elasticband.rb
 - lib/elasticband/aggregation.rb
+- lib/elasticband/aggregation/field_based.rb
+- lib/elasticband/aggregation/max.rb
 - lib/elasticband/aggregation/nested.rb
 - lib/elasticband/aggregation/terms.rb
 - lib/elasticband/aggregation/top_hits.rb
@@ -136,6 +138,8 @@ files:
 - lib/elasticband/query/score_function/script_score.rb
 - lib/elasticband/search.rb
 - lib/elasticband/version.rb
+- spec/aggregation/field_based_spec.rb
+- spec/aggregation/max_spec.rb
 - spec/aggregation/nested_spec.rb
 - spec/aggregation/terms_spec.rb
 - spec/aggregation/top_hits_spec.rb
@@ -168,17 +172,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Query builder for elasticsearch-rails