pragma-rails 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0563c475beacd266ab3f640d62c67d0b8c519fc
-  data.tar.gz: 5ebeac250170de4abd8c7654bc2ba5d81d746355
+  metadata.gz: 3c796f199f42d005e7dcdbd930bbf2179f34d37d
+  data.tar.gz: c940a57224d06ba1f90af3a0f9af18d7e1baf330
 SHA512:
-  metadata.gz: a0308d1ef433128e28e82dc1948b1005bdaf137a4b24c4ca96de67f36930e9fd81ac0c0f873eb6b5e15a5d5d16551d1e8abf548997e6633ef1c46268d436f637
-  data.tar.gz: 5f144bb64724bafab0fc32b0ea5ae1a444f216480e108fb39fc64820a93dc5990022d5ffbcda2daa344fdb10b082e6bedd32be6a9f334b121fcc4fde5bc50137
+  metadata.gz: a84f079851c0c245b918f1098f0439fb204237d802f3c2a322bed6bb5340b7b0603c42d3de2c5497c2914fe587b94575bfe48de2da362aa5f17bd1e7606b8cae
+  data.tar.gz: 545923d78abc635d53f185c2f517133d9233c177fd8259c824587c962bb35551a4aac7e58801aaf527ae5d36f7445f8cd099b0750f22043305e71545c6fd680b

data/lib/pragma/rails/controller.rb

@@ -33,10 +33,7 @@ module Pragma
           end
 
           if result.resource
-            render status: result.status, json: result.resource.to_json(user_options: {
-              expand: params[:expand],
-              current_user: operation_user
-            })
+            render status: result.status, json: resource_to_json(result.resource)
           else
             head result.status
           end
@@ -61,6 +58,25 @@ module Pragma
         def operation_user
           current_user if respond_to?(:current_user)
         end
+
+        private
+
+        def resource_to_json(resource)
+          options = {
+            user_options: {
+              expand: params[:expand],
+              current_user: operation_user
+            }
+          }
+
+          if resource.is_a?(Array)
+            resource.map do |instance|
+              instance.to_hash(options)
+            end
+          else
+            resource.to_json(options)
+          end
+        end
       end
     end
   end

data/lib/pragma/rails/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Pragma
   module Rails
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pragma-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Alessandro Desantis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-27 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pragma
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails integration for the Pragma architecture.