kaminari-activerecord 1.0.0.rc1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2a91cf39e49f1e5075665a821d66ddd6894e908
-  data.tar.gz: e537ec8d5f281607dc88314f4c4065b12a996ef4
+  metadata.gz: 711c45636af3a883dd3423099b806119be97de69
+  data.tar.gz: c6e2277873dc10069fd8e25f7f7aae3fab3264bc
 SHA512:
-  metadata.gz: b016210acb39836dd3fe42d1626c488c7eba63ab38eb70ada6e2e16ddf65de8cea4b4d15c36f4d17ee6f8ab135438bfa55a1f15c2550bc8850fdca082c9ae75a
-  data.tar.gz: 36cc372bdaf202992e67aca716603977e834de447718b0c717501c88ead143dd6ed5a54968a6de7b2fc9a0a3c71292aa220eb17b71c8066cd97a722cda412ff7
+  metadata.gz: fc118f1c18bf2f7d721e13d84451ce9b06e669a64c22aecec81251208f06ff34d58a7b2e17cd1223b44de3daafeb7e179670bf474d616778414bbf953753afdf
+  data.tar.gz: 5e0974d4ac02e0d9e37be7b6c0e61121e14811862c9e5b7ed6b403359aa607d81796a1a59f303be4c8cce120b9b519c8c6d24b7b7746795917226c70a19d2508

data/lib/kaminari/activerecord/active_record_relation_methods.rb

@@ -20,8 +20,9 @@ module Kaminari
       if loaded?
         # Total count has to be 0 if loaded records are 0
         return @total_count = 0 if (current_page == 1) && @records.empty?
-        # Total count is calculatable at the last page
-        return @total_count = (current_page - 1) * @_per + @records.length if defined?(@_per) && (@records.length < @_per)
+        # Total count is calculable at the last page
+        per_page = (defined?(@_per) && @_per) || default_per_page
+        return @total_count = (current_page - 1) * per_page + @records.length if @records.any? && (@records.length < per_page)
       end
 
       # #count overrides the #select which could include generated columns referenced in #order, so skip #order here, where it's irrelevant to the result anyway
@@ -55,8 +56,12 @@ module Kaminari
         super
       else
         @values[:limit] = limit_value + 1
+        # FIXME: this could be removed when we're dropping AR 4 support
+        @arel.limit = @values[:limit] if @arel && (Integer === @arel.limit)
         super
         @values[:limit] = limit_value - 1
+        # FIXME: this could be removed when we're dropping AR 4 support
+        @arel.limit = @values[:limit] if @arel && (Integer === @arel.limit)
 
         if @records.any?
           @records = @records.dup if (frozen = @records.frozen?)

data/lib/kaminari/activerecord/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Kaminari
   module Activerecord
-    VERSION = '1.0.0.rc1'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -96,9 +96,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8