0
@@ -131,8 +131,9 @@
0
     #
0
     #   <%= page_entries_info @posts %>
0
     #   #-> Displaying entries 6 - 10 of 26 in total
0
-    def page_entries_info(collection, opts = {})
0
-      entry_name = opts[:entry_name] || 'entry'
0
+    def page_entries_info(collection, options = {})
0
+      entry_name = options[:entry_name] ||
0
+        (collection.empty?? 'entry' : collection.first.class.name.underscore.sub('_', ' '))
0
       
0
       if collection.total_pages < 2
0
         case collection.size

0
@@ -135,22 +135,31 @@
0
     array = ('a'..'z').to_a
0
     
0
     paginate array.paginate(:page => 2, :per_page => 5)
0
-    assert_equal %{Displaying entries <b>6&nbsp;-&nbsp;10</b> of <b>26</b> in total},
0
+    assert_equal %{Displaying strings <b>6&nbsp;-&nbsp;10</b> of <b>26</b> in total},
0
       @html_result
0
     
0
     paginate array.paginate(:page => 7, :per_page => 4)
0
-    assert_equal %{Displaying entries <b>25&nbsp;-&nbsp;26</b> of <b>26</b> in total},
0
+    assert_equal %{Displaying strings <b>25&nbsp;-&nbsp;26</b> of <b>26</b> in total},
0
       @html_result
0
   end
0
 
0
+  def test_page_entries_info_with_longer_class_name
0
+    @template = '<%= page_entries_info collection %>'
0
+    collection = ('a'..'z').to_a.paginate
0
+    collection.first.stubs(:class).returns(mock('class', :name => 'ProjectType'))
0
+    
0
+    paginate collection
0
+    assert @html_result.index('project types'), "expected <#{@html_result.inspect}> to mention 'project types'"
0
+  end
0
+
0
   def test_page_entries_info_with_single_page_collection
0
     @template = '<%= page_entries_info collection %>'
0
     
0
     paginate(('a'..'d').to_a.paginate(:page => 1, :per_page => 5))
0
-    assert_equal %{Displaying <b>all 4</b> entries}, @html_result
0
+    assert_equal %{Displaying <b>all 4</b> strings}, @html_result
0
     
0
     paginate(['a'].paginate(:page => 1, :per_page => 5))
0
-    assert_equal %{Displaying <b>1</b> entry}, @html_result
0
+    assert_equal %{Displaying <b>1</b> string}, @html_result
0
     
0
     paginate([].paginate(:page => 1, :per_page => 5))
0
     assert_equal %{No entries found}, @html_result
0
@@ -172,10 +181,6 @@
0
     
0
     paginate([].paginate(:page => 1, :per_page => 5))
0
     assert_equal %{No authors found}, @html_result
0
-    
0
-    @template = '<%= page_entries_info collection %>'
0
-    paginate([].paginate(:page => 1, :per_page => 5))
0
-    assert_equal %{No entries found}, @html_result
0
   end
0
   
0
   ## parameter handling in page links ##