elasticsearch-dsl 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afb07ac938ef185bc8a443aa3342adb1728d4e3947be80591760cd38b1870a33
-  data.tar.gz: eab97dbc6c770bb122be1c9adbb53871771cc6861a688aea3d2f41aafddaba6c
+  metadata.gz: 5f1f7538a8ba72fb494c08161eaeea00b841efb6053eb9b640916082380e44d1
+  data.tar.gz: 8952342319cc9f742c8ad7c2be57d1b78a9025535a590f1b4b464a4e77f4cc4b
 SHA512:
-  metadata.gz: 745dbe52e814395095ba7473c80595ad73f69de5d1def5ee9e82dac93d5864f5fda5564462990fc747e6963b1f7f72b352302e3a0d047229347bfc8737ba638e
-  data.tar.gz: 0c17e0f57cdf44e84f0247048e8e1ecbd76eac23642a38fd7a22f357c13840b9090da94163739dc48278b9c993db817d47d514498dac06d48fd18f51dead49f9
+  metadata.gz: e845c2c5a586e8de9d7ef256305b4a9635c8f5278fbac3f22b3b512560366a25edefac398f9fdc8eba7fda84e6c67e79ce337e46b22a7f0491c486b00e62dfc2
+  data.tar.gz: 89628d179337835661ce4d671b4e7fcd56ee8cf92af8155a3a18bdbf8c3901e1791c9cfc427a55a1814b0c656598aca873a122c32a0fa423ea595ea6c86e3acf

data/README.md

@@ -1,7 +1,7 @@
 # Elasticsearch::DSL
 
 The `elasticsearch-dsl` library provides a Ruby API for
-the [Elasticsearch Query DSL](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html).
+the [Elasticsearch Query DSL](http://www.elasticsearch.com/guide/en/elasticsearch/reference/current/query-dsl.html).
 
 The library is compatible with Ruby 1.9 or higher and Elasticsearch 1.0 and higher.
 
@@ -26,7 +26,7 @@ or install it from a source code checkout:
 
 The library is designed as a group of standalone Ruby modules, classes and DSL methods,
 which provide an idiomatic way to build complex
-[search definitions](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-body.html).
+[search definitions](http://www.elasticsearch.com/guide/en/elasticsearch/reference/current/search-request-body.html).
 
 Let's have a simple example using the declarative variant:
 
@@ -100,20 +100,20 @@ which are translated to Hashes, and ultimately, JSON, the language of Elasticsea
 
 All Elasticsearch DSL features are supported, namely:
 
-* [Queries](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-queries.html)
-* [Filters](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-filters.html)
-* [Aggregations](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations.html)
-* [Suggestions](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-suggesters.html)
-* [Sorting](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-sort.html)
-* [Pagination](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-from-size.html)
-* [Options](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-body.html) (source filtering, highlighting, etc)
+* [Queries](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-queries.html)
+* [Filters](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-filters.html)
+* [Aggregations](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations.html)
+* [Suggestions](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters.html)
+* [Sorting](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-sort.html)
+* [Pagination](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-from-size.html)
+* [Options](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-body.html) (source filtering, highlighting, etc)
 
 An example of a complex search definition is below.
 
 **NOTE:** In order to run the example, you have to allow restoring from the `data.elasticsearch.org` repository by adding the following configuration line to your `elasticsearch.yml`:
 
 ```yaml
-repositories.url.allowed_urls: ["https://s3.amazonaws.com/data.elasticsearch.org/*"]
+repositories.url.allowed_urls: ["https://s3.amazonaws.com/data.elasticsearch.com/*"]
 ```
 
 ```ruby
@@ -130,8 +130,8 @@ puts "Recovering the 'bicycles.stackexchange.com' index...".yellow
 
 client.indices.delete index: 'bicycles.stackexchange.com', ignore: 404
 
-client.snapshot.create_repository repository: 'data.elasticsearch.org', body: { type: 'url', settings: { url: 'https://s3.amazonaws.com/data.elasticsearch.org/bicycles.stackexchange.com/' } }
-client.snapshot.restore repository: 'data.elasticsearch.org', snapshot: 'bicycles.stackexchange.com', body: { indices: 'bicycles.stackexchange.com' }
+client.snapshot.create_repository repository: 'data.elasticsearch.com', body: { type: 'url', settings: { url: 'https://s3.amazonaws.com/data.elasticsearch.com/bicycles.stackexchange.com/' } }
+client.snapshot.restore repository: 'data.elasticsearch.com', snapshot: 'bicycles.stackexchange.com', body: { indices: 'bicycles.stackexchange.com' }
 until client.cluster.health(level: 'indices')['indices']['bicycles.stackexchange.com']['status'] == 'green'
   r = client.indices.recovery(index: 'bicycles.stackexchange.com', human: true)['bicycles.stackexchange.com']['shards'][0] rescue nil
   print "\r#{r['index']['size']['recovered'] rescue '0b'} of #{r['index']['size']['total'] rescue 'N/A'}".ljust(52).gray
@@ -263,16 +263,19 @@ see instructions in the main [README](../README.md#development).
 
 This software is licensed under the Apache 2 license, quoted below.
 
-    Copyright (c) 2015 Elasticsearch <http://www.elasticsearch.org>
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
+    Licensed to Elasticsearch B.V. under one or more contributor
+    license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright
+    ownership. Elasticsearch B.V. licenses this file to you under
+    the Apache License, Version 2.0 (the "License"); you may
+    not use this file except in compliance with the License.
     You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+    
+    	http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.

data/lib/elasticsearch/dsl.rb

@@ -54,7 +54,7 @@ module Elasticsearch
   #     # => { query: { match: { title: "test"} } }
   #
   # @see Search
-  # @see http://www.elasticsearch.org/guide/en/elasticsearch/guide/current/query-dsl-intro.html
+  # @see https://www.elastic.co/guide/en/elasticsearch/guide/current/query-dsl-intro.html
   #
   module DSL
     def self.included(base)

data/lib/elasticsearch/dsl/search.rb

@@ -43,7 +43,7 @@ module Elasticsearch
       #     definition.to_hash
       #     # => {:query=>{:match=>{:title=>"test"}}}
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search.html
       #
       def search(*args, &block)
         Search.new(*args, &block)

data/lib/elasticsearch/dsl/search/aggregation.rb

@@ -31,7 +31,7 @@ module Elasticsearch
 
       # Wraps the `aggregations` part of a search definition
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations.html
       #
       class Aggregation
         def initialize(*args, &block)

data/lib/elasticsearch/dsl/search/aggregations/composite.rb

@@ -0,0 +1,60 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Elasticsearch
+  module DSL
+    module Search
+      module Aggregations
+        #
+        # A multi-bucket aggregation that creates composite buckets from different sources.
+        #
+        # @example
+        #
+        #  search do
+        #    aggregation :things do
+        #      composite do
+        #        size 2000
+        #        sources [
+        #          { thing1: { terms: { field: 'thing1.field1' } } },
+        #          { thing2: { terms: { field: 'thing2.field2' } } }
+        #        ]
+        #        after after_key
+        #      end
+        #    end
+        #  end
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-composite-aggregation.html
+        #
+        class Composite
+          include BaseAggregationComponent
+
+          option_method :size
+          option_method :sources
+          option_method :after
+
+          def to_hash(_options={})
+            super
+            # remove :after if no value is given
+            @hash[name.to_sym].delete(:after) if @hash[name.to_sym].is_a?(Hash) && @hash[name.to_sym][:after].nil?
+
+            @hash
+          end
+        end
+      end
+    end
+  end
+end

data/lib/elasticsearch/dsl/search/aggregations/extended_stats.rb

@@ -30,7 +30,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-metrics-extendedstats-aggregation.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-extendedstats-aggregation.html
         #
         class ExtendedStats
           include BaseComponent

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

@@ -37,7 +37,7 @@ module Elasticsearch
         #
         # See the integration test for a full example.
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-bucket-nested-aggregation.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-nested-aggregation.html
         #
         class Nested
           include BaseAggregationComponent

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

@@ -47,7 +47,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-bucket-range-aggregation.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-range-aggregation.html
         class Range
           include BaseAggregationComponent
 

data/lib/elasticsearch/dsl/search/filter.rb

@@ -25,7 +25,7 @@ module Elasticsearch
 
       # Wraps the `filter` part of a search definition, aggregation, etc
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-filters.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-filters.html
       #
       class Filter
         def initialize(*args, &block)

data/lib/elasticsearch/dsl/search/filters/bool.rb

@@ -52,28 +52,28 @@ module Elasticsearch
         #
         # See the integration test for a working example.
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-bool-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-filter.html
         #
         class Bool
           include BaseComponent
 
           def must(*args, &block)
             @hash[name][:must] ||= []
-            value = Filter.new(*args, &block).to_hash
+            value = args.empty? ? Filter.new(*args, &block).to_hash : args.first.to_hash
             @hash[name][:must].push(value).flatten! unless @hash[name][:must].include?(value)
             self
           end
 
           def must_not(*args, &block)
             @hash[name][:must_not] ||= []
-            value = Filter.new(*args, &block).to_hash
+            value = args.empty? ? Filter.new(*args, &block).to_hash : args.first.to_hash
             @hash[name][:must_not].push(value).flatten! unless @hash[name][:must_not].include?(value)
             self
           end
 
           def should(*args, &block)
             @hash[name][:should] ||= []
-            value = Filter.new(*args, &block).to_hash
+            value = args.empty? ? Filter.new(*args, &block).to_hash : args.first.to_hash
             @hash[name][:should].push(value).flatten! unless @hash[name][:should].include?(value)
             self
           end

data/lib/elasticsearch/dsl/search/filters/match_all.rb

@@ -34,7 +34,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-match-all-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-all-filter.html
         #
         class MatchAll
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/range.rb

@@ -37,7 +37,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-filter.html
         #
         class Range
           include BaseComponent

data/lib/elasticsearch/dsl/search/filters/term.rb

@@ -37,7 +37,7 @@ module Elasticsearch
         # @note The specified terms are *not analyzed* (lowercased, stemmed, etc),
         #       so they must match the indexed terms.
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-term-filter.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-filter.html
         #
         class Term
           include BaseComponent

data/lib/elasticsearch/dsl/search/highlight.rb

@@ -21,7 +21,7 @@ module Elasticsearch
 
       # Wraps the `highlight` part of a search definition
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-highlighting.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-highlighting.html
       #
       class Highlight
         include BaseComponent

data/lib/elasticsearch/dsl/search/options.rb

@@ -21,7 +21,7 @@ module Elasticsearch
 
       # Wraps the "extra" options of a search definition
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-body.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-body.html
       #
       class Options
         DSL_METHODS = [

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

@@ -58,21 +58,21 @@ module Elasticsearch
 
           def must(*args, &block)
             @hash[name][:must] ||= []
-            value = Query.new(*args, &block).to_hash
+            value = args.empty? ? Query.new(*args, &block).to_hash : args.first.to_hash
             @hash[name][:must].push(value).flatten! unless @hash[name][:must].include?(value)
             self
           end
 
           def must_not(*args, &block)
             @hash[name][:must_not] ||= []
-            value = Query.new(*args, &block).to_hash
+            value = args.empty? ? Query.new(*args, &block).to_hash : args.first.to_hash
             @hash[name][:must_not].push(value).flatten! unless @hash[name][:must_not].include?(value)
             self
           end
 
           def should(*args, &block)
             @hash[name][:should] ||= []
-            value = Query.new(*args, &block).to_hash
+            value = args.empty? ? Query.new(*args, &block).to_hash : args.first.to_hash
             @hash[name][:should].push(value).flatten! unless @hash[name][:should].include?(value)
             self
           end

data/lib/elasticsearch/dsl/search/queries/geo_shape.rb

@@ -33,7 +33,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-query.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-geo-shape-query.html
         #
         class GeoShape
           include BaseComponent

data/lib/elasticsearch/dsl/search/queries/match.rb

@@ -34,7 +34,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-match-query.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query.html
         #
         class Match
           include BaseComponent

data/lib/elasticsearch/dsl/search/queries/match_all.rb

@@ -30,7 +30,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-match-all-query.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-all-query.html
         #
         class MatchAll
           include BaseComponent

data/lib/elasticsearch/dsl/search/queries/query_string.rb

@@ -33,7 +33,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html
         # @see http://lucene.apache.org/core/2_9_4/queryparsersyntax.html
         #
         class QueryString

data/lib/elasticsearch/dsl/search/queries/range.rb

@@ -45,7 +45,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-range-query.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-range-query.html
         #
         class Range
           include BaseComponent

data/lib/elasticsearch/dsl/search/queries/term.rb

@@ -32,7 +32,7 @@ module Elasticsearch
         #       end
         #     end
         #
-        # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-term-query.html
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-query.html
         #
         class Term
           include BaseComponent

data/lib/elasticsearch/dsl/search/query.rb

@@ -25,7 +25,7 @@ module Elasticsearch
 
       # Wraps the `query` part of a search definition
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html
       #
       class Query
         def initialize(*args, &block)

data/lib/elasticsearch/dsl/search/sort.rb

@@ -21,7 +21,7 @@ module Elasticsearch
 
       # Wraps the `sort` part of a search definition
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-sort.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-sort.html
       #
       class Sort
         include BaseComponent

data/lib/elasticsearch/dsl/search/suggest.rb

@@ -21,7 +21,7 @@ module Elasticsearch
 
       # Wraps the `suggest` part of a search definition
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-suggesters.html
+      # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters.html
       #
       class Suggest
         include BaseComponent

data/lib/elasticsearch/dsl/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module DSL
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/spec/elasticsearch/dsl/search/aggregations/composite_spec.rb

@@ -0,0 +1,99 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'spec_helper'
+
+describe Elasticsearch::DSL::Search::Aggregations::Composite do
+
+  let(:search) do
+    described_class.new
+  end
+
+  describe '#to_hash' do
+
+    it 'can be converted to a hash' do
+      expect(search.to_hash).to eq(composite: {})
+    end
+  end
+
+  context 'when options methods are called' do
+
+    let(:search) do
+      described_class.new(:foo)
+    end
+
+    describe '#size' do
+
+      before do
+        search.size(2_000)
+      end
+
+      it 'applies the option' do
+        expect(search.to_hash[:composite][:foo][:size]).to eq(2_000)
+      end
+    end
+
+    describe '#sources' do
+
+      before do
+        search.sources('bar')
+      end
+
+      it 'applies the option' do
+        expect(search.to_hash[:composite][:foo][:sources]).to eq('bar')
+      end
+    end
+
+    describe '#after' do
+      context 'when after is not given' do
+        before do
+          search.size(2_000)
+        end
+
+        it 'applies the option' do
+          expect(search.to_hash[:composite][:foo].keys).not_to include(:after)
+        end
+      end
+
+      context 'when after is given' do
+        before do
+          search.after('fake_after_key')
+        end
+
+        it 'applies the option' do
+          expect(search.to_hash[:composite][:foo][:after]).to eq('fake_after_key')
+        end
+      end
+    end
+  end
+
+  describe '#initialize' do
+
+    context 'when a block is provided' do
+
+      let(:search) do
+        described_class.new(:foo) do
+          size 2_000
+        end
+      end
+
+      it 'executes the block' do
+        expect(search.to_hash).to eq({ composite: { foo: { size: 2_000 } } })
+      end
+    end
+  end
+end

data/spec/elasticsearch/dsl/search/filters/bool_spec.rb

@@ -32,6 +32,56 @@ describe Elasticsearch::DSL::Search::Filters::Bool do
 
   describe '#initialize' do
 
+    context 'when an object instance is provided' do
+
+      let(:search) do
+        described_class.new.must( Elasticsearch::DSL::Search::Filters::Term.new foo: 'bar')
+      end
+
+      it 'applies the condition' do
+        expect(search.to_hash).to eq(bool: { must: [ { term: { foo: 'bar' } } ] })
+      end
+
+      context 'when the block calls multiple methods' do
+
+        let(:search) do
+          described_class.new do
+            must(Elasticsearch::DSL::Search::Filters::Term.new foo: 'bar')
+            must_not(Elasticsearch::DSL::Search::Filters::Term.new moo: 'bam')
+            should(Elasticsearch::DSL::Search::Filters::Term.new xoo: 'bax')
+          end
+        end
+
+        it 'executes the block' do
+          expect(search.to_hash).to eq(bool:
+                                         { must:     [ { term: { foo: 'bar' } } ],
+                                           must_not: [ { term: { moo: 'bam' } } ],
+                                           should:   [ { term: { xoo: 'bax' } } ]
+                                         })
+        end
+      end
+
+      context 'when the block calls multiple conditions' do
+
+        let(:search) do
+          described_class.new do
+            must(Elasticsearch::DSL::Search::Filters::Term.new foo: 'bar')
+            must(Elasticsearch::DSL::Search::Filters::Term.new moo: 'bam')
+
+            should(Elasticsearch::DSL::Search::Filters::Term.new xoo: 'bax')
+            should(Elasticsearch::DSL::Search::Filters::Term.new zoo: 'baz')
+          end
+        end
+
+        it 'executes the block' do
+          expect(search.to_hash).to eq(bool:
+                                         { must:     [ { term: { foo: 'bar' } }, { term: { moo: 'bam' } } ],
+                                           should:   [ { term: { xoo: 'bax' } }, { term: { zoo: 'baz' } } ]
+                                         })
+        end
+      end
+    end
+
     context 'when a hash is provided' do
 
       let(:search) do

data/spec/elasticsearch/dsl/search/queries/bool_spec.rb

@@ -32,6 +32,64 @@ describe Elasticsearch::DSL::Search::Queries::Bool do
 
   describe '#initialize' do
 
+    context 'when an object instance is provided' do
+
+      let(:search) do
+        described_class.new.must(Elasticsearch::DSL::Search::Queries::Match.new foo: 'bar')
+      end
+
+      it 'applies the condition' do
+        expect(search.to_hash).to eq(bool: {must: [ {match: { foo: 'bar' }} ] })
+      end
+
+      context 'when multiple option methods are called' do
+
+        let(:search) do
+          described_class.new do
+            should(Elasticsearch::DSL::Search::Queries::Term.new(tag: 'wow'))
+            should(Elasticsearch::DSL::Search::Queries::Term.new(tag: 'elasticsearch'))
+
+            minimum_should_match 1
+            boost 1.0
+          end
+        end
+
+        it 'defines all the options' do
+          expect(search.to_hash).to eq(bool: {
+            minimum_should_match: 1,
+            boost: 1.0,
+            should:     [ {term: { tag: 'wow' }}, {term: { tag: 'elasticsearch' }} ]})
+        end
+      end
+
+      context 'when multiple conditions are provided' do
+
+        let(:search) do
+          described_class.new do
+            must(Elasticsearch::DSL::Search::Queries::Match.new foo: 'bar')
+            must(Elasticsearch::DSL::Search::Queries::Match.new moo: 'bam')
+
+            should(Elasticsearch::DSL::Search::Queries::Match.new xoo: 'bax')
+            should(Elasticsearch::DSL::Search::Queries::Match.new zoo: 'baz')
+          end
+        end
+
+        it 'applies each condition' do
+          expect(search.to_hash).to eq(bool:
+                                         { must:     [ {match: { foo: 'bar' }}, {match: { moo: 'bam' }} ],
+                                           should:   [ {match: { xoo: 'bax' }}, {match: { zoo: 'baz' }} ]
+                                         })
+        end
+
+        context 'when #to_hash is called more than once' do
+
+          it 'does not alter the hash' do
+            expect(search.to_hash).to eq(search.to_hash)
+          end
+        end
+      end
+    end
+
     context 'when a block is provided' do
 
       let(:search) do

data/test/integration/search_aggregation_children_test.rb

@@ -29,16 +29,14 @@ module Elasticsearch
 
         setup do
           @client.indices.create index: 'articles-and-comments', body: {
-            mappings: {
-              _doc: {
-                properties: {
-                  title:    { type: 'text' },
-                  category: { type: 'keyword' },
-                  join_field: { type: 'join', relations: { article: 'comment' } },
-                  author: { type: 'keyword'}
-                }
+              mappings: {
+                  properties: {
+                      title: {type: 'text'},
+                      category: {type: 'keyword'},
+                      join_field: {type: 'join', relations: {article: 'comment'}},
+                      author: {type: 'keyword'}
+                  }
               }
-            }
           }
 
           @client.index index: 'articles-and-comments', id: 1,

data/test/integration/search_aggregation_geo_test.rb

@@ -29,23 +29,21 @@ module Elasticsearch
 
         setup do
           @client.indices.create index: 'venues-test', body: {
-            mappings: {
-              venue: {
-                properties: {
-                  location: { type: 'geo_point' }
-                }
+              mappings: {
+                  properties: {
+                      location: {type: 'geo_point'}
+                  }
               }
-            }
           }
-          @client.index index: 'venues-test', type: 'venue',
+          @client.index index: 'venues-test',
                         body: { name: 'Space', location: "38.886214,1.403889" }
-          @client.index index: 'venues-test', type: 'venue',
+          @client.index index: 'venues-test',
                         body: { name: 'Pacha', location: "38.9184427,1.4433646" }
-          @client.index index: 'venues-test', type: 'venue',
+          @client.index index: 'venues-test',
                         body: { name: 'Amnesia', location: "38.948045,1.408341" }
-          @client.index index: 'venues-test', type: 'venue',
+          @client.index index: 'venues-test',
                         body: { name: 'Privilege', location: "38.958082,1.408288" }
-          @client.index index: 'venues-test', type: 'venue',
+          @client.index index: 'venues-test',
                         body: { name: 'Es Paradis', location: "38.979071,1.307394" }
           @client.indices.refresh index: 'venues-test'
         end

data/test/integration/search_aggregation_nested_test.rb

@@ -29,31 +29,30 @@ module Elasticsearch
 
         setup do
           @client.indices.create index: 'products-test', body: {
-            mappings: {
-              product: {
-                properties: {
-                  title: { type: 'text' },
-                  category: { type: 'keyword' },
-                  offers: {
-                    type: 'nested',
-                    properties: {
-                      name:  { type: 'text' },
-                      price: { type: 'double' }
-                    }
+              mappings: {
+                  properties: {
+                      title: {type: 'text'},
+                      category: {type: 'keyword'},
+                      offers: {
+                          type: 'nested',
+                          properties: {
+                              name: {type: 'text'},
+                              price: {type: 'double'}
+                          }
+                      }
                   }
-                }
               }
-            }
           }
-          @client.index index: 'products-test', type: 'product',
+
+          @client.index index: 'products-test',
                         body: { title: 'A',
                                 category: 'audio',
                                 offers: [ { name: 'A1', price: 100 }, { name: 'A2', price: 120 } ] }
-          @client.index index: 'products-test', type: 'product',
+          @client.index index: 'products-test',
                         body: { title: 'B',
                                 category: 'audio',
                                 offers: [ { name: 'B1', price: 200 }, { name: 'B2', price: 180 } ] }
-          @client.index index: 'products-test', type: 'product',
+          @client.index index: 'products-test',
                         body: { title: 'C',
                                 category: 'video',
                                 offers: [ { name: 'C1', price: 300 }, { name: 'C2', price: 350 } ] }

data/test/integration/search_aggregations_test.rb

@@ -25,17 +25,15 @@ module Elasticsearch
       context "Aggregations integration" do
         setup do
           @client.indices.create index: 'test', body: {
-            mappings: {
-              d: {
-                properties: {
-                  tags: { type: 'keyword' }
-                }
+              mappings: {
+                  properties: {
+                      tags: {type: 'keyword'}
+                  }
               }
-            }
           }
-          @client.index index: 'test', type: 'd', id: '1', body: { title: 'A', tags: %w[one], clicks: 5 }
-          @client.index index: 'test', type: 'd', id: '2', body: { title: 'B', tags: %w[one two], clicks: 15 }
-          @client.index index: 'test', type: 'd', id: '3', body: { title: 'C', tags: %w[one three], clicks: 20 }
+          @client.index index: 'test', id: '1', body: { title: 'A', tags: %w[one], clicks: 5 }
+          @client.index index: 'test', id: '2', body: { title: 'B', tags: %w[one two], clicks: 15 }
+          @client.index index: 'test', id: '3', body: { title: 'C', tags: %w[one three], clicks: 20 }
           @client.indices.refresh index: 'test'
         end
 

data/test/integration/search_filters_test.rb

@@ -31,49 +31,49 @@ module Elasticsearch
 
         setup do
           @client.indices.create index: 'test'
-          @client.index index: 'test', type: 'd', id: 1,
+          @client.index index: 'test', id: 1,
                         body: { name: 'Original',
                                 color: 'red',
                                 size: 'xxl',
                                 category: 'unisex',
                                 manufacturer: 'a' }
 
-          @client.index index: 'test', type: 'd', id: 2,
+          @client.index index: 'test', id: 2,
                         body: { name: 'Original',
                                 color: 'red',
                                 size: 'xl',
                                 category: 'unisex',
                                 manufacturer: 'a' }
 
-          @client.index index: 'test', type: 'd', id: 3,
+          @client.index index: 'test', id: 3,
                         body: { name: 'Original',
                                 color: 'red',
                                 size: 'l',
                                 category: 'unisex',
                                 manufacturer: 'a' }
 
-          @client.index index: 'test', type: 'd', id: 4,
+          @client.index index: 'test', id: 4,
                         body: { name: 'Western',
                                 color: 'red',
                                 size: 'm',
                                 category: 'men',
                                 manufacturer: 'c' }
 
-          @client.index index: 'test', type: 'd', id: 5,
+          @client.index index: 'test', id: 5,
                         body: { name: 'Modern',
                                 color: 'grey',
                                 size: 'l',
                                 category: 'men',
                                 manufacturer: 'b' }
 
-          @client.index index: 'test', type: 'd', id: 6,
+          @client.index index: 'test', id: 6,
                         body: { name: 'Modern',
                                 color: 'grey',
                                 size: 's',
                                 category: 'men',
                                 manufacturer: 'b' }
 
-          @client.index index: 'test', type: 'd', id: 7,
+          @client.index index: 'test', id: 7,
                         body: { name: 'Modern',
                                 color: 'grey',
                                 size: 's',
@@ -152,21 +152,19 @@ module Elasticsearch
         context "geographical filters" do
           setup do
             @client.indices.create index: 'places', body: {
-              mappings: {
-                d: {
-                  properties: {
-                    location: {
-                      type: 'geo_point'
+                mappings: {
+                    properties: {
+                        location: {
+                            type: 'geo_point'
+                        }
                     }
-                  }
                 }
-              }
             }
-            @client.index index: 'places', type: 'd', id: 1,
+            @client.index index: 'places', id: 1,
                           body: { name: 'Vyšehrad',
                                   location: '50.064399, 14.420018'}
 
-            @client.index index: 'places', type: 'd', id: 2,
+            @client.index index: 'places', id: 2,
                           body: { name: 'Karlštejn',
                                   location: '49.939518, 14.188046'}
 

data/test/integration/search_options_test.rb

@@ -25,8 +25,8 @@ module Elasticsearch
       context "Search options" do
         setup do
           @client.indices.create index: 'test'
-          @client.index index: 'test', type: 'd', id: '1', body: { title: 'Test' }
-          @client.index index: 'test', type: 'd', id: '2', body: { title: 'Rest' }
+          @client.index index: 'test', id: '1', body: { title: 'Test' }
+          @client.index index: 'test', id: '2', body: { title: 'Rest' }
           @client.indices.refresh index: 'test'
         end
 

data/test/integration/search_query_test.rb

@@ -29,8 +29,8 @@ module Elasticsearch
 
         setup do
           @client.indices.create index: 'test'
-          @client.index index: 'test', type: 'd', id: '1', body: { title: 'Test', tags: ['one'] }
-          @client.index index: 'test', type: 'd', id: '2', body: { title: 'Rest', tags: ['one', 'two'] }
+          @client.index index: 'test', id: '1', body: { title: 'Test', tags: ['one'] }
+          @client.index index: 'test', id: '2', body: { title: 'Rest', tags: ['one', 'two'] }
           @client.indices.refresh index: 'test'
         end
 

data/test/integration/search_size_from_test.rb

@@ -25,9 +25,9 @@ module Elasticsearch
         context "Search results pagination" do
           setup do
             @client.indices.create index: 'test', body: {
-              mappings: { d: { properties: { title: { type: 'text', fields: { keyword: { type: 'keyword' } } } } } } }
+              mappings: { properties: { title: { type: 'text', fields: { keyword: { type: 'keyword' } } } } } }
 
-            25.times { |i| @client.index index: 'test', type: 'd', id: i, body: { title: "Test #{sprintf('%03d', i)}" } }
+            25.times { |i| @client.index index: 'test', id: i, body: { title: "Test #{sprintf('%03d', i)}" } }
 
             @client.indices.refresh index: 'test'
           end

data/test/integration/search_sort_test.rb

@@ -29,9 +29,9 @@ module Elasticsearch
 
         setup do
           @client.indices.create index: 'test'
-          @client.index index: 'test', type: 'd', id: '1', body: { tags: ['one'], clicks: 15 }
-          @client.index index: 'test', type: 'd', id: '2', body: { tags: ['one', 'two'], clicks: 5 }
-          @client.index index: 'test', type: 'd', id: '3', body: { tags: ['one', 'three'], clicks: 20 }
+          @client.index index: 'test', id: '1', body: { tags: ['one'], clicks: 15 }
+          @client.index index: 'test', id: '2', body: { tags: ['one', 'two'], clicks: 5 }
+          @client.index index: 'test', id: '3', body: { tags: ['one', 'three'], clicks: 20 }
           @client.indices.refresh index: 'test'
         end
 

data/test/integration/search_suggest_test.rb

@@ -31,37 +31,35 @@ module Elasticsearch
 
         setup do
           @client.indices.create index: 'test', body: {
-            mappings: {
-              d: {
-                properties: {
-                  title: { type: 'text' },
-                  suggest: {
-                    type: 'object',
-                    properties: {
-                      title:   { type: 'completion' },
-                      payload: { type: 'object', enabled: false }
-                    }
+              mappings: {
+                  properties: {
+                      title: {type: 'text'},
+                      suggest: {
+                          type: 'object',
+                          properties: {
+                              title: {type: 'completion'},
+                              payload: {type: 'object', enabled: false}
+                          }
+                      }
                   }
-                }
               }
-            }
           }
 
-          @client.index index: 'test', type: 'd', id: '1', body: {
+          @client.index index: 'test', id: '1', body: {
             title: 'One',
             suggest: {
               title: { input: ['one', 'uno', 'jedna'] },
               payload: { id: '1' }
             }
           }
-          @client.index index: 'test', type: 'd', id: '2', body: {
+          @client.index index: 'test', id: '2', body: {
             title: 'Two',
             suggest: {
               title: { input: ['two', 'due', 'dvě'] },
               payload: { id: '2' }
             }
           }
-          @client.index index: 'test', type: 'd', id: '3', body: {
+          @client.index index: 'test', id: '3', body: {
             title: 'Three',
             suggest: {
               title: { input: ['three', 'tres', 'tři'] },

data/test/integration/search_test.rb

@@ -56,9 +56,9 @@ module Elasticsearch
 
         setup do
           @client.indices.create index: 'test'
-          @client.index index: 'test', type: 'd', id: '1', body: { title: 'Test', tags: ['one'] }
-          @client.index index: 'test', type: 'd', id: '2', body: { title: 'Test', tags: ['one', 'two'] }
-          @client.index index: 'test', type: 'd', id: '3', body: { title: 'Test', tags: ['three'] }
+          @client.index index: 'test', id: '1', body: { title: 'Test', tags: ['one'] }
+          @client.index index: 'test', id: '2', body: { title: 'Test', tags: ['one', 'two'] }
+          @client.index index: 'test', id: '3', body: { title: 'Test', tags: ['three'] }
           @client.indices.refresh index: 'test'
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,6 +214,7 @@ files:
 - lib/elasticsearch/dsl/search/aggregations/avg.rb
 - lib/elasticsearch/dsl/search/aggregations/cardinality.rb
 - lib/elasticsearch/dsl/search/aggregations/children.rb
+- lib/elasticsearch/dsl/search/aggregations/composite.rb
 - lib/elasticsearch/dsl/search/aggregations/date_histogram.rb
 - lib/elasticsearch/dsl/search/aggregations/date_range.rb
 - lib/elasticsearch/dsl/search/aggregations/extended_stats.rb
@@ -333,6 +334,7 @@ files:
 - spec/elasticsearch/dsl/search/aggregations/avg_spec.rb
 - spec/elasticsearch/dsl/search/aggregations/cardinality_spec.rb
 - spec/elasticsearch/dsl/search/aggregations/children_spec.rb
+- spec/elasticsearch/dsl/search/aggregations/composite_spec.rb
 - spec/elasticsearch/dsl/search/aggregations/date_histogram_spec.rb
 - spec/elasticsearch/dsl/search/aggregations/date_range_spec.rb
 - spec/elasticsearch/dsl/search/aggregations/extended_stats_spec.rb
@@ -484,7 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby DSL builder for Elasticsearch
@@ -492,6 +494,7 @@ test_files:
 - spec/elasticsearch/dsl/search/aggregations/avg_spec.rb
 - spec/elasticsearch/dsl/search/aggregations/cardinality_spec.rb
 - spec/elasticsearch/dsl/search/aggregations/children_spec.rb
+- spec/elasticsearch/dsl/search/aggregations/composite_spec.rb
 - spec/elasticsearch/dsl/search/aggregations/date_histogram_spec.rb
 - spec/elasticsearch/dsl/search/aggregations/date_range_spec.rb
 - spec/elasticsearch/dsl/search/aggregations/extended_stats_spec.rb