Don't update deltas in toggle_deleted if deltas not enabled

Also moved check for test environment into the setting of default value for deltas_enabled?
  so that deltas can be turned on and off

lib/thinking_sphinx.rb

@@ -52,10 +52,12 @@ def self.define_indexes=(value)
     @@define_indexes = value
   end
 
+  @@deltas_enabled = nil
+
   # Check if delta indexing is enabled.
   # 
   def self.deltas_enabled?
-    @@deltas_enabled =  true unless defined?(@@deltas_enabled)
+    @@deltas_enabled =  ('test' == ThinkingSphinx::Configuration.environment ? false : true) if @@deltas_enabled.nil?
     @@deltas_enabled == true
   end
 
@@ -79,4 +81,4 @@ def self.use_group_by_shortcut?
       "SELECT @@global.sql_mode, @@session.sql_mode;"
     ).all? { |key,value| value.nil? || value[/ONLY_FULL_GROUP_BY/].nil? }
   end
-end
+end

lib/thinking_sphinx/active_record.rb

@@ -131,7 +131,8 @@ def toggle_deleted
         "#{self.class.indexes.first.name}_delta",
         ['sphinx_deleted'],
         {self.id => 1}
-      ) if self.class.indexes.any? { |index| index.delta? } && self.delta?
+      ) if self.class.indexes.any? { |index| index.delta? } && self.delta? && ThinkingSphinx.deltas_enabled?
+    rescue ThinkingSphinx::ConnectionError
     end
   end
 end

lib/thinking_sphinx/active_record/delta.rb

@@ -73,10 +73,7 @@ def toggle_delta
           # if running in the test environment.
           # 
           def index_delta
-            if ThinkingSphinx::Configuration.environment == "test" ||
-              !ThinkingSphinx.deltas_enabled?
-              return true
-            end
+            return true unless ThinkingSphinx.deltas_enabled?
 
             configuration = ThinkingSphinx::Configuration.new
             system "indexer --config #{configuration.config_file} --rotate #{self.class.indexes.first.name}_delta"

spec/unit/thinking_sphinx/active_record/delta_spec.rb

@@ -167,6 +167,7 @@
     end
 
     it "shouldn't index if the environment is 'test'" do
+      ThinkingSphinx.unstub_method(:deltas_enabled?)
       ThinkingSphinx::Configuration.stub_method(:environment => "test")
 
       @person.send(:index_delta)
@@ -182,4 +183,4 @@
       )
     end
   end
-end
+end

spec/unit/thinking_sphinx/active_record_spec.rb

@@ -158,6 +158,7 @@ class TestModel < ActiveRecord::Base; end
     end
 
     it "should update the delta index's deleted flag if delta indexing is enabled and the instance's delta is true" do
+      ThinkingSphinx.stub_method(:deltas_enabled? => true)
       Person.indexes.each { |index| index.stub_method(:delta? => true) }
       @person.delta = true
 

spec/unit/thinking_sphinx_spec.rb

@@ -24,6 +24,7 @@
   end
 
   it "should index deltas by default" do
+    ThinkingSphinx.deltas_enabled = nil
     ThinkingSphinx.deltas_enabled?.should be_true
   end
 
@@ -104,4 +105,4 @@
       end
     end
   end
-end
+end