kaminari-core 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 71383288887542c1c6fa3f97848d7c8808c832e6
-  data.tar.gz: 39eaef3145689f64c2d2811365f581d133891c7a
+SHA256:
+  metadata.gz: 13bfdf7c93e9183a36d3e99699eee59895948472c66d31f97bbb99a768ec89d0
+  data.tar.gz: 44c167d6cfe80ecca307ee3a31ac3ebbd8766c09b259686442cf22d4968df9d3
 SHA512:
-  metadata.gz: fd05edc2e7fe87e05f73837e6c299a9a944423a34e37972a790c448c490d3b3fdf749950174cbc7cbbbd832286015a5638df67c5c426fa5239903eff9e5540e1
-  data.tar.gz: 376afd5167b074d3a73afa27b38b4a3d86b7eb1071ebf392e64508484a9708ad7103ed06f1870e6fef4d770c1a3ac2bbeed6538facf366acc675165ec5066c30
+  metadata.gz: 89492adf61154a7eeabd3eac4e4429dc82802596de85d04066f76523f5ca1b6a89d493814b30537dd29e245a2d92f88d263688fb0ed3ce7cdbb979d1ee2ccf71
+  data.tar.gz: 25cc4d4c811c80e15cd271f49dd0de85ba83749a44411f3ce64de441b32de01f1122448e7d939831eb42cb5ba3269e4953b021a4f8abb29a949e717ee098c67b

data/app/views/kaminari/_paginator.html.erb

@@ -7,7 +7,7 @@
     paginator:     the paginator that renders the pagination tags inside
 -%>
 <%= paginator.render do -%>
-  <nav class="pagination">
+  <nav class="pagination" role="navigation" aria-label="pager">
     <%= first_page_tag unless current_page.first? %>
     <%= prev_page_tag unless current_page.first? %>
     <% each_page do |page| -%>

data/lib/generators/kaminari/views_generator.rb

@@ -110,6 +110,8 @@ BANNER
     end
 
     module GitHubApiHelper
+      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|
           ActiveSupport::JSON.decode(json.read)['object']['sha']

data/lib/kaminari/config.rb

@@ -1,28 +1,40 @@
 # frozen_string_literal: true
-require 'active_support/configurable'
 
 module Kaminari
   # Configures global settings for Kaminari
   #   Kaminari.configure do |config|
   #     config.default_per_page = 10
   #   end
-  include ActiveSupport::Configurable
+  class << self
+    def configure
+      yield config
+    end
+
+    def config
+      @_config ||= Config.new
+    end
+  end
+
+  class Config
+    attr_accessor :default_per_page, :max_per_page, :window, :outer_window, :left, :right, :page_method_name, :max_pages, :params_on_first_page
+    attr_writer :param_name
 
-  config.instance_eval do
-    self.default_per_page = 25
-    self.max_per_page = nil
-    self.window = 4
-    self.outer_window = 0
-    self.left = 0
-    self.right = 0
-    self.page_method_name = :page
-    self.param_name = :page
-    self.max_pages = nil
-    self.params_on_first_page = false
+    def initialize
+      @default_per_page = 25
+      @max_per_page = nil
+      @window = 4
+      @outer_window = 0
+      @left = 0
+      @right = 0
+      @page_method_name = :page
+      @param_name = :page
+      @max_pages = nil
+      @params_on_first_page = false
+    end
 
     # If param_name was given as a callable object, call it when returning
     def param_name
-      self[:param_name].respond_to?(:call) ? self[:param_name].call : self[:param_name]
+      @param_name.respond_to?(:call) ? @param_name.call : @param_name
     end
   end
 end

data/lib/kaminari/core/version.rb

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

data/lib/kaminari/helpers/helper_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Kaminari
   module Helpers
     module HelperMethods
@@ -99,7 +101,7 @@ module Kaminari
       #   #-> Displaying items 6 - 10 of 26 in total
       def page_entries_info(collection, entry_name: nil)
         entry_name = if entry_name
-                       entry_name.pluralize(collection.size)
+                       entry_name.pluralize(collection.size, I18n.locale)
                      else
                        collection.entry_name(count: collection.size).downcase
                      end

data/lib/kaminari/helpers/paginator.rb

@@ -6,11 +6,8 @@ module Kaminari
   module Helpers
     # The main container tag
     class Paginator < Tag
-      def initialize(template, window: nil, outer_window: nil, left: nil, right: nil, inner_window: nil, **options) #:nodoc:
-        outer_window ||= Kaminari.config.outer_window
-        left ||= Kaminari.config.left
-        right ||= Kaminari.config.right
-        @window_options = {window: window || inner_window || Kaminari.config.window, left: left.zero? ? outer_window : left, right: right.zero? ? outer_window : right}
+      def initialize(template, window: nil, outer_window: Kaminari.config.outer_window, left: Kaminari.config.left, right: Kaminari.config.right, inner_window: Kaminari.config.window, **options) #:nodoc:
+        @window_options = {window: window || inner_window, left: left.zero? ? outer_window : left, right: right.zero? ? outer_window : right}
 
         @template, @options, @theme, @views_prefix, @last = template, options, options[:theme], options[:views_prefix], nil
         @window_options.merge! @options

data/lib/kaminari/helpers/tags.rb

@@ -24,7 +24,7 @@ module Kaminari
         @params = @params.to_unsafe_h if @params.respond_to?(:to_unsafe_h)
         @params = @params.with_indifferent_access
         @params.except!(*PARAM_KEY_BLACKLIST)
-        @params.merge! params
+        @params.reverse_merge! params
       end
 
       def to_s(locals = {}) #:nodoc:
@@ -117,6 +117,19 @@ module Kaminari
     # The "previous" page of the current page
     class PrevPage < Tag
       include Link
+
+      # TODO: Remove this initializer before 1.3.0.
+      def initialize(template, params: {}, param_name: nil, theme: nil, views_prefix: nil, **options) #:nodoc:
+        # params in Rails 5 may not be a Hash either,
+        # so it must be converted to a Hash to be merged into @params
+        if params && params.respond_to?(:to_unsafe_h)
+          ActiveSupport::Deprecation.warn 'Explicitly passing params to helpers could be omitted.'
+          params = params.to_unsafe_h
+        end
+
+        super(template, params: params, param_name: param_name, theme: theme, views_prefix: views_prefix, **options)
+      end
+
       def page #:nodoc:
         @options[:current_page] - 1
       end
@@ -125,6 +138,19 @@ module Kaminari
     # The "next" page of the current page
     class NextPage < Tag
       include Link
+
+      # TODO: Remove this initializer before 1.3.0.
+      def initialize(template, params: {}, param_name: nil, theme: nil, views_prefix: nil, **options) #:nodoc:
+        # params in Rails 5 may not be a Hash either,
+        # so it must be converted to a Hash to be merged into @params
+        if params && params.respond_to?(:to_unsafe_h)
+          ActiveSupport::Deprecation.warn 'Explicitly passing params to helpers could be omitted.'
+          params = params.to_unsafe_h
+        end
+
+        super(template, params: params, param_name: param_name, theme: theme, views_prefix: views_prefix, **options)
+      end
+
       def page #:nodoc:
         @options[:current_page] + 1
       end

data/lib/kaminari/models/configuration_methods.rb

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

data/lib/kaminari/models/page_scope_methods.rb

@@ -19,7 +19,7 @@ module Kaminari
 
     def max_paginates_per(new_max_per_page)
       @_max_per_page = new_max_per_page
-      per ((defined?(@_per) && @_per) || default_per_page), max_per_page: new_max_per_page
+      per current_per_page, max_per_page: new_max_per_page
     end
 
     def padding(num)
@@ -52,6 +52,11 @@ module Kaminari
       raise ZeroPerPageOperation, "Current page was incalculable. Perhaps you called .per(0)?"
     end
 
+    # Current per-page number
+    def current_per_page
+      (defined?(@_per) && @_per) || default_per_page
+    end
+
     # Next page number in the collection
     def next_page
       current_page + 1 unless last_page? || out_of_range?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaminari-core
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Kaminari's core pagination library