From 4008b724b3e74e37476d7b8eac7efa2725464086 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Wed, 5 Mar 2014 23:11:01 -0800 Subject: [PATCH] Better results --- lib/searchkick/query.rb | 7 +++---- lib/searchkick/results.rb | 9 ++++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/searchkick/query.rb b/lib/searchkick/query.rb index 4192feb..7126bcf 100644 --- a/lib/searchkick/query.rb +++ b/lib/searchkick/query.rb @@ -338,13 +338,12 @@ module Searchkick end opts = { + page: @page, + per_page: @per_page, load: @load, includes: options[:include] || options[:includes] } - results = Searchkick::Results.new(searchkick_klass, response, opts) - results.current_page = @page - results.per_page = @per_page - results + Searchkick::Results.new(searchkick_klass, response, opts) end private diff --git a/lib/searchkick/results.rb b/lib/searchkick/results.rb index 47d76be..864cb4b 100644 --- a/lib/searchkick/results.rb +++ b/lib/searchkick/results.rb @@ -4,7 +4,6 @@ module Searchkick extend Forwardable attr_reader :klass, :response, :options - attr_accessor :current_page, :per_page def_delegators :results, :each, :empty?, :size, :slice, :[], :to_ary @@ -65,6 +64,14 @@ module Searchkick response["hits"]["total"] end + def current_page + options[:page] + end + + def per_page + options[:per_page] + end + def total_pages (total_count / per_page.to_f).ceil end -- libgit2 0.21.0