kaminari-activerecord 1.0.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 711c45636af3a883dd3423099b806119be97de69
-  data.tar.gz: c6e2277873dc10069fd8e25f7f7aae3fab3264bc
+SHA256:
+  metadata.gz: 6876071aa2d14ad868c0b30fe2d47478c6237c8d2e32f5e09ff2d6406d308f8c
+  data.tar.gz: 9ab1589acaec71a5ad35eeb9f80b38d7d6abcfd4f9ee83a468ab9686e8bcb2e1
 SHA512:
-  metadata.gz: fc118f1c18bf2f7d721e13d84451ce9b06e669a64c22aecec81251208f06ff34d58a7b2e17cd1223b44de3daafeb7e179670bf474d616778414bbf953753afdf
-  data.tar.gz: 5e0974d4ac02e0d9e37be7b6c0e61121e14811862c9e5b7ed6b403359aa607d81796a1a59f303be4c8cce120b9b519c8c6d24b7b7746795917226c70a19d2508
+  metadata.gz: dc82c0b5e7aa6292bdbe94474b1a7c532706a6d07886a7a44134e49d593102d21a052a29cbd8edf187b7b1a0e736a1638bdd92fcfa7fe3bc4a6b54b2fb73599f
+  data.tar.gz: 7c6904976fdc124170c8b01294dacca2433e86895f60f7a1cabfccfd780cfac2f59263cd1777dc70cbf74e745939174b5ee29eee7df20909eca537b45172e001

data/CHANGELOG.md

@@ -0,0 +1 @@
+See https://github.com/kaminari/kaminari/tree/master/CHANGELOG.md for changes.

data/README.md

@@ -20,11 +20,11 @@ This gem is basically an internal gem that will be automatically bundled from ka
 
 Or if you're using ORMs other than Active Record, you might need to explicitly bundle this gem.
 
-See [Kaminari README (Other Framework/Library Support)](https://github.com/amatsuda/kaminari/blob/master/README.md#other-frameworklibrary-support) for details.
+See [Kaminari README (Other Framework/Library Support)](https://github.com/kaminari/kaminari/blob/master/README.md#other-frameworklibrary-support) for details.
 
 ## Contributing
 
-Pull requests are welcome on GitHub at https://github.com/amatsuda/kaminari.
+Pull requests are welcome on GitHub at https://github.com/kaminari/kaminari.
 
 
 ## License

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'
@@ -12,8 +12,9 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Kaminari Active Record adapter'
   spec.description   = 'kaminari-activerecord lets your Active Record models be paginatable'
-  spec.homepage      = 'https://github.com/amatsuda/kaminari'
+  spec.homepage      = 'https://github.com/kaminari/kaminari'
   spec.license       = "MIT"
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]

data/lib/kaminari/activerecord.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
+
 require "kaminari/activerecord/version"
 require 'active_support/lazy_load_hooks'
 
 ActiveSupport.on_load :active_record do
+  require 'kaminari/core'
   require 'kaminari/activerecord/active_record_extension'
   ::ActiveRecord::Base.send :include, Kaminari::ActiveRecordExtension
 end

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,21 +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
-      else
-        c.respond_to?(:count) ? c.count(column_name) : 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.
@@ -48,6 +53,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
@@ -55,13 +89,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.0.0'
+    VERSION = '1.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2020-05-27 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
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - MIT-LICENSE
 - README.md
 - kaminari-activerecord.gemspec
@@ -81,7 +82,7 @@ files:
 - lib/kaminari/activerecord/active_record_model_extension.rb
 - lib/kaminari/activerecord/active_record_relation_methods.rb
 - lib/kaminari/activerecord/version.rb
-homepage: https://github.com/amatsuda/kaminari
+homepage: https://github.com/kaminari/kaminari
 licenses:
 - MIT
 metadata: {}
@@ -93,15 +94,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: Kaminari Active Record adapter