will_paginate 3.1.3 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef2cd8f47f945a1b5d7378a4c66ceba6dc49cdb
-  data.tar.gz: af9aa669e248488ec198d5239172fcf08fead4a1
+  metadata.gz: 5b9c92a0ce3f9e697334ea1bf11c0b57bdfd9fe2
+  data.tar.gz: b2794b2de86ceaa34f86d06f2c1952484b5409f9
 SHA512:
-  metadata.gz: ea9ced53320267da3646dad5102f408ed8cc5ad7d973f0a91893035d6ef671c1d57ab5b8793b6002d84ca71363618948718f3ee8cfdd4f3b01e0628eebb96434
-  data.tar.gz: c0571c50659366d61692379a97fbaff6f012529f38dc617a5efba1a24a1d9a3a687e95777ef4da6c96b9f0f94ee8380d6ce80b62b8ce7a2b36d95fb66c352eb3
+  metadata.gz: fe7a7e48c35bda6cd6648f5243f3992ebe576f586afd5d140066fa05ecdd83862681245f44e554f5483e5dc4fe9f957e3b84b6208cc91a8e1dd1804c8593a49b
+  data.tar.gz: 5c388ced4fd0b8ad3da2ce6c5e9b2323b4cff1b950fdf3b35cc6e148b1e12509e8b6c0b83156b483d1a732ce4fe2497a4c09553b2650775cc922803699bf4347

data/lib/will_paginate/railtie.rb

@@ -38,9 +38,15 @@ module WillPaginate
         alias_method :status_code, :status_code_with_paginate
       end
       def status_code_with_paginate(exception = @exception)
-        if exception.is_a?(WillPaginate::InvalidPage) or
-            (exception.respond_to?(:original_exception) &&
-              exception.original_exception.is_a?(WillPaginate::InvalidPage))
+        actual_exception = if exception.respond_to?(:cause)
+          exception.cause
+        elsif exception.respond_to?(:original_exception)
+          exception.original_exception
+        else
+          exception
+        end
+
+        if actual_exception.is_a?(WillPaginate::InvalidPage)
           Rack::Utils.status_code(:not_found)
         else
           original_method = method(:status_code_without_paginate)

data/lib/will_paginate/version.rb

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

data/lib/will_paginate/view_helpers/link_renderer.rb

@@ -41,10 +41,10 @@ module WillPaginate
     protected
     
       def page_number(page)
-        unless page == current_page
-          link(page, page, :rel => rel_value(page))
-        else
+        if page == current_page
           tag(:em, page, :class => 'current')
+        else
+          link(page, page, :rel => rel_value(page))
         end
       end
       
@@ -108,9 +108,8 @@ module WillPaginate
 
       def rel_value(page)
         case page
-        when @collection.current_page - 1; 'prev' + (page == 1 ? ' start' : '')
+        when @collection.current_page - 1; 'prev'
         when @collection.current_page + 1; 'next'
-        when 1; 'start'
         end
       end
 

data/lib/will_paginate/view_helpers/link_renderer_base.rb

@@ -30,7 +30,7 @@ module WillPaginate
         window_from = current_page - inner_window
         window_to = current_page + inner_window
         
-        # adjust lower or upper limit if other is out of bounds
+        # adjust lower or upper limit if either is out of bounds
         if window_to > total_pages
           window_from -= window_to - total_pages
           window_to = total_pages

data/spec/view_helpers/action_view_spec.rb

@@ -80,9 +80,9 @@ describe WillPaginate::ActionView do
         validate_page_numbers [1,1,3,3], elements
         # test rel attribute values:
         text(elements[0]).should == 'Prev'
-        elements[0]['rel'].should == 'prev start'
+        elements[0]['rel'].should == 'prev'
         text(elements[1]).should == '1'
-        elements[1]['rel'].should == 'prev start'
+        elements[1]['rel'].should == 'prev'
         text(elements[3]).should == 'Next'
         elements[3]['rel'].should == 'next'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: will_paginate
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.5
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-10-15 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