paginate 0.1.1 → 0.1.2

data/Rakefile

@@ -1,6 +1,5 @@
 require "rake/testtask"
-require "jeweler"
-require "lib/paginate/version"
+require "./lib/paginate/version"
 
 Rake::TestTask.new do |t|
   t.libs += %w[ test lib ]
@@ -9,14 +8,20 @@ Rake::TestTask.new do |t|
   t.ruby_opts = %w[ -rubygems ]
 end
 
-Jeweler::Tasks.new do |gem|
-  gem.name = "paginate"
-  gem.version = Paginate::Version::STRING
-  gem.summary = "Paginate collections using SIZE+1 to determine if there is a next page. Includes ActiveRecord and ActionView support."
-  gem.email = "fnando.vieira@gmail.com"
-  gem.homepage = "http://github.com/fnando/paginate"
-  gem.authors = ["Nando Vieira"]
-  gem.files = FileList["lib/**/*", "Rakefile", "README.rdoc"]
-end
+begin
+  require "jeweler"
+
+  Jeweler::Tasks.new do |gem|
+    gem.name = "paginate"
+    gem.version = Paginate::Version::STRING
+    gem.summary = "Paginate collections using SIZE+1 to determine if there is a next page. Includes ActiveRecord and ActionView support."
+    gem.email = "fnando.vieira@gmail.com"
+    gem.homepage = "http://github.com/fnando/paginate"
+    gem.authors = ["Nando Vieira"]
+    gem.files = FileList["lib/**/*", "Rakefile", "README.rdoc"]
+  end
 
-Jeweler::GemcutterTasks.new
+  Jeweler::GemcutterTasks.new
+rescue LoadError => e
+  puts "You don't have Jeweler installed, so you won't be able to build this gem."
+end

data/lib/paginate/renderer.rb

@@ -16,19 +16,23 @@ module Paginate
     def url_for(page)
       url = options[:url] || options[:fullpath]
 
-      if url.kind_of?(Proc)
-        url[page]
+      if url.respond_to?(:call)
+        url = url.call(page).to_s.dup
       else
-        re = Regexp.new("([&?])#{Regexp.escape(options[:param_name].to_s)}=[0-9]+")
+        url = url.dup
+
+        re = Regexp.new("([&?])#{Regexp.escape(options[:param_name].to_s)}=[^&]*")
         url.gsub!(re, "\\1")
-        url.gsub!(/\?$/, "")
+        url.gsub!(/[\?&]$/, "")
+        url.gsub!(/&+/, "&")
         url.gsub!(/\?&/, "?")
-        url = URI.parse(url).to_s
-
-        connector = (url =~ /\?/) ? "&" : "?"
 
-        url + connector + page.to_s.to_query(options[:param_name])
+        url << (url =~ /\?/ ? "&" : "?")
+        url << page.to_query(options[:param_name])
       end
+
+      url.gsub!(/&/, "&amp;")
+      url
     end
 
     def render

data/lib/paginate/version.rb

@@ -2,7 +2,7 @@ module Paginate
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/test/paginate/action_view_test.rb

@@ -60,11 +60,12 @@ class ActionViewTest < Test::Unit::TestCase
   end
 
   def test_display_previous_page_link
+    $DEBUG = 1
     @params[:page] = 2
     @request.fullpath = "/some/path?page=2"
     html = render(:default, Array.new(11))
     link = html.css("li.previous-page > a").first
-
+    $DEBUG = 0
     assert_not_nil link
     assert_equal "/some/path?page=1", link["href"]
     assert_equal "Previous page", link.text
@@ -125,6 +126,17 @@ class ActionViewTest < Test::Unit::TestCase
     assert_equal items[0, 10], values
   end
 
+  def test_iterate_with_fewer_records
+    values = []
+    items = Array.new(8) {|i| "User#{i}" }
+
+    @helper.iterate items do |item|
+      values << item
+    end
+
+    assert_equal items[0, 8], values
+  end
+
   def test_iterate_with_index
     values = []
     indices = []

data/test/paginate/renderer_test.rb

@@ -33,4 +33,39 @@ class RendererTest < Test::Unit::TestCase
 
     @renderer.render
   end
+
+  def test_simple_url
+    @renderer.options[:url] = "/some/path"
+    assert_equal "/some/path?page=1", @renderer.url_for(1)
+  end
+
+  def test_simple_url_with_page_param
+    @renderer.options[:url] = "/some/path?page=3"
+    assert_equal "/some/path?page=1", @renderer.url_for(1)
+  end
+
+  def test_simple_url_with_page_as_first_param
+    @renderer.options[:url] = "/some/path?page=3&a=1&b=2&c=3"
+    assert_equal "/some/path?a=1&amp;b=2&amp;c=3&amp;page=1", @renderer.url_for(1)
+  end
+
+  def test_simple_url_with_page_as_last_param
+    @renderer.options[:url] = "/some/path?a=1&b=2&c=3&page=3"
+    assert_equal "/some/path?a=1&amp;b=2&amp;c=3&amp;page=1", @renderer.url_for(1)
+  end
+
+  def test_simple_url_with_page_param_in_the_middle
+    @renderer.options[:url] = "/some/path?a=1&b=2&page=3&c=3"
+    assert_equal "/some/path?a=1&amp;b=2&amp;c=3&amp;page=1", @renderer.url_for(1)
+  end
+
+  def test_simple_url_with_page_as_text
+    @renderer.options[:url] = "/some/path?a=1&b=2&c=3&page=abc"
+    assert_equal "/some/path?a=1&amp;b=2&amp;c=3&amp;page=1", @renderer.url_for(1)
+  end
+
+  def test_escape_url_from_blocks
+    @renderer.options[:url] = proc {|page| "/some/path/#{page}?a=1&b=2"}
+    assert_equal "/some/path/1?a=1&amp;b=2", @renderer.url_for(1)
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paginate
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -03:00
+date: 2010-09-22 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -40,6 +41,15 @@ files:
 - lib/paginate/locales/pt.yml
 - lib/paginate/renderer.rb
 - lib/paginate/version.rb
+- test/paginate/action_view_test.rb
+- test/paginate/active_record_test.rb
+- test/paginate/base_test.rb
+- test/paginate/config_test.rb
+- test/paginate/renderer_test.rb
+- test/resources/controller.rb
+- test/resources/model.rb
+- test/resources/schema.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/fnando/paginate
 licenses: []
@@ -50,23 +60,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Paginate collections using SIZE+1 to determine if there is a next page. Includes ActiveRecord and ActionView support.