Merge pull request #53 from ifad/bugfix/fix-pagination

Improve pagination
ifad · Jan 23, 2024 · 11a6c07 · 11a6c07
2 parents fb9652d + be6d49f
commit 11a6c07
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
diff --git a/lib/hawk/model/pagination.rb b/lib/hawk/model/pagination.rb
@@ -5,7 +5,11 @@ module Model
     module Pagination
       module Common
         def current_page
-          limit_value == 0 ? 1 : (offset_value / limit_value) + 1
+          if limit_value == 0
+            1
+          else
+            (offset_value / limit_value) + 1
+          end
         end
       end
 
@@ -14,12 +18,9 @@ def self.included(base)
           base.instance_eval do
             include Kaminari::ConfigurationMethods
 
-            eval <<-RUBY, binding, __FILE__, __LINE__ + 1
-              def #{Kaminari.config.page_method_name}(num = nil)
-                limit(default_per_page).
-                offset(default_per_page * ([num.to_i, 1].max - 1))
-              end
-            RUBY
+            define_singleton_method Kaminari.config.page_method_name do |num = nil|
+              limit(default_per_page).offset(default_per_page * ([num.to_i, 1].max - 1))
+            end
           end
         end