Fixed total_entries method when the index has no data.

vizjerai · Nov 25, 2009 · d3757ca · d3757ca
1 parent 4c0e214
commit d3757ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/thinking_sphinx/search.rb b/lib/thinking_sphinx/search.rb
@@ -168,6 +168,8 @@ def total_pages
     # 
     def total_entries
       populate
+      return 0 if @results[:total_found].nil?
+
       @total_entries ||= @results[:total_found]
     end
 

diff --git a/spec/lib/thinking_sphinx/search_spec.rb b/spec/lib/thinking_sphinx/search_spec.rb
@@ -868,6 +868,14 @@
     it "should return the total number of results, not just the amount on the page" do
       ThinkingSphinx::Search.new.total_entries.should == 41
     end
+
+    it "should return 0 if there is no index and therefore no results" do
+      @client.stub!(:query => {
+        :matches => [], :total_found => nil
+      })
+
+      ThinkingSphinx::Search.new.total_entries.should == 0
+    end
   end
 
   describe '#offset' do