[DSL] Added the match_phrase and match_phrase_prefix queries

Elasticsearch 5.x now has match_phrase and match_phrase_prefix queries that are not currently available in the DSL.

Closes #441
Closes #448

Author: Aaron Gunderson

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

@@ -35,6 +35,7 @@ class Match
           option_method :lenient
           option_method :zero_terms_query
           option_method :cutoff_frequency
+          option_method :max_expansions
         end
 
       end

lib/elasticsearch/dsl/search/queries/match_phrase.rb

@@ -0,0 +1,33 @@
+module Elasticsearch
+  module DSL
+    module Search
+      module Queries
+
+        # A query that analyzes the text and creates a phrase query out of the analyzed text
+        #
+        # @example
+        #
+        #     search do
+        #       query do
+        #         match_phrase :content do
+        #           query 'example content'
+        #           analyzer 'standard'
+        #         end
+        #       end
+        #     end
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query-phrase.html
+        #
+        class MatchPhrase
+          include BaseComponent
+
+          option_method :query
+          option_method :analyzer
+          option_method :boost
+          option_method :slop
+        end
+
+      end
+    end
+  end
+end

lib/elasticsearch/dsl/search/queries/match_phrase_prefix.rb

@@ -0,0 +1,32 @@
+module Elasticsearch
+  module DSL
+    module Search
+      module Queries
+
+        # The same as match_phrase, except that it allows for prefix matches on the last term in the text
+        #
+        # @example
+        #
+        #     search do
+        #       query do
+        #         match_phrase_prefix :content do
+        #           query 'example content'
+        #           max_expansions 10
+        #         end
+        #       end
+        #     end
+        #
+        # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-match-query-phrase-prefix.html
+        #
+        class MatchPhrasePrefix
+          include BaseComponent
+
+          option_method :query
+          option_method :boost
+          option_method :max_expansions
+        end
+
+      end
+    end
+  end
+end

test/unit/queries/match_phrase_prefix_test.rb

@@ -0,0 +1,62 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Queries
+      class MatchPhrasePrefixTest < ::Test::Unit::TestCase
+        include Elasticsearch::DSL::Search::Queries
+
+        context "Match Phrase Prefix Query" do
+          subject { MatchPhrasePrefix.new }
+
+          should "be converted to a Hash" do
+            assert_equal({ match_phrase_prefix: {} }, subject.to_hash)
+          end
+
+          should "take a concrete value" do
+            subject = MatchPhrasePrefix.new message: 'test'
+
+            assert_equal({match_phrase_prefix: {message: "test"}}, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = MatchPhrasePrefix.new
+
+            subject.query    'bar'
+            subject.boost    10
+            subject.max_expansions     1
+
+            assert_equal %w[ boost max_expansions query ],
+                         subject.to_hash[:match_phrase_prefix].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:match_phrase_prefix][:query]
+          end
+
+          should "take a Hash" do
+            subject = MatchPhrasePrefix.new message: { query: 'test' }
+
+            assert_equal({match_phrase_prefix: {message: {query: "test" }}}, subject.to_hash)
+          end
+
+          should "take a block" do
+            subject = MatchPhrasePrefix.new :message do
+              query          'test'
+              boost          2
+              max_expansions 1
+            end
+
+            assert_equal({match_phrase_prefix: {message: {query: "test", max_expansions: 1, boost: 2 }}},
+                         subject.to_hash)
+          end
+
+          should "take a method call" do
+            subject = MatchPhrasePrefix.new :message
+            subject.query    'test'
+
+            assert_equal({match_phrase_prefix: {message: {query: "test" }}}, subject.to_hash)
+          end
+
+        end
+      end
+    end
+  end
+end

test/unit/queries/match_phrase_test.rb

@@ -0,0 +1,63 @@
+require 'test_helper'
+
+module Elasticsearch
+  module Test
+    module Queries
+      class MatchPhraseTest < ::Test::Unit::TestCase
+        include Elasticsearch::DSL::Search::Queries
+
+        context "Match Phrase Query" do
+          subject { MatchPhrase.new }
+
+          should "be converted to a Hash" do
+            assert_equal({ match_phrase: {} }, subject.to_hash)
+          end
+
+          should "take a concrete value" do
+            subject = MatchPhrase.new message: 'test'
+
+            assert_equal({match_phrase: {message: "test"}}, subject.to_hash)
+          end
+
+          should "have option methods" do
+            subject = MatchPhrase.new
+
+            subject.query    'bar'
+            subject.analyzer 'standard'
+            subject.boost    10
+            subject.slop     1
+
+            assert_equal %w[ analyzer boost query slop ],
+                         subject.to_hash[:match_phrase].keys.map(&:to_s).sort
+            assert_equal 'bar', subject.to_hash[:match_phrase][:query]
+          end
+
+          should "take a Hash" do
+            subject = MatchPhrase.new message: { query: 'test' }
+
+            assert_equal({match_phrase: {message: {query: "test" }}}, subject.to_hash)
+          end
+
+          should "take a block" do
+            subject = MatchPhrase.new :message do
+              query     'test'
+              slop      1
+              boost     2
+            end
+
+            assert_equal({match_phrase: {message: {query: "test", slop: 1, boost: 2 }}},
+                         subject.to_hash)
+          end
+
+          should "take a method call" do
+            subject = MatchPhrase.new :message
+            subject.query    'test'
+
+            assert_equal({match_phrase: {message: {query: "test" }}}, subject.to_hash)
+          end
+
+        end
+      end
+    end
+  end
+end