Fixed param replacement boundary issue [#22]

tj · Oct 27, 2009 · 59a2c32 · 59a2c32
1 parent b15ce2f
commit 59a2c32
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/dm-pager/pager.rb b/lib/dm-pager/pager.rb
@@ -183,9 +183,9 @@ def li css_class = nil, contents = nil
 
     def uri_for page
       case @uri
-      when /page=/ ; @uri.gsub /page=\d+/, "page=#{page}"
+      when /\bpage=/ ; @uri.gsub /\bpage=\d+/, "page=#{page}"
-      when /\?/    ; @uri += "&page=#{page}"
+      when /\?/      ; @uri += "&page=#{page}"
-      else         ; @uri += "?page=#{page}"
+      else           ; @uri += "?page=#{page}"
       end
     end
 

diff --git a/spec/unit/pager_spec.rb b/spec/unit/pager_spec.rb
@@ -214,6 +214,15 @@
           markup.should include('items?foo=bar&page=1')
         end
       end
+
+      describe "when containing other keys with 'page'" do
+        it "should append a pair" do
+          markup = Item.page.pager.to_html 'items?per_page=5'
+          markup.should include('items?per_page=5&page=1')
+          markup = Item.page.pager.to_html 'items?page=4&per_page=3'
+          markup.should include('items?page=1&per_page=3')
+        end
+      end
     end
 
   end