grape-listing 1.4.5 → 1.4.6

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: 3264dda6f4a9e954f297ebfc1e5976ff5ea5af55964913f364fa6374efb452d3
4
- data.tar.gz: 0b47faa426d87e075a3274a13cb6ed8502d59d7bf8faad949dd757f102e70b19
3
+ metadata.gz: c6edf5f40b3f9e87da8699d958cc6938f681a9f0b0383ced05d067cbc9703176
4
+ data.tar.gz: 1e0038d81fd51dd43fc7c9443568d4d12fa52b24f39fad1aa7ec045f27611691
5
5
  SHA512:
6
- metadata.gz: de19868e12b548bd118a8162cba35ec9bbaf58f37235ddd53e4ff4bcb23c035800fd82470eeaea0ad6ee260aebf521bbfe9865fda03c008bebfca399ba038c24
7
- data.tar.gz: ba555cc2b47a8ea5a89c8b99aa8ea432d239709d8606d8433c5849bdae89711eca80cd9bcbb8744b584f20e1e498025ea0029a6782655c37752f7bd1487b0610
6
+ metadata.gz: 936556382a09a06bd0450cb2808ae13893554d905a5ceb9a3b361817192f447b06190a7c2429611c19f117e252c421c4b497ef6167952cdb91ef61a890299086
7
+ data.tar.gz: ab714fcfbeef853743da5c3d200a3ac2f93ebf3f690f323ade42fafaaa8e4f97e0acc888e15a43043e97f521a559d2fe8ac905b5b3d06b5837501165cdfcc6e8
@@ -1,3 +1,3 @@
1
1
  module GrapeListing
2
- VERSION = '1.4.5'.freeze
2
+ VERSION = '1.4.6'.freeze
3
3
  end
@@ -33,7 +33,7 @@ module GrapeListing
33
33
  @limit = @params['limit'] || 20
34
34
 
35
35
  # проверка максимального значения лимита
36
- if @limit.to_i > 100
36
+ if @limit.to_i > 500
37
37
  raise StandardError.new('Лимит слишком большой')
38
38
  end
39
39
 
@@ -100,10 +100,9 @@ module GrapeListing
100
100
  model_cols = @model.columns_hash
101
101
 
102
102
  spreadsheet_cols.each do |column|
103
- # поиск описания среди комментариев к таблице БД
104
- db_col = model_cols[column.to_s]
105
- if db_col&.comment&.present?
106
- values << db_col.comment
103
+ # исключение: колонка с ИД
104
+ if column.to_s == 'id'
105
+ values << 'ИД'
107
106
  next
108
107
  end
109
108
 
@@ -114,6 +113,13 @@ module GrapeListing
114
113
  next
115
114
  end
116
115
 
116
+ # поиск описания среди комментариев к таблице БД
117
+ db_col = model_cols[column.to_s]
118
+ if db_col&.comment&.present?
119
+ values << db_col.comment
120
+ next
121
+ end
122
+
117
123
  # ничего из вышеперечисленного не найдено, заголовок - название самой колонки
118
124
  values << column.upcase
119
125
  end
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.4.5
4
+ version: 1.4.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Павел Бабин
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-02-25 00:00:00.000000000 Z
11
+ date: 2025-03-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack