github / searchkick

Download as
Browse Code ยป

Commit 7a9b312a66976609a28300ec004dca26b32fe916

Authored by Andrew Kane
1 parent f8823126
Exists in master and in 21 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, highlighted, index_name, lazy_index_name, less_deps, nested, reindex_async_threads, reindex_refactor, relation, relation_search, routing_queue, scope_attributes, search_as_you_type, synonyms_ci, test_language, threads, wildcard

Fixed remaining tests

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
lib/searchkick/query.rb
  Diff comments   View file @7a9b312
@@ -78,9 +78,9 @@ module Searchkick @@ -78,9 +78,9 @@ module Searchkick
78 fields: [field], 78 fields: [field],
79 query: term, 79 query: term,
80 use_dis_max: false, 80 use_dis_max: false,
81 - operator: operator,  
82 - cutoff_frequency: 0.001 81 + operator: operator
83 } 82 }
  83 + shared_options[:cutoff_frequency] = 0.001 unless operator == "and"
84 queries.concat [ 84 queries.concat [
85 {multi_match: shared_options.merge(boost: 10, analyzer: "searchkick_search")}, 85 {multi_match: shared_options.merge(boost: 10, analyzer: "searchkick_search")},
86 {multi_match: shared_options.merge(boost: 10, analyzer: "searchkick_search2")} 86 {multi_match: shared_options.merge(boost: 10, analyzer: "searchkick_search2")}
searchkick.gemspec
  Diff comments   View file @7a9b312
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec| @@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
19 spec.require_paths = ["lib"] 19 spec.require_paths = ["lib"]
20 20
21 spec.add_dependency "activemodel" 21 spec.add_dependency "activemodel"
22 - spec.add_dependency "elasticsearch", "~> 0.4.11" 22 + spec.add_dependency "elasticsearch", ">= 1.0.0"
23 spec.add_dependency "hashie" 23 spec.add_dependency "hashie"
24 24
25 spec.add_development_dependency "bundler", "~> 1.3" 25 spec.add_development_dependency "bundler", "~> 1.3"