Raise error when Sphinx returns error

lib/thinking_sphinx.rb

@@ -53,6 +53,16 @@ def initialize(ids)
     end
   end
 
+  # A SphinxError occurs when Sphinx responds with an error due to problematic
+  # queries or indexes.
+  class SphinxError < RuntimeError
+    attr_accessor :results
+    def initialize(message = nil, results = nil)
+      super(message)
+      self.results = results
+    end
+  end
+
   # The current version of Thinking Sphinx.
   # 
   # @return [String] The version number as a string

lib/thinking_sphinx/search.rb

@@ -384,6 +384,13 @@ def populate
           }
           log "Found #{@results[:total_found]} results", :debug,
             "Sphinx (#{sprintf("%f", runtime)}s)"
+
+          log "Sphinx Daemon returned warning: #{warning}", :error if warning?
+
+          if error?
+            log "Sphinx Daemon returned error: #{error}", :error
+            raise ThinkingSphinx::SphinxError.new(error, @results)
+          end
         rescue Errno::ECONNREFUSED => err
           raise ThinkingSphinx::ConnectionError,
             'Connection to Sphinx Daemon (searchd) failed.'

spec/thinking_sphinx/search_spec.rb

@@ -940,6 +940,22 @@
         end
       end
     end
+
+    context 'Sphinx errors' do
+      describe '#error?' do
+        before :each do
+          @client.stub! :query => {
+            :error => @warning = "Not good"
+          }
+          # @search.should_receive(:error).and_return(nil)
+        end
+        it "should raise an error" do
+          lambda{
+            ThinkingSphinx::Search.new.first
+          }.should raise_error(ThinkingSphinx::SphinxError)
+        end
+      end
+    end
   end
 
   describe '#current_page' do