kaminari-activerecord 1.1.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea8e3ace660d361f867d8358b4b8da5330fe38cf58e67a5f51ea52ba8c86d103
-  data.tar.gz: bfab69ff0b3736bae5e657ccd3bdeb9188dc689205cb56c7d9eb9ab7c782c499
+  metadata.gz: e02b1d73471d5966fc0a51c928644d0f47318e6de292267cecfc6742983c24dc
+  data.tar.gz: 77dfa6a9124df355c7b3ac038f5c8db374ee0769f58d22ebb9db48b448fe5b00
 SHA512:
-  metadata.gz: 7a53c8910b98e6dbe3e62d8e5ca32869c0d591a3b54394422cab727df6bbd7193e836201e6de2dc9a18724f5de7f3c88f7ad314b5a39d94a4a21d154f61fb065
-  data.tar.gz: 81d0a8aff3e2cf06b0014b8460d1070ed30d0b0f7b735827a79a179d07590c94ae24772ee07aa3ace8ae71e9b5808d95b0432b6db92f9109cc3ab8dc53f37b94
+  metadata.gz: f5cc9d8c8ee50631d2086ac46b50f9b4acd2cb7860a750089de6665578465d1130f0dbcae116c904d8646dc4daae36ffe87d9a71aadcfb8171d76267802fae99
+  data.tar.gz: 6ec4e5f73926f62ae1a8ce0ccca455932336147cef42203be1ffd821199317fed96f87a76ec8d3277b2a2e1c5c4cb48dc0b7f5e8703d273b03d269d0de59f8e1

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/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,23 +22,25 @@ 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?
+
+      c = c.limit(max_pages * limit_value) if max_pages && max_pages.respond_to?(:*)
+
       # .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
-      end
+                       c.count
+                     elsif c.respond_to? :count
+                       c.count(column_name)
+                     else
+                       c
+                     end
     end
 
     # Turn this Relation to a "without count mode" Relation.
@@ -50,6 +53,37 @@ 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 hold `limit` to a given value
+        def set_limit_value(new_limit)
+          @values[:limit] = new_limit
+
+          if @arel
+            case @arel.limit.class.name
+            when 'Integer', 'Fixnum'
+              @arel.limit = new_limit
+            when 'ActiveModel::Attribute::WithCastValue'  # comparing by class name because ActiveModel::Attribute::WithCastValue is a private constant
+              @arel.limit = build_cast_value '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 +91,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.0'
+    VERSION = '1.2.2'
   end
 end

data/lib/kaminari/activerecord.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2021-12-25 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.0
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ homepage: https://github.com/kaminari/kaminari
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,9 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: Kaminari Active Record adapter
 test_files: []