will_paginate 2.3.16 → 2.3.17

data/lib/will_paginate/finder.rb

@@ -97,7 +97,8 @@ module WillPaginate
       # See {Faking Cursors in ActiveRecord}[http://weblog.jamisbuck.org/2007/4/6/faking-cursors-in-activerecord]
       # where Jamis Buck describes this and a more efficient way for MySQL.
       def paginated_each(options = {})
-        options = { :order => 'id', :page => 1 }.merge options
+        order = scope(:find, :order) || 'id'
+        options = { :order => order, :page => 1 }.merge options
         options[:page] = options[:page].to_i
         options[:total_entries] = 0 # skip the individual count queries
         total = 0
@@ -160,7 +161,11 @@ module WillPaginate
       end
 
     protected
-      
+
+      def respond_to_missing?(method, include_private = false)
+        method.to_s.index('paginate') == 0 || super
+      end
+
       def method_missing_with_paginate(method, *args) #:nodoc:
         # did somebody tried to paginate? if not, let them be
         unless method.to_s.index('paginate') == 0

data/lib/will_paginate/version.rb

@@ -2,7 +2,7 @@ module WillPaginate
   module VERSION
     MAJOR = 2
     MINOR = 3
-    TINY  = 16
+    TINY  = 17
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/ci.rb

@@ -45,6 +45,10 @@ gemfiles.each do |gemfile|
       next if 'mysql' == db and !run_mysql
       announce "Rails #{version}", "with #{db}"
       ENV['DB'] = db
+      if db == 'postgres' && !ENV['TRAVIS']
+        system "psql -c 'drop database will_paginate;' &>/dev/null"
+        system "psql -c 'create database will_paginate;' >/dev/null"
+      end
       failed = true unless system %(bundle exec rake)
     end
   else

data/test/database.yml

@@ -12,5 +12,5 @@ mysql:
 postgres:
   adapter: postgresql
   database: will_paginate
-  username: postgres
+  username: 
   min_messages: warning

data/test/finder_test.rb

@@ -100,7 +100,7 @@ class FinderTest < ActiveRecordTestCase
   end
   
   def test_paginate_with_conditions
-    entries = Topic.paginate :page => 1, :conditions => ["created_at > ?", 30.minutes.ago]
+    entries = Topic.paginate :page => 1, :conditions => ["created_at > ?", 30.minutes.ago], :order => :id
     expected = [topics(:rails), topics(:ar)]
     assert_equal expected, entries.to_a
     assert_equal 1, entries.total_pages
@@ -190,7 +190,7 @@ class FinderTest < ActiveRecordTestCase
   end
 
   def test_paginate_association_extension
-    project = Project.find(:first)
+    project = Project.find(:first, :order => :id)
     
     assert_queries(2) do
       entries = project.replies.paginate_recent :page => 1
@@ -241,7 +241,7 @@ class FinderTest < ActiveRecordTestCase
     assert_equal entries, Developer.paginate_by_salary(100000, :page => 1, :per_page => 5)
 
     # dynamic finder + conditions
-    entries = Developer.paginate_by_salary(100000, :page => 1,
+    entries = Developer.paginate_by_salary(100000, :page => 1, :order => :id,
                                            :conditions => ['id > ?', 6])
     assert_equal 4, entries.total_entries
     assert_equal (7..10).to_a, entries.map(&:id)
@@ -308,6 +308,13 @@ class FinderTest < ActiveRecordTestCase
     assert_equal 1, entries.size
   end
 
+  def test_paginated_each_with_scoped_order
+    paginated_developers = []
+    Developer.poor.paginated_each {|d| paginated_developers << d}
+
+    assert_equal Developer.poor.find(:all), paginated_developers, 'should use scoped :order option'
+  end
+
   ## misc ##
 
   def test_count_and_total_entries_options_are_mutually_exclusive

data/test/view_test.rb

@@ -241,7 +241,14 @@ class ViewTest < WillPaginate::ViewTestCase
     paginate
     assert_links_match /foo%5Bbar%5D=baz/
   end
-  
+
+  def test_will_paginate_prevents_host_and_protocol_tampering
+    @request.params :host => 'disney.com', :protocol => 'javascript'
+    paginate
+    assert_no_links_match /disney/
+    assert_no_links_match /javascript/
+  end
+
   def test_will_paginate_doesnt_preserve_parameters_on_post
     @request.post
     @request.params :foo => 'bar'

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: will_paginate
 version: !ruby/object:Gem::Version 
+  hash: 33
   prerelease: 
-  version: 2.3.16
+  segments: 
+  - 2
+  - 3
+  - 17
+  version: 2.3.17
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -11,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 Z
+date: 2016-10-15 00:00:00 +02:00
+default_executable: 
 dependencies: []
 
 description: will_paginate provides a simple API for Active Record pagination and rendering of pagination links in Rails templates.
@@ -72,9 +78,10 @@ files:
 - README.md
 - LICENSE
 - CHANGELOG.rdoc
+has_rdoc: true
 homepage: https://github.com/mislav/will_paginate/wiki
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: 
 - --main
@@ -87,17 +94,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Easy pagination for Rails