[DSL] Allow Bool query and Bool filter methods to take objects as arguments

Author: defgenx

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

@@ -59,21 +59,21 @@ class Bool
 
           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

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

@@ -58,21 +58,21 @@ class Bool
 
           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

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

@@ -32,6 +32,56 @@
 
   describe '#initialize' do
 
+    context 'when an object instance is provided' do
+
+      let(:search) do
+        described_class.new.must( Elasticsearch::DSL::Search::Queries::Term.new foo: 'bar')
+      end
+
+      it 'executes the block' 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::Queries::Term.new foo: 'bar')
+            must_not(Elasticsearch::DSL::Search::Queries::Term.new moo: 'bam')
+            should(Elasticsearch::DSL::Search::Queries::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::Queries::Term.new foo: 'bar')
+            must(Elasticsearch::DSL::Search::Queries::Term.new moo: 'bam')
+
+            should(Elasticsearch::DSL::Search::Queries::Term.new xoo: 'bax')
+            should(Elasticsearch::DSL::Search::Queries::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

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

@@ -32,6 +32,64 @@
 
   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 'executes the block' 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