Merge pull request #277 from eitoball/possible_fix_for_issue_276

Possible fix for issue#276
kaminari · Sep 2, 2012 · 3996dfb · 3996dfb
2 parents 5daef8e + cd0ee29
commit 3996dfb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/kaminari/helpers/action_view_extension.rb b/lib/kaminari/helpers/action_view_extension.rb
@@ -88,7 +88,7 @@ def link_to_next_page(scope, name, options = {}, &block)
     def page_entries_info(collection, options = {})
       entry_name = if options[:entry_name]
         options[:entry_name]
-      elsif collection.empty?
+      elsif collection.empty? || collection.is_a?(PaginatableArray)
         'entry'
       else
         if collection.respond_to? :model  # DataMapper

diff --git a/spec/helpers/action_view_extension_spec.rb b/spec/helpers/action_view_extension_spec.rb
@@ -214,6 +214,14 @@
         end
       end
     end
+
+    context 'on a PaginatableArray' do
+      before do
+        @numbers = Kaminari.paginate_array(%w{one two three}).page(1)
+      end
+      subject { helper.page_entries_info @numbers }
+      it      { should == 'Displaying <b>all 3</b> entries' }
+    end
   end
 
   describe '#rel_next_prev_link_tags' do