appengine-paginator 0.1.3 → 0.2.0.pre

data/Gemfile

@@ -1,7 +1,7 @@
 # Critical default settings:
-disable_system_gems
-disable_rubygems
-bundle_path ".gems/bundler_gems"
+#disable_system_gems
+#disable_rubygems
+#bundle_path ".gems/bundler_gems"
 
 # List gems to bundle here:
 gem 'rspec'

data/README.rdoc

@@ -1,6 +1,6 @@
 = appengine-paginator
 
-This is a gem that will help you to get pagination working on the Google AppEngine.  It uses the AppEngien Cursor so currently you can only get the next cursor, you cannot go in reverse and get previous records.  In order to do that you would need to have two queries.  
+This is a gem that will help you to get pagination working on the Google AppEngine.  It uses the AppEngine Cursor so currently you can only get the next cursor, you cannot go in reverse and get previous records.  In order to do that you would need to have two queries.
 
 == Installation
 
@@ -14,13 +14,22 @@ require 'appengine-paginator'
 
 Simply create a paginate object by passing it an AppEngine::Datastore::Query object, the limit, then an optional model and option cursor.
 
-i.e. p = Paginate.new(query, 10, :model => Post, :cursor => c)
+i.e. p = Paginator::Paginate.new(query, 10, :model => Post, :cursor => c)
 
 The query and the limit are pretty self explanitory.  The :model is an optional datamapper model that is used if you want the paginate object to return active record models.  The cursor is what tells the query where to start, thus giving it pagination.
 
 Once the paginate object is created you can access the results by either calling result or datamapper_result.  The result method returns the raw entities returned by the query.  The datastore_result method returns an array of Datamapper models that are instiances of the the model class (the class you passed in at creating time).  If a cursor is passed in then the result set will start with the record indicated by the cursor (i.e. if you passed in a limit of 10 and then created the cursor it would point to the 11th search result).
 
-In order to get the cursor simply call cursor on the paginate object.  This will return an instance of Cursor (a wrapper for com.google.appengine.api.datastore.Cursor) which points to the first row after the given limit.  Simple call to_s on the cursor object to get a string representation that can be stored in a session, the datastore, or on the rendered HTML page.  Calling Cursor.parse <string_representation_of_cursor> will convert the cursor string back into a cursor object that can be passed into a new Paginate object.
+In order to get the cursor simply call cursor on the paginate object.  This will return an instance of Paginator::Cursor (a wrapper for com.google.appengine.api.datastore.Cursor) which points to the first row after the given limit.  Simple call to_s on the cursor object to get a string representation that can be stored in a session, the datastore, or on the rendered HTML page.  Calling Paginator::Cursor.parse <string_representation_of_cursor> will convert the cursor string back into a cursor object that can be passed into a new Paginator::Paginate object.
+
+== DataMapper integration
+
+As long as DataMapper is loaded before appengine-paginator then it will integrate into DataMapper.  With datamapper integration you can pass the cursor into the query like this: p = Post.all(:limit => 10, :cursor => c, :updated_at.gt => Date.today) (where c is a Paginator::Cursor).  Also all the result sets of datamapper queries now have a cursor method that will return the Paginator::Cursor that is the start of the next query.  Here is a complete example:
+
+posts = Post.all :updated_at.gt => Date.today, :limit => 10
+c = posts.cursor
+
+next_page_posts = Post.all :updated_at.gt => Date.today, :limit => 10, :cursor => c
 
 == Note on Patches/Pull Requests
  

data/Rakefile

@@ -18,17 +18,17 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+#require 'spec/rake/spectask'
+#Spec::Rake::SpecTask.new(:spec) do |spec|
+#  spec.libs << 'lib' << 'spec'
+#  spec.spec_files = FileList['spec/**/*_spec.rb']
+#end
+#
+#Spec::Rake::SpecTask.new(:rcov) do |spec|
+#  spec.libs << 'lib' << 'spec'
+#  spec.pattern = 'spec/**/*_spec.rb'
+#  spec.rcov = true
+#end
 
 task :spec => :check_dependencies
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0.pre

data/appengine-paginator.gemspec

@@ -1,60 +1,64 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{appengine-paginator}
-  s.version = "0.1.3"
+  s.version = "0.2.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Moore"]
-  s.date = %q{2010-10-20}
+  s.date = %q{2010-11-16}
   s.description = %q{Pagination on JRuby running on the Google AppEngine}
   s.email = %q{josh@codingforrent.com}
-  s.executables = ["autospec", "rackup", "spec"]
+  s.executables = ["ldiff", "spec", "rspec", "rackup", "htmldiff", "autospec"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "WEB-INF/app.yaml",
-     "appengine-paginator.gemspec",
-     "bin/autospec",
-     "bin/rackup",
-     "bin/spec",
-     "config.ru",
-     "lib/appengine-paginator.rb",
-     "lib/appengine-paginator/cursor.rb",
-     "lib/appengine-paginator/paginate.rb",
-     "public/favicon.ico",
-     "public/robots.txt",
-     "spec/appengine-paginator_spec.rb",
-     "spec/cursor_spec.rb",
-     "spec/paginate_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/support/post.rb",
-     "spec_runner"
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "WEB-INF/app.yaml",
+    "appengine-paginator.gemspec",
+    "bin/autospec",
+    "bin/htmldiff",
+    "bin/ldiff",
+    "bin/rackup",
+    "bin/rspec",
+    "bin/spec",
+    "config.ru",
+    "lib/appengine-paginator.rb",
+    "lib/appengine-paginator/cursor.rb",
+    "lib/appengine-paginator/datamapper_ext.rb",
+    "lib/appengine-paginator/paginate.rb",
+    "public/favicon.ico",
+    "public/robots.txt",
+    "spec/appengine-paginator_spec.rb",
+    "spec/cursor_spec.rb",
+    "spec/datamapper_ext_spec.rb",
+    "spec/paginate_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/support/post.rb",
+    "spec_runner"
   ]
   s.homepage = %q{http://github.com/joshsmoore/appengine-paginator}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A gem to assist in pagination for the Google AppEngine}
   s.test_files = [
     "spec/appengine-paginator_spec.rb",
-     "spec/cursor_spec.rb",
-     "spec/paginate_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/support/post.rb"
+    "spec/cursor_spec.rb",
+    "spec/datamapper_ext_spec.rb",
+    "spec/paginate_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/post.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -62,11 +66,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rspec>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-appengine>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-core>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<dm-appengine>, [">= 0"])
+      s.add_dependency(%q<dm-core>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<dm-appengine>, [">= 0"])
+    s.add_dependency(%q<dm-core>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/bin/autospec

@@ -1,3 +1,3 @@
-#!/Users/jmoore/.rvm/rubies/ree-1.8.7-2010.02/bin/ruby
+#!/Users/joshmoore/.rvm/rubies/ree-1.8.7-2010.01/bin/ruby
 require File.expand_path(File.join(File.dirname(__FILE__), "../.gems/bundler_gems/jruby/1.8/environment"))
-load File.expand_path(File.join(File.dirname(__FILE__), "../.gems/bundler_gems/jruby/1.8/gems/rspec-1.3.0/bin/autospec"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../.gems/bundler_gems/jruby/1.8/gems/rspec-core-2.1.0/bin/autospec"))

data/bin/htmldiff

@@ -0,0 +1,3 @@
+#!/Users/joshmoore/.rvm/rubies/ree-1.8.7-2010.01/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../.gems/bundler_gems/jruby/1.8/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../.gems/bundler_gems/jruby/1.8/gems/diff-lcs-1.1.2/bin/htmldiff"))

data/bin/ldiff

@@ -0,0 +1,3 @@
+#!/Users/joshmoore/.rvm/rubies/ree-1.8.7-2010.01/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../.gems/bundler_gems/jruby/1.8/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../.gems/bundler_gems/jruby/1.8/gems/diff-lcs-1.1.2/bin/ldiff"))

data/bin/rackup

@@ -1,3 +1,3 @@
-#!/Users/jmoore/.rvm/rubies/ree-1.8.7-2010.02/bin/ruby
+#!/Users/joshmoore/.rvm/rubies/ree-1.8.7-2010.01/bin/ruby
 require File.expand_path(File.join(File.dirname(__FILE__), "../.gems/bundler_gems/jruby/1.8/environment"))
 load File.expand_path(File.join(File.dirname(__FILE__), "../.gems/bundler_gems/jruby/1.8/gems/rack-1.2.1/bin/rackup"))

data/bin/rspec

@@ -0,0 +1,3 @@
+#!/Users/joshmoore/.rvm/rubies/ree-1.8.7-2010.01/bin/ruby
+require File.expand_path(File.join(File.dirname(__FILE__), "../.gems/bundler_gems/jruby/1.8/environment"))
+load File.expand_path(File.join(File.dirname(__FILE__), "../.gems/bundler_gems/jruby/1.8/gems/rspec-core-2.1.0/bin/rspec"))

data/config.ru

@@ -0,0 +1 @@
+run lambda {Rack::Response.new('Hello').finish}

data/lib/appengine-paginator.rb

@@ -1,2 +1,3 @@
 require 'appengine-paginator/paginate'
-require 'appengine-paginator/cursor'
+require 'appengine-paginator/cursor'
+require 'appengine-paginator/datamapper_ext'

data/lib/appengine-paginator/cursor.rb

@@ -1,24 +1,27 @@
-class Cursor
+module Paginator
+  class Cursor
 
-  def initialize(cursor)
-    @_cursor = cursor
-  end
+    def initialize(cursor)
+      @_cursor = cursor
+    end
 
-  # Converts the cursor to a string encoded in base64.
-  def to_s
-    @_cursor.to_web_safe_string
-  end
+    # Converts the cursor to a string encoded in base64.
+    def to_s
+      @_cursor.to_web_safe_string
+    end
 
 
-  # Converts the cursor from a base 64 encoded string and returns the cursor object
-  #
-  # * must be a base 64 encoded cursor
-  def self.parse(cursor_string)
-    Cursor.new Java::comGoogleAppengineApiDatastore::Cursor.from_web_safe_string(cursor_string)
-  end
+    # Converts the cursor from a base 64 encoded string and returns the cursor object
+    #
+    # * must be a base 64 encoded cursor
+    def self.parse(cursor_string)
+      Cursor.new Java::comGoogleAppengineApiDatastore::Cursor.from_web_safe_string(cursor_string)
+    end
 
-  # returns the actual Java cursor (instance of com.google.appengine.api.datastore.Cursor 
-  def to_java
-    @_cursor
+    # returns the actual Java cursor (instance of com.google.appengine.api.datastore.Cursor
+    def to_java
+      @_cursor
+    end
   end
 end
+

data/lib/appengine-paginator/datamapper_ext.rb

@@ -0,0 +1,89 @@
+datamapper = false
+begin
+  DataMapper
+  datamapper = true
+rescue
+end
+
+if datamapper
+  module DataMapper
+    class Query
+      alias :old_update :update
+
+
+      def update(other)
+
+        class << self;
+          def singleton_class;
+            self;
+          end
+
+          ;
+        end
+        @cursor = other[:cursor]
+
+        @cursor = @cursor.to_java if @cursor.instance_of? Paginator::Cursor
+
+        singleton_class.class.send :define_method, :cursor do
+          @cursor
+        end
+
+        other.delete :cursor
+        old_update(other)
+      end
+    end
+  end
+
+  module DataMapper
+    module Adapters
+      class AppEngineAdapter
+        class QueryBuilder
+          alias :old_run :run
+
+          def get_entities
+            if is_get?
+              Datastore.get(@keys)
+            else
+              prepare_java_query.collect { |e| e }
+            end
+          end
+
+          def prepare_java_query
+            begin
+              chunk_size = FetchOptions::DEFAULT_CHUNK_SIZE
+              options    = FetchOptions::Builder.with_chunk_size(
+                  chunk_size)
+              options.limit(@limit) if @limit
+              options.offset(@offset) if @offset
+              options.cursor(@dm_query.cursor) if @dm_query.respond_to?(:cursor) && @dm_query.cursor
+              @query.pquery.as_query_result_list(options)
+            rescue java.lang.IllegalArgumentException => ex
+              raise ArgumentError, ex.message
+            end
+          end
+
+          def run
+            resources = old_run
+
+            class << resources;
+              def singleton_class;
+                self.class;
+              end
+
+              ;
+            end
+
+
+            cursor    = prepare_java_query.cursor
+            resources.singleton_class.send :define_method, :cursor do
+              Paginator::Cursor.new(cursor)
+            end
+
+            resources
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/appengine-paginator/paginate.rb

@@ -1,67 +1,69 @@
-class Paginate
-  attr_reader :query, :limit, :options
+module Paginator
+  class Paginate
+    attr_reader :query, :limit, :options
 
-  # creates a paginate object
-  # * query - an instance of AppEngine::Datastore::Query
-  # * limit - number of items per page
-  # * :model => DataMapperObject - used to cast the datamapper_result (optional)
-  # * :cursor => instance of Cursor - used to skip to the next page in the query (optional)
-  def initialize(query, limit, *options)
-    @query = query
-    @limit = limit
-    @options = options.first || {}
-  end
+    # creates a paginate object
+    # * query - an instance of AppEngine::Datastore::Query
+    # * limit - number of items per page
+    # * :model => DataMapperObject - used to cast the datamapper_result (optional)
+    # * :cursor => instance of Cursor - used to skip to the next page in the query (optional)
+    def initialize(query, limit, *options)
+      @query   = query
+      @limit   = limit
+      @options = options.first || {}
+    end
 
-  # Returns an array of entities.  This array is the current page based on the
-  # position of the cursor (or the first page if no cursor is passed in).
-  def result
-    if options[:cursor].nil?
-      @query.pquery.as_query_result_list(query.convert_options(:limit => limit)[1])
-    else
-      java_cursor = options[:cursor].instance_of?(Cursor) ? options[:cursor].to_java : options[:cursor]
-      @query.pquery.as_query_result_list(query.convert_options(:limit => limit)[1].cursor(java_cursor))
+    # Returns an array of entities.  This array is the current page based on the
+    # position of the cursor (or the first page if no cursor is passed in).
+    def result
+      if options[:cursor].nil?
+        @query.pquery.as_query_result_list(query.convert_options(:limit => limit)[1])
+      else
+        java_cursor = options[:cursor].instance_of?(Cursor) ? options[:cursor].to_java : options[:cursor]
+        @query.pquery.as_query_result_list(query.convert_options(:limit => limit)[1].cursor(java_cursor))
+      end
     end
-  end
 
-  # Returns an array of DataMapper objects.  This array is the current page based on the
-  # position of the cursor (or the first page if no cursor is passed in).  In order for the
-  # DataMapper objects to be loaded the paginate object must be crated with the :model option
-  def datamapper_result
-    model = options[:model]
-    dm_query =Struct.new(:repository, :fields, :reload?).new(DataMapper::repository, model.properties, false)
-    result.collect {|e| model.load([Paginate.entity_to_hash(e, model.properties)], dm_query)}.flatten
-  end
+    # Returns an array of DataMapper objects.  This array is the current page based on the
+    # position of the cursor (or the first page if no cursor is passed in).  In order for the
+    # DataMapper objects to be loaded the paginate object must be crated with the :model option
+    def datamapper_result
+      model    = options[:model]
+      dm_query =Struct.new(:repository, :fields, :reload?).new(DataMapper::repository, model.properties, false)
+      result.collect { |e| model.load([Paginate.entity_to_hash(e, model.properties)], dm_query) }.flatten
+    end
 
-  # returns the cursor (the starting position for the next page)
-  def cursor
-    Cursor.new result.cursor
-  end
+    # returns the cursor (the starting position for the next page)
+    def cursor
+      Cursor.new result.cursor
+    end
 
-  #This should be moved to the Adapter
-  def self.entity_to_hash(entity, properties)
-    return if entity.nil?
-    key = entity.get_key
-    hash = {}
-    properties.each do |property|
-      name = property.field
-      if property.key?
-        hash[name] = if property.kind_of? DataMapper::Property::Key
-          key
-        elsif property.serial?
-          key.get_id
-        elsif property.kind_of? DataMapper::Property::String
-          key.get_name
+    #This should be moved to the Adapter
+    def self.entity_to_hash(entity, properties)
+      return if entity.nil?
+      key  = entity.get_key
+      hash = {}
+      properties.each do |property|
+        name = property.field
+        if property.key?
+          hash[name] = if property.kind_of? DataMapper::Property::Key
+                         key
+                       elsif property.serial?
+                         key.get_id
+                       elsif property.kind_of? DataMapper::Property::String
+                         key.get_name
+                       else
+                         key
+                       end
         else
-          key
-        end
-      else
-        value = entity.get_property(name)
-        if property.kind_of?(DataMapper::Property::Decimal) && value
-          value = Lexidecimal.string_to_decimal(entity.get_property(name))
+          value      = entity.get_property(name)
+          if property.kind_of?(DataMapper::Property::Decimal) && value
+            value = Lexidecimal.string_to_decimal(entity.get_property(name))
+          end
+          hash[name] = value
         end
-        hash[name] = value
       end
+      hash
     end
-    hash
   end
 end

data/spec/cursor_spec.rb

@@ -1,11 +1,11 @@
 require 'spec/spec_helper'
 
-describe Cursor do
+describe Paginator::Cursor do
 
   before(:each) do
     @cursor_string = 'E9oBJGofagR0ZXN0chcLEggKABoEUG9zdAwLEgRQb3N0GMEMDIIBAOABABQ'
     java_cursor = Java::ComGoogleAppengineApiDatastore::Cursor.from_web_safe_string(@cursor_string)
-    @cursor = Cursor.new(java_cursor)
+    @cursor = Paginator::Cursor.new(java_cursor)
   end
 
   describe '#to_s' do
@@ -16,7 +16,7 @@ describe Cursor do
 
   describe '.parse' do
     it 'should return an object of class Cursor' do
-      Cursor.parse(@cursor_string).should be_instance_of Cursor
+      Paginator::Cursor.parse(@cursor_string).should be_instance_of Paginator::Cursor
     end
   end
 

data/spec/datamapper_ext_spec.rb

@@ -0,0 +1,89 @@
+require 'spec/spec_helper'
+
+require 'spec/support/post'
+
+describe 'DataMapper Extensions' do
+  before(:all) do
+    Post.create(:title => "t1")
+    Post.create(:title => "t2")
+    Post.create(:title => "t3")
+    Post.create(:title => "t4")
+    Post.create(:title => "t5")
+    Post.create(:title => "t6")
+
+
+    @cursor_string = 'E9oBJGofagR0ZXN0chcLEggKABoEUG9zdAwLEgRQb3N0GMEMDIIBAOABABQ'
+    @java_cursor    = Java::ComGoogleAppengineApiDatastore::Cursor.from_web_safe_string(@cursor_string)
+    @cursor        = Paginator::Cursor.new(@java_cursor)
+
+  end
+
+  after(:all) do
+    Post.destroy
+  end
+
+  describe '#update' do
+    it 'should work as expected if not cursor is passed in' do
+      Post.all(:title.gt => 't2').count.should == 4
+    end
+
+    it 'should run without exception if a cursor is added' do
+      lambda { Post.all(:title => 't3', :cursor => '20')}.should_not raise_error
+    end
+
+    it 'should create a cursor method that returns the cursor' do
+      dm_query = DataMapper::Query.new(DataMapper::Repository.new(:default), Post, {})
+
+      dm_query.update(:cursor => @java_cursor)
+      dm_query.cursor.should == @java_cursor
+    end
+
+    it 'should convert a Paginator::Cursor to a java cursor' do
+      dm_query = DataMapper::Query.new(DataMapper::Repository.new(:default), Post, {})
+
+      dm_query.update(:cursor => @cursor)
+      dm_query.cursor.should == @java_cursor
+    end
+
+  end
+
+  describe 'should be able to use the cursor' do
+    it 'should start where the last cursor left off' do
+      p = Post.all(:limit => 2)
+      c = p.cursor
+      Post.all(:limit => 2, :cursor => c.to_java).collect{ |p| p.title}.should == ['t3', 't4']
+    end
+  end
+
+  describe '#cursor (on the returned array)' do
+    it 'should respond to cursor' do
+      Post.all.should respond_to(:cursor)
+    end
+
+    it 'should return an instance of' do
+      Post.all.cursor.should be_instance_of Paginator::Cursor
+    end
+  end
+
+end
+
+
+describe 'loading without datamapper' do
+
+  it 'should load correctly if datamapper is not loaded' do
+    old_dm = DataMapper
+#
+    Object.send :remove_const, :DataMapper
+#
+    lambda { load 'lib/appengine-paginator/datamapper_ext.rb'}.should_not raise_error
+    #lambda { load 'lib/appengine-paginator.rb'}.should_not raise_error
+
+    DataMapper = old_dm
+
+    #require 'dm-core'
+    load 'lib/appengine-paginator/datamapper_ext.rb'
+
+
+  end
+
+end

data/spec/paginate_spec.rb

@@ -2,7 +2,8 @@ require 'spec/spec_helper'
 
 require 'spec/support/post'
 
-describe Paginate do
+describe Paginator::Paginate do
+
   before(:all) do
     Post.create(:title => "t1")
     Post.create(:title => "t2")
@@ -15,30 +16,31 @@ describe Paginate do
   after(:all) do
     Post.destroy
   end
+
   define '.initialize' do
     it 'should create an instance of the Paginate class and take two required pareters' do
-      Paginate.new(1,2).should be_instance_of Paginate
+      Paginator::Paginate.new(1, 2).should be_instance_of Paginator::Paginate
     end
 
     it 'should accept more parameters as a hash' do
-      Paginate.new(1,2,:cursor => 4, :model => 4).should be_instance_of Paginate
+      Paginator::Paginate.new(1, 2, :cursor => 4, :model => 4).should be_instance_of Paginator::Paginate
     end
   end
 
   describe '#result' do
     it 'should return the results of the query' do
-      paginate = Paginate.new(AppEngine::Datastore::Query.new('Posts'), 7)
+      paginate = Paginator::Paginate.new(AppEngine::Datastore::Query.new('Posts'), 7)
       paginate.result.count.should == 6
     end
 
     it 'should limit the results based on the limit value' do
-      paginate = Paginate.new(AppEngine::Datastore::Query.new('Posts'), 2)
+      paginate = Paginator::Paginate.new(AppEngine::Datastore::Query.new('Posts'), 2)
       paginate.result.count.should == 2
     end
 
     it 'should start at the cursor when a cursor is provided' do
-      p = Paginate.new(AppEngine::Datastore::Query.new('Posts'), 2)
-      paginate = Paginate.new(AppEngine::Datastore::Query.new('Posts'), 2, :cursor => p.cursor)
+      p        = Paginator::Paginate.new(AppEngine::Datastore::Query.new('Posts'), 2)
+      paginate = Paginator::Paginate.new(AppEngine::Datastore::Query.new('Posts'), 2, :cursor => p.cursor)
 
       paginate.result.first[:title].should == 't3'
     end
@@ -46,7 +48,7 @@ describe Paginate do
 
   describe '#datamapper_result' do
     before(:each) do
-      @paginate = Paginate.new(AppEngine::Datastore::Query.new('Posts'), 2, :model => Post)
+      @paginate = Paginator::Paginate.new(AppEngine::Datastore::Query.new('Posts'), 2, :model => Post)
     end
 
     it 'should call the result method' do
@@ -63,18 +65,18 @@ describe Paginate do
     end
 
     it 'each item should be an instance of the passed in model' do
-      @paginate.datamapper_result.each {|e| e.should be_instance_of Post}
+      @paginate.datamapper_result.each { |e| e.should be_instance_of Post }
     end
   end
 
   describe '#cursor' do
     it 'should return the cursor' do
-      paginate = Paginate.new(AppEngine::Datastore::Query.new('Post'), 2, :model => Post)
+      paginate = Paginator::Paginate.new(AppEngine::Datastore::Query.new('Post'), 2, :model => Post)
       paginate.should respond_to :cursor
     end
     it 'should return the java cursor' do
-      paginate = Paginate.new(AppEngine::Datastore::Query.new('Post'), 2, :model => Post)
-      paginate.cursor.should be_instance_of Cursor
+      paginate = Paginator::Paginate.new(AppEngine::Datastore::Query.new('Post'), 2, :model => Post)
+      paginate.cursor.should be_instance_of Paginator::Cursor
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'appengine-paginator'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 require 'dm-core'
-require 'dm-appengine-adapter'
+require 'appengine_adapter'
+#require 'dm-appengine-adapter'
 
 DataMapper.setup(:default, "app_engine://memory")
-Spec::Runner.configure do |config|
+DataMapper::Query
+require 'appengine-paginator'
+RSpec.configure do |config|
   
 end

data/spec_runner

@@ -1,16 +1,40 @@
 #!/usr/bin/env ruby
-require 'rubygems'
+#require 'rubygems'
+#
+#version = ">= 0"
+#
+#if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+#  version = $1
+#  ARGV.shift
+#end
+#
+##gem 'rspec', version
+#
+#rspec_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+#$LOAD_PATH.unshift(rspec_dir) unless $LOAD_PATH.include?(rspec_dir)
+##require 'spec/autorun'
+#exit ::RSpec::Runner::CommandLine.run
+begin
+  require 'rspec/autorun'
+rescue LoadError
+  $stderr.puts <<-EOS
+#{'*'*50}
+  Could not find 'rspec/autorun'
 
-version = ">= 0"
+  This may happen if you're using rubygems as your package manager, but it is not
+  being required through some mechanism before executing the rspec command.
 
-if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
-  version = $1
-  ARGV.shift
-end
+  You may need to do one of the following in your shell:
+
+    # for bash/zsh
+    export RUBYOPT=rubygems
 
-#gem 'rspec', version
+    # for csh, etc.
+    set RUBYOPT=rubygems
+
+  For background, please see http://gist.github.com/54177.
+#{'*'*50}
+  EOS
+  exit(1)
+end
 
-rspec_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(rspec_dir) unless $LOAD_PATH.include?(rspec_dir)
-require 'spec/autorun'
-exit ::Spec::Runner::CommandLine.run

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: appengine-paginator
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 961915988
+  prerelease: true
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  - pre
+  version: 0.2.0.pre
 platform: ruby
 authors: 
 - Josh Moore
@@ -15,13 +16,56 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 +08:00
+date: 2010-11-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: rspec
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: dm-appengine
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: dm-core
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rspec
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,14 +76,16 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  type: :development
-  version_requirements: *id001
+  requirement: *id004
 description: Pagination on JRuby running on the Google AppEngine
 email: josh@codingforrent.com
 executables: 
-- autospec
-- rackup
+- ldiff
 - spec
+- rspec
+- rackup
+- htmldiff
+- autospec
 extensions: []
 
 extra_rdoc_files: 
@@ -47,7 +93,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -56,16 +101,21 @@ files:
 - WEB-INF/app.yaml
 - appengine-paginator.gemspec
 - bin/autospec
+- bin/htmldiff
+- bin/ldiff
 - bin/rackup
+- bin/rspec
 - bin/spec
 - config.ru
 - lib/appengine-paginator.rb
 - lib/appengine-paginator/cursor.rb
+- lib/appengine-paginator/datamapper_ext.rb
 - lib/appengine-paginator/paginate.rb
 - public/favicon.ico
 - public/robots.txt
 - spec/appengine-paginator_spec.rb
 - spec/cursor_spec.rb
+- spec/datamapper_ext_spec.rb
 - spec/paginate_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -76,8 +126,8 @@ homepage: http://github.com/joshsmoore/appengine-paginator
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -92,12 +142,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -108,6 +160,7 @@ summary: A gem to assist in pagination for the Google AppEngine
 test_files: 
 - spec/appengine-paginator_spec.rb
 - spec/cursor_spec.rb
+- spec/datamapper_ext_spec.rb
 - spec/paginate_spec.rb
 - spec/spec_helper.rb
 - spec/support/post.rb

data/.gitignore

@@ -1,26 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-.gems
-WEB-INF/lib
-WEB-INF/appengine-generated
-config.ru
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC