kaminari-core 1.1.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13bfdf7c93e9183a36d3e99699eee59895948472c66d31f97bbb99a768ec89d0
-  data.tar.gz: 44c167d6cfe80ecca307ee3a31ac3ebbd8766c09b259686442cf22d4968df9d3
+  metadata.gz: f97cdb29c6cc0f87f4a3b2439bc98d4015894053aece52f9685f9053d828eee2
+  data.tar.gz: fda4562a4e0fe69e90af6276b78575dc6dbbe6f42f98ffecd70bd54ddf7cf5cc
 SHA512:
-  metadata.gz: 89492adf61154a7eeabd3eac4e4429dc82802596de85d04066f76523f5ca1b6a89d493814b30537dd29e245a2d92f88d263688fb0ed3ce7cdbb979d1ee2ccf71
-  data.tar.gz: 25cc4d4c811c80e15cd271f49dd0de85ba83749a44411f3ce64de441b32de01f1122448e7d939831eb42cb5ba3269e4953b021a4f8abb29a949e717ee098c67b
+  metadata.gz: 0dbaec420bee38126a89931872d0d4dcc37772a7bb22d0c97844399b95c55cc4677a2634d1b908b1c4c5c60a0319ab5b88d8b7bb4f01658db3ecc52400eb9c94
+  data.tar.gz: a5294c22cd10b649243d4ebd4ac85481e1ae16b956d2777121926026eb21f2c3ec6c07a799ca02271f0348a76f9cc4fcf409ce0cdbe69672289fdca1e745e800

data/kaminari-core.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/core/version'

data/lib/generators/kaminari/config_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kaminari
   module Generators
     # rails g kaminari:config

data/lib/generators/kaminari/templates/kaminari_config.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Kaminari.configure do |config|
   # config.default_per_page = 25
   # config.max_per_page = nil
@@ -8,5 +9,6 @@ Kaminari.configure do |config|
   # config.right = 0
   # config.page_method_name = :page
   # config.param_name = :page
+  # config.max_pages = nil
   # config.params_on_first_page = false
 end

data/lib/generators/kaminari/views_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kaminari
   module Generators
     # rails g kaminari:views THEME
@@ -113,10 +114,10 @@ BANNER
       require 'open-uri'
 
       def get_files_in_master
-        master_tree_sha = open('https://api.github.com/repos/amatsuda/kaminari_themes/git/refs/heads/master') do |json|
+        master_tree_sha = URI.open('https://api.github.com/repos/amatsuda/kaminari_themes/git/refs/heads/master') do |json|
           ActiveSupport::JSON.decode(json.read)['object']['sha']
         end
-        open('https://api.github.com/repos/amatsuda/kaminari_themes/git/trees/' + master_tree_sha + '?recursive=1') do |json|
+        URI.open('https://api.github.com/repos/amatsuda/kaminari_themes/git/trees/' + master_tree_sha + '?recursive=1') do |json|
           blobs = ActiveSupport::JSON.decode(json.read)['tree'].find_all {|i| i['type'] == 'blob' }
           blobs.map do |blob|
             [blob['path'], blob['sha']]
@@ -126,7 +127,7 @@ BANNER
       module_function :get_files_in_master
 
       def get_content_for(path)
-        open('https://api.github.com/repos/amatsuda/kaminari_themes/contents/' + path) do |json|
+        URI.open('https://api.github.com/repos/amatsuda/kaminari_themes/contents/' + path) do |json|
           Base64.decode64(ActiveSupport::JSON.decode(json.read)['content'])
         end
       end

data/lib/kaminari/core/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 module Kaminari
   module Core
-    VERSION = '1.1.0'
+    VERSION = '1.2.2'
   end
 end

data/lib/kaminari/core.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kaminari
 end
 

data/lib/kaminari/engine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kaminari #:nodoc:
   class Engine < ::Rails::Engine #:nodoc:
   end

data/lib/kaminari/exceptions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kaminari
   class ZeroPerPageOperation < ZeroDivisionError; end
 end

data/lib/kaminari/helpers/helper_methods.rb

@@ -2,7 +2,102 @@
 
 module Kaminari
   module Helpers
+
+    # The Kaminari::Helpers::UrlHelper module provides useful methods for
+    # generating a path or url to a particular page. A class must implement the
+    # following methods:
+    #
+    #   * <tt>url_for</tt>: A method that generates an actual path
+    #   * <tt>params</tt>: A method that returns query string parameters
+    #   * <tt>request</tt>: A method that returns a Rack::Request object
+    #
+    # A normal Rails controller implements all the methods, which make it
+    # trivial to use this module:
+    #
+    # ==== Examples
+    #
+    #   class UsersController < ApplicationController
+    #     include Kaminari::Helpers::UrlHelper
+    #
+    #     def index
+    #       @users = User.page(1)
+    #
+    #       path_to_next_page(@items)
+    #       # => /items?page=2
+    #     end
+    #   end
+    #
+    module UrlHelper
+
+      # A helper that calculates the url to the next page.
+      #
+      # ==== Examples
+      # Basic usage:
+      #
+      #   <%= next_page_url @items %>
+      #   #-> http://www.example.org/items?page=2
+      #
+      # It will return `nil` if there is no next page.
+      def next_page_url(scope, options = {})
+        "#{request.base_url}#{next_page_path(scope, options)}" if scope.next_page
+      end
+      alias url_to_next_page next_page_url
+
+      def path_to_next_url(scope, options = {})
+        ActiveSupport::Deprecation.warn 'path_to_next_url is deprecated. Use next_page_url or url_to_next_page instead.'
+        next_page_url(scope, options)
+      end
+
+      # A helper that calculates the url to the previous page.
+      #
+      # ==== Examples
+      # Basic usage:
+      #
+      #   <%= prev_page_url @items %>
+      #   #-> http://www.example.org/items
+      #
+      # It will return `nil` if there is no previous page.
+      def prev_page_url(scope, options = {})
+        "#{request.base_url}#{prev_page_path(scope, options)}" if scope.prev_page
+      end
+      alias previous_page_url     prev_page_url
+      alias url_to_prev_page      prev_page_url
+      alias url_to_previous_page  prev_page_url
+
+      # A helper that calculates the path to the next page.
+      #
+      # ==== Examples
+      # Basic usage:
+      #
+      #   <%= path_to_next_page @items %>
+      #   #-> /items?page=2
+      #
+      # It will return `nil` if there is no next page.
+      def next_page_path(scope, options = {})
+        Kaminari::Helpers::NextPage.new(self, **options.reverse_merge(current_page: scope.current_page)).url if scope.next_page
+      end
+      alias path_to_next_page next_page_path
+
+      # A helper that calculates the path to the previous page.
+      #
+      # ==== Examples
+      # Basic usage:
+      #
+      #   <%= path_to_prev_page @items %>
+      #   #-> /items
+      #
+      # It will return `nil` if there is no previous page.
+      def prev_page_path(scope, options = {})
+        Kaminari::Helpers::PrevPage.new(self, **options.reverse_merge(current_page: scope.current_page)).url if scope.prev_page
+      end
+      alias previous_page_path     prev_page_path
+      alias path_to_previous_page  prev_page_path
+      alias path_to_prev_page      prev_page_path
+    end
+
     module HelperMethods
+      include UrlHelper
+
       # A helper that renders the pagination links.
       #
       #   <%= paginate @articles %>
@@ -22,7 +117,7 @@ module Kaminari
         options[:total_pages] ||= scope.total_pages
         options.reverse_merge! current_page: scope.current_page, per_page: scope.limit_value, remote: false
 
-        paginator = paginator_class.new (template || self), options
+        paginator = paginator_class.new (template || self), **options
         paginator.to_s
       end
 
@@ -49,8 +144,10 @@ module Kaminari
         options.except! :params, :param_name
         options[:rel] ||= 'prev'
 
-        link_to_if prev_page, name, prev_page, options do
-          yield if block_given?
+        if prev_page
+          link_to name, prev_page, options
+        elsif block_given?
+          yield
         end
       end
       alias link_to_prev_page link_to_previous_page
@@ -78,8 +175,10 @@ module Kaminari
         options.except! :params, :param_name
         options[:rel] ||= 'next'
 
-        link_to_if next_page, name, next_page, options do
-          yield if block_given?
+        if next_page
+          link_to name, next_page, options
+        elsif block_given?
+          yield
         end
       end
 
@@ -109,7 +208,10 @@ module Kaminari
         if collection.total_pages < 2
           t('helpers.page_entries_info.one_page.display_entries', entry_name: entry_name, count: collection.total_count)
         else
-          t('helpers.page_entries_info.more_pages.display_entries', entry_name: entry_name, first: collection.offset_value + 1, last: [collection.offset_value + collection.limit_value, collection.total_count].min, total: collection.total_count)
+          from = collection.offset_value + 1
+          to   = collection.offset_value + (collection.respond_to?(:records) ? collection.records : collection.to_a).size
+
+          t('helpers.page_entries_info.more_pages.display_entries', entry_name: entry_name, first: from, last: to, total: collection.total_count)
         end.html_safe
       end
 
@@ -129,43 +231,17 @@ module Kaminari
       #     <%= rel_next_prev_link_tags @items %>
       #   <% end %>
       #
-      #   #-> <link rel="next" href="/items/page/3" /><link rel="prev" href="/items/page/1" />
+      #   #-> <link rel="next" href="/items/page/3"><link rel="prev" href="/items/page/1">
       #
       def rel_next_prev_link_tags(scope, options = {})
         next_page = path_to_next_page(scope, options)
         prev_page = path_to_prev_page(scope, options)
 
         output = String.new
-        output << tag(:link, rel: "next", href: next_page) if next_page
-        output << tag(:link, rel: "prev", href: prev_page) if prev_page
+        output << %Q|<link rel="next" href="#{next_page}">| if next_page
+        output << %Q|<link rel="prev" href="#{prev_page}">| if prev_page
         output.html_safe
       end
-
-      # A helper that calculates the path to the next page.
-      #
-      # ==== Examples
-      # Basic usage:
-      #
-      #   <%= path_to_next_page @items %>
-      #   #-> /items?page=2
-      #
-      # It will return `nil` if there is no next page.
-      def path_to_next_page(scope, options = {})
-        Kaminari::Helpers::NextPage.new(self, options.reverse_merge(current_page: scope.current_page)).url if scope.next_page
-      end
-
-      # A helper that calculates the path to the previous page.
-      #
-      # ==== Examples
-      # Basic usage:
-      #
-      #   <%= path_to_prev_page @items %>
-      #   #-> /items
-      #
-      # It will return `nil` if there is no previous page.
-      def path_to_prev_page(scope, options = {})
-        Kaminari::Helpers::PrevPage.new(self, options.reverse_merge(current_page: scope.current_page)).url if scope.prev_page
-      end
     end
   end
 end

data/lib/kaminari/helpers/paginator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support/inflector'
 require 'kaminari/helpers/tags'
 
@@ -26,7 +27,11 @@ module Kaminari
       # render given block as a view template
       def render(&block)
         instance_eval(&block) if @options[:total_pages] > 1
-        @output_buffer
+
+        # This allows for showing fall-back HTML when there's only one page:
+        #
+        #   <%= paginate(@search_results) || "Showing all search results" %>
+        @output_buffer.presence
       end
 
       # enumerate each page providing PageProxy object as the block parameter
@@ -54,13 +59,13 @@ module Kaminari
       private :relevant_pages
 
       def page_tag(page)
-        @last = Page.new @template, @options.merge(page: page)
+        @last = Page.new @template, **@options.merge(page: page)
       end
 
       %w[first_page prev_page next_page last_page gap].each do |tag|
         eval <<-DEF, nil, __FILE__, __LINE__ + 1
           def #{tag}_tag
-            @last = #{tag.classify}.new @template, @options
+            @last = #{tag.classify}.new @template, **@options
           end
         DEF
       end

data/lib/kaminari/helpers/tags.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 module Kaminari
   module Helpers
-    PARAM_KEY_BLACKLIST = [:authenticity_token, :commit, :utf8, :_method, :script_name].freeze
+    PARAM_KEY_EXCEPT_LIST = [:authenticity_token, :commit, :utf8, :_method, :script_name, :original_script_name].freeze
 
     # A tag stands for an HTML tag inside the paginator.
     # Basically, a tag has its own partial template file, so every tag can be
@@ -12,7 +13,7 @@ module Kaminari
     # class, so _tag partial is not needed).
     #   e.g.)  PrevLink  ->  app/views/kaminari/_prev_link.html.erb
     #
-    # When no matching template were found in your app, the engine's pre
+    # When no matching templates were found in your app, the engine's pre
     # installed template will be used.
     #   e.g.)  Paginator  ->  $GEM_HOME/kaminari-x.x.x/app/views/kaminari/_paginator.html.erb
     class Tag
@@ -23,8 +24,8 @@ module Kaminari
         # @params in Rails 5 no longer inherits from Hash
         @params = @params.to_unsafe_h if @params.respond_to?(:to_unsafe_h)
         @params = @params.with_indifferent_access
-        @params.except!(*PARAM_KEY_BLACKLIST)
-        @params.reverse_merge! params
+        @params.except!(*PARAM_KEY_EXCEPT_LIST)
+        @params.merge! params
       end
 
       def to_s(locals = {}) #:nodoc:
@@ -65,7 +66,7 @@ module Kaminari
          "kaminari",
          @theme,
          self.class.name.demodulize.underscore
-        ].compact.join("/")
+        ].compact.join("/").gsub('//', '/')
       end
     end
 

data/lib/kaminari/models/array_extension.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support/core_ext/module'
 module Kaminari
   # Kind of Array that can paginate
@@ -34,7 +35,7 @@ module Kaminari
 
     # Used for page_entry_info
     def entry_name(options = {})
-      I18n.t('helpers.page_entries_info.entry', options.reverse_merge(default: ENTRY.pluralize(options[:count])))
+      I18n.t('helpers.page_entries_info.entry', **options.reverse_merge(default: ENTRY.pluralize(options[:count])))
     end
 
     # items at the specified "page"

data/lib/kaminari/models/configuration_methods.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
+require 'active_support/concern'
+
 module Kaminari
   module ConfigurationMethods #:nodoc:
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
+    extend ActiveSupport::Concern
     module ClassMethods #:nodoc:
       # Overrides the default +per_page+ value per model
       #   class Article < ActiveRecord::Base

data/lib/kaminari/models/page_scope_methods.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kaminari
   module PageScopeMethods
     # Specify the <tt>per_page</tt> value for the preceding <tt>page</tt> scope
@@ -19,7 +20,8 @@ module Kaminari
 
     def max_paginates_per(new_max_per_page)
       @_max_per_page = new_max_per_page
-      per current_per_page, max_per_page: new_max_per_page
+
+      per (defined?(@_per) && @_per) || default_per_page, max_per_page: new_max_per_page
     end
 
     def padding(num)
@@ -54,7 +56,11 @@ module Kaminari
 
     # Current per-page number
     def current_per_page
-      (defined?(@_per) && @_per) || default_per_page
+      ActiveSupport::Deprecation.warn '#current_per_page is deprecated and will be removed in the next major ' \
+                                      'version. Please use #limit_value instead.'
+
+      limit_value
+      # (defined?(@_per) && @_per) || default_per_page
     end
 
     # Next page number in the collection

data/lib/kaminari/railtie.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Kaminari
   class Railtie < ::Rails::Railtie #:nodoc:
     # Doesn't actually do anything. Just keeping this hook point, mainly for compatibility

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-core
 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: bundler
@@ -91,7 +91,7 @@ homepage: https://github.com/kaminari/kaminari
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,9 +106,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's core pagination library
 test_files: []