kaminari-activerecord 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a6578e9af2cd73cd987f013310cc7db6f338af3996cc9f8033279bb80fe37f
-  data.tar.gz: 26f8663b6b30ef6a4cae8529e86a9e394d4dec9936e7518ea0dcc971a29c15cd
+  metadata.gz: df68cbe8dbf5e813cf9695d7b7f89c432005701347017ae25e8711646ea9d21e
+  data.tar.gz: 6f7d3965cc8849695ed7e8b495b0040f3405a7669ff1333dc570af4d10620942
 SHA512:
-  metadata.gz: 6d72db40c4816e6a57074b39a0118a5586bb3a5c39c40dfecef53a61b9ad83cdf380cd2a249f1305d73ff1c3c3f77d744d4f6fd5cc71858793a9f5b34c923d8a
-  data.tar.gz: 3e8de5ead4b7627e8d6a803f0cff8c3608f4c37422cc33db36aebed5dc23d30d340ef09c1f3d19f9a2f60b30981194fe1b1ee1600c91f2267ea419371a20c726
+  metadata.gz: 277cb5b789e37e8889f66e03f5aaec7ee06f04c3230630a0d9c06ca242c2a29545eee91f0bf8262d3d7fa8229dcf77714bc095a6925f886716af3fef2ce497ec
+  data.tar.gz: b240655b581ed051c18831dfad97d5207cb02d41eaed7db3bcf95932fff8a7acc64df18bb21776eb9d63f4792f05912b8e7ad4566e8edba6531655cbbda62f32

data/kaminari-activerecord.gemspec

@@ -1,5 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kaminari/activerecord/version'

data/lib/kaminari/activerecord.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "kaminari/activerecord/version"
 require 'active_support/lazy_load_hooks'
 

data/lib/kaminari/activerecord/active_record_extension.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'kaminari/activerecord/active_record_model_extension'
 
 module Kaminari

data/lib/kaminari/activerecord/active_record_model_extension.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'kaminari/activerecord/active_record_relation_methods'
 
 module Kaminari

data/lib/kaminari/activerecord/active_record_relation_methods.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kaminari
   # Active Record specific page scope methods implementations
   module ActiveRecordRelationMethods
@@ -21,22 +22,21 @@ module Kaminari
         # Total count has to be 0 if loaded records are 0
         return @total_count = 0 if (current_page == 1) && @records.empty?
         # 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)
+        return @total_count = (current_page - 1) * limit_value + @records.length if @records.any? && (@records.length < limit_value)
       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
       c = except(:offset, :limit, :order)
       # Remove includes only if they are irrelevant
       c = c.except(:includes) unless references_eager_loaded_tables?
-      # .group returns an OrderedHash that responds to #count
-      c = c.count(column_name)
-      @total_count = if c.is_a?(Hash) || c.is_a?(ActiveSupport::OrderedHash)
-        c.count
-     elsif c.respond_to? :count
-       c.count(column_name)
-     else
-       c
+
+      c = c.limit(max_pages * limit_value) if max_pages && max_pages.respond_to?(:*)
+
+      # Handle grouping with a subquery
+      @total_count = if c.group_values.any?
+        c.model.from(c.except(:select).select("1")).count
+      else
+        c.count(column_name)
       end
     end
 
@@ -50,6 +50,35 @@ module Kaminari
   end
 
   # A module that makes AR::Relation paginatable without having to cast another SELECT COUNT query
+  module PaginatableWithoutCount
+    module LimitValueSetter
+      # refine PaginatableWithoutCount do  # NOTE: this doesn't work in Ruby < 2.4
+      refine ::ActiveRecord::Relation do
+        private
+
+        # Update multiple instance variables that holds `limit` to a given value
+        def set_limit_value(new_limit)
+          @values[:limit] = new_limit
+
+          if @arel
+            case @arel.limit
+            when Integer
+              @arel.limit = new_limit
+            when Arel::Nodes::BindParam
+              if @arel.limit.respond_to?(:value)
+                @arel.limit = Arel::Nodes::BindParam.new(@arel.limit.value.with_cast_value(new_limit))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+# NOTE: ending all modules and reopening again because using has to be called from the toplevel in Ruby 2.0
+using Kaminari::PaginatableWithoutCount::LimitValueSetter
+
+module Kaminari
   module PaginatableWithoutCount
     # Overwrite AR::Relation#load to actually load one more record to judge if the page has next page
     # then store the result in @_has_next ivar
@@ -57,13 +86,9 @@ module Kaminari
       if loaded? || limit_value.nil?
         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)
+        set_limit_value limit_value + 1
         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)
+        set_limit_value limit_value - 1
 
         if @records.any?
           @records = @records.dup if (frozen = @records.frozen?)

data/lib/kaminari/activerecord/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 module Kaminari
   module Activerecord
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2020-01-30 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.1.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Kaminari Active Record adapter