dm-pager 0.0.7 → 0.0.8

data/History.md

@@ -1,4 +1,9 @@
 
+0.0.8 / 2009-10-27
+==================
+
+  * Fixed param replacement boundary issue [#22]
+
 0.0.7 / 2009-10-10
 ==================
 

data/Manifest

@@ -2,6 +2,7 @@ History.md
 Manifest
 Rakefile
 Readme.md
+dm-pager.gemspec
 examples/pager.rb
 lib/dm-pager.rb
 lib/dm-pager/defaults.rb

data/dm-pager.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-pager}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-10-10}
+  s.date = %q{2009-10-27}
   s.description = %q{DataMapper Pagination}
   s.email = %q{tj@vision-media.ca}
   s.extra_rdoc_files = ["lib/dm-pager.rb", "lib/dm-pager/defaults.rb", "lib/dm-pager/helpers.rb", "lib/dm-pager/helpers/rails.rb", "lib/dm-pager/pager.rb", "lib/dm-pager/pagination.rb", "lib/dm-pager/version.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake"]
-  s.files = ["History.md", "Manifest", "Rakefile", "Readme.md", "examples/pager.rb", "lib/dm-pager.rb", "lib/dm-pager/defaults.rb", "lib/dm-pager/helpers.rb", "lib/dm-pager/helpers/rails.rb", "lib/dm-pager/pager.rb", "lib/dm-pager/pagination.rb", "lib/dm-pager/version.rb", "spec/integration/rails_helper_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/unit/pager_spec.rb", "spec/unit/pagination_spec.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake", "dm-pager.gemspec"]
+  s.files = ["History.md", "Manifest", "Rakefile", "Readme.md", "dm-pager.gemspec", "examples/pager.rb", "lib/dm-pager.rb", "lib/dm-pager/defaults.rb", "lib/dm-pager/helpers.rb", "lib/dm-pager/helpers/rails.rb", "lib/dm-pager/pager.rb", "lib/dm-pager/pagination.rb", "lib/dm-pager/version.rb", "spec/integration/rails_helper_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/unit/pager_spec.rb", "spec/unit/pagination_spec.rb", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake"]
   s.homepage = %q{http://github.com/visionmedia/dm-pagination}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Dm-pager", "--main", "Readme.md"]
   s.require_paths = ["lib"]

data/lib/dm-pager/pager.rb

@@ -183,9 +183,9 @@ module DataMapper
 
     def uri_for page
       case @uri
-      when /page=/ ; @uri.gsub /page=\d+/, "page=#{page}"
-      when /\?/    ; @uri += "&page=#{page}"
-      else         ; @uri += "?page=#{page}"
+      when /\bpage=/ ; @uri.gsub /\bpage=\d+/, "page=#{page}"
+      when /\?/      ; @uri += "&page=#{page}"
+      else           ; @uri += "?page=#{page}"
       end
     end
     

data/lib/dm-pager/version.rb

@@ -1,6 +1,6 @@
 
 module DataMapper
   module Pagination
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

data/spec/unit/pager_spec.rb

@@ -214,6 +214,15 @@ describe DataMapper::Pager do
           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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-pager
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 -07:00
+date: 2009-10-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - Manifest
 - Rakefile
 - Readme.md
+- dm-pager.gemspec
 - examples/pager.rb
 - lib/dm-pager.rb
 - lib/dm-pager/defaults.rb
@@ -70,7 +71,6 @@ files:
 - tasks/docs.rake
 - tasks/gemspec.rake
 - tasks/spec.rake
-- dm-pager.gemspec
 has_rdoc: true
 homepage: http://github.com/visionmedia/dm-pagination
 licenses: []