deep_unrest 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06c3e91ce0d55f72657cbbc336204ee4e9892d55
-  data.tar.gz: 94d86685379dd5dd778234d59d0d46973e774b6d
+  metadata.gz: ae3d92d31f39fb9850caad832917df453a3d1c9b
+  data.tar.gz: e9d68cb90229eb52728e9889fcee1a0e02391b08
 SHA512:
-  metadata.gz: 240d5d75be4343f354d1255ecc8eb1a0f3a5218b5162c433e2260677c44d7407bc62309e0f7b2a3b5469a2ea27a3834758eef6a31c88f6cc2b9f3c90fe1b0ee0
-  data.tar.gz: e50e934116f6095b25b8dea4f3139bc4c203c4f3999b1b622fb329bab0df0c234ceca63fe5050523133b7e518ecb5d73fc78beb213f05a6fdae3113ceae7d6d2
+  metadata.gz: 8e3334ab48073acdfafd5958d876cadca7cae37e4a4d0a1845bcbc2f2d4dbfbb30894698c85ca14bb370d7c3c0aa0dd8c20d01611a8d0397df0ddacc2836d0b1
+  data.tar.gz: cefde02eb26d6e4bfd6dcb21ec4942e4edfc3c7fea2c0b278d5fb95902b102ea768c5b424d8d009b5ce9e724f6847f664f661ac4e451ca97899eff0b6e2db583

data/app/controllers/deep_unrest/application_controller.rb

@@ -6,16 +6,25 @@ module DeepUnrest
       { current_user: current_user }
     end
 
+
+    # multipart data will be an array-like hash
+    def format_data(data)
+      if data.respond_to? :values
+        data.values
+      else
+        data
+      end
+    end
+
     def update
       redirect = allowed_params[:redirect]
-      redirect_replace = DeepUnrest.perform_update(allowed_params[:data],
+      data = format_data(allowed_params[:data])
+      redirect_replace = DeepUnrest.perform_update(data,
                                                    current_user)
-      if redirect
-        response.headers.merge! update_auth_header
-        redirect_to redirect_replace.call(redirect)
-      else
-        render json: {}, status: 200
-      end
+      resp = {}
+      resp[:redirect] = redirect_replace.call(redirect) if redirect
+      response.headers.merge! update_auth_header
+      render json: resp, status: 200
     rescue DeepUnrest::Unauthorized => err
       render json: err.message, status: 403
     rescue DeepUnrest::UnpermittedParams => err

data/lib/deep_unrest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeepUnrest
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/lib/deep_unrest.rb

@@ -384,6 +384,20 @@ module DeepUnrest
     end
   end
 
+  def self.format_error_keys(res, i)
+    record = res[:record]
+    errors = record&.errors&.messages
+    if errors
+      base_key = "#{record.class.to_s.underscore.pluralize}[#{i}]"
+      errors.keys.map do |attr|
+        if record.respond_to? attr
+          errors["#{base_key}.#{attr}".to_sym] = errors.delete(attr)
+        end
+      end
+    end
+    errors
+  end
+
   def self.perform_update(params, user)
     # identify requested scope(s)
     scopes = collect_all_scopes(params)
@@ -401,10 +415,9 @@ module DeepUnrest
     results = mutate(mutations, user).flatten
 
     # check results for errors
-    errors = results.map { |res| res[:record] }
+    errors = results.each_with_index
+                    .map { |res, i| format_error_keys(res, i) }
                     .compact
-                    .map(&:errors)
-                    .map(&:messages)
                     .reject(&:empty?)
                     .compact
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep_unrest
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Lynn Hurley