folio-pagination 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aec00730bd1236fe759cc576bf5e29eae27ff64
-  data.tar.gz: 4d626f686033e152725a4baaf69186260b377ce7
+  metadata.gz: 1a0d73a4c15184fbb37db68d3bb6c6ae6558a852
+  data.tar.gz: d7e6bfda606da39dbacda3c54f5df7d617525df9
 SHA512:
-  metadata.gz: 2e37ead5e804b5e9ad40fafe7b2676f57b3ea8bb8736ea962b3d7c1a0c8466383bc10b9d8bdf84981bb12bf49e1c1488c5dbb4e75571dee37f8e4dd92dbf4336
-  data.tar.gz: 91c2dce2d25f1e590b913be8f534739f63f43f88fdf7c87dc171bcca369fedf097456ee30bd94595eae4364afcacbaf0775875da3d28f4019dc5b136132b19e7
+  metadata.gz: f3a9e950c8f51452dd1a77a722ee93509558a2e6d7fc587f45ae8f067f1816bb5865f76f2b82774917d91ad1f04b9a76a00cf3140b917dbb699645605d699e34
+  data.tar.gz: 1f41f9b7fac962d8b61912269ee5d4b9b84d4cab5f25b20b1bac0a4126903669b8f12a434debe28f1ad3d9360faefe4f1bd61096bf93e1b95a8147f9af33b020

data/Gemfile

@@ -7,10 +7,10 @@ group :development do
 end
 
 group :will_paginate do
-  gem 'rails', '>= 3.0', '< 4.1'
+  gem 'rails', '>= 3.0', '< 5.1'
   # this isn't in the gemspec because folio/rails.rb loads only part of
   # will_paginate, and only if folio/rails.rb is required. see the README.
-  gem 'will_paginate', '~> 3.0.7'
+  gem 'will_paginate', '~> 3.0'
 end
 
 group :test do

data/lib/folio/page.rb

@@ -31,6 +31,10 @@ module Folio
     # page identifier addressing the first page within the folio.
     attr_accessor :first_page
 
+    def initialize
+      @last_page = nil
+    end
+
     # page identifier addressing the final page within the folio, if
     # known.
     def last_page=(value)

data/lib/folio/per_page.rb

@@ -7,7 +7,7 @@ module Folio
     def per_page(*args)
       raise ArgumentError if args.size > 1
       @per_page = (args.first && args.first.to_i) if args.size > 0
-      @per_page ? @per_page : default_per_page
+      instance_variable_defined?(:@per_page) ? @per_page || default_per_page : default_per_page
     end
 
     alias_method :per_page=, :per_page

data/lib/folio/version.rb

@@ -1,3 +1,3 @@
 module Folio
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/folio/will_paginate/active_record.rb

@@ -130,8 +130,13 @@ module Folio
               # 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 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
+              having_clause_empty = Rails.version < '5' ? scope.having_values.empty? : scope.having_clause.empty?
+              if having_clause_empty && group_values.length == 1 # multi-column distinct counts are broken right now (as of rails 4.2.5) :(
+                if Rails.version < '5'
+                  options[:total_entries] = except(:group, :select).select(group_values).uniq.count
+                else
+                  options[:total_entries] = except(:group, :select).select(group_values).distinct.count
+                end
               else
                 options[:total_entries] = unscoped.from("(#{to_sql}) a").count
               end

data/test/folio_test.rb

@@ -68,6 +68,7 @@ describe Folio do
     end
 
     it "should populate current_page and per_page before passing it to fill_page" do
+      @klass.send(:remove_method, :fill_page)
       @klass.send(:define_method, :fill_page) do |page|
         page.current_page.wont_be_nil
         page.per_page.wont_be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: folio-pagination
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Jacob Fugal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2017-03-06 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.7
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Folio is a library for pagination. It's meant to be nearly compatible with
@@ -138,4 +138,3 @@ test_files:
 - test/folio/will_paginate/view_helpers_test.rb
 - test/folio_test.rb
 - test/setup/active_record.rb
-has_rdoc: