deep_unrest 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e805e8e946507f8e9e3c7efc8699f45da9aeb6d1
-  data.tar.gz: 24dbd8cd92cac4fd34ce96c0ee7234a20773ccd1
+  metadata.gz: cbd08967e61dac10c811ea4a4183108ef47a1069
+  data.tar.gz: 22fcd681e5e79ca74723fbd470d767dc9b5d9dd6
 SHA512:
-  metadata.gz: e565d06c10f0d524d1f4e940ec125702704d28722ed86e8db399af34aacd08c5a2639e5fef76e544dbfd0809a515e9e6ee0ab7abcfa0bc178aa1439c6d774983
-  data.tar.gz: 957d530761f55e9aa9b9392efa38181a4627354c6f38f129a3c8c83cc4992c47bf078adb11785b9d053a82b8525c1f9c6699ba298263a35448bc86919cb955fd
+  metadata.gz: 67dce499be10b554c4530694fb6fbb51c6aa119b58b1d81d5748fa4dd5339273bc63a6ee29b7fcc9ac54595780ef1e53aba00150f83823e07f007b85415c3632
+  data.tar.gz: bc4141b5c7e7d3c58f58562dd227e06b24deb1b63f6613d7ece5a20dab6b6a9047962c33393e0bd591384ecc1bd8da176ffa43bb4277d4ba40a753608fafcbaa

data/app/controllers/deep_unrest/application_controller.rb

@@ -9,6 +9,7 @@ module DeepUnrest
     # rails can't deal with array indices in params (converts them to hashes)
     # see https://gist.github.com/bloudermilk/2884947
     def repair_nested_params(obj)
+      return unless obj.respond_to?(:each)
       obj.each do |key, value|
         if value.is_a?(ActionController::Parameters) || value.is_a?(Hash)
           # If any non-integer keys
@@ -25,10 +26,9 @@ module DeepUnrest
     def update
       redirect = allowed_params[:redirect]
       data = repair_nested_params(allowed_params)[:data]
-      redirect_replace = DeepUnrest.perform_update(data,
-                                                   current_user)
-      resp = {}
-      resp[:redirect] = redirect_replace.call(redirect) if redirect
+      results = DeepUnrest.perform_update(data, current_user)
+      resp = { destroyed: results[:destroyed] }
+      resp[:redirect] = results[:redirect_regex].call(redirect) if redirect
       render json: resp, status: 200
     rescue DeepUnrest::Unauthorized => err
       render json: err.message, status: 403

data/lib/deep_unrest.rb

@@ -94,7 +94,7 @@ module DeepUnrest
   end
 
   def self.temp_id?(str)
-    /^\[[\w+\-]+\]$/.match(str)
+    /\[[\w+\-]+\]$/.match(str)
   end
 
   def self.plural?(s)
@@ -245,6 +245,7 @@ module DeepUnrest
     case action
     when :destroy
       cursor[:_destroy] = true
+      scope[:destroyed] = true
     when :update, :create, :update_all
       cursor.merge! parse_attributes(type,
                                      operation[:action],
@@ -461,14 +462,19 @@ module DeepUnrest
   end
 
   def self.perform_update(params, user)
+    # reject new resources marked for destruction
+    viable_params = params.reject do |param|
+      temp_id?(param[:path]) && param[:destroy]
+    end
+
     # identify requested scope(s)
-    scopes = collect_all_scopes(params)
+    scopes = collect_all_scopes(viable_params)
 
     # authorize user for requested scope(s)
     DeepUnrest.authorization_strategy.authorize(scopes, user).flatten
 
     # bulid update arguments
-    mutations = build_mutation_body(params, scopes, user)
+    mutations = build_mutation_body(viable_params, scopes, user)
 
     merge_siblings!(mutations)
     remove_temp_ids!(mutations)
@@ -486,7 +492,16 @@ module DeepUnrest
       temp_ids = results.map { |res| res[:temp_ids] }
                         .compact
                         .each_with_object({}) { |item, mem| mem.merge!(item) }
-      return build_redirect_regex(temp_ids)
+
+      return {
+        redirect_regex: build_redirect_regex(temp_ids),
+        destroyed: scopes.select { |item| item[:destroyed] }
+                         .map do |item|
+                           { type: item[:type],
+                             id: parse_id(item[:id]),
+                             destroyed: true }
+                         end
+      }
     end
 
     # map errors to their sources

data/lib/deep_unrest/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_unrest
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails