Better results

Andrew Kane
1 parent 400664f1
Showing 2 changed files with 11 additions and 5 deletions Show diff stats
lib/searchkick/query.rb
lib/searchkick/results.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
@@ -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