snfoil-rails 0.5.0 → 0.5.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/lib/sn_foil/controller/api.rb +10 -3
  3. data/lib/sn_foil/controller/concerns/index_controller_concern.rb +1 -0
  4. data/lib/sn_foil/rails/version.rb +1 -1
  5. metadata +11 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 28a1f49800c3ca49e322970d28d6ec119e686a04d2bdac14d2a42099d7cac976
4
- data.tar.gz: 194ca6911b6272a6805893fcc5e05af4e60a05697516e617c8ed8b6f93e0d2cf
3
+ metadata.gz: d48c445c4545a06e5d8e76b7efff38cc25397ee250a0cecf742c662e35b85c0e
4
+ data.tar.gz: 91b1a44d6fe259a22148bfcbe7e70ae6d5114e1253ab65eecb906032e6b17216
5
5
  SHA512:
6
- metadata.gz: 5b62cb7a7c0da0deb684e6d9bcc41f23848f3de1c9abc69c7878ac075ecad496e2ae63be579c23a093369f73b616a18b87347c59026fee78774d37f70833ba6d
7
- data.tar.gz: da6331fea3c1d892ff7c901a79a3d1861eee9479c1f77f9e5fd82cf709c0c2a64d8b061d7f130f5835c6b86cb3613bb80014472404b031eb38df2cd5e5d429c9
6
+ metadata.gz: 53bef1d3d8eaf8f7e46dd5e9d161bb9ff6e83628e0cf0682519aaee965cfcafb575e87031aa2760d4fcb47693670f3c505b83ee828cae9a4efc28906fb2ad982
7
+ data.tar.gz: 9c6cee13f1ba22c291469b9339c655a5a797fc31666f92ab60eaec8c1229e51aa10648f3beb13a9b29505d1b69e9a61a20c3f56a9b52968fb2d97e4fc85e507d
data/lib/sn_foil/controller/api.rb CHANGED
@@ -41,7 +41,10 @@ module SnFoil
41
41
  def render_change(model, **options)
42
42
  if model.errors.empty?
43
43
  params
44
- render json: serializer(**options).new(model, **options.merge, params: { current_entity: current_entity }).serializable_hash
44
+ render json: serializer(**options).new(model,
45
+ **options,
46
+ params: (options[:controller_params] || options[:params] || {})
47
+ .merge(current_entity: current_entity)).serializable_hash
45
48
  else
46
49
  render json: model.errors, status: :unprocessable_entity
47
50
  end
@@ -58,13 +61,17 @@ module SnFoil
58
61
  def render_index(results, **options)
59
62
  render json: serializer(**options).new(paginate(results, **options),
60
63
  **options,
61
- params: { current_entity: current_entity },
64
+ params: (options[:controller_params] || options[:params] || {})
65
+ .merge(current_entity: current_entity),
62
66
  meta: meta(results, **options))
63
67
  .serializable_hash
64
68
  end
65
69
 
66
70
  def render_show(model, **options)
67
- render json: serializer(**options).new(model, **options, params: { current_entity: current_entity }).serializable_hash
71
+ render json: serializer(**options).new(model,
72
+ **options,
73
+ params: (options[:controller_params] || options[:params] || {})
74
+ .merge(current_entity: current_entity)).serializable_hash
68
75
  end
69
76
 
70
77
  private
data/lib/sn_foil/controller/concerns/index_controller_concern.rb CHANGED
@@ -50,6 +50,7 @@ module SnFoil
50
50
  end
51
51
 
52
52
  def meta(results, **options)
53
+ results = paginate(results, **options)
53
54
  total_pages = results.respond_to?(:total_pages) ? results.total_pages : nil
54
55
  total_count = results.respond_to?(:total_count) ? results.total_count : nil
55
56
 
data/lib/sn_foil/rails/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module SnFoil
4
4
  module Rails
5
- VERSION = '0.5.0'
5
+ VERSION = '0.5.5'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: snfoil-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.5.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matthew Howes
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2020-04-16 00:00:00.000000000 Z
12
+ date: 2020-07-21 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
@@ -17,28 +17,28 @@ dependencies:
17
17
  requirements:
18
18
  - - ">="
19
19
  - !ruby/object:Gem::Version
20
- version: '5.1'
20
+ version: 5.2.4.3
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - ">="
26
26
  - !ruby/object:Gem::Version
27
- version: '5.1'
27
+ version: 5.2.4.3
28
28
  - !ruby/object:Gem::Dependency
29
- name: fast_jsonapi
29
+ name: jsonapi-serializer
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - "~>"
33
33
  - !ruby/object:Gem::Version
34
- version: '1.0'
34
+ version: '2.0'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - "~>"
40
40
  - !ruby/object:Gem::Version
41
- version: '1.0'
41
+ version: '2.0'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: snfoil
44
44
  requirement: !ruby/object:Gem::Requirement
@@ -85,16 +85,16 @@ dependencies:
85
85
  name: rails
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - "~>"
88
+ - - '='
89
89
  - !ruby/object:Gem::Version
90
- version: 5.1.7
90
+ version: 5.2.4.3
91
91
  type: :development
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
- - - "~>"
95
+ - - '='
96
96
  - !ruby/object:Gem::Version
97
- version: 5.1.7
97
+ version: 5.2.4.3
98
98
  - !ruby/object:Gem::Dependency
99
99
  name: rake
100
100
  requirement: !ruby/object:Gem::Requirement