folio-pagination 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94206add54cee4c16494e9d8e4df1ffca4ec071f
-  data.tar.gz: f403b5c0289400f39f001c2a53b75482dd5bffa6
+  metadata.gz: 832b40bbfc520a630238027b81a611c1a503a6bf
+  data.tar.gz: 5f3b9010512ece27b16eb4542824216388cbbdaa
 SHA512:
-  metadata.gz: 2e97cf79296562e8887f54734d1e717a912772ccaa508bff551ac10aff5d593273b67cc5f030ea0f45305591c836109e1f3e78373c4ce5d9c77b55a1fafd9788
-  data.tar.gz: 8e7d031be30734a29a46ffd86aab32e7c66e2730e133f5ca990e4bc6ca2c9ef9ea3f7a0fc8966ae4fd4c9101fb81be781ee6ff55bd8cdf3070a1ff4da283320c
+  metadata.gz: d86e58bd0076d1754ff9ca084a411445634607997d2af0027099730dd437213df7c5a44e8b20b4094a2c3a1d49cd265a52b3b97c37855fdf5dded0f538636fbd
+  data.tar.gz: 62197be67cf3966aa7ccf28830fcccf47570bbea7525b5dbc22ae15c147917bb76ce83acb0847137b277d85c35a4a8deb4e95ec26fc442065664d12c74ace5bd

data/lib/folio.rb

@@ -49,7 +49,18 @@ module Folio
     current_page = page.first_page if current_page.nil?
     page.current_page = current_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.total_entries = options.fetch(:total_entries) do
+      if self.respond_to?(:count)
+        if self.is_a?(::ActiveRecord::Relation) && ::Rails.version >= '4'
+          self.count(:all)
+        else
+          self.count
+        end
+      else
+        nil
+      end
+    end
     page
   end
 

data/lib/folio/version.rb

@@ -1,3 +1,3 @@
 module Folio
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/folio/will_paginate/active_record.rb

@@ -116,19 +116,28 @@ module Folio
 
         def paginate(options={})
           if !options.has_key?(:total_entries)
-            group_values = self.scoped.group_values
+            scope = if ::Rails.version < '4'
+                      self.scoped
+                    elsif self.is_a?(::ActiveRecord::Relation)
+                      self
+                    elsif self.is_a?(::ActiveRecord::Base)
+                      self.all
+                    else
+                      self.scope
+                    end
+            group_values = scope.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
+              if scope.having_values.empty? && group_values.length == 1 # multi-column distinct counts are broken right now (as of rails 4.2.5) :(
+                options[:total_entries] = except(:group, :select).select(group_values).uniq.count
               else
                 options[:total_entries] = unscoped.from("(#{to_sql}) a").count
               end
             end
           end
-          super(options).all
+          super(options).to_a
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: folio-pagination
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jacob Fugal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Folio is a library for pagination. It's meant to be nearly compatible with