will_paginate 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3445d24047dd419909e314bc5f1b9eb3fdb7f73
-  data.tar.gz: 2e6ce5705bc95b523bdd8a7ffa9d8e0b35acc36f
+  metadata.gz: 37738a4f9afbe87bcb4061f1e0336498f38ddf49
+  data.tar.gz: 61784364ffb2e3fc1719b85fe0e7ee8f92de8a9a
 SHA512:
-  metadata.gz: bdc9b0d1f20379dc1df3dc503796834b329976c90a63f4e0f14b77152aef8721bea240f850d0abc0c0171a3e1ad10d5c88a354136e47d4bb933b29a205311d7d
-  data.tar.gz: c35edfea8e81e70fef045d9f1c3c32bea89723a1bd74a6c2edb438c62fc54c3356eb4704329c42b35760178c71a505ee0d86c0109a6f7cd3fdacd5276af4eb74
+  metadata.gz: dfc4458d9ab67b9d059c5028d8346d28be729bc85c81df5b5d4a23e34f71075ea5ca9a3ccc98950ee82302413101fb3b259ed5f4180e43e4f5952fd0286c05e0
+  data.tar.gz: b4efefc99c7aff85f172eead0b2356f90eab50c4502002425bb198abb187c0ed833aa3dd1f7da36a8dd0a6bf4cf2a62d5339f090ea5f7ad20a198c14ea71a731

data/README.md

@@ -6,7 +6,7 @@ Installation:
 
 ``` ruby
 ## Gemfile for Rails 3+, Sinatra, and Merb
-gem 'will_paginate', '~> 3.0.6'
+gem 'will_paginate', '~> 3.1.0'
 ```
 
 See [installation instructions][install] on the wiki for more info.

data/lib/will_paginate/active_record.rb

@@ -51,8 +51,8 @@ module WillPaginate
       end
 
       # fix for Rails 3.0
-      def find_last
-        if !loaded? and offset_value || limit_value
+      def find_last(*args)
+        if !loaded? && args.empty? && (offset_value || limit_value)
           @last ||= to_a.last
         else
           super

data/lib/will_paginate/version.rb

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

data/lib/will_paginate/view_helpers/action_view.rb

@@ -99,6 +99,8 @@ module WillPaginate
     class LinkRenderer < ViewHelpers::LinkRenderer
       protected
 
+      GET_PARAMS_BLACKLIST = [:script_name]
+
       def default_url_params
         {}
       end
@@ -118,7 +120,7 @@ module WillPaginate
 
       def merge_get_params(url_params)
         if @template.respond_to? :request and @template.request and @template.request.get?
-          symbolized_update(url_params, @template.params)
+          symbolized_update(url_params, @template.params, GET_PARAMS_BLACKLIST)
         end
         url_params
       end

data/lib/will_paginate/view_helpers/link_renderer.rb

@@ -114,11 +114,12 @@ module WillPaginate
         end
       end
 
-      def symbolized_update(target, other)
+      def symbolized_update(target, other, blacklist = nil)
         other.each do |key, value|
           key = key.to_sym
           existing = target[key]
-          
+          next if blacklist && blacklist.include?(key)
+
           if value.is_a?(Hash) and (existing.is_a?(Hash) or existing.nil?)
             symbolized_update(existing || (target[key] = {}), value)
           else

data/spec/database.yml

@@ -3,23 +3,27 @@ sqlite3:
   adapter: sqlite3
   timeout: 500
 
-mysql:
+mysql: &mysql
   adapter: mysql
   database: will_paginate
   username: 
   encoding: utf8
-  socket: <%= ENV["BOXEN_MYSQL_SOCKET"] %>
+<% if File.exist?("/var/run/mysql5/mysqld.sock") %>
+  host: localhost
+  socket: /var/run/mysql5/mysqld.sock
+<% elsif File.exist? "/tmp/mysql.sock" %>
+  host: localhost
+  socket: /tmp/mysql.sock
+<% else %>
+  host: 127.0.0.1
+<% end %>
 
 mysql2:
+  <<: *mysql
   adapter: mysql2
-  database: will_paginate
-  username: 
-  encoding: utf8
-  socket: <%= ENV["BOXEN_MYSQL_SOCKET"] %>
 
 postgres:
   adapter: postgresql
   database: will_paginate
   username: <%= "postgres" if ENV["TRAVIS"] %>
   min_messages: warning
-  port: <%= ENV["BOXEN_POSTGRESQL_PORT"] %>

data/spec/view_helpers/action_view_spec.rb

@@ -201,6 +201,13 @@ describe WillPaginate::ActionView do
     assert_no_links_match /99/
     assert_no_links_match /ftp/
   end
+
+  it "doesn't allow tampering with script_name" do
+    request.params :script_name => 'p0wned'
+    paginate
+    assert_links_match %r{^/foo/bar}
+    assert_no_links_match /p0wned/
+  end
   
   it "should not preserve parameters on POST" do
     request.post
@@ -250,7 +257,7 @@ describe WillPaginate::ActionView do
   end
 
   it "should paginate with custom route page parameter" do
-    request.symbolized_path_parameters.update :controller => 'dummy', :action => nil
+    request.symbolized_path_parameters.update :controller => 'dummy', :action => 'index'
     paginate :per_page => 2 do
       assert_select 'a[href]', 6 do |links|
         assert_links_match %r{/page/(\d+)$}, links, [2, 3, 4, 5, 6, 2]
@@ -268,7 +275,7 @@ describe WillPaginate::ActionView do
   end
 
   it "should paginate with custom route and first page number implicit" do
-    request.symbolized_path_parameters.update :controller => 'ibocorp', :action => nil
+    request.symbolized_path_parameters.update :controller => 'ibocorp', :action => 'index'
     paginate :page => 2, :per_page => 2 do
       assert_select 'a[href]', 7 do |links|
         assert_links_match %r{/ibocorp(?:/(\d+))?$}, links, [nil, nil, 3, 4, 5, 6, 3]

data/spec/view_helpers/view_example_group.rb

@@ -143,4 +143,4 @@ module HTML
       childless?? '' : super
     end
   end
-end
+end if defined?(HTML)

metadata

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