searchkick 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2afa6ea99c2995b003f51cbe409392097fdfa8e
-  data.tar.gz: dc2e4add51195454636f94db1ae6417c2a8933bb
+  metadata.gz: 74cd357aadff8dc7f80b5db94f74dde7940abcd8
+  data.tar.gz: ae9c5f086a639fbb18e0848a862231f188ee7624
 SHA512:
-  metadata.gz: 1895d905c2b916de3e5e5fb5640d8132318f0dccffa553cfd6770d1c38d84bcd5dc9c92d1749711fa16f0bfdf677962318a5ec50e366f91e0dd1324121bf169f
-  data.tar.gz: 8c9bc21cf09a320ee676d2307f7ebbdbf1cc2f2dce37633e799f6282ee2f3f1d8e5ba0af1696c23c2271f401ca1173b4803779f6f50f43cd8674db15c7483620
+  metadata.gz: 22c8007b1672a5ca1d6def91d812509f50fc795b0744817f8af52feaa024c569b6f993f41b138f47c2aa5d42a7709faa2e6a51f1ff3a5005ff0c8e084ae1a4e9
+  data.tar.gz: ce18c6e5766bfc8a203c1a6ebe77f9d717b7a88c6ce361858ad15fa3049a4722cb5dcc23bc41f0e3d3be9e12f34a47d70a6783b458b2fe9701cb5d673376711f

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.2
+
+- Use after_commit hook for ActiveRecord to prevent data inconsistencies
+
 ## 0.5.1
 
 - Replaced stop words with common terms query

data/README.md

@@ -657,25 +657,18 @@ class Product < ActiveRecord::Base
 end
 ```
 
-Reindex conditionally
+Asynchronous reindexing
 
 ```ruby
 class Product < ActiveRecord::Base
   searchkick callbacks: false
 
   # add the callbacks manually
-  after_save :reindex, if: proc{|model| model.name_changed? } # use your own condition
-  after_destroy :reindex
-end
-```
 
-Asynchronous reindexing
+  # ActiveRecord - one callback
+  after_commit :reindex_async
 
-```ruby
-class Product < ActiveRecord::Base
-  searchkick callbacks: false
-
-  # add the callbacks manually
+  # Mongoid - two callbacks
   after_save :reindex_async
   after_destroy :reindex_async
 
@@ -686,6 +679,20 @@ class Product < ActiveRecord::Base
 end
 ```
 
+Reindex conditionally
+
+**Note:** With ActiveRecord, use this feature with caution - [transaction rollbacks can cause data inconstencies](https://github.com/elasticsearch/elasticsearch-rails/blob/master/elasticsearch-model/README.md#custom-callbacks)
+
+```ruby
+class Product < ActiveRecord::Base
+  searchkick callbacks: false
+
+  # add the callbacks manually
+  after_save :reindex, if: proc{|model| model.name_changed? } # use your own condition
+  after_destroy :reindex
+end
+```
+
 Reindex all models (Rails only)
 
 ```sh

data/lib/searchkick/model.rb

@@ -19,8 +19,12 @@ module Searchkick
         extend Searchkick::Reindex
         include Searchkick::Similar
 
-        after_save :reindex, if: proc { self.class.search_callbacks? }
-        after_destroy :reindex, if: proc { self.class.search_callbacks? }
+        if respond_to?(:after_commit)
+          after_commit :reindex, if: proc{ self.class.search_callbacks? }
+        else
+          after_save :reindex, if: proc{ self.class.search_callbacks? }
+          after_destroy :reindex, if: proc{ self.class.search_callbacks? }
+        end
 
         def self.enable_search_callbacks
           class_variable_set :@@searchkick_callbacks, true

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/test/index_test.rb

@@ -32,4 +32,17 @@ class TestIndex < Minitest::Unit::TestCase
     assert_equal ["Dollar Tree"], Store.search(query: {match: {name: "Dollar Tree"}}).map(&:name)
   end
 
+  if defined?(ActiveRecord)
+
+    def test_transaction
+      Product.transaction do
+        store_names ["Product A"]
+        raise ActiveRecord::Rollback
+      end
+
+      assert_search "product", []
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Andrew Kane