From e6399ff5d7afb02fae803208b000096069cf5e70 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Tue, 13 May 2014 21:24:39 -0700 Subject: [PATCH] Fixed offset_value - closes #206 --- CHANGELOG.md | 1 + lib/searchkick/results.rb | 2 +- test/sql_test.rb | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 481a9d2..6c32360 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Do not throw errors when index becomes out of sync with database - Added custom exception types +- Fixed `offset` and `offset_value` ## 0.7.4 diff --git a/lib/searchkick/results.rb b/lib/searchkick/results.rb index 59ea667..ad66a79 100644 --- a/lib/searchkick/results.rb +++ b/lib/searchkick/results.rb @@ -96,7 +96,7 @@ module Searchkick alias_method :num_pages, :total_pages def offset_value - current_page * per_page + (current_page - 1) * per_page end alias_method :offset, :offset_value diff --git a/test/sql_test.rb b/test/sql_test.rb index 6fd0cf7..0d2fe18 100644 --- a/test/sql_test.rb +++ b/test/sql_test.rb @@ -30,8 +30,8 @@ class TestSql < Minitest::Unit::TestCase assert_equal 5, products.total_count assert_equal 5, products.total_entries assert_equal 2, products.limit_value - assert_equal 4, products.offset_value - assert_equal 4, products.offset + assert_equal 2, products.offset_value + assert_equal 2, products.offset assert !products.first_page? assert !products.last_page? assert !products.empty? -- libgit2 0.21.0