will_paginate 3.1.8 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7e2f95ebf19f3cb09fca66deb17fbc5cafe985b102642b40ee9ca330f8228c7
-  data.tar.gz: f9eecffdda2bdf6a08b9ff44090025725277898bb3410fc963c390c5e2e73724
+  metadata.gz: 751b354f97d844f6679cec31ce90298e6d6ff77217446d77e729421caa52c8da
+  data.tar.gz: 5a18d970f3e6b0ca1e1949aa3eb14856ee80f1feea4b919f808e5d02f623bf58
 SHA512:
-  metadata.gz: 0aae93122e8e72caff23c32c6332a959dabad21f72db562f5098dc5bb707197be11afb63eaf82a290a32a34fe3808a9eff1b3c5550e3f51c0f594d4de5abc3f4
-  data.tar.gz: fd4e932326cea4561cf7fffba6a1a643481b00d37f7b274067ccc54be03fc820512a52fbba1075c52ff30cec1c91e3fb071d78e8754bb9d9ca19327b7bc6ad7c
+  metadata.gz: 1196350bf1e40de517c21fd8f085df09c682709894d1edd688402d33fab8d15c2b9af91b84c0df5dc5aad2eda9e6e8fbc006474b8ee3829af13879a6c66f24ed
+  data.tar.gz: 5ef9ce7f70c5cc3ba0b1e024e4c4cfeb8e8afbb20cea2b983abfb31cb29eb850931b652f68d95579acaa5b69b71ffdfc384716640e4168e49c108fe3a525441d

data/README.md

@@ -1,6 +1,6 @@
 # will_paginate
 
-will_paginate is a pagination library that integrates with Ruby on Rails, Sinatra, Merb, DataMapper and Sequel.
+will_paginate is a pagination library that integrates with Ruby on Rails, Sinatra, Hanami::View, Merb, DataMapper and Sequel.
 
 Installation:
 

data/lib/will_paginate/locale/en.yml

@@ -3,6 +3,8 @@ en:
     previous_label: "← Previous"
     next_label: "Next →"
     page_gap: "…"
+    container_aria_label: "Pagination"
+    page_aria_label: "Page %{page}"
 
     page_entries_info:
       single_page:

data/lib/will_paginate/mongoid.rb

@@ -8,6 +8,8 @@ module WillPaginate
         extend CollectionMethods
         @current_page = WillPaginate::PageNumber(options[:page] || @current_page || 1)
         @page_multiplier = current_page - 1
+        @total_entries = options.delete(:total_entries)
+
         pp = (options[:per_page] || per_page || WillPaginate.per_page).to_i
         limit(pp).skip(@page_multiplier * pp)
       end

data/lib/will_paginate/page_number.rb

@@ -6,7 +6,7 @@ module WillPaginate
   module InvalidPage; end
 
   # integer representing a page number
-  class PageNumber < DelegateClass(Integer)
+  class PageNumber < Numeric
     # a value larger than this is not supported in SQL queries
     BIGINT = 9223372036854775807
 
@@ -18,13 +18,17 @@ module WillPaginate
         raise RangeError, "invalid #{name}: #{value.inspect}"
       end
       @name = name
-      super(value)
+      @value = value
     rescue ArgumentError, TypeError, RangeError => error
       error.extend InvalidPage
       raise error
     end
 
-    alias_method :to_i, :__getobj__
+    def to_i
+      @value
+    end
+
+    def_delegators :@value, :coerce, :==, :<=>, :to_s, :+, :-, :*, :/
 
     def inspect
       "#{@name} #{to_i}"
@@ -40,13 +44,6 @@ module WillPaginate
     alias is_a? kind_of?
   end
 
-  # Ultrahax: makes `Integer === current_page` checks pass
-  Numeric.extend Module.new {
-    def ===(obj)
-      obj.instance_of? PageNumber or super
-    end
-  }
-
   # An idemptotent coercion method
   def self.PageNumber(value, name = 'page')
     case value

data/lib/will_paginate/railtie.rb

@@ -1,4 +1,3 @@
-require 'will_paginate'
 require 'will_paginate/page_number'
 require 'will_paginate/collection'
 require 'will_paginate/i18n'
@@ -39,7 +38,7 @@ module WillPaginate
       end
       def status_code_with_paginate(exception = @exception)
         actual_exception = if exception.respond_to?(:cause)
-          exception.cause
+          exception.cause || exception
         elsif exception.respond_to?(:original_exception)
           exception.original_exception
         else

data/lib/will_paginate/version.rb

@@ -1,8 +1,8 @@
 module WillPaginate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 1
-    TINY  = 8
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/will_paginate/view_helpers/action_view.rb

@@ -43,7 +43,7 @@ module WillPaginate
     # Wrapper for rendering pagination links at both top and bottom of a block
     # of content.
     # 
-    #   <% paginated_section @posts do %>
+    #   <%= paginated_section @posts do %>
     #     <ol id="posts">
     #       <% for post in @posts %>
     #         <li> ... </li>

data/lib/will_paginate/view_helpers/hanami.rb

@@ -0,0 +1,41 @@
+require 'hanami/view'
+require 'will_paginate/view_helpers'
+require 'will_paginate/view_helpers/link_renderer'
+
+module WillPaginate
+  module Hanami
+    module Helpers
+      include ViewHelpers
+
+      def will_paginate(collection, options = {}) #:nodoc:
+        options = options.merge(:renderer => LinkRenderer) unless options[:renderer]
+        str = super(collection, options)
+        str && raw(str)
+      end
+    end
+
+    class LinkRenderer < ViewHelpers::LinkRenderer
+      protected
+
+      def url(page)
+        str = File.join(request_env['SCRIPT_NAME'].to_s, request_env['PATH_INFO'])
+        params = request_env['rack.request.query_hash'].merge(param_name.to_s => page.to_s)
+        params.update @options[:params] if @options[:params]
+        str << '?' << build_query(params)
+      end
+
+      def request_env
+        @template.params.env
+      end
+
+      def build_query(params)
+        Rack::Utils.build_nested_query params
+      end
+    end
+
+    def self.included(base)
+      base.include Helpers
+    end
+
+  end
+end

data/lib/will_paginate/view_helpers/link_renderer.rb

@@ -35,16 +35,20 @@ module WillPaginate
       # Returns the subset of +options+ this instance was initialized with that
       # represent HTML attributes for the container element of pagination links.
       def container_attributes
-        @container_attributes ||= @options.except(*(ViewHelpers.pagination_options.keys + [:renderer] - [:class]))
+        @container_attributes ||= {
+          :role => 'navigation',
+          :"aria-label" => @template.will_paginate_translate(:container_aria_label) { 'Pagination' }
+        }.update @options.except(*(ViewHelpers.pagination_options.keys + [:renderer] - [:class]))
       end
       
     protected
     
       def page_number(page)
+        aria_label = @template.will_paginate_translate(:page_aria_label, :page => page.to_i) { "Page #{page}" }
         if page == current_page
-          tag(:em, page, :class => 'current')
+          tag(:em, page, :class => 'current', :"aria-label" => aria_label, :"aria-current" => 'page')
         else
-          link(page, page, :rel => rel_value(page))
+          link(page, page, :rel => rel_value(page), :"aria-label" => aria_label)
         end
       end
       

data/spec/page_number_spec.rb

@@ -37,7 +37,6 @@ describe WillPaginate::PageNumber do
 
     it "passes the Numeric=== type check" do |variable|
       (Numeric === num).should be
-      (Integer === num).should be
     end
   end
 

data/spec/view_helpers/action_view_spec.rb

@@ -14,7 +14,8 @@ Routes.draw do
   get 'ibocorp(/:page)' => 'ibocorp#index',
         :constraints => { :page => /\d+/ }, :defaults => { :page => 1 }
 
-  get ':controller(/:action(/:id(.:format)))'
+  get 'foo/bar' => 'foo#bar'
+  get 'baz/list' => 'baz#list'
 end
 
 describe WillPaginate::ActionView do
@@ -38,7 +39,14 @@ describe WillPaginate::ActionView do
   attr_reader :assigns, :controller, :request
   
   def render(locals)
-    @view = ActionView::Base.new([], @assigns, @controller)
+    lookup_context = []
+    if defined? ActionView::LookupContext
+      lookup_context = ActionView::LookupContext.new(lookup_context)
+    end
+
+    klass = ActionView::Base
+    klass = klass.with_empty_template_cache if klass.respond_to?(:with_empty_template_cache)
+    @view = klass.new(lookup_context, @assigns, @controller)
     @view.request = @request
     @view.singleton_class.send(:include, @controller._routes.url_helpers)
     @view.render(:inline => @template, :locals => locals)
@@ -120,16 +128,20 @@ describe WillPaginate::ActionView do
   it "should match expected markup" do
     paginate
     expected = <<-HTML
-      <div class="pagination"><span class="previous_page disabled">&#8592; Previous</span>
-      <em class="current">1</em>
-      <a href="/foo/bar?page=2" rel="next">2</a>
-      <a href="/foo/bar?page=3">3</a>
+      <div class="pagination" role="navigation" aria-label="Pagination"><span class="previous_page disabled">&#8592; Previous</span>
+      <em class="current" aria-label="Page 1" aria-current="page">1</em>
+      <a href="/foo/bar?page=2" aria-label="Page 2" rel="next">2</a>
+      <a href="/foo/bar?page=3" aria-label="Page 3">3</a>
       <a href="/foo/bar?page=2" class="next_page" rel="next">Next &#8594;</a></div>
     HTML
     expected.strip!.gsub!(/\s{2,}/, ' ')
-    expected_dom = parse_html_document(expected).root
+    expected_dom = parse_html_document(expected)
 
-    html_document.root.should == expected_dom
+    if expected_dom.respond_to?(:canonicalize)
+      html_document.canonicalize.should == expected_dom.canonicalize
+    else
+      html_document.root.should == expected_dom.root
+    end
   end
   
   it "should output escaped URLs" do

data/spec/view_helpers/view_example_group.rb

@@ -50,7 +50,7 @@ module ViewExampleGroup
   end
 
   def parse_html_document(html)
-    @html_document ||= if defined?(Rails::Dom::Testing::Assertions)
+    if defined?(Rails::Dom::Testing::Assertions)
       Nokogiri::HTML::Document.parse(html)
     else
       HTML::Document.new(html, true, false)

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: will_paginate
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.2.0
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies: []
 description: will_paginate provides a simple API for performing paginated queries
   with Active Record, DataMapper and Sequel, and includes helpers for rendering pagination
-  links in Rails, Sinatra and Merb web apps.
+  links in Rails, Sinatra, Hanami, and Merb web apps.
 email: mislav.marohnic@gmail.com
 executables: []
 extensions: []
@@ -39,6 +39,7 @@ files:
 - lib/will_paginate/version.rb
 - lib/will_paginate/view_helpers.rb
 - lib/will_paginate/view_helpers/action_view.rb
+- lib/will_paginate/view_helpers/hanami.rb
 - lib/will_paginate/view_helpers/link_renderer.rb
 - lib/will_paginate/view_helpers/link_renderer_base.rb
 - lib/will_paginate/view_helpers/merb.rb
@@ -77,10 +78,15 @@ files:
 - spec/view_helpers/base_spec.rb
 - spec/view_helpers/link_renderer_base_spec.rb
 - spec/view_helpers/view_example_group.rb
-homepage: https://github.com/mislav/will_paginate/wiki
+homepage: https://github.com/mislav/will_paginate
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/mislav/will_paginate/issues
+  changelog_uri: https://github.com/mislav/will_paginate/releases/tag/v3.2.0
+  documentation_uri: https://www.rubydoc.info/gems/will_paginate/3.2.0
+  source_code_uri: https://github.com/mislav/will_paginate/tree/v3.2.0
+  wiki_uri: https://github.com/mislav/will_paginate/wiki
 post_install_message: 
 rdoc_options:
 - "--main"