fix: convert per_page param to integer for will_paginate (#6)

* fix: convert per_page param to integer for will_paginate

* chore: add specs

* chore: update version

CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [TODO]
+
+- Move translation from wallaby-core to here
+
+## [0.2.1](https://github.com/wallaby-rails/wallaby-active_record/releases/tag/0.2.1) - 2020-02-17
+
+### Changed
+
+- fix: convert per_page param to integer for will_paginate ([#6](https://github.com/wallaby-rails/wallaby-active_record/pull/6))
+
 ## [0.2.0](https://github.com/wallaby-rails/wallaby-active_record/releases/tag/0.2.0) - 2020-02-16
 
 ### Changed

lib/adapters/wallaby/active_record/model_pagination_provider.rb

@@ -32,7 +32,7 @@ def total
       #   {https://rubydoc.info/gems/wallaby-core/Wallaby/Configuration/Pagination#page_size-instance_method page_size}
       #   Wallaby configuration
       def page_size
-        @params[:per].try(:to_i) || Wallaby.configuration.pagination.page_size
+        (@params[:per] || Wallaby.configuration.pagination.page_size).to_i
       end
 
       # @return [Integer] page number from parameters starting from 1

lib/adapters/wallaby/active_record/model_service_provider.rb

@@ -30,7 +30,8 @@ def collection(params, authorizer)
       # @return [ActiveRecord::Relation] paginated query
       # @see Wallaby::ModelServiceProvider#paginate
       def paginate(query, params)
-        per = params[:per] || Wallaby.configuration.pagination.page_size
+        # NOTE: do not take out the `.to_i` as will_paginate requires an integer `per_page`
+        per = (params[:per] || Wallaby.configuration.pagination.page_size).to_i
         query = query.page params[:page] if query.respond_to? :page
         query = query.per per if query.respond_to? :per # kaminari
         query = query.per_page per if query.respond_to? :per_page # will_paginate

lib/wallaby/active_record/version.rb

@@ -2,6 +2,6 @@
 
 module Wallaby
   module ActiveRecordGem
-    VERSION = '0.2.0' # :nodoc:
+    VERSION = '0.2.1' # :nodoc:
   end
 end

spec/adapters/wallaby/active_record/model_service_provider_spec.rb

@@ -50,9 +50,9 @@
     describe '#paginate' do
       it 'paginates the query' do
         if version? '>= 6'
-          expect(subject.paginate(model_class.where(nil), parameters(page: 10, per: 8)).to_sql).to eq 'SELECT "all_postgres_types".* FROM "all_postgres_types" LIMIT 8 OFFSET 72'
+          expect(subject.paginate(model_class.where(nil), parameters(page: '10', per: '8')).to_sql).to eq 'SELECT "all_postgres_types".* FROM "all_postgres_types" LIMIT 8 OFFSET 72'
         else
-          expect(subject.paginate(model_class.where(nil), parameters(page: 10, per: 8)).to_sql).to eq 'SELECT  "all_postgres_types".* FROM "all_postgres_types" LIMIT 8 OFFSET 72'
+          expect(subject.paginate(model_class.where(nil), parameters(page: '10', per: '8')).to_sql).to eq 'SELECT  "all_postgres_types".* FROM "all_postgres_types" LIMIT 8 OFFSET 72'
         end
       end
     end