0
@@ -114,6 +114,10 @@ module ThinkingSphinx
0
       )
0
     end
0
     
0
+    def in_core_index?
0
+      @in_core_index ||= self.class.search_for_id(self.id, "#{self.class.name.downcase}_core")
0
+    end
0
+    
0
     def toggle_deleted
0
       config = ThinkingSphinx::Configuration.new
0
       client = Riddle::Client.new config.address, config.port
0
@@ -122,7 +126,7 @@ module ThinkingSphinx
0
         "#{self.class.indexes.first.name}_core",
0
         ['sphinx_deleted'],
0
         {self.id => 1}
0
-      )
0
+      ) if self.in_core_index?
0
       
0
       client.update(
0
         "#{self.class.indexes.first.name}_delta",

0
@@ -28,6 +28,13 @@ module ThinkingSphinx
0
               args << options
0
               ThinkingSphinx::Search.search(*args)
0
             end
0
+            
0
+            def search_for_id(*args)
0
+              options = args.extract_options!
0
+              options[:class] = self
0
+              args << options
0
+              ThinkingSphinx::Search.search_for_id(*args)
0
+            end
0
           end
0
         end
0
       end

0
@@ -182,6 +182,35 @@ module ThinkingSphinx
0
         end
0
       end
0
       
0
+      # Checks if a document with the given id exists within a specific index.
0
+      # Expected parameters:
0
+      #
0
+      # - ID of the document
0
+      # - Index to check within
0
+      # - Options hash (defaults to {})
0
+      # 
0
+      # Example:
0
+      # 
0
+      #   ThinkingSphinx::Search.search_for_id(10, "user_core", :class => User)
0
+      # 
0
+      def search_for_id(*args)
0
+        options = args.extract_options!
0
+        client  = client_from_options options
0
+        
0
+        query, filters    = search_conditions(
0
+          options[:class], options[:conditions] || {}
0
+        )
0
+        client.filters   += filters
0
+        client.match_mode = :extended unless query.empty?
0
+        client.id_range   = args.first..args.first
0
+        
0
+        begin
0
+          return client.query(query, args[1])[:matches].length > 0
0
+        rescue Errno::ECONNREFUSED => err
0
+          raise ThinkingSphinx::ConnectionError, "Connection to Sphinx Daemon (searchd) failed."
0
+        end
0
+      end
0
+      
0
       private
0
       
0
       # This method handles the common search functionality, and returns both

0
@@ -9,15 +9,15 @@ describe "ThinkingSphinx::ActiveRecord::Search" do
0
     ActiveRecord::Base.methods.should include("search")
0
   end
0
   
0
+  it "should add search_for_id to ActiveRecord::Base" do
0
+    ActiveRecord::Base.methods.should include("search_for_id")
0
+  end
0
+  
0
   describe "search_for_ids method" do
0
     before :each do
0
       ThinkingSphinx::Search.stub_method(:search_for_ids => true)
0
     end
0
     
0
-    after :each do
0
-      ThinkingSphinx::Search.unstub_method(:search_for_ids)
0
-    end
0
-    
0
     it "should call ThinkingSphinx::Search#search_for_ids with the class option set" do
0
       Person.search_for_ids("search")
0
       
0
@@ -40,10 +40,6 @@ describe "ThinkingSphinx::ActiveRecord::Search" do
0
       ThinkingSphinx::Search.stub_method(:search => true)
0
     end
0
     
0
-    after :each do
0
-      ThinkingSphinx::Search.unstub_method(:search)
0
-    end
0
-    
0
     it "should call ThinkingSphinx::Search#search with the class option set" do
0
       Person.search("search")
0
       
0
@@ -60,4 +56,26 @@ describe "ThinkingSphinx::ActiveRecord::Search" do
0
       )
0
     end
0
   end
0
+  
0
+  describe "search_for_id method" do
0
+    before :each do
0
+      ThinkingSphinx::Search.stub_method(:search_for_id => true)
0
+    end
0
+    
0
+    it "should call ThinkingSphinx::Search#search with the class option set" do
0
+      Person.search_for_id(10)
0
+      
0
+      ThinkingSphinx::Search.should have_received(:search_for_id).with(
0
+        10, :class => Person
0
+      )
0
+    end
0
+    
0
+    it "should override the class option" do
0
+      Person.search_for_id(10, :class => Friendship)
0
+      
0
+      ThinkingSphinx::Search.should have_received(:search_for_id).with(
0
+        10, :class => Person
0
+      )
0
+    end
0
+  end
0
 end
0
\ No newline at end of file

0
@@ -100,6 +100,16 @@ describe "ThinkingSphinx::ActiveRecord" do
0
     end
0
   end
0
   
0
+  describe "in_core_index? method" do
0
+    it "should return the model's corresponding search_for_id value" do
0
+      Person.stub_method(:search_for_id => :searching_for_id)
0
+      
0
+      person = Person.find(:first)
0
+      person.in_core_index?.should == :searching_for_id
0
+      Person.should have_received(:search_for_id).with(person.id, "person_core")
0
+    end
0
+  end
0
+  
0
   describe "toggle_deleted method" do
0
     before :each do
0
       @configuration = ThinkingSphinx::Configuration.stub_instance(
0
@@ -112,13 +122,14 @@ describe "ThinkingSphinx::ActiveRecord" do
0
       ThinkingSphinx::Configuration.stub_method(:new => @configuration)
0
       Riddle::Client.stub_method(:new => @client)
0
       Person.indexes.each { |index| index.stub_method(:delta? => false) }
0
+      @person.stub_method(:in_core_index? => true)
0
     end
0
     
0
-    after :each do
0
-      ThinkingSphinx::Configuration.unstub_method(:new)
0
-      Riddle::Client.unstub_method(:new)
0
-      Person.indexes.each { |index| index.unstub_method(:delta?) }
0
-    end
0
+    # after :each do
0
+    #   ThinkingSphinx::Configuration.unstub_method(:new)
0
+    #   Riddle::Client.unstub_method(:new)
0
+    #   Person.indexes.each { |index| index.unstub_method(:delta?) }
0
+    # end
0
     
0
     it "should create a client using the Configuration's address and port" do
0
       @person.toggle_deleted
0
@@ -128,7 +139,7 @@ describe "ThinkingSphinx::ActiveRecord" do
0
       )
0
     end
0
     
0
-    it "should update the core index's deleted flag" do
0
+    it "should update the core index's deleted flag if in core index" do
0
       @person.toggle_deleted
0
       
0
       @client.should have_received(:update).with(
0
@@ -136,6 +147,16 @@ describe "ThinkingSphinx::ActiveRecord" do
0
       )
0
     end
0
     
0
+    it "shouldn't update the core index's deleted flag if the record isn't in it" do
0
+      @person.stub_method(:in_core_index? => false)
0
+      
0
+      @person.toggle_deleted
0
+      
0
+      @client.should_not have_received(:update).with(
0
+        "person_core", ["sphinx_deleted"], {@person.id => 1}
0
+      )
0
+    end
0
+    
0
     it "should update the delta index's deleted flag if delta indexing is enabled and the instance's delta is true" do
0
       Person.indexes.each { |index| index.stub_method(:delta? => true) }
0
       @person.delta = true

0
@@ -1,6 +1,48 @@
0
 require 'spec/spec_helper'
0
 
0
 describe ThinkingSphinx::Search do
0
+  describe "search_for_id method" do
0
+    before :each do
0
+      @client = Riddle::Client.stub_instance(
0
+        :filters    => [],
0
+        :filters=   => true,
0
+        :id_range=  => true,
0
+        :query      => {
0
+          :matches  => []
0
+        }
0
+      )
0
+      
0
+      ThinkingSphinx::Search.stub_methods(
0
+        :client_from_options => @client,
0
+        :search_conditions   => ["", []]
0
+      )
0
+    end
0
+    
0
+    it "should set the client id range to focus on the given id" do
0
+      ThinkingSphinx::Search.search_for_id 42, "an_index"
0
+      
0
+      @client.should have_received(:id_range=).with(42..42)
0
+    end
0
+    
0
+    it "should query on the given index" do
0
+      ThinkingSphinx::Search.search_for_id 42, "an_index"
0
+      
0
+      @client.should have_received(:query).with("", "an_index")
0
+    end
0
+    
0
+    it "should return true if a record is returned" do
0
+      @client.stub_method(:query => {
0
+        :matches => [24]
0
+      })
0
+      
0
+      ThinkingSphinx::Search.search_for_id(42, "an_index").should be_true
0
+    end
0
+    
0
+    it "should return false if no records are returned" do
0
+      ThinkingSphinx::Search.search_for_id(42, "an_index").should be_false
0
+    end
0
+  end
0
+  
0
   describe "instance_from_result method" do
0
     before :each do
0
       Person.stub_method(:find => true)