mislav-will_paginate 2.3.1 → 2.3.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 2.3.2, released 2008-05-16
+
+* Fixed LinkRenderer#stringified_merge by removing "return" from iterator block
+* Ensure that 'href' values in pagination links are escaped URLs
+
 == 2.3.1, released 2008-05-04
 
 * Fixed page numbers not showing with custom routes and implicit first page

data/README.rdoc

@@ -22,11 +22,7 @@ Some resources to get you started:
 
 The recommended way is that you get the gem:
 
-  # add GitHub to your local list of gem sources:
-  gem sources -a http://gems.github.com/
-  
-  # install the gem:
-  gem install mislav-will_paginate
+  gem install mislav-will_paginate --source http://gems.github.com/
 
 After that you don't need the will_paginate <i>plugin</i> in your Rails
 application anymore. Just add a simple require to the end of

data/lib/will_paginate/version.rb

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

data/lib/will_paginate/view_helpers.rb

@@ -299,7 +299,7 @@ module WillPaginate
     def url_for(page)
       page_one = page == 1
       unless @url_string and !page_one
-        @url_params = { :escape => false }
+        @url_params = {}
         # page links should preserve GET parameters
         stringified_merge @url_params, @template.params if @template.request.get?
         stringified_merge @url_params, @options[:params] if @options[:params]
@@ -317,7 +317,7 @@ 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@')
           return url
         else
           @url_string = url
@@ -356,20 +356,17 @@ module WillPaginate
       @param_name ||= @options[:param_name].to_s
     end
 
+    # Recursively merge into target hash by using stringified keys from the other one
     def stringified_merge(target, other)
       other.each do |key, value|
-        key = key.to_s
+        key = key.to_s # this line is what it's all about!
         existing = target[key]
 
-        if value.is_a?(Hash)
-          target[key] = existing = {} if existing.nil?
-          if existing.is_a?(Hash)
-            stringified_merge(existing, value)
-            return
-          end
+        if value.is_a?(Hash) and (existing.is_a?(Hash) or existing.nil?)
+          stringified_merge(existing || (target[key] = {}), value)
+        else
+          target[key] = value
         end
-        
-        target[key] = value
       end
     end
   end

data/test/tasks.rake

@@ -0,0 +1,56 @@
+require 'rake/testtask'
+
+desc 'Test the will_paginate plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+  t.libs << 'test'
+end
+
+# I want to specify environment variables at call time
+class EnvTestTask < Rake::TestTask
+  attr_accessor :env
+
+  def ruby(*args)
+    env.each { |key, value| ENV[key] = value } if env
+    super
+    env.keys.each { |key| ENV.delete key } if env
+  end
+end
+
+for configuration in %w( sqlite3 mysql postgres )
+  EnvTestTask.new("test_#{configuration}") do |t|
+    t.pattern = 'test/finder_test.rb'
+    t.verbose = true
+    t.env = { 'DB' => configuration }
+    t.libs << 'test'
+  end
+end
+
+task :test_databases => %w(test_mysql test_sqlite3 test_postgres)
+
+desc %{Test everything on SQLite3, MySQL and PostgreSQL}
+task :test_full => %w(test test_mysql test_postgres)
+
+desc %{Test everything with Rails 1.2.x and 2.0.x gems}
+task :test_all do
+  all = Rake::Task['test_full']
+  ENV['RAILS_VERSION'] = '~>1.2.6'
+  all.invoke 
+  # reset the invoked flag
+  %w( test_full test test_mysql test_postgres ).each do |name|
+    Rake::Task[name].instance_variable_set '@already_invoked', false
+  end
+  # do it again
+  ENV['RAILS_VERSION'] = '~>2.0.2'
+  all.invoke 
+end
+
+task :rcov do
+  excludes = %w( lib/will_paginate/named_scope*
+                 lib/will_paginate/core_ext.rb
+                 lib/will_paginate.rb
+                 rails* )
+  
+  system %[rcov -Itest:lib test/*.rb -x #{excludes.join(',')}]
+end

data/test/view_test.rb

@@ -95,6 +95,16 @@ class ViewTest < WillPaginate::ViewTestCase
     assert_dom_equal expected, @html_result
   end
 
+  def test_escaping_of_urls
+    paginate({:page => 1, :per_page => 1, :total_entries => 2},
+             :page_links => false, :params => { :tag => '<br>' })
+    
+    assert_select 'a[href]', 1 do |links|
+      query = links.first['href'].split('?', 2)[1]
+      assert_equal %w(page=2 tag=%3Cbr%3E), query.split('&amp;').sort
+    end
+  end
+
   ## advanced options for pagination ##
 
   def test_will_paginate_without_container

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mislav-will_paginate
 version: !ruby/object:Gem::Version 
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -10,10 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 -07:00
+date: 2008-05-16 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.4
+    version: 
 description: The will_paginate library provides a simple, yet powerful and extensible API for ActiveRecord pagination and rendering of pagination links in ActionView templates.
 email: mislav.marohnic@gmail.com
 executables: []
@@ -72,6 +80,7 @@ files:
 - test/lib/activerecord_test_connector.rb
 - test/lib/load_fixtures.rb
 - test/lib/view_test_process.rb
+- test/tasks.rake
 - test/view_test.rb
 has_rdoc: true
 homepage: http://github.com/mislav/will_paginate/wikis
@@ -127,4 +136,5 @@ test_files:
 - test/lib/activerecord_test_connector.rb
 - test/lib/load_fixtures.rb
 - test/lib/view_test_process.rb
+- test/tasks.rake
 - test/view_test.rb