vendor/after_commit/.gitignore vendor/after_commit/LICENSE vendor/after_commit/README vendor/after_commit/Rakefile vendor/after_commit/init.rb vendor/after_commit/lib/after_commit.rb vendor/after_commit/lib/after_commit/active_record.rb vendor/after_commit/lib/after_commit/connection_adapters.rb vendor/after_commit/test/after_commit_test.rb @@ -4,6 +4,7 @@ end require 'active_record' require 'riddle' +require 'after_commit' require 'thinking_sphinx/active_record' require 'thinking_sphinx/association' lib/thinking_sphinx.rb @@ -11,57 +11,6 @@ module ThinkingSphinx # def self.included(base) base.class_eval do - # The define_callbacks method was added post Rails 2.0.2 - if it - # doesn't exist, we define the callback manually - # - if respond_to?(:define_callbacks) - define_callbacks :after_commit - else - class << self - # Handle after_commit callbacks - call all the registered callbacks. - # - def after_commit(*callbacks, &block) - callbacks << block if block_given? - write_inheritable_array(:after_commit, callbacks) - end - end - end - - def after_commit - # Deliberately blank. - end - - # Normal boolean save wrapped in a handler for the after_commit - # callback. - # - def save_with_after_commit_callback(*args) - value = save_without_after_commit_callback(*args) - callback(:after_commit) if value - return value - end - - alias_method_chain :save, :after_commit_callback - - # Forceful save wrapped in a handler for the after_commit callback. - # - def save_with_after_commit_callback!(*args) - value = save_without_after_commit_callback!(*args) - callback(:after_commit) if value - return value - end - - alias_method_chain :save!, :after_commit_callback - - # Normal destroy wrapped in a handler for the after_commit callback. - # - def destroy_with_after_commit_callback - value = destroy_without_after_commit_callback - callback(:after_commit) if value - return value - end - - alias_method_chain :destroy, :after_commit_callback - private # Set the delta value for the model to be true. lib/thinking_sphinx/active_record/delta.rb @@ -2,16 +2,16 @@ DROP TABLE IF EXISTS `people`; CREATE TABLE `people` ( `id` int(11) NOT NULL auto_increment, - `first_name` varchar(50) NOT NULL, - `middle_initial` varchar(10) NOT NULL, - `last_name` varchar(50) NOT NULL, - `gender` varchar(10) NOT NULL, - `street_address` varchar(200) NOT NULL, - `city` varchar(100) NOT NULL, - `state` varchar(100) NOT NULL, - `postcode` varchar(10) NOT NULL, - `email` varchar(100) NOT NULL, - `birthday` datetime NOT NULL, + `first_name` varchar(50) NULL, + `middle_initial` varchar(10) NULL, + `last_name` varchar(50) NULL, + `gender` varchar(10) NULL, + `street_address` varchar(200) NULL, + `city` varchar(100) NULL, + `state` varchar(100) NULL, + `postcode` varchar(10) NULL, + `email` varchar(100) NULL, + `birthday` datetime NULL, `team_id` int(11) NULL, `team_type` varchar(50) NULL, `type` varchar(50) NULL, spec/fixtures/structure.sql @@ -1,137 +1,27 @@ require 'spec/spec_helper' -describe "ThinkingSphinx::ActiveRecord::Delta" do - describe "after_commit callback" do - before :each do - Person.stub_method(:write_inheritable_array => true) - end +# Ensure after_commit plugin is loaded correctly +Object.subclasses_of(ActiveRecord::ConnectionAdapters::AbstractAdapter).each { |klass| + klass.send(:include, AfterCommit::ConnectionAdapters) +} - # This spec only passes with ActiveRecord 2.0.2 or earlier. - # it "should add callbacks" do - # Person.after_commit :toggle_delta - # - # Person.should have_received(:write_inheritable_array).with( - # :after_commit, [:toggle_delta] - # ) - # end - - it "should have an after_commit method by default" do - Person.instance_methods.should include("after_commit") - end - end - - describe "save_with_after_commit_callback method" do - before :each do - @person = Person.new - @person.stub_methods( - :save_without_after_commit_callback => true, - :callback => true - ) - end - - it "should call the normal save method" do - @person.save - - @person.should have_received(:save_without_after_commit_callback) - end - - it "should call the callbacks if the save was successful" do - @person.save - - @person.should have_received(:callback).with(:after_commit) - end - - it "shouldn't call the callbacks if the save failed" do - @person.stub_method(:save_without_after_commit_callback => false) - - @person.save - - @person.should_not have_received(:callback) - end - - it "should return the normal save's result" do - @person.save.should be_true - - @person.stub_method(:save_without_after_commit_callback => false) - - @person.save.should be_false - end - end - - describe "save_with_after_commit_callback! method" do - before :each do - @person = Person.new - @person.stub_methods( - :save_without_after_commit_callback! => true, - :callback => true - ) - end - - it "should call the normal save! method" do - @person.save! - - @person.should have_received(:save_without_after_commit_callback!) - end +describe "ThinkingSphinx::ActiveRecord::Delta" do + it "should call the toggle_delta method after a save" do + @beta = Beta.new + @beta.stub_method(:toggle_delta => true) - it "should call the callbacks if the save! was successful" do - @person.save! - - @person.should have_received(:callback).with(:after_commit) - end + @beta.save - it "shouldn't call the callbacks if the save! failed" do - @person.stub_method(:save_without_after_commit_callback! => false) - - @person.save! - - @person.should_not have_received(:callback) - end - - it "should return the normal save's result" do - @person.save!.should be_true - - @person.stub_method(:save_without_after_commit_callback! => false) - - @person.save!.should be_false - end + @beta.should have_received(:toggle_delta) end - describe "destroy_with_after_commit_callback method" do - before :each do - @person = Person.new - @person.stub_methods( - :destroy_without_after_commit_callback => true, - :callback => true - ) - end - - it "should call the normal destroy method" do - @person.destroy - - @person.should have_received(:destroy_without_after_commit_callback) - end + it "should call the toggle_delta method after a save!" do + @beta = Beta.new + @beta.stub_method(:toggle_delta => true) - it "should call the callbacks if the destroy was successful" do - @person.destroy - - @person.should have_received(:callback).with(:after_commit) - end + @beta.save! - it "shouldn't call the callbacks if the destroy failed" do - @person.stub_method(:destroy_without_after_commit_callback => false) - - @person.destroy - - @person.should_not have_received(:callback) - end - - it "should return the normal save's result" do - @person.destroy.should be_true - - @person.stub_method(:destroy_without_after_commit_callback => false) - - @person.destroy.should be_false - end + @beta.should have_received(:toggle_delta) end describe "toggle_delta method" do spec/unit/thinking_sphinx/active_record/delta_spec.rb a56912f709e8306add7632435b74192da914c487 Pat Allan pat@freelancing-gods.com http://github.com/jaikoo/thinking-sphinx/commit/29c3b7d976932af9318046d95b00a51a0006ee9e 29c3b7d976932af9318046d95b00a51a0006ee9e 2008-10-11T22:50:04-07:00 2008-10-11T22:50:04-07:00 Switching to after_commit plugin 27cea9220e3c8c3bb94f3e4f516ac9aa9c45af19 Pat Allan pat@freelancing-gods.com