0
@@ -16,4 +16,5 @@ Since I first released this library, there's been several people who have submit
0
 - Benoit Caccinolo
0
 - John Barton
0
 - Oliver Beddows
0
-- Arthur Zapparoli
0
\ No newline at end of file
0
+- Arthur Zapparoli
0
+- Dusty Doris
0
\ No newline at end of file

0
@@ -39,7 +39,8 @@ module ThinkingSphinx
0
   # Check if index definition is disabled.
0
   # 
0
   def self.define_indexes?
0
-    @@define_indexes ||= true
0
+    @@define_indexes =  true unless defined?(@@define_indexes)
0
+    @@define_indexes == true
0
   end
0
   
0
   # Enable/disable indexes - you may want to do this while migrating data.
0
@@ -53,7 +54,8 @@ module ThinkingSphinx
0
   # Check if delta indexing is enabled.
0
   # 
0
   def self.deltas_enabled?
0
-    @@deltas_enabled ||= true
0
+    @@deltas_enabled =  true unless defined?(@@deltas_enabled)
0
+    @@deltas_enabled == true
0
   end
0
   
0
   # Enable/disable all delta indexing.

0
@@ -264,7 +264,7 @@ module ThinkingSphinx
0
         # normal attribute filters
0
         client.filters += options[:with].collect { |attr,val|
0
           Riddle::Client::Filter.new attr.to_s, filter_value(val)
0
-        } if options[:where]
0
+        } if options[:with]
0
         
0
         # exclusive attribute filters
0
         client.filters += options[:without].collect { |attr,val|

0
@@ -1,5 +1,35 @@
0
 require 'spec/spec_helper'
0
 
0
 describe ThinkingSphinx do
0
-  #
0
+  it "should define indexes by default" do
0
+    ThinkingSphinx.define_indexes?.should be_true
0
+  end
0
+
0
+  it "should disable index definition" do
0
+    ThinkingSphinx.define_indexes = false
0
+    ThinkingSphinx.define_indexes?.should be_false
0
+  end
0
+
0
+  it "should enable index definition" do
0
+    ThinkingSphinx.define_indexes = false
0
+    ThinkingSphinx.define_indexes?.should be_false
0
+    ThinkingSphinx.define_indexes = true
0
+    ThinkingSphinx.define_indexes?.should be_true
0
+  end
0
+
0
+  it "should index deltas by default" do
0
+    ThinkingSphinx.deltas_enabled?.should be_true
0
+  end
0
+
0
+  it "should disable delta indexing" do
0
+    ThinkingSphinx.deltas_enabled = false
0
+    ThinkingSphinx.deltas_enabled?.should be_false
0
+  end
0
+
0
+  it "should enable delta indexing" do
0
+    ThinkingSphinx.deltas_enabled = false
0
+    ThinkingSphinx.deltas_enabled?.should be_false
0
+    ThinkingSphinx.deltas_enabled = true
0
+    ThinkingSphinx.deltas_enabled?.should be_true
0
+  end
0
 end
0
\ No newline at end of file