snfoil-rails 0.4.6 → 0.5.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: b203541b05fc0a0b1928b4b6ab94a363527b902619f59928a53df3347b0af453
4
- data.tar.gz: b13ab3c8fc1f012d786d051bfbd2d340c9259b59bec7f5f3d0a3e641604bc680
3
+ metadata.gz: a1c6591b763673686e66b459bdb085c0a9425d654b99c04b398b0d0f8cdb2d1e
4
+ data.tar.gz: e64a5d8ea7349749f4fb28c9ce0007ac7d13ebf931284f4400f0185a82e012dc
5
5
  SHA512:
6
- metadata.gz: 011e88e00141d9d19244ba48f08240bebf78103c2683c5d57ab2f1ac719c84a45167d572b871baf429b8328dd0542f35814574df0518fda14957f475b71c3d73
7
- data.tar.gz: 93252b6c25a2b80604d2b3c25d4cf8c424d01d135083345c41fa89491f455ff0a35b2e74ef438b25a9696a88de74a7a72fde9678d74db024d65dffa817f5a874
6
+ metadata.gz: 393ab3637a26c3b07e4baf12fc50c4a621be27db740b6e9820ff38c79a9b6a8e846629f17412bd2ee8cf854b962d08fd188ab6d08f3d92ec9d47c362a3503ac3
7
+ data.tar.gz: b0dad34bb18a07567aadd1e4d53e16bdf1bb558d480830d59c7eed8c0fdfbbb2622f10a1e9e7c17a7baec9e785b62aaeddf62c3898c357b7791f73bded5c2135
@@ -40,7 +40,11 @@ module SnFoil
40
40
 
41
41
  def render_change(model, **options)
42
42
  if model.errors.empty?
43
- render json: serializer(**options).new(model, **options).serializable_hash
43
+ params
44
+ render json: serializer(**options).new(model,
45
+ **options,
46
+ params: (options[:controller_params] || options[:params] || {})
47
+ .merge(current_entity: current_entity)).serializable_hash
44
48
  else
45
49
  render json: model.errors, status: :unprocessable_entity
46
50
  end
@@ -55,12 +59,19 @@ module SnFoil
55
59
  end
56
60
 
57
61
  def render_index(results, **options)
58
- render json: serializer(**options).new(paginate(results, **options), **options, meta: meta(results, **options))
62
+ render json: serializer(**options).new(paginate(results, **options),
63
+ **options,
64
+ params: (options[:controller_params] || options[:params] || {})
65
+ .merge(current_entity: current_entity),
66
+ meta: meta(results, **options))
59
67
  .serializable_hash
60
68
  end
61
69
 
62
70
  def render_show(model, **options)
63
- render json: serializer(**options).new(model, **options).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
64
75
  end
65
76
 
66
77
  private
@@ -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
 
@@ -28,7 +28,7 @@ module SnFoil
28
28
  end
29
29
 
30
30
  def current_context(**options)
31
- @current_context ||= context(**options).new(context_user)
31
+ @current_context ||= context(**options).new(context_entity)
32
32
  end
33
33
 
34
34
  protected
@@ -75,7 +75,8 @@ module SnFoil
75
75
  options
76
76
  end
77
77
 
78
- def context_user
78
+ def context_entity
79
+ return current_entity if defined? current_entity
79
80
  return current_user if defined? current_user
80
81
  end
81
82
  end
@@ -2,6 +2,6 @@
2
2
 
3
3
  module SnFoil
4
4
  module Rails
5
- VERSION = '0.4.6'
5
+ VERSION = '0.5.4'
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.4.6
4
+ version: 0.5.4
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-03-27 00:00:00.000000000 Z
12
+ date: 2020-07-01 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
@@ -17,42 +17,42 @@ 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
45
45
  requirements:
46
46
  - - "~>"
47
47
  - !ruby/object:Gem::Version
48
- version: '0.4'
48
+ version: '0.5'
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
53
  - - "~>"
54
54
  - !ruby/object:Gem::Version
55
- version: '0.4'
55
+ version: '0.5'
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: bundler
58
58
  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