ru.Bee 2.7.18 → 2.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01a7357826a17d0689fadebdf99357cf7ad50b38ec612f397260cb8580cd5291
-  data.tar.gz: 2481e8249b9a035d2095af11d8fbc8c8f410fe9711e144fd190cc5c1e167d188
+  metadata.gz: c3259d99e11204edf63640fbf913ae79fa59ffda9ea39d50d5b604a5a5920416
+  data.tar.gz: 8e0d0139912e774967734197f467661c06eb2a3ab33cdb0381977ede7dab08e3
 SHA512:
-  metadata.gz: 82c9964621101a59769a73747527fa0fda93ff60d691c6d3d75dbf40917463517446073a71622e058c6f15fe7cbfaa736b117c26d75c92b71cbbcd2e3bcf4808
-  data.tar.gz: ea3d93e87f2f8ef4dfd6350f5db386ca906d33aa79c000fcb8954df1d7ab7614de8b4f9b91e2c5c16dba25316f78b06f1998799b61d082b08561e19d407c505d
+  metadata.gz: 1e684ae9168fec0400e252b78e64b74773e8f074879f722b54306fdcae9057e069c20b7276d720476cec635388f774588d31fe73695e3bb87142b03458cec1fb
+  data.tar.gz: 72d396aae6e4c299bf6e211b86822c96c17e988c1b066a610914c6d642a59fb20b88ed7445368d19d35c54f9df3c5103b87d1293da378e392e51388499a2cbcb

data/lib/rubee/models/assoc_array.rb

@@ -50,9 +50,10 @@ module Rubee
       @__model.owns_many(*args, __query_dataset: @__query_dataset)
     end
 
-    def paginate(*args)
+    def paginate(*args, **kwargs)
       total_count = @__query_dataset.count
-      current_page, per_page = args
+      current_page = kwargs[:page] || args[0]
+      per_page     = kwargs[:per_page] || args[1]
       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
@@ -66,7 +67,7 @@ module Rubee
         next: current_page < total_pages ? current_page + 1 : nil,
       }
 
-      @__model.paginate(*args, __query_dataset: @__query_dataset, __pagination_meta:)
+      @__model.paginate(*args, **kwargs, __query_dataset: @__query_dataset, __pagination_meta:)
     end
 
     def pagination_meta

data/lib/rubee/models/sequel_object.rb

@@ -264,14 +264,16 @@ module Rubee
         ::Rubee::AssocArray.new([], self, query_dataset.offset(*args))
       end
 
-      def paginate(page = 1, per_page = 10, options = {})
-        query_dataset = options[:__query_dataset] || dataset
+      def paginate(*args, **kwargs)
+        page = kwargs[:page] || args[0]
+        per_page = kwargs[:per_page] || args[1]
+        query_dataset = kwargs[:__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),
-                       pagination_meta: options[:__pagination_meta])
+                       pagination_meta: kwargs[:__pagination_meta])
       end
 
       def create(attrs)

data/lib/rubee.rb

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

data/lib/tests/models/comment_model_test.rb

@@ -137,6 +137,27 @@ describe 'Comment model' do
           Comment.destroy_all
         end
       end
+
+      describe 'when pass args as hash' 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(page: 1, per_page: 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.18
+  version: 2.7.19
 platform: ruby
 authors:
 - Oleg Saltykov