grape-listing 1.1.7 → 1.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8718471a29bc7aa2abcb3b58465ace6e5dd453962e7f54422fd3e3e311e323c0
4
- data.tar.gz: 3d0cc9a56ce90c53464f021944bdfc37f3112d56d009cfe3815ab85e770c4b03
3
+ metadata.gz: d4640c1fef7edd90ba2d131032ba1f8ee8d5edf276d8a703f114b7d944e0ef52
4
+ data.tar.gz: c5cccf46f30fddf0fa7bf7b9f128e42fc6a6fe3291c941a302ea4c440e34e726
5
5
  SHA512:
6
- metadata.gz: 38777a8933a68a07e18b5f47f2ae45a831d6c18d164cdc0e1679c33204964da94446ec95ae83ca10646e52d656d01588f81e9f2e651e8a787c61040fbd4b38f5
7
- data.tar.gz: 6c43aca8751cbf6582ab838360c8aed7ed5e239e82dab5ae910e56be71ee8d007fd1aa44729b42e7d5983a44ebf66137c7d2a4b73c749731a68a2913b1e1ff26
6
+ metadata.gz: 96658857f1c6b6f2eecc2b45417c2240dad18880ae87dd6e0d9522f468fcda24ab50bfc9cb20762166e664f0a1b2f78739122c8c5041783914a7ef4c9f8e7478
7
+ data.tar.gz: 38681ed959270122c72573669b9ba6d92bf534adace4b99ee948e1f2e25580e9d9da6056229c3484a23a53f21c735c1d93414714c5c6ec42617be32cbec70c64
@@ -58,7 +58,7 @@ module GrapeListing
58
58
  return cached if cached
59
59
 
60
60
  # получение кол-ва записей из запроса к БД
61
- count = @model.merge(@scopes).count(:id)
61
+ count = @model.merge(@scopes).distinct.count(:id)
62
62
 
63
63
  # кеширование кол-ва записей при превышении порогового значения
64
64
  if count >= 1_000
@@ -19,13 +19,13 @@ module GrapeListing
19
19
  # название скоупа из модели, который нужно применить
20
20
  scope_name = operator.split('.')[1]
21
21
  # применение скоупа
22
- @objects = list.send(scope_name, value)
23
- @objects_count = @objects.count
22
+ @objects = list.send(scope_name, value).distinct
23
+ @objects_count = @objects.distinct.count
24
24
  next
25
25
  end
26
26
 
27
27
  # форматирование кавычек
28
- if operator != 'IN' && !@model.defined_enums.key?(field)
28
+ if operator != 'IN'
29
29
  value = quotations_formatting(value)
30
30
  end
31
31
 
@@ -57,7 +57,7 @@ module GrapeListing
57
57
  # проверка мульти-поиска по параметру с массивом
58
58
  if operator == 'multi' && !value.blank?
59
59
  operator = 'IN'
60
- value = "(#{value.join(', ')})"
60
+ value = "(#{value.map { |i| "'#{i}'" }.join(', ')})"
61
61
  end
62
62
 
63
63
  # проверка диапазона (MIN/MAX)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: grape-listing
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.7
4
+ version: 1.1.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Павел Бабин
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-06-18 00:00:00.000000000 Z
11
+ date: 2024-06-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack