Merge #395

395: Properly set `limit` in Kaminari r=ellnix a=ellnix

Fixes regression in #376
Fixes #394

Co-authored-by: ellnix <[email protected]>

Author: meili-bors[bot]

lib/meilisearch/rails/pagination/kaminari.rb

@@ -18,11 +18,14 @@ def initialize(array, options)
         end
 
         def self.create(results, total_hits, options = {})
-          offset = ((options[:page] - 1) * options[:per_page])
-          total_hits = 0 if total_hits.nil?
-          offset = 0 if offset.nil?
-          limit = 0 if options[:per_page].nil?
-          array = new results, limit: limit, offset: offset, total_count: total_hits
+          unless MeiliSearch::Rails.active?
+            total_hits = 0
+            options[:page] = 1
+            options[:per_page] = 1
+          end
+
+          offset = (options[:page] - 1) * options[:per_page]
+          array = new results, limit: options[:per_page], offset: offset, total_count: total_hits
 
           if array.empty? && !results.empty?
             # since Kaminari 0.16.0, you need to pad the results with nil values so it matches the offset param

spec/pagination/kaminari_spec.rb

@@ -70,4 +70,10 @@
   it 'respects max_total_hits' do
     expect(Restaurant.search('*').count).to eq(2)
   end
+
+  it 'correctly forwards parameters' do
+    # Kaminari only makes current_page available if
+    # limit and offset have been passed
+    expect(Restaurant.search('*').current_page).to eq(1)
+  end
 end