objectreload-pagination 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/pagination/collection.rb

@@ -19,7 +19,7 @@ module Pagination
       else
         @current_page = options[:current_page].to_i
         @per_page = options[:per_page].to_i
-        self.total_entries ||= @collection.count(:distinct => true, :select => :id)
+        self.total_entries ||= @collection.empty? ? 0 : @collection.count(:id , :distinct => true)
       end
 
       raise InvalidPage.new(@current_page) if @current_page < 1

data/test/collection_test.rb

@@ -63,6 +63,17 @@ class CollectionTest < Test::Unit::TestCase
       end
     end
 
+    context "collection is empty" do
+      setup do
+        @collection = []
+        @paginated_collection = paginate_collection(@collection, 1, 1)
+      end
+
+      should "return total entries equal 0" do
+        assert_equal @paginated_collection.total_entries, 0
+      end
+    end
+    
     context "having already paginated collection" do
       setup do
         @collection = (11..20).to_a

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Mateusz Drozdzynski