leaf 0.1.2 → 0.1.3

data/lib/leaf/version.rb

@@ -2,7 +2,7 @@ module Leaf
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/leaf/view_helpers/sinatra.rb

@@ -7,11 +7,11 @@ Leaf::ViewHelpers::LinkRenderer.class_eval do
   def url(page)
     url = @template.request.url
     if page == 1
-      # strip out page param and trailing ? if it exists
-      url.gsub(/page=[0-9]+/, '').gsub(/\?$/, '')
+      # strip out page param and trailing ? and & if they exists
+      url.gsub(/(\?|\&)page=[0-9]+/, '').gsub(/\?$/, '').gsub(/\&$/, '')
     else
-      if url =~ /page=[0-9]+/
-        url.gsub(/page=[0-9]+/, "page=#{page}")
+      if url =~ /(\?|\&)page=[0-9]+/
+        url.gsub(/page=[0-9]+/, "page=#{page}").gsub(/\&+/, '&')
       else
         (url =~ /\?/) ? url + "&page=#{page}" : url + "?page=#{page}"
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: leaf
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Peter Hellberg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +02:00
+date: 2010-06-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency