Merge branch 'master' into rails3

Conflicts: HISTORY README.textile
purcell · Sep 10, 2011 · 2a7b885 · 2a7b885
2 parents 58f4807 + 3e2eff8
commit 2a7b885
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/HISTORY b/HISTORY
@@ -1,4 +1,5 @@
 Edge:
+* Adding ThinkingSphinx::Search#last_page? for Kaminari (Pete Deffendol).
 * Ensuring associations for acts-as-taggable-on are tweaked for Rails 3.1 (Anthony).
 * Bug fix for association collection proxies in Rails 3.1 (Pavel Forkert).
 * References all known Rails model paths - better for Rails 3 Engines.

diff --git a/README.textile b/README.textile
@@ -221,3 +221,4 @@ Since I first released this library, there's been quite a few people who have su
 * Aaron Gibralter
 * Pavel Forkert
 * Anthony Byram
+* Pete Deffendol
diff --git a/lib/thinking_sphinx/search.rb b/lib/thinking_sphinx/search.rb
@@ -224,6 +224,10 @@ def next_page
     def next_page?
       !next_page.nil?
     end
+
+    def last_page?
+      next_page.nil?
+    end
 
     # The previous page number of the result set. If this is the first page,
     # then nil is returned.