ru.Bee 2.7.17 → 2.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eaf884496bf93cbf6d181a5fa3081dd39c7bef50dd9f7d9b0d03273e7badb01
-  data.tar.gz: 6732e5abecbde5ba909e126b19654fe5d1c419d7aaf7b4051a8ae3c14dc01eb1
+  metadata.gz: 01a7357826a17d0689fadebdf99357cf7ad50b38ec612f397260cb8580cd5291
+  data.tar.gz: 2481e8249b9a035d2095af11d8fbc8c8f410fe9711e144fd190cc5c1e167d188
 SHA512:
-  metadata.gz: c9c7802934054261b64d0e5f2c551da238368b6e55c8e5b0f0e4a59a0d3f3b0ab7450e6fe494cce126ba9b5876393e47c8f9ac8787993343b57ce59c328cea51
-  data.tar.gz: 40e1678a46bf8134ed96fdc26bd58f10eef451fbe4b0459727c7651781202093e226f6182fbd5ac2c5518324b175535f5d4875ff05673152b5cb56eba244a534
+  metadata.gz: 82c9964621101a59769a73747527fa0fda93ff60d691c6d3d75dbf40917463517446073a71622e058c6f15fe7cbfaa736b117c26d75c92b71cbbcd2e3bcf4808
+  data.tar.gz: ea3d93e87f2f8ef4dfd6350f5db386ca906d33aa79c000fcb8954df1d7ab7614de8b4f9b91e2c5c16dba25316f78b06f1998799b61d082b08561e19d407c505d

data/lib/rubee/models/assoc_array.rb

@@ -53,14 +53,17 @@ module Rubee
     def paginate(*args)
       total_count = @__query_dataset.count
       current_page, per_page = args
+      total_pages = per_page.to_i > 0 ? (total_count / per_page.to_f).ceil : 1
+      current_page = current_page.to_i > 0 ? current_page.to_i : 1
+      per_page = per_page.to_i > 0 ? per_page.to_i : 10
       __pagination_meta = {
         current_page:,
         per_page:,
         total_count:,
         first_page: current_page == 1,
-        last_page: current_page == (total_count / per_page.to_f).ceil,
+        last_page: current_page == total_pages,
         prev: current_page > 1 ? current_page - 1 : nil,
-        next: current_page < (total_count / per_page.to_f).ceil ? current_page + 1 : nil,
+        next: current_page < total_pages ? current_page + 1 : nil,
       }
 
       @__model.paginate(*args, __query_dataset: @__query_dataset, __pagination_meta:)

data/lib/rubee/models/sequel_object.rb

@@ -266,6 +266,8 @@ module Rubee
 
       def paginate(page = 1, per_page = 10, options = {})
         query_dataset = options[:__query_dataset] || dataset
+        page = page.to_i > 0 ? page.to_i : 1
+        per_page = per_page.to_i > 0 ? per_page.to_i : 10
         offset = (page - 1) * per_page
 
         ::Rubee::AssocArray.new([], self, query_dataset.offset(offset).limit(per_page),

data/lib/rubee.rb

@@ -20,7 +20,7 @@ module Rubee
     RUBEE_SUPPORT = { "Rubee::Support::Hash" => Hash, "Rubee::Support::String" => String }
   end
 
-  VERSION = '2.7.17'
+  VERSION = '2.7.18'
 
   require_relative 'rubee/router'
   require_relative 'rubee/logger'

data/lib/tests/models/comment_model_test.rb

@@ -116,6 +116,27 @@ describe 'Comment model' do
         )
         Comment.destroy_all
       end
+
+      describe 'when pass page number as zero' do
+        it 'returns target records' do
+          Comment.destroy_all cascade: true
+          10.times do |n|
+            Comment.new(text: "test_#{n}").save
+          end
+          comments = Comment.all.paginate(0, 5)
+          _(comments.count).must_equal(5)
+          _(comments.pagination_meta).must_equal(
+            current_page: 1,
+            per_page: 5,
+            total_count: 10,
+            first_page: true,
+            last_page: false,
+            prev: nil,
+            next: 2
+          )
+          Comment.destroy_all
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ru.Bee
 version: !ruby/object:Gem::Version
-  version: 2.7.17
+  version: 2.7.18
 platform: ruby
 authors:
 - Oleg Saltykov