xsdk-scaffold-rails 0.1.10 → 0.1.11

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: 75d85ae55d8bef8eadbb1af2b40f558c60279d31408c2378220bf73ea398eada
4
- data.tar.gz: ba396e8dc6effc8787e6ed885d77e65ddfd8c56979dd899d8fc86f1da69b7f0d
3
+ metadata.gz: 9febb86209ef377bac9ac2913c5f9dc7040ffb86217de6bca2144fd8d31cd9c4
4
+ data.tar.gz: d91f1206b72fb81317896a9b96ab5045f783d99ec5796024c86a9a1ab3a98699
5
5
  SHA512:
6
- metadata.gz: fe6202b413534c5c6df73eea0f073cfba20c12ad5fc04c7bf580df61699f869c7d32746e36c540d82458f19976b7076a390a51b820d1f76a3503d46c85ce3a21
7
- data.tar.gz: 00d7b44019557ea04c309a91ddbb6753cacf37abc5e04f12849e1e1274fb5d2dad72067ed119aba86ab9f100319ef6619c671146a0ab10064b16b4eee771842c
6
+ metadata.gz: dbbba730369a3f1c38e3cb8e82541f60b6e32d897ef02b5022c2446c4fa02da773495413bc1b180835037c926ed628ee8623afb854bda59b49d92fcf07e99290
7
+ data.tar.gz: 0cd783af14aeab46f95ae0bdc2675c8a4211ac0735107accd403c92dd1735daa2927fecfe9d9e9699df3ab968d87ce27bb0fab06fff13b2c6772fa64b29c31e6
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- xsdk-scaffold-rails (0.1.10)
4
+ xsdk-scaffold-rails (0.1.11)
5
5
  activerecord (>= 6.0.0)
6
6
  pg (>= 1.1)
7
7
 
@@ -42,7 +42,7 @@ GEM
42
42
  parallel (1.20.1)
43
43
  parser (3.0.1.1)
44
44
  ast (~> 2.4.1)
45
- pg (1.2.3)
45
+ pg (1.3.5)
46
46
  racc (1.5.2)
47
47
  rack (2.2.3)
48
48
  rainbow (3.0.0)
@@ -127,4 +127,4 @@ DEPENDENCIES
127
127
  xsdk-scaffold-rails!
128
128
 
129
129
  BUNDLED WITH
130
- 2.2.17
130
+ 2.3.10
@@ -28,10 +28,16 @@ module Xsdk
28
28
  sort = @options[:sortBy]
29
29
  direction = @options[:sortDesc]
30
30
  order_string = sort.map.with_index { |k, idx| "#{sorting_map[k.to_sym]} #{direction[idx] ? 'DESC' : 'ASC'}" }
31
- data.limit(per_page)
32
- .offset(page * per_page)
33
- .order(order_string)
34
- .as_json(methods: methods + enum_methods, except: keys_to_exclude, include: has_many_include)
31
+
32
+ if per_page > 0
33
+ data = data.limit(per_page).offset(page * per_page)
34
+ end
35
+
36
+ data.order(order_string).as_json(
37
+ methods: methods + enum_methods,
38
+ except: keys_to_exclude,
39
+ include: has_many_include
40
+ )
35
41
  end
36
42
 
37
43
  def keys_to_exclude
@@ -1,7 +1,7 @@
1
1
  module Xsdk
2
2
  module Scaffold
3
3
  module Rails
4
- VERSION = "0.1.10"
4
+ VERSION = "0.1.11"
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: xsdk-scaffold-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.10
4
+ version: 0.1.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Davide Croci
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-11-22 00:00:00.000000000 Z
11
+ date: 2022-05-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord