pagelux 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71e370b775e3f741c799079db211a151e684ed4b
-  data.tar.gz: bc64214d693c26bbb172534a91af47ad75dd7b2f
+  metadata.gz: db493f43c8dd8b9d479aaf0afe5a224643889c5a
+  data.tar.gz: 3ef1f90aed47b5035d339b57df08c1970cabf904
 SHA512:
-  metadata.gz: 8173fc58874fae1ac61bcde84bdbb8306208994aa1bf0bdcd0553925c79b5f41de2ef6fdbf66bd410689171fc01af056c0a3341ace02c0883b1a3bc606506de6
-  data.tar.gz: 7721ba2cf925c31074241d3a1679e034ba70d88850f11a292d38e0d83dbc67226ac106cec9bf8cfba61a24724f72b835fcd1ba7b812c90e6c4fc18260b8c6728
+  metadata.gz: 5b30e0228b5d71c66e5684c136b3e7790462d0308559d3da36cefeaae6c85bfe3c55a391312203756f355ac23052f300bc325b27ab284d95855587fe75f49e25
+  data.tar.gz: 565d8cbe3e5cd9473dbb0ef9808729311fdbbb122f531e98b706ec7571ea57372aed169515af432f4cbe2f921e5caa0698754618d6151cf04336a3dc1732931d

data/lib/pagelux/query_paginator.rb

@@ -9,10 +9,20 @@ module Pagelux
     end
 
     def paginate(params)
-      @pagination_data = PaginationData.new(params[:page], params[:limit], base_query.count)
+      @pagination_data = PaginationData.new(
+        params[:page], params[:limit], total
+      )
       limit_query
     end
 
+    def total
+      query_total.is_a?(Hash) ? base_query.to_a.size : query_total
+    end
+
+    def query_total
+      @query_total ||= base_query.count
+    end
+
     def limit_query
       base_query.offset((page-1) * limit).limit(limit)
     end

data/lib/pagelux/version.rb

@@ -1,3 +1,3 @@
 module Pagelux
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/query_paginator_spec.rb

@@ -9,7 +9,6 @@ describe Pagelux::QueryPaginator do
     Query.all
   }
   let(:paginator) { Pagelux::QueryPaginator.new(query) }
-  # let(:results) { paginator.paginate(params) }
 
   describe 'normalizing pagination values' do
     let(:params) { {} }
@@ -95,4 +94,22 @@ describe Pagelux::QueryPaginator do
       end
     end
   end
+
+  context 'when query count results in grouped set' do
+    let(:page) { 1 }
+
+    let(:query) { 
+      (1..13).to_a.each do |n|
+        Query.create!(n: n)
+      end
+
+      Query.all.select('n').group(:n)
+    }
+
+    let(:results) { paginator.paginate({page: page, limit: 5}).map(&:n) }
+
+    it "still return the right number (and does not blow up)" do
+      results.size.should == 5
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagelux
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rae Bonfanti
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord