Take total_count option when kaminari used

Author: zabolotnov87

lib/rails/pagination.rb

@@ -24,13 +24,9 @@ def paginate_with(collection)
     private
 
     def _paginate_collection(collection, options={})
-      options = {
-        :page     => ApiPagination.config.page_param(params),
-        :per_page => (
-          options.delete(:per_page) ||
-          ApiPagination.config.per_page_param(params)
-        )
-      }
+      options[:page] = ApiPagination.config.page_param(params)
+      options[:per_page] ||= ApiPagination.config.per_page_param(params)
+
       collection = ApiPagination.paginate(collection, options)
 
       links = (headers['Link'] || "").split(',').map(&:strip)
@@ -47,12 +43,20 @@ def _paginate_collection(collection, options={})
       page_header     = ApiPagination.config.page_header
       include_total   = ApiPagination.config.include_total
 
-      headers['Link']          = links.join(', ') unless links.empty?
-      headers[total_header]    = ApiPagination.total_from(collection) if include_total
+      headers['Link'] = links.join(', ') unless links.empty?
       headers[per_page_header] = options[:per_page].to_s
-      headers[page_header]     = options[:page].to_s unless page_header.nil?
+      headers[page_header] = options[:page].to_s unless page_header.nil?
+      headers[total_header] = total_count(collection, options) if include_total
 
       return collection
     end
+
+    def total_count(collection, options)
+      total_count = if ApiPagination.config.paginator == :kaminari
+        paginate_array_options = options[:paginate_array_options]
+        paginate_array_options[:total_count] if paginate_array_options
+      end
+      total_count || ApiPagination.total_from(collection)
+    end
   end
 end

spec/rails_spec.rb

@@ -201,6 +201,52 @@
       end
     end
 
+    context 'paginate array options' do
+      shared_examples 'properly set Total header' do
+        let(:params) do
+          {
+            paginate_array_total_count: paginate_array_total_count,
+            count: count,
+          }
+        end
+
+        specify do
+          get :index_with_paginate_array_options, params
+          expect(response.header['Total'].to_i).to eq total_header
+        end
+      end
+
+      context 'kaminari' do
+        around do |example|
+          paginator = ApiPagination.config.paginator
+          ApiPagination.config.paginator = :kaminari
+          example.run
+          ApiPagination.config.paginator = paginator
+        end
+
+        it_should_behave_like 'properly set Total header' do
+          let(:paginate_array_total_count) { 300 }
+          let(:total_header) { 300 }
+          let(:count) { 50 }
+        end
+      end
+
+      context 'will_paginate' do
+        around do |example|
+          paginator = ApiPagination.config.paginator
+          ApiPagination.config.paginator = :will_paginate
+          example.run
+          ApiPagination.config.paginator = paginator
+        end
+
+        it_should_behave_like 'properly set Total header' do
+          let(:paginate_array_total_count) { 300 }
+          let(:total_header) { 50 }
+          let(:count) { 50 }
+        end
+      end
+    end
+
     context 'default per page in model' do
       before do
         class Fixnum

spec/support/numbers_controller.rb

@@ -40,8 +40,11 @@ def teardown(*methods)
 
 Rails.application.routes.draw do
   resources :numbers, :only => [:index] do
-    get :index_with_custom_render, on: :collection
-    get :index_with_no_per_page,   on: :collection
+    collection do
+      get :index_with_custom_render
+      get :index_with_no_per_page
+      get :index_with_paginate_array_options
+    end
   end
 end
 
@@ -85,4 +88,13 @@ def index_with_no_per_page
 
     render json: NumbersSerializer.new(numbers)
   end
+
+  def index_with_paginate_array_options
+    count = params.fetch(:count).to_i
+    total_count = params.fetch(:paginate_array_total_count).to_i
+    numbers = (1..count).to_a
+    numbers = paginate numbers, paginate_array_options: {total_count: total_count}
+
+    render json: NumbersSerializer.new(numbers)
+  end
 end