From a040066c4b09eae52d1aaadcc2a46f85e2903c0a Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 2 May 2018 19:06:33 -0700 Subject: [PATCH] Added :inline as alias for true for callbacks and mode options - closes #1133 --- CHANGELOG.md | 1 + lib/searchkick/model.rb | 4 ++-- lib/searchkick/record_indexer.rb | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c9b014..17eaa02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## 3.0.4 [unreleased] +- Added `:inline` as alias for `true` for `callbacks` and `mode` options - Friendlier error message for bad mapping with partial matches - Warn when records in search index do not exist in database diff --git a/lib/searchkick/model.rb b/lib/searchkick/model.rb index 26ae73b..12409ff 100644 --- a/lib/searchkick/model.rb +++ b/lib/searchkick/model.rb @@ -16,8 +16,8 @@ module Searchkick options[:_type] ||= -> { searchkick_index.klass_document_type(self, true) } - callbacks = options.key?(:callbacks) ? options[:callbacks] : true - unless [true, false, :async, :queue].include?(callbacks) + callbacks = options.key?(:callbacks) ? options[:callbacks] : :inline + unless [:inline, true, false, :async, :queue].include?(callbacks) raise ArgumentError, "Invalid value for callbacks" end diff --git a/lib/searchkick/record_indexer.rb b/lib/searchkick/record_indexer.rb index 5428518..e869f4e 100644 --- a/lib/searchkick/record_indexer.rb +++ b/lib/searchkick/record_indexer.rb @@ -8,7 +8,7 @@ module Searchkick end def reindex(method_name = nil, refresh: false, mode: nil) - unless [true, nil, :async, :queue].include?(mode) + unless [:inline, true, nil, :async, :queue].include?(mode) raise ArgumentError, "Invalid value for mode" end @@ -31,7 +31,7 @@ module Searchkick record.id.to_s, method_name ? method_name.to_s : nil ) - else # bulk, true + else # bulk, inline/true reindex_record(method_name) index.refresh if refresh -- libgit2 0.21.0