github / searchkick

Download as
Browse Code ยป

Commit 21f1b15a5aba36f988adc80fb2e5c944aebdcc9f

Authored by Andrew Kane
1 parent 37a06a44
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 ActiveModel hook

Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
lib/searchkick.rb
  Diff comments   View file @21f1b15
  1 +require "active_model"
1 2 require "elasticsearch/model"
2 3 require "searchkick/version"
3 4 require "searchkick/index"
... ... @@ -32,8 +33,5 @@ module Searchkick
32 33 end
33 34 end
34 35  
35   -require "active_record" # TODO remove
36   -
37 36 # TODO find better ActiveModel hook
38   -ActiveModel::Callbacks.send(:include, Searchkick::Model) if defined?(ActiveModel)
39   -ActiveRecord::Base.send(:extend, Searchkick::Model) if defined?(ActiveRecord)
  37 +ActiveModel::Callbacks.send(:include, Searchkick::Model)
... ...
searchkick.gemspec
  Diff comments   View file @21f1b15
... ... @@ -18,6 +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 "activemodel"
21 22 spec.add_dependency "elasticsearch-model"
22 23  
23 24 spec.add_development_dependency "bundler", "~> 1.3"
... ...