github / searchkick

Download as
Browse Code ยป

Commit 6281297d371648c11843a0d90845c4e2cec44893

Authored by Andrew Kane
1 parent 80ffae45
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

Use elasticsearch-model

Showing 4 changed files with 4 additions and 23 deletions   Show diff stats
lib/searchkick.rb
  Diff comments   View file @6281297
1   -require "elasticsearch"
  1 +require "elasticsearch/model"
2 2 require "searchkick/version"
3 3 require "searchkick/index"
4 4 require "searchkick/reindex"
... ... @@ -13,7 +13,7 @@ require "searchkick/tasks"
13 13 module Searchkick
14 14  
15 15 def self.client
16   - @client ||= Elasticsearch::Client.new log: true
  16 + @client ||= Elasticsearch::Client.new(log: true)
17 17 end
18 18  
19 19 @callbacks = true
... ...
lib/searchkick/logger.rb
View file @80ffae4
... ... @@ -1,19 +0,0 @@
1   -require "tire/rails/logger"
2   -require "tire/rails/logger/log_subscriber"
3   -
4   -class Tire::Rails::LogSubscriber
5   -
6   - # better output format
7   - def search(event)
8   - self.class.runtime += event.duration
9   - return unless logger.debug?
10   -
11   - payload = event.payload
12   -
13   - name = "%s (%.1fms)" % [payload[:name], event.duration]
14   - query = payload[:search].to_s
15   -
16   - debug " #{color(name, YELLOW, true)} #{query}"
17   - end
18   -
19   -end
lib/searchkick/results.rb
  Diff comments   View file @6281297
1 1 module Searchkick
2   - class Results
  2 + class Results < Elasticsearch::Model::Response::Results
3 3  
4 4 def suggestions
5 5 if @response["suggest"]
... ...
searchkick.gemspec
  Diff comments   View file @6281297
... ... @@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
18 18 spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19 19 spec.require_paths = ["lib"]
20 20  
21   - spec.add_dependency "elasticsearch"
  21 + spec.add_dependency "elasticsearch-model"
22 22  
23 23 spec.add_development_dependency "bundler", "~> 1.3"
24 24 spec.add_development_dependency "rake"
... ...