grape-listing 1.4.3 → 1.4.5

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: b39f35492ea200776aaf47d09842ac0f3ddc9b2feeb0b582f116527e3ede531c
4
- data.tar.gz: 38c22258be092078cfd94a55428f98abe6eba3fead710118e90738614ead271a
3
+ metadata.gz: 3264dda6f4a9e954f297ebfc1e5976ff5ea5af55964913f364fa6374efb452d3
4
+ data.tar.gz: 0b47faa426d87e075a3274a13cb6ed8502d59d7bf8faad949dd757f102e70b19
5
5
  SHA512:
6
- metadata.gz: 6aad32559cb9532b50e5e68870eae48929c4b35c2aaef621a36f72afa17d66f7f253e7e4b92013a56cfbbea63f7e12ac35be5697bda83d21a9c37b9262421192
7
- data.tar.gz: 1fb20e21e76fa8affd0150774d5c69f5a70112203c62a3a6ebc1fdcab66583e8c91c079b65bc417cda4311d9d24001078b27319410f52c639b1904b447b3a12e
6
+ metadata.gz: de19868e12b548bd118a8162cba35ec9bbaf58f37235ddd53e4ff4bcb23c035800fd82470eeaea0ad6ee260aebf521bbfe9865fda03c008bebfca399ba038c24
7
+ data.tar.gz: ba555cc2b47a8ea5a89c8b99aa8ea432d239709d8606d8433c5849bdae89711eca80cd9bcbb8744b584f20e1e498025ea0029a6782655c37752f7bd1487b0610
@@ -1,3 +1,3 @@
1
1
  module GrapeListing
2
- VERSION = '1.4.3'.freeze
2
+ VERSION = '1.4.5'.freeze
3
3
  end
@@ -6,16 +6,18 @@ module GrapeListing
6
6
  def sort_proc
7
7
  # проверка необходимости нестандартной сортировки
8
8
  if !@sortable.is_a?(Array) || @sortable.empty? || custom_sorting_field.blank?
9
- return proc { order('id DESC NULLS LAST') }
9
+ return proc { order('id desc') }
10
10
  end
11
11
 
12
12
  @sort_order = @params['sort_order'] || 'desc'
13
13
  sorting_scope = custom_sorting_field.split('|')[1]
14
14
 
15
15
  if sorting_scope
16
- proc { send(sorting_scope, @sort_order) }
16
+ direction = @sort_order
17
+ proc { send(sorting_scope, direction) }
17
18
  else
18
- query = Arel.sql("#{custom_sorting_field} #{@sort_order} NULLS LAST")
19
+ nulls_order = @sort_order.to_s.downcase == 'desc' ? 'LAST' : 'FIRST'
20
+ query = Arel.sql("#{custom_sorting_field} #{@sort_order} NULLS #{nulls_order}")
19
21
  proc { order(query) }
20
22
  end
21
23
  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.3
4
+ version: 1.4.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Павел Бабин
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-02-24 00:00:00.000000000 Z
11
+ date: 2025-02-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack