lib/searchkick/index_options.rb in searchkick-4.3.0 vs lib/searchkick/index_options.rb in searchkick-4.3.1

- old
+ new

@@ -25,13 +25,10 @@ else default_type = "text" default_analyzer = :searchkick_index keyword_mapping = {type: "keyword"} - index_true_value = true - index_false_value = false - keyword_mapping[:ignore_above] = options[:ignore_above] || 30000 settings = { analysis: { analyzer: { @@ -354,17 +351,17 @@ word = options[:word] != false && (!options[:match] || options[:match] == :word) mapping_options[:searchable].delete("_all") - analyzed_field_options = {type: default_type, index: index_true_value, analyzer: default_analyzer} + analyzed_field_options = {type: default_type, index: true, analyzer: default_analyzer} mapping_options.values.flatten.uniq.each do |field| fields = {} if options.key?(:filterable) && !mapping_options[:filterable].include?(field) - fields[field] = {type: default_type, index: index_false_value} + fields[field] = {type: default_type, index: false} else fields[field] = keyword_mapping end if !options[:searchable] || mapping_options[:searchable].include?(field) @@ -376,11 +373,11 @@ end end mapping_options.except(:highlight, :searchable, :filterable, :word).each do |type, f| if options[:match] == type || f.include?(field) - fields[type] = {type: default_type, index: index_true_value, analyzer: "searchkick_#{type}_index"} + fields[type] = {type: default_type, index: true, analyzer: "searchkick_#{type}_index"} end end end mapping[field] = fields[field].merge(fields: fields.except(field)) @@ -416,15 +413,15 @@ # and the _all index analyzer will take care of it "{name}" => keyword_mapping } if options.key?(:filterable) - dynamic_fields["{name}"] = {type: default_type, index: index_false_value} + dynamic_fields["{name}"] = {type: default_type, index: false} end unless options[:searchable] if options[:match] && options[:match] != :word - dynamic_fields[options[:match]] = {type: default_type, index: index_true_value, analyzer: "searchkick_#{options[:match]}_index"} + dynamic_fields[options[:match]] = {type: default_type, index: true, analyzer: "searchkick_#{options[:match]}_index"} end if word dynamic_fields[:analyzed] = analyzed_field_options end