grape-listing 2.0.0.pre.beta.12 → 2.0.0.pre.beta.13

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: f684c600fca890e935f642070d3ee285a25dba712edbc068b00dd481d171e2da
4
- data.tar.gz: c22091b194e455d5fe1adeef5dcd02bb09312ca30693315ab09bda994a8d6a41
3
+ metadata.gz: 2728296b805a8877461c3696a08b7f604301b04911dc23690c38e4662d49e4e4
4
+ data.tar.gz: 8621fc8d53b6c608c85fab5a5231ce8a5e95446a0b424c3f2d4154b609f1a142
5
5
  SHA512:
6
- metadata.gz: 7de521bc355da9bf4d1d315fb0230ed9e2b471f225b6dd8c46de6b46fb6a5899bf8b08f9b0d1c7e7051c15e494640da2328660eedf861f69a11436fde6591e93
7
- data.tar.gz: c4a2177173922988f56f5defcc1bd3b9d4c07c81bc312da498489aaed0b392eea9eb9ae3b2820c7700551614f1acef38e6916657720772a99bf86f73069bb784
6
+ metadata.gz: b5faf00132b016257f6bf72790f17e3f8a6ce986a75b5d335569ba6335e1a6cbdf80dd344ce348be1fe9c559e1c5074df665b3b6f2acebf18bdf6b4a953d2766
7
+ data.tar.gz: 91d2b3865e241d629e3377dd5e9770389f6f37f676b4947ee30c19becbbdba1949de59152b6eafb12a2ee1ee3eec0950d87228447c41896d7a7796561fa58bbf
@@ -1,3 +1,3 @@
1
1
  module GrapeListing
2
- VERSION = '2.0.0-beta.12'.freeze
2
+ VERSION = '2.0.0-beta.13'.freeze
3
3
  end
@@ -10,8 +10,8 @@ module GrapeListing
10
10
 
11
11
  # результат с пагинацией
12
12
  {
13
- sort_by: @sort_by,
14
- sort_order: @sort_order,
13
+ sort_by: @params['sort_by'] || 'id',
14
+ sort_order: @params['sort_order'] || 'desc',
15
15
  count: @objects_count,
16
16
  objects: @objects
17
17
  }
@@ -4,15 +4,15 @@ module GrapeListing
4
4
  private
5
5
 
6
6
  def sort_proc
7
- @sort_by = @params['sort_by'] || 'id'
8
- @sort_order = @params['sort_order'] || 'desc'
9
- custom_scope = @custom_sort[@sort_by] if @custom_sort
7
+ sort_by = @params['sort_by'] || 'id'
8
+ sort_order = @params['sort_order'] || 'desc'
9
+ custom_scope = @custom_sort[sort_by] if @custom_sort
10
10
 
11
11
  if custom_scope
12
- proc { send(custom_scope, @sort_order) }
12
+ proc { send(custom_scope, sort_order) }
13
13
  else
14
- nulls_order = @sort_order.to_s.downcase == 'desc' ? 'LAST' : 'FIRST'
15
- query = Arel.sql("#{@model.table_name}.#{@sort_by} #{@sort_order} NULLS #{nulls_order}")
14
+ nulls_order = sort_order.to_s.downcase == 'desc' ? 'LAST' : 'FIRST'
15
+ query = Arel.sql("#{@model.table_name}.#{sort_by} #{sort_order} NULLS #{nulls_order}")
16
16
  proc { order(query) }
17
17
  end
18
18
  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: 2.0.0.pre.beta.12
4
+ version: 2.0.0.pre.beta.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Павел Бабин
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-06-19 00:00:00.000000000 Z
11
+ date: 2025-06-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionpack