will_paginate 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1868f72daf66f8ede4a9253c2b09f8f31b139491
-  data.tar.gz: 6c3e2f25535acb3ec0be32c3352d4007405debf8
+  metadata.gz: 578bfcd70a16322ebd1801e1c4a8c76a4ed0a334
+  data.tar.gz: 2cdd8ab00a1283414888adc8ed64bbd7446223cf
 SHA512:
-  metadata.gz: 3ca8c0a4b2e6f3be74b770618fc46f54a729171936b5e39c46425b8c9e48aa61701713825a6a6ab973a93c732886f582366878235624901d06119f94a7ba675d
-  data.tar.gz: 1127948955580aa81cdaeea1e028f0abec34743e1047bfd659c3152d372bb41299ff7336710b8ef77aeb885b53241f077e93be90e000a1feeb6e602b72447607
+  metadata.gz: 36e1ec8a34231aefd0a13ccc77afc09951762eefba81c11fb23561ebdff6914dc941e04b0c5209444afa1893e70463dc137f4b8eb1c0e6337cf35182a88faded
+  data.tar.gz: 2bb06f172cdbc858e2bbbbce3582757b0b2f1a65fdcae9be930b44a00551ecd64ceb585f43279f5ebf9989e0c406fc4aa3399c7f2b2536041b1e86949a5bbef7

data/lib/will_paginate/deprecation.rb

@@ -10,7 +10,7 @@ module WillPaginate::Deprecation
     private
 
     def rails_logger
-      defined?(Rails) && Rails.logger
+      defined?(Rails.logger) && Rails.logger
     end
 
     def origin_of_call(stack)

data/lib/will_paginate/railtie.rb

@@ -32,14 +32,17 @@ module WillPaginate
     end
 
     def self.add_locale_path(config)
-      config.i18n.railties_load_path.unshift(*WillPaginate::I18n.load_path)
+      config.i18n.load_path.unshift(*WillPaginate::I18n.load_path)
     end
 
     # Extending the exception handler middleware so it properly detects
     # WillPaginate::InvalidPage regardless of it being a tag module.
     module ShowExceptionsPatch
       extend ActiveSupport::Concern
-      included { alias_method_chain :status_code, :paginate }
+      included do
+        alias_method :status_code_without_paginate, :status_code
+        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) &&

data/lib/will_paginate/version.rb

@@ -2,7 +2,7 @@ module WillPaginate #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 7
+    TINY  = 8
 
     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/finders/active_record_spec.rb

@@ -387,7 +387,7 @@ describe WillPaginate::ActiveRecord do
       result.total_entries.should == 2
 
       lambda {
-        dhh.projects.find(:all, :order => 'projects.id', :limit => 4)
+        dhh.projects.order('projects.id').limit(4).to_a
       }.should_not raise_error
       
       result = dhh.projects.paginate(:page => 1, :per_page => 4).reorder('projects.id')

data/spec/finders/activerecord_test_connector.rb

@@ -4,12 +4,23 @@ require 'active_support/multibyte' # needed for Ruby 1.9.1
 require 'stringio'
 require 'erb'
 
+# https://travis-ci.org/mislav/will_paginate/jobs/99999001
+require 'active_support/core_ext/string/conversions'
+class String
+  alias to_datetime_without_patch to_datetime
+  def to_datetime
+    to_datetime_without_patch
+  rescue ArgumentError
+    return nil
+  end
+end
+
 $query_count = 0
 $query_sql = []
 
 ignore_sql = /
     ^(
-      PRAGMA | SHOW\ max_identifier_length |
+      PRAGMA | SHOW\ (max_identifier_length|search_path) |
       SELECT\ (currval|CAST|@@IDENTITY|@@ROWCOUNT) |
       SHOW\ ((FULL\ )?FIELDS|TABLES)
     )\b |

data/spec/fixtures/admin.rb

@@ -1,3 +1,3 @@
 class Admin < User
-  has_many :companies, :finder_sql => 'SELECT * FROM companies'
+  has_many :companies
 end

data/spec/fixtures/developer.rb

@@ -1,5 +1,5 @@
 class Developer < User
-  has_and_belongs_to_many :projects, :order => 'projects.name', :join_table => 'developers_projects'
+  has_and_belongs_to_many :projects, :join_table => 'developers_projects'
 
   def self.with_poor_ones(&block)
     options = { :conditions => ['salary <= ?', 80000], :order => 'salary' }

data/spec/fixtures/project.rb

@@ -1,5 +1,5 @@
 class Project < ActiveRecord::Base
-  has_and_belongs_to_many :developers, :uniq => true, :join_table => 'developers_projects'
+  has_and_belongs_to_many :developers, :join_table => 'developers_projects'
   
   has_many :topics
     # :finder_sql  => 'SELECT * FROM topics WHERE (topics.project_id = #{id})',

data/spec/page_number_spec.rb

@@ -3,23 +3,41 @@ require 'will_paginate/page_number'
 
 describe WillPaginate::PageNumber do
   describe "valid" do
-    subject { described_class.new('12', 'page') }
+    def num
+      WillPaginate::PageNumber.new('12', 'page')
+    end
+
+    it "== 12" do
+      num.should eq(12)
+    end
 
-    it { should eq(12) }
-    its(:inspect) { should eq('page 12') }
-    it { should be_a(WillPaginate::PageNumber) }
-    it { should be_instance_of(WillPaginate::PageNumber) }
-    it { should be_a(Numeric) }
-    it { should be_a(Fixnum) }
-    it { should_not be_instance_of(Fixnum) }
+    it "inspects to 'page 12'" do
+      num.inspect.should eq('page 12')
+    end
+
+    it "is a PageNumber" do
+      (num.instance_of? WillPaginate::PageNumber).should be
+    end
+
+    it "is a kind of Numeric" do
+      (num.is_a? Numeric).should be
+    end
+
+    it "is a kind of Fixnum" do
+      (num.is_a? Fixnum).should be
+    end
+
+    it "isn't directly a Fixnum" do
+      (num.instance_of? Fixnum).should_not be
+    end
 
     it "passes the PageNumber=== type check" do |variable|
-      (WillPaginate::PageNumber === subject).should be
+      (WillPaginate::PageNumber === num).should be
     end
 
     it "passes the Numeric=== type check" do |variable|
-      (Numeric === subject).should be
-      (Fixnum === subject).should be
+      (Numeric === num).should be
+      (Fixnum === num).should be
     end
   end
 

data/spec/view_helpers/action_view_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 require 'active_support/rescuable' # needed for Ruby 1.9.1
 require 'action_controller'
@@ -20,6 +21,7 @@ describe WillPaginate::ActionView do
 
   before(:all) do
     I18n.load_path.concat WillPaginate::I18n.load_path
+    I18n.enforce_available_locales = false
   end
 
   before(:each) do
@@ -48,12 +50,14 @@ describe WillPaginate::ActionView do
     paginate do |pagination|
       assert_select 'a[href]', 3 do |elements|
         validate_page_numbers [2,3,2], elements
-        assert_select elements.last, ':last-child', "Next →"
+        text(elements[2]).should == 'Next →'
+      end
+      assert_select 'span', 1 do |spans|
+        spans[0]['class'].should == 'previous_page disabled'
+        text(spans[0]).should == '← Previous'
       end
-      assert_select 'span', 1
-      assert_select 'span.disabled:first-child', '← Previous'
       assert_select 'em.current', '1'
-      pagination.first.inner_text.should == '← Previous 1 2 3 Next →'
+      text(pagination[0]).should == '← Previous 1 2 3 Next →'
     end
   end
 
@@ -75,15 +79,12 @@ describe WillPaginate::ActionView do
       assert_select 'a[href]', 4 do |elements|
         validate_page_numbers [1,1,3,3], elements
         # test rel attribute values:
-        assert_select elements[1], 'a', '1' do |link|
-          link.first['rel'].should == 'prev start'
-        end
-        assert_select elements.first, 'a', "Prev" do |link|
-          link.first['rel'].should == 'prev start'
-        end
-        assert_select elements.last, 'a', "Next" do |link|
-          link.first['rel'].should == 'next'
-        end
+        text(elements[0]).should == 'Prev'
+        elements[0]['rel'].should == 'prev start'
+        text(elements[1]).should == '1'
+        elements[1]['rel'].should == 'prev start'
+        text(elements[3]).should == 'Next'
+        elements[3]['rel'].should == 'next'
       end
       assert_select '.current', '2'
     end
@@ -126,8 +127,8 @@ describe WillPaginate::ActionView do
       <a href="/foo/bar?page=2" class="next_page" rel="next">Next &#8594;</a></div>
     HTML
     expected.strip!.gsub!(/\s{2,}/, ' ')
-    expected_dom = HTML::Document.new(expected).root
-    
+    expected_dom = parse_html_document(expected).root
+
     html_document.root.should == expected_dom
   end
   
@@ -137,7 +138,8 @@ describe WillPaginate::ActionView do
     
     assert_select 'a[href]', 1 do |links|
       query = links.first['href'].split('?', 2)[1]
-      query.split('&amp;').sort.should == %w(page=2 tag=%3Cbr%3E)
+      parts = query.gsub('&amp;', '&').split('&').sort
+      parts.should == %w(page=2 tag=%3Cbr%3E)
     end
   end
   
@@ -199,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
@@ -248,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]
@@ -266,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]
@@ -355,6 +364,11 @@ describe WillPaginate::ActionView do
     I18n.available_locales # triggers loading existing translations
     I18n.backend.store_translations(:en, data)
   end
+
+  # Normalizes differences between HTML::Document and Nokogiri::HTML
+  def text(node)
+    node.inner_text.gsub('&#8594;', '→').gsub('&#8592;', '←')
+  end
 end
 
 class AdditionalLinkAttributesRenderer < WillPaginate::ActionView::LinkRenderer
@@ -376,7 +390,7 @@ class DummyController
   include Routes.url_helpers
   
   def initialize
-    @request = DummyRequest.new
+    @request = DummyRequest.new(self)
   end
 
   def params
@@ -399,12 +413,17 @@ class DummyRequest
   attr_accessor :symbolized_path_parameters
   alias :path_parameters :symbolized_path_parameters
   
-  def initialize
+  def initialize(controller)
+    @controller = controller
     @get = true
     @params = {}
     @symbolized_path_parameters = { :controller => 'foo', :action => 'bar' }
   end
-  
+
+  def routes
+    @controller._routes
+  end
+
   def get?
     @get
   end

data/spec/view_helpers/base_spec.rb

@@ -10,6 +10,7 @@ describe WillPaginate::ViewHelpers do
   before(:all) do
     # make sure default translations aren't loaded
     I18n.load_path.clear
+    I18n.enforce_available_locales = false
   end
 
   before(:each) do

data/spec/view_helpers/view_example_group.rb

@@ -9,12 +9,21 @@ rescue LoadError
 ensure
   $stderr = STDERR
 end
-require 'action_dispatch/testing/assertions'
+
+begin
+  require 'rails/dom/testing/assertions'
+rescue LoadError
+  require 'action_dispatch/testing/assertions'
+end
 require 'will_paginate/array'
 
 module ViewExampleGroup
   
-  include ActionDispatch::Assertions::SelectorAssertions
+  if defined?(Rails::Dom::Testing::Assertions)
+    include Rails::Dom::Testing::Assertions::SelectorAssertions
+  else
+    include ActionDispatch::Assertions::SelectorAssertions
+  end
   include MiniTest::Assertions if defined? MiniTest
 
   def assert(value, message)
@@ -40,11 +49,23 @@ module ViewExampleGroup
     
     @render_output
   end
-  
+
+  def parse_html_document(html)
+    @html_document ||= if defined?(Rails::Dom::Testing::Assertions)
+      Nokogiri::HTML::Document.parse(html)
+    else
+      HTML::Document.new(html, true, false)
+    end
+  end
+
   def html_document
-    @html_document ||= HTML::Document.new(@render_output, true, false)
+    @html_document ||= parse_html_document(@render_output)
   end
-  
+
+  def document_root_element
+    html_document.root
+  end
+
   def response_from_page_or_rjs
     html_document.root
   end
@@ -123,4 +144,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.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 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
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Pagination plugin for web frameworks and other apps