Merge pull request #1204 from pat/realtime-after-commit

Use after_commit callbacks for real-time changes.

Author: pat

lib/thinking_sphinx/active_record/callbacks/delete_callbacks.rb

@@ -3,7 +3,11 @@
 class ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks <
   ThinkingSphinx::Callbacks
 
-  callbacks :after_destroy, :after_rollback
+  callbacks :after_commit, :after_destroy, :after_rollback
+
+  def after_commit
+    delete_from_sphinx
+  end
 
   def after_destroy
     delete_from_sphinx

lib/thinking_sphinx/callbacks/appender.rb

@@ -24,7 +24,10 @@ def call
   attr_reader :model, :reference, :options, :block
 
   def add_core_callbacks
-    model.after_destroy ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks
+    model.after_commit(
+      ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks,
+      on: :destroy
+    )
   end
 
   def add_delta_callbacks
@@ -40,8 +43,9 @@ def add_delta_callbacks
   end
 
   def add_real_time_callbacks
-    model.after_save ThinkingSphinx::RealTime.callback_for(
-      reference, path, &block
+    model.after_commit(
+      ThinkingSphinx::RealTime.callback_for(reference, path, &block),
+      on: [:create, :update]
     )
   end
 

spec/acceptance/sql_deltas_spec.rb

@@ -16,7 +16,7 @@
     )
     sleep 0.25
 
-    expect(Book.search('Terry Pratchett').to_a).to eq([guards, men])
+    expect(Book.search('Terry Pratchett').to_a).to match_array([guards, men])
   end
 
   it "automatically indexes updated records" do

spec/thinking_sphinx/active_record/index_spec.rb

@@ -5,7 +5,9 @@
 describe ThinkingSphinx::ActiveRecord::Index do
   let(:index)        { ThinkingSphinx::ActiveRecord::Index.new :user }
   let(:config)       { double('config', :settings => {},
-    :indices_location => 'location', :next_offset => 8) }
+    :indices_location => 'location', :next_offset => 8,
+    :index_set_class => index_set_class) }
+  let(:index_set_class) { double :reference_name => :user }
 
   before :each do
     allow(ThinkingSphinx::Configuration).to receive_messages :instance => config