From d88fe6d37732666da2786d07c5283644e3167bd7 Mon Sep 17 00:00:00 2001 From: John Crepezzi Date: Tue, 10 May 2011 23:35:17 +0800 Subject: [PATCH 1/2] Only add extensions to direct descendents of ActiveRecord::Base --- lib/kaminari/models/active_record_extension.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/kaminari/models/active_record_extension.rb b/lib/kaminari/models/active_record_extension.rb index 77445fa..0d11f3c 100644 --- a/lib/kaminari/models/active_record_extension.rb +++ b/lib/kaminari/models/active_record_extension.rb @@ -18,7 +18,7 @@ module Kaminari include Kaminari::ActiveRecordRelationMethods include Kaminari::PageScopeMethods end - end + end if kls.superclass == ActiveRecord::Base end end end From 7f71f2c07bc46c741be0c4381497c40296a87eb4 Mon Sep 17 00:00:00 2001 From: noice Date: Sun, 14 Aug 2011 04:25:59 +0200 Subject: [PATCH 2/2] Added support for DataMapper v1.1.0. Including tests. --- README.rdoc | 2 + kaminari.gemspec | 2 + .../models/data_mapper_collection_methods.rb | 23 +++++++ lib/kaminari/models/data_mapper_extension.rb | 43 +++++++++++++ lib/kaminari/railtie.rb | 6 ++ spec/models/data_mapper_spec.rb | 64 +++++++++++++++++++ spec/support/matchers.rb | 6 ++ 7 files changed, 146 insertions(+) create mode 100644 lib/kaminari/models/data_mapper_collection_methods.rb create mode 100644 lib/kaminari/models/data_mapper_extension.rb create mode 100644 spec/models/data_mapper_spec.rb diff --git a/README.rdoc b/README.rdoc index 51f76b1..328349c 100644 --- a/README.rdoc +++ b/README.rdoc @@ -37,6 +37,8 @@ The pagination helper outputs the HTML5