elasticsearch-dsl-builder 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a58300aec0d5ee66159153ffe0cd8bc4a14e5fa8
-  data.tar.gz: d9187ba6eb6c8017ea9039b957d30c8607c18176
+  metadata.gz: f0b148414b20b6644d211ecbc5ee92c7423888f5
+  data.tar.gz: 9db8534bc5557fc4d9c51fa9117c17ed675e5249
 SHA512:
-  metadata.gz: e9941a0a509660fb524cbc6e527312d8014392e3a77a16583679e1b9b7e106b97438137c7e36aff095bc1765680522c089cc45e54f63848384b4a33ad2440738
-  data.tar.gz: 1153f628e7b62acd9a24ff5d6ae5af324bc49ab9bf49ad0f029368dc87607bc88a83111374f60382b6126c33b897ee33f6bf7ff6581803da9cd9fd128e2fe3a9
+  metadata.gz: 94ae776602bde608971ef7ea3b1b240977a45cf88d3eb39c163208ea468bc0c92d265f699a8b4386689dd9ee4e0ff80eb8c89cb28d9e3815dc39210e39deb0fe
+  data.tar.gz: e1004ac5a0d17335e44cd3e3e65ea2e99e97645322db273015500f1142b8c1e27c76f764e5458cf2f897ef3fb7e12807d78e0c78099938167e578242baf7db31

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elasticsearch-dsl-builder (0.0.12)
+    elasticsearch-dsl-builder (0.0.13)
 
 GEM
   remote: https://rubygems.org/

data/elasticsearch-dsl-builder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'elasticsearch-dsl-builder'
-  s.version     = '0.0.12'
+  s.version     = '0.0.13'
   s.date        = '2017-10-06'
   s.summary     = 'Library utilizing builder pattern providing Ruby API for the Elasticsearch Query DSL'
   s.description = 'TBD'

data/lib/elasticsearch_dsl_builder/dsl/search/aggregations/nested.rb

@@ -0,0 +1,26 @@
+module ElasticsearchDslBuilder
+  module DSL
+    module Search
+      module Aggregations
+        class Nested < Aggregation
+          def initialize(path = nil)
+            @type = :nested
+            path(path)
+            super()
+          end
+
+          def path(path)
+            raise ArgumentError, 'path must be a String' unless path.instance_of?(String)
+            @path = path
+            self
+          end
+
+          def to_hash
+            @aggregation = { path: @path }
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/elasticsearch_dsl_builder/dsl/search/aggregations/terms.rb

@@ -15,9 +15,15 @@ module ElasticsearchDslBuilder
             self
           end
 
+          def size(size)
+            raise ArgumentError, 'size must be Numeric' unless size.is_a?(Numeric)
+            @size = size
+            self
+          end
+
           def include(include)
             include_valid = include.instance_of?(String) ||
-              (include.instance_of?(Array) && include.all? { |i| i.instance_of?(String)})
+              (include.instance_of?(Array) && include.all? { |i| i.instance_of?(String) })
             raise ArgumentError, 'include argument must be a String or Array of Strings' unless include_valid
             @include = include
             self
@@ -25,7 +31,7 @@ module ElasticsearchDslBuilder
 
           def exclude(exclude)
             exclude_valid = exclude.instance_of?(String) ||
-              (exclude.instance_of?(Array) && exclude.all? { |i| i.instance_of?(String)})
+              (exclude.instance_of?(Array) && exclude.all? { |i| i.instance_of?(String) })
             raise ArgumentError, 'exclude argument must be a String or Array of Strings' unless exclude_valid
             @exclude = exclude
             self
@@ -33,6 +39,7 @@ module ElasticsearchDslBuilder
 
           def to_hash
             @aggregation = { field: @field }
+            @aggregation.update(size: @size) if @size
             @aggregation.update(include: @include) if @include
             @aggregation.update(exclude: @exclude) if @exclude
             super

data/spec/lib/dsl/search/aggregations/nested_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe ElasticsearchDslBuilder::DSL::Search::Aggregations::Nested do
+  it 'should fail if path not valid' do
+    expect { Aggregations::Nested.new(123) }.to raise_error(ArgumentError)
+    expect { Aggregations::Nested.new(nil) }.to raise_error(ArgumentError)
+    expect { Aggregations::Nested.new('path_a').path(nil) }.to raise_error(ArgumentError)
+  end
+
+  it 'should chain create valid ES aggregation hash' do
+    nested = Aggregations::Nested.new('path_a').path('path_b')
+    expect(nested.to_hash).to eq(
+      nested: { path: 'path_b' }
+    )
+  end
+end

data/spec/lib/dsl/search/aggregations/terms_spec.rb

@@ -7,6 +7,11 @@ describe ElasticsearchDslBuilder::DSL::Search::Aggregations::Terms do
     expect { Aggregations::Terms.new('field_a').field(nil) }.to raise_error(ArgumentError)
   end
 
+  it 'should fail if size not valid' do
+    expect { Aggregations::Terms.new('field_a').size('fail') }.to raise_error(ArgumentError)
+    expect { Aggregations::Terms.new('field_a').size(nil) }.to raise_error(ArgumentError)
+  end
+
   it 'should fail if include not valid' do
     expect { Aggregations::Terms.new('field_a').include(nil) }.to raise_error(ArgumentError)
     expect { Aggregations::Terms.new('field_a').include({}) }.to raise_error(ArgumentError)
@@ -21,11 +26,12 @@ describe ElasticsearchDslBuilder::DSL::Search::Aggregations::Terms do
 
   it 'should chain create valid ES aggregation hash' do
     terms = Aggregations::Terms.new('field_a').
-      include('*ball').exclude(%w(baseball racquetball)).
+      size(5).
+      include('*ball').exclude(['baseball', 'racquetball']).
       aggregation('nested_agg', Aggregations::Terms.new('field_b'))
     expect(terms.to_hash).to eq(
-                               terms: { field: 'field_a', include: '*ball', exclude: %w(baseball racquetball) },
-                               aggregations: { nested_agg: { terms: { field: 'field_b' } } }
-                             )
+      terms: { field: 'field_a', size: 5, include: '*ball', exclude: ['baseball', 'racquetball'] },
+      aggregations: { nested_agg: { terms: { field: 'field_b' } } }
+    )
   end
 end

data/spec/lib/dsl/search/queries/range_spec.rb

@@ -17,12 +17,9 @@ describe ElasticsearchDslBuilder::DSL::Search::Queries::Range do
     range = Queries::Range.new(:field_a).
       format('YYYY-MM').gt('2017-09').gte('2017-09').lt('2017-09').lte('2017-09')
     expect(range.to_hash).to eq(
-                               range: {
-                                 field_a: {
-                                   gt: '2017-09', gte: '2017-09', lt: '2017-09', lte: '2017-09',
-                                   format: 'YYYY-MM'
-                                 }
-                               }
-                             )
+      range: {
+        field_a: { gt: '2017-09', gte: '2017-09', lt: '2017-09', lte: '2017-09', format: 'YYYY-MM' }
+      }
+    )
   end
 end

data/spec/lib/dsl/search/queries/terms_spec.rb

@@ -15,6 +15,6 @@ describe ElasticsearchDslBuilder::DSL::Search::Queries::Terms do
 
   it 'should chain create valid ES query hash' do
     terms = Queries::Terms.new(:field_a, [1, 2])
-    expect(terms.to_hash).to eq({ terms: { field_a: [1, 2] } })
+    expect(terms.to_hash).to eq(terms: { field_a: [1, 2] })
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-dsl-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Marvin Guerra
@@ -85,6 +85,7 @@ files:
 - lib/elasticsearch_dsl_builder/dsl.rb
 - lib/elasticsearch_dsl_builder/dsl/search.rb
 - lib/elasticsearch_dsl_builder/dsl/search/aggregation.rb
+- lib/elasticsearch_dsl_builder/dsl/search/aggregations/nested.rb
 - lib/elasticsearch_dsl_builder/dsl/search/aggregations/terms.rb
 - lib/elasticsearch_dsl_builder/dsl/search/queries/bool.rb
 - lib/elasticsearch_dsl_builder/dsl/search/queries/exists.rb
@@ -101,6 +102,7 @@ files:
 - lib/elasticsearch_dsl_builder/dsl/search/sort.rb
 - lib/elasticsearch_dsl_builder/dsl/version.rb
 - lib/elasticsearch_dsl_builder/exceptions.rb
+- spec/lib/dsl/search/aggregations/nested_spec.rb
 - spec/lib/dsl/search/aggregations/terms_spec.rb
 - spec/lib/dsl/search/queries/bool_spec.rb
 - spec/lib/dsl/search/queries/exists_spec.rb
@@ -144,6 +146,7 @@ specification_version: 4
 summary: Library utilizing builder pattern providing Ruby API for the Elasticsearch
   Query DSL
 test_files:
+- spec/lib/dsl/search/aggregations/nested_spec.rb
 - spec/lib/dsl/search/aggregations/terms_spec.rb
 - spec/lib/dsl/search/queries/bool_spec.rb
 - spec/lib/dsl/search/queries/exists_spec.rb