Added match option to searchkick method

Andrew Kane
1 parent 390878f3
Showing 2 changed files with 5 additions and 2 deletions Show diff stats
lib/searchkick/index.rb
lib/searchkick/query.rb
@@ -464,10 +464,13 @@ module Searchkick
           "{name}" => {type: "string", index: "not_analyzed"}
         }
-        unless options[:word] == false
+        if options[:match] && options[:match] != :word
+          dynamic_fields[options[:match]] = {type: "string", index: "analyzed", analyzer: "searchkick_#{options[:match]}_index"}
+        elsif options[:word] != false
           dynamic_fields["analyzed"] = {type: "string", index: "analyzed"}
         end
+
         mappings = {
           _default_: {
             properties: mapping,
@@ -30,7 +30,7 @@ module Searchkick
             options[:fields].map { |f| "#{f}.autocomplete" }
           else
             options[:fields].map do |value|
-              k, v = value.is_a?(Hash) ? value.to_a.first : [value, options[:match] || :word]
+              k, v = value.is_a?(Hash) ? value.to_a.first : [value, options[:match] || searchkick_options[:match] || :word]
               k2, boost = k.to_s.split("^", 2)
               field = "#{k2}.#{v == :word ? 'analyzed' : v}"
               boost_fields[field] = boost.to_f if boost
	@@ -30,7 +30,7 @@ module Searchkick		@@ -30,7 +30,7 @@ module Searchkick
30	options[:fields].map { \|f\| "#{f}.autocomplete" }	30	options[:fields].map { \|f\| "#{f}.autocomplete" }
31	else	31	else
32	options[:fields].map do \|value\|	32	options[:fields].map do \|value\|
33	- k, v = value.is_a?(Hash) ? value.to_a.first : [value, options[:match] \|\| :word]	33	+ k, v = value.is_a?(Hash) ? value.to_a.first : [value, options[:match] \|\| searchkick_options[:match] \|\| :word]
34	k2, boost = k.to_s.split("^", 2)	34	k2, boost = k.to_s.split("^", 2)
35	field = "#{k2}.#{v == :word ? 'analyzed' : v}"	35	field = "#{k2}.#{v == :word ? 'analyzed' : v}"
36	boost_fields[field] = boost.to_f if boost	36	boost_fields[field] = boost.to_f if boost