diff --git a/lib/searchkick/query.rb b/lib/searchkick/query.rb index 09bb63e..1b7870c 100644 --- a/lib/searchkick/query.rb +++ b/lib/searchkick/query.rb @@ -78,9 +78,9 @@ module Searchkick fields: [field], query: term, use_dis_max: false, - operator: operator, - cutoff_frequency: 0.001 + operator: operator } + shared_options[:cutoff_frequency] = 0.001 unless operator == "and" queries.concat [ {multi_match: shared_options.merge(boost: 10, analyzer: "searchkick_search")}, {multi_match: shared_options.merge(boost: 10, analyzer: "searchkick_search2")} diff --git a/searchkick.gemspec b/searchkick.gemspec index e1e2b6d..58ad987 100644 --- a/searchkick.gemspec +++ b/searchkick.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_dependency "activemodel" - spec.add_dependency "elasticsearch", "~> 0.4.11" + spec.add_dependency "elasticsearch", ">= 1.0.0" spec.add_dependency "hashie" spec.add_development_dependency "bundler", "~> 1.3" -- libgit2 0.21.0