freelancing-god-thinking-sphinx 1.2.6 → 1.2.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 2
-:patch: 6
+:patch: 7

data/lib/thinking_sphinx/search.rb

@@ -154,7 +154,8 @@ module ThinkingSphinx
     # @return [Integer]
     # 
     def total_pages
-      @total_pages ||= (total_entries / per_page.to_f).ceil
+      populate
+      @total_pages ||= (@results[:total] / per_page.to_f).ceil
     end
     # Compatibility with older versions of will_paginate
     alias_method :page_count, :total_pages

data/spec/lib/thinking_sphinx/search_spec.rb

@@ -7,7 +7,7 @@ describe ThinkingSphinx::Search do
     @client = Riddle::Client.new
     
     @config.stub!(:client => @client)
-    @client.stub!(:query => {:matches => [], :total_found => 41})
+    @client.stub!(:query => {:matches => [], :total_found => 41, :total => 41})
   end
   
   it "not request results from the client if not accessing items" do
@@ -756,6 +756,14 @@ describe ThinkingSphinx::Search do
     it "should allow for custom per_page values" do
       ThinkingSphinx::Search.new(:per_page => 30).total_pages.should == 2
     end
+    
+    it "should not overstep the max_matches implied limit" do
+      @client.stub!(:query => {
+        :matches => [], :total_found => 41, :total => 40
+      })
+      
+      ThinkingSphinx::Search.new.total_pages.should == 2
+    end
   end
   
   describe '#next_page' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-08 00:00:00 -07:00
+date: 2009-08-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency