0
@@ -270,19 +270,32 @@ module WillPaginate
0
         stringified_merge @url_params, @template.params if @template.request.get?
0
         stringified_merge @url_params, @options[:params] if @options[:params]
0
         
0
-        if param_name.index(/[^\w-]/)
0
+        if complex = param_name.index(/[^\w-]/)
0
           page_param = (defined?(CGIMethods) ? CGIMethods : ActionController::AbstractRequest).
0
             parse_query_parameters("#{param_name}=#{page}")
0
           
0
           stringified_merge @url_params, page_param
0
         else
0
-          @url_params[param_name] = page
0
+          @url_params[param_name] = 1
0
         end
0
 
0
         url = @template.url_for(@url_params)
0
-        @url_string = url.sub(%r!([?&/]#{CGI.escape param_name}[=/])#{page}!, '\1@')
0
-        return url
0
+        
0
+        if complex
0
+          @url_string = url.sub(%r!([?&]#{CGI.escape param_name}=)#{page}!, '\1@')
0
+          return url
0
+        else
0
+          @url_string = url
0
+          @url_params[param_name] = 2
0
+          @template.url_for(@url_params).split(//).each_with_index do |char, i|
0
+            if char == '2' and url[i, 1] == '1'
0
+              @url_string[i] = '@'
0
+              break
0
+            end
0
+          end
0
+        end
0
       end
0
+      # finally!
0
       @url_string.sub '@', page.to_s
0
     end
0
 

0
@@ -6,6 +6,7 @@ WillPaginate.enable_actionpack
0
 
0
 ActionController::Routing::Routes.draw do |map|
0
   map.connect 'dummy/page/:page', :controller => 'dummy'
0
+  map.connect 'dummy/dots/page.:page', :controller => 'dummy', :action => 'dots'
0
   map.connect ':controller/:action/:id'
0
 end
0
 

0
@@ -234,6 +234,15 @@ class ViewTest < Test::Unit::TestCase
0
     end
0
   end
0
 
0
+  def test_custom_routing_page_param_with_dot_separator
0
+    @request.symbolized_path_parameters.update :controller => 'dummy', :action => 'dots'
0
+    paginate :per_page => 2 do
0
+      assert_select 'a[href]', 6 do |links|
0
+        assert_links_match %r{/page\.(\d+)$}, links, [2, 3, 4, 5, 6, 2]
0
+      end
0
+    end
0
+  end
0
+
0
   ## internal hardcore stuff ##
0
 
0
   class LegacyCollection < WillPaginate::Collection
0
@@ -336,7 +345,7 @@ class ViewTest < Test::Unit::TestCase
0
         end
0
       end
0
 
0
-      assert_equal pages, numbers, "page numbers don't match" if numbers
0
+      assert_equal numbers, pages, "page numbers don't match" if numbers
0
     end
0
 
0
     def assert_no_links_match pattern