snfoil-rails 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28a1f49800c3ca49e322970d28d6ec119e686a04d2bdac14d2a42099d7cac976
-  data.tar.gz: 194ca6911b6272a6805893fcc5e05af4e60a05697516e617c8ed8b6f93e0d2cf
+  metadata.gz: 552d48b3b6acfe4814b6c058c65ae6b93853c8a8d954447e916b96252439cf7c
+  data.tar.gz: 9fc7c3fcae1f33429ae733ea74ea1eefd0a9be03852b3796ba60cd4169c6659b
 SHA512:
-  metadata.gz: 5b62cb7a7c0da0deb684e6d9bcc41f23848f3de1c9abc69c7878ac075ecad496e2ae63be579c23a093369f73b616a18b87347c59026fee78774d37f70833ba6d
-  data.tar.gz: da6331fea3c1d892ff7c901a79a3d1861eee9479c1f77f9e5fd82cf709c0c2a64d8b061d7f130f5835c6b86cb3613bb80014472404b031eb38df2cd5e5d429c9
+  metadata.gz: 18575fcc9acd7102cb6b9d023dda3f911f38864824ea4b02144ac37471c48b271bfea04d62aeb2da644b5c2343f6fdd462a59a0ae184c0e03ffe58ead39ed9b1
+  data.tar.gz: 3393de5fd2ed5bbee912f67c19e3573f1179c95e66d20385df01c70d0d658459c705ef46ed94a17fd6cf9af200006a6eab0c2b5a6a9e2311197a8955b324cdd9

data/lib/sn_foil/controller/api.rb

@@ -41,7 +41,10 @@ module SnFoil
       def render_change(model, **options)
         if model.errors.empty?
           params
-          render json: serializer(**options).new(model, **options.merge, params: { current_entity: current_entity }).serializable_hash
+          render json: serializer(**options).new(model,
+                                                 **options,
+                                                 params: (options[:controller_params] || options[:params] || {})
+                                                           .merge(current_entity: current_entity)).serializable_hash
         else
           render json: model.errors, status: :unprocessable_entity
         end
@@ -58,13 +61,17 @@ module SnFoil
       def render_index(results, **options)
         render json: serializer(**options).new(paginate(results, **options),
                                                **options,
-                                               params: { current_entity: current_entity },
+                                               params: (options[:controller_params] || options[:params] || {})
+                                                         .merge(current_entity: current_entity),
                                                meta: meta(results, **options))
                                           .serializable_hash
       end
 
       def render_show(model, **options)
-        render json: serializer(**options).new(model, **options, params: { current_entity: current_entity }).serializable_hash
+        render json: serializer(**options).new(model,
+                                               **options,
+                                               params: (options[:controller_params] || options[:params] || {})
+                                                         .merge(current_entity: current_entity)).serializable_hash
       end
 
       private

data/lib/sn_foil/rails/version.rb

@@ -2,6 +2,6 @@
 
 module SnFoil
   module Rails
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snfoil-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Matthew Howes