ru.Bee 2.7.16 → 2.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60d76c4c74e1ef25002822bd6a85b82ca622cec1725632a110ee53f46d71d23a
-  data.tar.gz: 9ec77780e934c56f139f0f765a1fa631bd6bad7b68894701c589cbd10a75bef6
+  metadata.gz: 01a7357826a17d0689fadebdf99357cf7ad50b38ec612f397260cb8580cd5291
+  data.tar.gz: 2481e8249b9a035d2095af11d8fbc8c8f410fe9711e144fd190cc5c1e167d188
 SHA512:
-  metadata.gz: a45bbf711fc7be24f49a8315f14c5af794d1ace97ee974a15e466e4feb5b6d904be16695ebf9252f640f6a6c97f9bc771085edd53b97a88f7317ee09e2246981
-  data.tar.gz: c4d35b51ed0bc20c08364e5e072f1fd9ad04eea690d3e55fa243898d11fee500adbb1a6c96eb0e489fc720d6dc43ac54d96e6647911ee3e7ba123daefe3e39fb
+  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

@@ -178,7 +178,7 @@ module Rubee
         return unless db_set?
 
         DB.disconnect
-        Object.send(:remove_const, :DB)
+        remove_const(:DB)
       end
 
       def force_reconnect!
@@ -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.16'
+  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.16
+  version: 2.7.18
 platform: ruby
 authors:
 - Oleg Saltykov