pragma-rails 1.2.1 → 1.2.2

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
  SHA1:
3
- metadata.gz: f0563c475beacd266ab3f640d62c67d0b8c519fc
4
- data.tar.gz: 5ebeac250170de4abd8c7654bc2ba5d81d746355
3
+ metadata.gz: 3c796f199f42d005e7dcdbd930bbf2179f34d37d
4
+ data.tar.gz: c940a57224d06ba1f90af3a0f9af18d7e1baf330
5
5
  SHA512:
6
- metadata.gz: a0308d1ef433128e28e82dc1948b1005bdaf137a4b24c4ca96de67f36930e9fd81ac0c0f873eb6b5e15a5d5d16551d1e8abf548997e6633ef1c46268d436f637
7
- data.tar.gz: 5f144bb64724bafab0fc32b0ea5ae1a444f216480e108fb39fc64820a93dc5990022d5ffbcda2daa344fdb10b082e6bedd32be6a9f334b121fcc4fde5bc50137
6
+ metadata.gz: a84f079851c0c245b918f1098f0439fb204237d802f3c2a322bed6bb5340b7b0603c42d3de2c5497c2914fe587b94575bfe48de2da362aa5f17bd1e7606b8cae
7
+ data.tar.gz: 545923d78abc635d53f185c2f517133d9233c177fd8259c824587c962bb35551a4aac7e58801aaf527ae5d36f7445f8cd099b0750f22043305e71545c6fd680b
@@ -33,10 +33,7 @@ module Pragma
33
33
  end
34
34
 
35
35
  if result.resource
36
- render status: result.status, json: result.resource.to_json(user_options: {
37
- expand: params[:expand],
38
- current_user: operation_user
39
- })
36
+ render status: result.status, json: resource_to_json(result.resource)
40
37
  else
41
38
  head result.status
42
39
  end
@@ -61,6 +58,25 @@ module Pragma
61
58
  def operation_user
62
59
  current_user if respond_to?(:current_user)
63
60
  end
61
+
62
+ private
63
+
64
+ def resource_to_json(resource)
65
+ options = {
66
+ user_options: {
67
+ expand: params[:expand],
68
+ current_user: operation_user
69
+ }
70
+ }
71
+
72
+ if resource.is_a?(Array)
73
+ resource.map do |instance|
74
+ instance.to_hash(options)
75
+ end
76
+ else
77
+ resource.to_json(options)
78
+ end
79
+ end
64
80
  end
65
81
  end
66
82
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
  module Pragma
3
3
  module Rails
4
- VERSION = '1.2.1'
4
+ VERSION = '1.2.2'
5
5
  end
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pragma-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alessandro Desantis
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-05-27 00:00:00.000000000 Z
11
+ date: 2017-11-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pragma
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
171
171
  version: '0'
172
172
  requirements: []
173
173
  rubyforge_project:
174
- rubygems_version: 2.6.8
174
+ rubygems_version: 2.6.13
175
175
  signing_key:
176
176
  specification_version: 4
177
177
  summary: Ruby on Rails integration for the Pragma architecture.