From 6e614149d1ba7ce0b5f5bfc415a1898d30e56ed1 Mon Sep 17 00:00:00 2001 From: Leonard Chin Date: Sun, 20 Feb 2011 01:00:32 +0900 Subject: [PATCH] Use Proc.new instead of lambda for scope_options. lambda is strict about block parameters in 1.9.2, so we might as well just use Proc.new. --- lib/kaminari/active_record_extension.rb | 4 +--- lib/kaminari/mongoid_extension.rb | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/kaminari/active_record_extension.rb b/lib/kaminari/active_record_extension.rb index ff40ab9..e8ffa99 100644 --- a/lib/kaminari/active_record_extension.rb +++ b/lib/kaminari/active_record_extension.rb @@ -17,9 +17,7 @@ module Kaminari kls.class_eval do # Fetch the values at the specified page number # Model.page(5) - scope :page, lambda {|*num| - raise ArgumentError if num.size > 1 - num = num.first || 1 + scope :page, Proc.new {|num| limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1)) } do # Specify the per_page value for the preceding page scope diff --git a/lib/kaminari/mongoid_extension.rb b/lib/kaminari/mongoid_extension.rb index 27bd4b3..b1f936e 100644 --- a/lib/kaminari/mongoid_extension.rb +++ b/lib/kaminari/mongoid_extension.rb @@ -16,7 +16,7 @@ module Kaminari included do # Fetch the values at the specified page number # Model.page(5) - scope :page, lambda {|num| + scope :page, Proc.new {|num| limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1)) } do # Specify the per_page value for the preceding page scope