folio-pagination 0.0.3 → 0.0.5

data/lib/folio.rb

@@ -45,10 +45,10 @@ module Folio
   end
 
   def configure_pagination(page, options)
-    current_page = options.fetch(:page) { nil }
+    current_page = options[:page]
     current_page = page.first_page if current_page.nil?
     page.current_page = current_page
-    page.per_page = options.fetch(:per_page) { self.per_page }
+    page.per_page = options[:per_page] || self.per_page
     page.total_entries = options.fetch(:total_entries) { self.respond_to?(:count) ? self.count : nil }
     page
   end

data/lib/folio/version.rb

@@ -1,3 +1,3 @@
 module Folio
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/folio/will_paginate/active_record.rb

@@ -113,6 +113,23 @@ module Folio
         end
 
         include ::Folio::Ordinal
+
+        def paginate(options={})
+          if !options.has_key?(:total_entries)
+            group_values = self.scoped.group_values
+            unless group_values.empty?
+              # total_entries left to an auto-count, but the relation being
+              # paginated has a grouping. we need to do a special count, lest
+              # self.count give us a hash instead of the integer we expect.
+              if self.scoped.having_values.empty?
+                options[:total_entries] = except(:group).select(group_values).uniq.count
+              else
+                options[:total_entries] = unscoped.from("(#{to_sql}) a").count
+              end
+            end
+          end
+          super(options).all
+        end
       end
 
       # mix into Active Record. these are the same ones that WillPaginate mixes

data/test/folio/will_paginate/active_record_test.rb

@@ -40,33 +40,27 @@ describe ActiveRecord do
       page.is_a?(Folio::Ordinal::Page).must_equal true
     end
 
-    it "should still return a relation" do
+    it "should return an instantiated page" do
       page = Item.paginate
-      page.is_a?(ActiveRecord::Relation).must_equal true
+      page.is_a?(Array).must_equal true
     end
 
-    it "should set limit_value according to per_page" do
-      page = Item.paginate(per_page: 10)
-      page.limit_value.must_equal 10
-    end
-
-    it "should use that limit_value as per_page attribute" do
+    it "should respect per_page" do
       page = Item.paginate(per_page: 10)
       page.per_page.must_equal 10
     end
 
-    it "should default limit_value/per_page to model's per_page" do
+    it "should default per_page to model's per_page" do
       was = Item.per_page
       Item.per_page = 10
       page = Item.paginate
-      page.limit_value.must_equal 10
       page.per_page.must_equal 10
       Item.per_page = was
     end
 
     it "should set offset from page and per_page" do
       page = Item.paginate(page: 3, per_page: 10)
-      page.offset_value.must_equal 20
+      page.offset.must_equal 20
     end
 
     it "should set current_page" do
@@ -74,19 +68,19 @@ describe ActiveRecord do
       page.current_page.must_equal 3
     end
 
-    it "should have the right count on the unloaded page" do
+    it "should have the right count" do
       page = Item.paginate(page: 3, per_page: 10)
       page.count.must_equal 4
     end
 
-    it "should have the right size on the unloaded page" do
+    it "should have the right size" do
       page = Item.paginate(page: 3, per_page: 10)
       page.size.must_equal 4
     end
 
     it "should return the expected items" do
       page = Item.paginate(page: 3, per_page: 10)
-      page.to_a.must_equal Item.offset(20).all
+      page.must_equal Item.offset(20).all
     end
 
     it "should auto-count total_entries unless specified as nil" do
@@ -94,11 +88,26 @@ describe ActiveRecord do
       page.total_entries.must_equal 24
     end
 
+    it "should correctly auto-count total_entries with a grouping" do
+      page = Item.group(:filter).paginate
+      page.total_entries.must_equal 2
+    end
+
+    it "should correctly auto-count total_entries with a grouping and a having" do
+      page = Item.group(:filter).having("COUNT(*)>1").paginate
+      page.total_entries.must_equal 2
+    end
+
     it "should work with total_entries nil" do
       page = Item.paginate(page: 3, total_entries: nil)
       page.current_page.must_equal 3
     end
 
+    it "should work with per_page nil" do
+      page = Item.paginate(per_page: nil)
+      page.per_page.must_equal Folio.per_page
+    end
+
     it "should validate page number against auto-counted total_entries" do
       lambda{ Item.paginate(page: 4, per_page: 10) }.must_raise Folio::InvalidPage
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: folio-pagination
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler