paginated 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 656e1f3fdd6c8b600f642a2e88fd395927ba28510a0ae8cdb2e34a4dddea25ea
-  data.tar.gz: 94d7e802d02e4882c1ec74cd88395a263007a31939689a06cb92ef01ee60e4d8
+  metadata.gz: 76e2b8888c610c376b97da4c118067cf4d6d1ac8d63e02fc11971638b9ad0595
+  data.tar.gz: a5fc2020f8d9a3adf16816e0d03d2e2419ed3128d806d23a5ce3d20a6831e442
 SHA512:
-  metadata.gz: bd60a2ca45d5dbc33b085a5d6911619afcf841c2291c0976517b144e38bb41de453fd86fbc7b42ade9d38e5ff4bb307490411f69c532649e37ca78a5225fc5f2
-  data.tar.gz: d3197bf624354ea4127a4527e35bbdb04a5bc35b8c8a83dc42db0afbc0a50f3105aa3f03bc5c7da139c3ef98f0011b8e9d48e14bf2cc9391d5837d501258e44a
+  metadata.gz: a3aa8e4b873a0498720d727d3517cb9576eb1b97a96884cdf2c8336b92f56a0016db99e1d6c3c49875bede9fc73dbd91d902180b05253e7079d9970504f9b01a
+  data.tar.gz: 7ad52eb2f7a3b3c3356781d7703f156f14ef4cec04d00dc14e825e0c6dd4ef10b868b9325b18ab2405d740d0ddc2d70072f09d4e91cc12f398548344ed66ce02

data/lib/paginated/serialization.rb

@@ -37,7 +37,7 @@ module Serialization
 
   def serialize_with_entity
     entity = @attrs[:entity].constantize
-    @objects = @objects.map { |i| entity.represent(i).as_json }
+    @objects = @objects.map { |i| entity.represent(i, current_user: @current_user).as_json }
   end
 
   def sort_proc

data/lib/paginated.rb

@@ -8,9 +8,10 @@ class Paginated
 
   def collection(**attrs)
     @attrs = attrs
+    @params = attrs[:serialization_scope].params.stringify_keys
+    @current_user = attrs[:serialization_scope].current_user
     @fields = attrs[:fields]
     @scopes = attrs[:scopes] || {}
-    @params = attrs[:params].stringify_keys
     @offset = @params['offset'].to_i
     @limit = @params['limit'] || 20
     @order = attrs[:order] || :id
@@ -45,7 +46,7 @@ class Paginated
     return cached_value if cached_value
 
     # получение кол-ва записей из запроса к БД
-    db_value = @model.unscoped.merge(@scopes).count(:id)
+    db_value = @model.merge(@scopes).count(:id)
 
     # кеширование кол-ва записей при превышении порогового значения
     if db_value >= 1_000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paginated
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Павел Бабин
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-16 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails