elasticsearch-dsl-builder 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 453e3fd5d3b0339d6706247ade41438347f1ca9c
-  data.tar.gz: 3989b7e9213782109d7bab0dcfb036dad90bf2a6
+  metadata.gz: 127afba26c31c5ba5eb40b9bd61466ad2e4037ae
+  data.tar.gz: 0bb347a6ab1a08a73a249446d28c456196c09fb7
 SHA512:
-  metadata.gz: d445152fffc6cdb0e32297981c3079143176367300ffd365d960d0c4ba98551778be22f5bc1acb1c3dffca3302a6c7b3d3c52370867c0d448071c7986220fd7e
-  data.tar.gz: 48b2b6efb27441b464867db62cbe8fde75a4fec39d91e628c1aaa0ba9152f0816a14c46a12882c2084cbd3492b2d563dd4e330bc700749dfb6da46fbaae83999
+  metadata.gz: fd34348170ec6f16797e0a6fe60b394e5202274034195e310316fa8b69876a38d02fa0b81c15d1c7750beb3480526d4a8ea3277ae529e3fde5dda0b46d5c5628
+  data.tar.gz: bc19abcde8d161d11102d92a16062320ab1acb83701653f8d5d8cebb9fc5543fcb660df5b1b00fae6b06b4a3dff237564376570d07a8690792d4d30aadb78e71

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elasticsearch-dsl-builder (0.0.19)
+    elasticsearch-dsl-builder (0.0.20)
 
 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.19'
+  s.version     = '0.0.20'
   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/cardinality.rb

@@ -16,7 +16,7 @@ module ElasticsearchDslBuilder
 
           def script(script)
             raise ArgumentError, 'script must be a Script' unless script.instance_of?(Script)
-            @script = script.to_hash
+            @script = script
             self
           end
 
@@ -24,7 +24,7 @@ module ElasticsearchDslBuilder
             raise ArgumentError, 'must have set at least one of [field, script]' if @field.nil? && @script.nil?
             @aggregation = {}
             @aggregation.update(field: @field) if @field
-            @aggregation.update(script: @script) if @script
+            @aggregation.update(script: @script.to_hash) if @script
             super
           end
         end

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

@@ -11,12 +11,12 @@ module ElasticsearchDslBuilder
 
           def filter(query)
             raise ArgumentError, 'query must be a Queries::Query' unless query.is_a?(Queries::Query)
-            @query = query.to_hash
+            @query = query
             self
           end
 
           def to_hash
-            @aggregation = @query
+            @aggregation = @query.to_hash
             super
           end
         end

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

@@ -10,7 +10,6 @@ module ElasticsearchDslBuilder
 
           def filter(query, name = nil)
             raise ArgumentError, 'query must extend type Queries::Query' unless query.is_a?(Queries::Query)
-            query = query.to_hash
 
             if name.nil?
               # Adding an anonymous filter
@@ -30,7 +29,9 @@ module ElasticsearchDslBuilder
 
           def to_hash
             raise ArgumentError, 'no filters were added' if @filters.nil?
-            @aggregation = { filters: @filters }
+
+            filters = @filters.instance_of?(Hash) ? @filters.map { |k, v| [k, v.to_hash] }.to_h : @filters.map(&:to_hash)
+            @aggregation = { filters: filters }
             super
           end
         end

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

@@ -16,7 +16,7 @@ module ElasticsearchDslBuilder
 
           def script(script)
             raise ArgumentError, 'script must be a Script' unless script.instance_of?(Script)
-            @script = script.to_hash
+            @script = script
             self
           end
 
@@ -45,7 +45,7 @@ module ElasticsearchDslBuilder
             raise ArgumentError, 'must have set at least one of [field, script]' if @field.nil? && @script.nil?
             @aggregation = {}
             @aggregation.update(field: @field) if @field
-            @aggregation.update(script: @script) if @script
+            @aggregation.update(script: @script.to_hash) if @script
             @aggregation.update(keyed: @keyed) if @keyed
             @aggregation.update(ranges: @ranges) if @ranges
             super

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

@@ -16,7 +16,7 @@ module ElasticsearchDslBuilder
 
           def script(script)
             raise ArgumentError, 'script must be a Script' unless script.instance_of?(Script)
-            @script = script.to_hash
+            @script = script
             self
           end
 
@@ -29,7 +29,7 @@ module ElasticsearchDslBuilder
             raise ArgumentError, 'must have set at least one of [field, script]' if @field.nil? && @script.nil?
             @aggregation = {}
             @aggregation.update(field: @field) if @field
-            @aggregation.update(script: @script) if @script
+            @aggregation.update(script: @script.to_hash) if @script
             @aggregation.update(missing: @missing) if @missing
             super
           end

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

@@ -16,7 +16,7 @@ module ElasticsearchDslBuilder
 
           def script(script)
             raise ArgumentError, 'script must be a Script' unless script.instance_of?(Script)
-            @script = script.to_hash
+            @script = script
             self
           end
 
@@ -46,7 +46,7 @@ module ElasticsearchDslBuilder
             raise ArgumentError, 'must have set at least one of [field, script]' if @field.nil? && @script.nil?
             @aggregation = {}
             @aggregation.update(field: @field) if @field
-            @aggregation.update(script: @script) if @script
+            @aggregation.update(script: @script.to_hash) if @script
             @aggregation.update(size: @size) if @size
             @aggregation.update(include: @include) if @include
             @aggregation.update(exclude: @exclude) if @exclude

data/lib/elasticsearch_dsl_builder/dsl/search/queries/bool.rb

@@ -25,7 +25,7 @@ module ElasticsearchDslBuilder
             raise ArgumentError, 'query must extend type Queries::Query' unless query.is_a?(Query)
 
             @must ||= []
-            hashed_query = query.to_hash
+            hashed_query = query
             @must << hashed_query unless @must.include?(hashed_query)
             self
           end
@@ -34,7 +34,7 @@ module ElasticsearchDslBuilder
             raise ArgumentError, 'query must extend type Queries::Query' unless query.is_a?(Query)
 
             @must_not ||= []
-            hashed_query = query.to_hash
+            hashed_query = query
             @must_not << hashed_query unless @must_not.include?(hashed_query)
             self
           end
@@ -43,7 +43,7 @@ module ElasticsearchDslBuilder
             raise ArgumentError, 'query must extend type Queries::Query' unless query.is_a?(Query)
 
             @should ||= []
-            hashed_query = query.to_hash
+            hashed_query = query
             @should << hashed_query unless @should.include?(hashed_query)
             self
           end
@@ -52,7 +52,7 @@ module ElasticsearchDslBuilder
             raise ArgumentError, 'query must extend type Queries::Query' unless query.is_a?(Query)
 
             @filter ||= []
-            hashed_query = query.to_hash
+            hashed_query = query
             @filter << hashed_query unless @filter.include?(hashed_query)
             self
           end
@@ -60,10 +60,10 @@ module ElasticsearchDslBuilder
           def to_hash
             @query = {}
             @query.update(minimum_should_match: @minimum_should_match) if @minimum_should_match
-            @query.update(must: @must) if @must
-            @query.update(must_not: @must_not) if @must_not
-            @query.update(should: @should) if @should
-            @query.update(filter: @filter) if @filter
+            @query.update(must: @must.map(&:to_hash)) if @must
+            @query.update(must_not: @must_not.map(&:to_hash)) if @must_not
+            @query.update(should: @should.map(&:to_hash)) if @should
+            @query.update(filter: @filter.map(&:to_hash)) if @filter
             super
           end
         end

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

@@ -18,20 +18,20 @@ module ElasticsearchDslBuilder
           def query(query)
             raise ArgumentError, 'query must extend type Queries::Query' unless query.is_a?(Query)
 
-            @nested_query = query.to_hash
+            @nested_query = query
             self
           end
 
           def inner_hits(inner_hits)
             raise ArgumentError, 'inner_hits must be an InnerHits object' unless inner_hits.instance_of?(InnerHits)
-            @inner_hits = inner_hits.to_hash
+            @inner_hits = inner_hits
             self
           end
 
           def to_hash
             @query = { path: @path }
-            @query.update(query: @nested_query) if @nested_query
-            @query.update(inner_hits: @inner_hits) if @inner_hits
+            @query.update(query: @nested_query.to_hash) if @nested_query
+            @query.update(inner_hits: @inner_hits.to_hash) if @inner_hits
             super
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-dsl-builder
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Marvin Guerra