From 92052eedf047d65df71cc0021a9df9df1e2fc36e Mon Sep 17 00:00:00 2001 From: Yuriy Kolodovskyy Date: Thu, 12 Sep 2013 00:49:34 +0300 Subject: [PATCH] change scope to class method --- lib/kaminari/models/active_record_model_extension.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/kaminari/models/active_record_model_extension.rb b/lib/kaminari/models/active_record_model_extension.rb index b7880924d..f48b4c7ac 100644 --- a/lib/kaminari/models/active_record_model_extension.rb +++ b/lib/kaminari/models/active_record_model_extension.rb @@ -6,14 +6,16 @@ module ActiveRecordModelExtension included do self.send(:include, Kaminari::ConfigurationMethods) + end + module ClassMethods # Fetch the values at the specified page number # Model.page(5) - self.scope Kaminari.config.page_method_name, Proc.new {|num| - limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1)) - } do - include Kaminari::ActiveRecordRelationMethods - include Kaminari::PageScopeMethods + define_method(Kaminari.config.page_method_name) do |num = nil| + limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1)).extending do + include Kaminari::ActiveRecordRelationMethods + include Kaminari::PageScopeMethods + end end end end