jm81-paginate 0.1.3 → 0.1.4

data/README.md

@@ -90,6 +90,20 @@ There are currently three modules.
 - Paginate::DM - extended by a class that includes DataMapper::Resource
 - Paginate::AR - extended by a class that inherits ActiveRecord::Base
 
+For associated collections with DataMapper, you can use Paginator::ORM directly,
+or (for example):
+
+    jobs = Person.first.jobs
+    jobs.extend(Paginate::DM)
+    jobs.paginate(:page => 1)
+    # or
+    DataMapper::Collection.__send__(:include, Paginate::DM) # perhaps in init.rb
+    jobs = Person.first.jobs.paginate(:page => 1)
+
+Using the *DataMapper::Collection.\_\_send\_\_(:include, Paginate::DM)* option 
+makes the *#paginate* methods to all association collections. The first method 
+could be used for ActiveRecord.
+
 ##Paginator Classes
 
 Paginator classes do the actual work of paginating and are called by the 

data/Rakefile

@@ -18,7 +18,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "paginate"
-GEM_VERSION = "0.1.3"
+GEM_VERSION = "0.1.4"
 AUTHOR = "Jared Morgan"
 EMAIL = "jmorgan@morgancreative.net"
 HOMEPAGE = "http://github.com/jm81/paginate/"

data/TODO

@@ -1,2 +1,23 @@
 TODO:
-Add your code to lib/paginate.rb
+
+- Rails helpers:
+  Probably similar to Helpers::Merb. I just don't use Rails enough right now to
+  work through it.
+
+- Check for dependencies:
+  When, for example, Paginate::DM is extended into a class, verify that dm-core
+  and dm-aggregates are loaded. This would give me more timely errors than
+  finding out when #paginate is first called.
+  
+- Generic ORM module:
+  If dependencies are checked for, this would allow a way to use Paginators::ORM
+  through a module without the dependency check.
+
+- Includes for ORM collections:
+  For example:
+  
+      DataMapper::Collection.__send__(:include, Paginate::DM)
+      
+  What's the best way to do this?
+  Something similar for AR?
+  Maybe Paginate::auto_includes which would include such as the above

data/lib/helpers/merb.rb

@@ -75,7 +75,7 @@ module Paginate
       # in the query string to be used in the page link.
       def page_url(page, path = request.path, q = request.query_string)
         # Remove any current reference to page in the query string
-        q.to_s.gsub!(/page=(\d+)(&?)/, '') 
+        q.to_s.gsub!(/page=(-?[\d]+)(&?)/, '') 
         # Assemble new link
         link = "#{path}?page=#{page}&#{q}"
         link = link[0..-2] if link[-1..-1] == '&' # Strip trailing ampersand

data/spec/helpers/merb_spec.rb

@@ -53,5 +53,13 @@ describe Paginate::Helpers::Merb do
       @object.page_url(5, 'path', 'limit=10&something=text&page=10').should ==
         'path?page=5&limit=10&something=text'
     end
+    
+    it 'should remove existing negative page option' do
+      @object.page_url(5, 'path', 'limit=10&page=-10&something=text').should ==
+        'path?page=5&limit=10&something=text'
+      
+      @object.page_url(5, 'path', 'page=-5&limit=10&something=text').should ==
+        'path?page=5&limit=10&something=text'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jm81-paginate
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jared Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-22 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: []