mislav-will_paginate 2.3.8 → 2.3.10

data/lib/will_paginate.rb

@@ -17,7 +17,7 @@ module WillPaginate
     
     # hooks WillPaginate::ViewHelpers into ActionView::Base
     def enable_actionpack
-      return if ActionView::Base.instance_methods.include? 'will_paginate'
+      return if ActionView::Base.instance_methods.include_method? :will_paginate
       require 'will_paginate/view_helpers'
       ActionView::Base.send :include, ViewHelpers
 
@@ -44,6 +44,16 @@ module WillPaginate
         klass.send :include, Finder::ClassMethods
         klass.class_eval { alias_method_chain :method_missing, :paginate }
       end
+      
+      # monkeypatch Rails ticket #2189: "count breaks has_many :through"
+      ActiveRecord::Base.class_eval do
+        protected
+        def self.construct_count_options_from_args(*args)
+          result = super
+          result[0] = '*' if result[0].is_a?(String) and result[0] =~ /\.\*$/
+          result
+        end
+      end
     end
 
     # Enable named_scope, a feature of Rails 2.1, even if you have older Rails
@@ -73,6 +83,7 @@ module WillPaginate
   end
 end
 
-if defined?(Rails) and defined?(ActiveRecord) and defined?(ActionController)
-  WillPaginate.enable
+if defined? Rails
+  WillPaginate.enable_activerecord if defined? ActiveRecord
+  WillPaginate.enable_actionpack if defined? ActionController
 end

data/lib/will_paginate/core_ext.rb

@@ -1,7 +1,18 @@
 require 'set'
 require 'will_paginate/array'
 
-unless Hash.instance_methods.include? 'except'
+# helper to check for method existance in ruby 1.8- and 1.9-compatible way
+# because `methods`, `instance_methods` and others return strings in 1.8 and symbols in 1.9
+#
+#   ['foo', 'bar'].include_method?(:foo) # => true
+class Array
+  def include_method?(name)
+    name = name.to_sym
+    !!(find { |item| item.to_sym == name })
+  end
+end
+
+unless Hash.instance_methods.include_method? :except
   Hash.class_eval do
     # Returns a new hash without the given keys.
     def except(*keys)
@@ -16,7 +27,7 @@ unless Hash.instance_methods.include? 'except'
   end
 end
 
-unless Hash.instance_methods.include? 'slice'
+unless Hash.instance_methods.include_method? :slice
   Hash.class_eval do
     # Returns a new hash with only the given keys.
     def slice(*keys)

data/lib/will_paginate/finder.rb

@@ -141,7 +141,7 @@ module WillPaginate
             count_query = original_query.sub /\bORDER\s+BY\s+[\w`,\s]+$/mi, ''
             count_query = "SELECT COUNT(*) FROM (#{count_query})"
             
-            unless ['oracle', 'oci'].include?(self.connection.adapter_name.downcase)
+            unless self.connection.adapter_name =~ /^(oracle|oci$)/i
               count_query << ' AS count_table'
             end
             # perform the count query
@@ -214,7 +214,7 @@ module WillPaginate
 
         # forget about includes if they are irrelevant (Rails 2.1)
         if count_options[:include] and
-            klass.private_methods.include?('references_eager_loaded_tables?') and
+            klass.private_methods.include_method?(:references_eager_loaded_tables?) and
             !klass.send(:references_eager_loaded_tables?, count_options)
           count_options.delete :include
         end

data/lib/will_paginate/version.rb

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

data/lib/will_paginate/view_helpers.rb

@@ -332,21 +332,21 @@ module WillPaginate
         return url if page_one
         
         if complex
-          @url_string = url.sub(%r!((?:\?|&)#{CGI.escape param_name}=)#{page}!, '\1@')
+          @url_string = url.sub(%r!((?:\?|&)#{CGI.escape param_name}=)#{page}!, "\\1\0")
           return url
         else
           @url_string = url
           @url_params[param_name] = 3
           @template.url_for(@url_params).split(//).each_with_index do |char, i|
             if char == '3' and url[i, 1] == '2'
-              @url_string[i] = '@'
+              @url_string[i] = "\0"
               break
             end
           end
         end
       end
       # finally!
-      @url_string.sub '@', page.to_s
+      @url_string.sub "\0", page.to_s
     end
 
   private
@@ -386,16 +386,18 @@ module WillPaginate
     end
 
     def parse_query_parameters(params)
-      if defined?(CGIMethods)
-        CGIMethods.parse_query_parameters(params)
+      if defined? Rack::Utils
+        # For Rails > 2.3
+        Rack::Utils.parse_nested_query(params)
       elsif defined?(ActionController::AbstractRequest)
         ActionController::AbstractRequest.parse_query_parameters(params)
       elsif defined?(ActionController::UrlEncodedPairParser)
         # For Rails > 2.2
         ActionController::UrlEncodedPairParser.parse_query_parameters(params)
+      elsif defined?(CGIMethods)
+        CGIMethods.parse_query_parameters(params)
       else
-        # For Rails > 2.3
-        Rack::Utils.parse_nested_query(params)
+        raise "unsupported ActionPack version"
       end
     end
   end

data/test/finder_test.rb

@@ -284,11 +284,11 @@ class FinderTest < ActiveRecordTestCase
   # this functionality is temporarily removed
   def xtest_pagination_defines_method
     pager = "paginate_by_created_at"
-    assert !User.methods.include?(pager), "User methods should not include `#{pager}` method"
+    assert !User.methods.include_method?(pager), "User methods should not include `#{pager}` method"
     # paginate!
     assert 0, User.send(pager, nil, :page => 1).total_entries
     # the paging finder should now be defined
-    assert User.methods.include?(pager), "`#{pager}` method should be defined on User"
+    assert User.methods.include_method?(pager), "`#{pager}` method should be defined on User"
   end
 
   # Is this Rails 2.0? Find out by testing find_all which was removed in [6998]
@@ -361,18 +361,15 @@ class FinderTest < ActiveRecordTestCase
     end
 
     def test_paginate_by_sql
-      assert_respond_to Developer, :paginate_by_sql
-      Developer.expects(:find_by_sql).with(regexp_matches(/sql LIMIT 3(,| OFFSET) 3/)).returns([])
-      Developer.expects(:count_by_sql).with('SELECT COUNT(*) FROM (sql) AS count_table').returns(0)
-      
-      entries = Developer.paginate_by_sql 'sql', :page => 2, :per_page => 3
+      sql = "SELECT * FROM users WHERE type = 'Developer' ORDER BY id"
+      entries = Developer.paginate_by_sql(sql, :page => 2, :per_page => 3)
+      assert_equal 11, entries.total_entries
+      assert_equal [users(:dev_4), users(:dev_5), users(:dev_6)], entries
     end
 
     def test_paginate_by_sql_respects_total_entries_setting
-      Developer.expects(:find_by_sql).returns([])
-      Developer.expects(:count_by_sql).never
-      
-      entries = Developer.paginate_by_sql 'sql', :page => 1, :total_entries => 999
+      sql = "SELECT * FROM users"
+      entries = Developer.paginate_by_sql(sql, :page => 1, :total_entries => 999)
       assert_equal 999, entries.total_entries
     end
 
@@ -440,7 +437,7 @@ class FinderTest < ActiveRecordTestCase
     end
 
     # detect ActiveRecord 2.1
-    if ActiveRecord::Base.private_methods.include?('references_eager_loaded_tables?')
+    if ActiveRecord::Base.private_methods.include_method?(:references_eager_loaded_tables?)
       def test_removes_irrelevant_includes_in_count
         Developer.expects(:find).returns([1])
         Developer.expects(:count).with({}).returns(0)

data/test/lib/view_test_process.rb

@@ -1,3 +1,4 @@
+require 'will_paginate/core_ext'
 require 'action_controller'
 require 'action_controller/test_process'
 

data/test/tasks.rake

@@ -35,7 +35,7 @@ task :test_full => %w(test test_mysql test_postgres)
 desc %{Test everything with Rails 2.1.x, 2.0.x & 1.2.x gems}
 task :test_all do
   all = Rake::Task['test_full']
-  versions = %w(2.1.0 2.0.4 1.2.6)
+  versions = %w(2.3.2 2.2.2 2.1.0 2.0.4 1.2.6)
   versions.each do |version|
     ENV['RAILS_VERSION'] = "~> #{version}"
     all.invoke

data/test/view_test.rb

@@ -277,6 +277,14 @@ class ViewTest < WillPaginate::ViewTestCase
       end
     end    
   end
+
+  def test_will_paginate_with_atmark_url
+    @request.symbolized_path_parameters[:action] = "@tag"
+    renderer = WillPaginate::LinkRenderer.new
+    
+    paginate({ :page => 1 }, :renderer=>renderer)
+    assert_links_match %r[/foo/@tag\?page=\d]
+  end
   
   def test_complex_custom_page_param
     @request.params :developers => { :page => 2 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mislav-will_paginate
 version: !ruby/object:Gem::Version 
-  version: 2.3.8
+  version: 2.3.10
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 -07:00
+date: 2009-05-21 00:00:00 -07:00
 default_executable: 
 dependencies: []