deep_unrest 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 298848186d99b08b61138ee69e64f4b7e1533323
-  data.tar.gz: 6e6e1d641b427c8bff316dddc5022645c4a0d9e3
+  metadata.gz: d956b080370fba60df6de844edcb1346763aa98f
+  data.tar.gz: 0126de558b0326faf98280030b1e6b32f8c208c0
 SHA512:
-  metadata.gz: 294ef08f72dc4b7c75af39139be6860aca9728556e20856618a42bdd105f0e59a7559817ce6903f1a4a8cf64327fda14303cf44f49df91bd6b63af9a4a1495a7
-  data.tar.gz: 412601b198372de42790ca4985737d3ee9f876703d595fb3741000bfcad7a55edd8dbda7e053697e06814008ed53b869639c1b5adc2de4f0d660d077ec19327a
+  metadata.gz: 096bde94abae1571026d1664dfec6fd87feac55aab27fbd3c2eeac4267f69926f0738b717289f769ff11b1b1b59daf768920117b47606545deab60391f8ad268
+  data.tar.gz: d3574d96731e97b160dcf32c3dd1d6d75c5eace3abc8bbdad93e1ebc163e35803e998f5489d7743bbae7ba24bfaf924949ca9185290bfdc72c7dd1aa14fd66cf

data/app/controllers/deep_unrest/application_controller.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 module DeepUnrest
   class ApplicationController < ActionController::API
     include DeepUnrest.authentication_concern
 
+    @@temp_ids = {}
+
     def context
       { current_user: current_user }
     end
@@ -24,10 +28,12 @@ module DeepUnrest
     end
 
     def update
+      @@temp_ids[request.uuid] = {}
       redirect = allowed_params[:redirect]
       data = repair_nested_params(allowed_params)[:data]
-      results = DeepUnrest.perform_update(data, current_user)
-      resp = { destroyed: results[:destroyed] }
+      results = DeepUnrest.perform_update(request.uuid, data, current_user)
+      resp = { destroyed: results[:destroyed],
+               tempIds: @@temp_ids[request.uuid] }
       resp[:redirect] = results[:redirect_regex].call(redirect) if redirect
       render json: resp, status: 200
     rescue DeepUnrest::Unauthorized => err
@@ -36,6 +42,8 @@ module DeepUnrest
       render json: err.message, status: 405
     rescue DeepUnrest::Conflict => err
       render json: err.message, status: 409
+    ensure
+      @@temp_ids.delete(request.uuid)
     end
 
     def current_user

data/lib/deep_unrest.rb

@@ -240,7 +240,7 @@ module DeepUnrest
     end
 
     scope[:ar_error_key] = increment_error_indices(path_info, err_path_memo)
-    scope[:dr_error_key] = path_info.map {|pair| pair.join('') }.join('.')
+    scope[:dr_error_key] = path_info.map { |pair| pair.join('') }.join('.')
 
     case action
     when :destroy
@@ -256,9 +256,13 @@ module DeepUnrest
     cursor
   end
 
-  def self.get_mutation_cursor(memo, cursor, addr, type, id, temp_id, scope_type)
+  def self.get_mutation_cursor(ctx, memo, cursor, addr, type, id, temp_id, scope_type)
     if memo
       record = { id: id || temp_id }
+      if temp_id
+        record[:deep_unrest_temp_id] = temp_id
+        record[:deep_unrest_context] = ctx
+      end
       if plural?(type)
         cursor[addr] = [record]
         next_cursor = cursor[addr][0]
@@ -273,6 +277,8 @@ module DeepUnrest
       klass = to_class(type)
       body = {}
       body[klass.primary_key.to_sym] = id if id
+      body[:deep_unrest_temp_id] = temp_id if temp_id
+      body[:deep_unrest_context] = ctx if temp_id
       cursor[type_sym] = {
         klass: klass
       }
@@ -329,7 +335,7 @@ module DeepUnrest
     mutations
   end
 
-  def self.build_mutation_fragment(op, scopes, user, err_path_memo, rest = nil, memo = nil, cursor = nil, type = nil)
+  def self.build_mutation_fragment(ctx, op, scopes, user, err_path_memo, rest = nil, memo = nil, cursor = nil, type = nil)
     rest ||= parse_path(op[:path])
 
     if rest.empty?
@@ -343,7 +349,8 @@ module DeepUnrest
     scope_type = get_scope_type(id_str, rest.blank?, op[:destroy])
     temp_id = scope_type == :create ? id_str : nil
 
-    memo, next_cursor = get_mutation_cursor(memo,
+    memo, next_cursor = get_mutation_cursor(ctx,
+                                            memo,
                                             cursor,
                                             addr,
                                             type,
@@ -352,44 +359,46 @@ module DeepUnrest
                                             scope_type)
 
     next_cursor[:id] = id if id
-    build_mutation_fragment(op, scopes, user, err_path_memo, rest, memo, next_cursor, type)
+    build_mutation_fragment(ctx, op, scopes, user, err_path_memo, rest, memo, next_cursor, type)
   end
 
-  def self.build_mutation_body(ops, scopes, user)
+  def self.build_mutation_body(ctx, ops, scopes, user)
     err_path_memo = {}
     ops.each_with_object(HashWithIndifferentAccess.new({})) do |op, memo|
-      memo.deeper_merge(build_mutation_fragment(op, scopes, user, err_path_memo))
+      memo.deeper_merge(build_mutation_fragment(ctx, op, scopes, user, err_path_memo))
     end
   end
 
   def self.mutate(mutation, user)
-    mutation.map do |_, item|
-      item[:operations].map do |id, ops|
-        ops.map do |_, action|
-          record = case action[:method]
-                   when :update_all
-                     DeepUnrest.authorization_strategy
-                       .get_authorized_scope(user, item[:klass])
-                       .update(action[:body])
-                     nil
-                   when :destroy_all
-                     DeepUnrest.authorization_strategy
-                       .get_authorized_scope(user, item[:klass])
-                       .destroy_all
-                     nil
-                   when :update
-                     item[:klass].update(id, action[:body])
-                   when :create
-                     item[:klass].create(action[:body])
-                   when :destroy
-                     item[:klass].destroy(id)
-                   end
-          result = { record: record }
-          if action[:temp_id]
-            result[:temp_ids] = {}
-            result[:temp_ids][action[:temp_id]] = record.id
+    ActiveRecord::Base.transaction do
+      mutation.map do |_, item|
+        item[:operations].map do |id, ops|
+          ops.map do |_, action|
+            record = case action[:method]
+                     when :update_all
+                       DeepUnrest.authorization_strategy
+                                 .get_authorized_scope(user, item[:klass])
+                                 .update(action[:body])
+                       nil
+                     when :destroy_all
+                       DeepUnrest.authorization_strategy
+                                 .get_authorized_scope(user, item[:klass])
+                                 .destroy_all
+                       nil
+                     when :update
+                       item[:klass].update(id, action[:body])
+                     when :create
+                       item[:klass].create(action[:body])
+                     when :destroy
+                       item[:klass].destroy(id)
+                     end
+            result = { record: record }
+            if action[:temp_id]
+              result[:temp_ids] = {}
+              result[:temp_ids][action[:temp_id]] = record.id
+            end
+            result
           end
-          result
         end
       end
     end
@@ -470,7 +479,7 @@ module DeepUnrest
     record&.errors&.messages
   end
 
-  def self.perform_update(params, user)
+  def self.perform_update(ctx, params, user)
     # reject new resources marked for destruction
     viable_params = params.reject do |param|
       temp_id?(param[:path]) && param[:destroy].present?
@@ -483,7 +492,7 @@ module DeepUnrest
     DeepUnrest.authorization_strategy.authorize(scopes, user).flatten
 
     # bulid update arguments
-    mutations = build_mutation_body(viable_params, scopes, user)
+    mutations = build_mutation_body(ctx, viable_params, scopes, user)
 
     merge_siblings!(mutations)
     remove_temp_ids!(mutations)

data/lib/deep_unrest/concerns/map_temp_ids.rb

@@ -0,0 +1,22 @@
+module DeepUnrest
+  module Concerns
+    module MapTempIds
+      extend ActiveSupport::Concern
+
+      included do
+        attr_accessor :deep_unrest_context
+        attr_accessor :deep_unrest_temp_id
+        after_create :map_temp_id
+      end
+
+      def map_temp_id
+        # return unless @deep_unrest_temp_id
+        temp_id_map = DeepUnrest::ApplicationController.class_variable_get(
+          '@@temp_ids'
+        )
+        return unless temp_id_map && @deep_unrest_temp_id
+        temp_id_map[@deep_unrest_context][@deep_unrest_temp_id] = id
+      end
+    end
+  end
+end

data/lib/deep_unrest/concerns/null_concern.rb

@@ -2,6 +2,7 @@ module DeepUnrest
   module Concerns
     module NullConcern
       extend ActiveSupport::Concern
+
       included do
         before_action :issue_warning
       end

data/lib/deep_unrest/engine.rb

@@ -2,6 +2,7 @@ require 'deep_unrest/authorization/base_strategy'
 require 'deep_unrest/authorization/none_strategy'
 require 'deep_unrest/authorization/pundit_strategy'
 require 'deep_unrest/concerns/null_concern'
+require 'deep_unrest/concerns/map_temp_ids'
 require 'deep_merge/rails_compat'
 
 module DeepUnrest

data/lib/deep_unrest/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_unrest
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -173,6 +173,7 @@ files:
 - lib/deep_unrest/authorization/base_strategy.rb
 - lib/deep_unrest/authorization/none_strategy.rb
 - lib/deep_unrest/authorization/pundit_strategy.rb
+- lib/deep_unrest/concerns/map_temp_ids.rb
 - lib/deep_unrest/concerns/null_concern.rb
 - lib/deep_unrest/engine.rb
 - lib/deep_unrest/version.rb