deep_unrest 0.1.73 → 0.1.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dc811b66aacee9eef482287d03e975dc75dbd0844d5b198ff3cff8d3acb4a6d
-  data.tar.gz: 3302fe2dfde86ab590d4e430b2a5ced5c3d97bdfcad6fe770aff1201600b6f07
+  metadata.gz: 309a91b576429c12d2c5b6dfe938c736f20e065dfb36e19cd7e842e4e63a09f5
+  data.tar.gz: 9b3b6cd5b50ab09b43946721322783431bd3d1be59fc8d5c0234529662d451c1
 SHA512:
-  metadata.gz: e5b98c8dd8a70c97d5858f4f3b2ac8cfc4f106a4109d96302e7a1cb3ae492edaf244934beec3b646975f20e1d13dfbdc8b32b8a85de609f07761b37df2531812
-  data.tar.gz: 312a209f70086b73cbf636aeefcb318e49c87b5134bc20987612e49d10fe7dae292be6216624b7b1270cd8b0c5f3253eec138b565dbc582e96b32a899818b8da
+  metadata.gz: b6485d0999073274a62414519b7e807d5e97024904705f89d9aafb6e5170ea045faa6321223b3b929bfa84948a64aa1c40ce18e9c1f1369ffabe571a2f1c351c
+  data.tar.gz: ee10b543d71193acc2e8d4751e5ccfcfcbd3d90bd79b1e1d1a8ba7ff4505ef1d08b34bd604ecf8f13013b60b382476535a2dcd9cdc2f78040042b641f4f026f1

data/lib/deep_unrest/concerns/resource_scope.rb

@@ -0,0 +1,13 @@
+module DeepUnrest
+  module Concerns
+    module ResourceScope
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def records_base(opts)
+          opts&.dig(:context, :scope) || super(opts)
+        end
+      end
+    end
+  end
+end

data/lib/deep_unrest/engine.rb

@@ -4,6 +4,7 @@ require 'deep_unrest/authorization/pundit_strategy'
 require 'deep_unrest/paginators/basic'
 require 'deep_unrest/concerns/null_concern'
 require 'deep_unrest/concerns/map_temp_ids'
+require 'deep_unrest/concerns/resource_scope'
 
 module DeepUnrest
   class Engine < ::Rails::Engine

data/lib/deep_unrest/read.rb

@@ -116,9 +116,7 @@ module DeepUnrest
       paginator = get_paginator(query, parent)
       resource = item[:resource]
 
-      # monkey patch the resource to only show authorized records
-      old_records = resource.method(:records)
-      resource.define_singleton_method(:records) { |ctx| item[:scope].merge(old_records.call(ctx)) }
+      resource_scope = item[:scope]
 
       # transform sort value casing for rails
       sort_criteria = query[:sort]&.map { |s| s.clone.merge(field: s[:field].underscore) }
@@ -127,7 +125,7 @@ module DeepUnrest
       processor = JSONAPI::Processor.new(resource,
                                          :find,
                                          filters: query[:filter] || {},
-                                         context: ctx,
+                                         context: ctx.clone.merge(scope: resource_scope),
                                          sort_criteria: sort_criteria,
                                          serializer: serializer,
                                          paginator: paginator)
@@ -136,9 +134,6 @@ module DeepUnrest
 
       resource_results = format_processor_results(resource, jsonapi_result)
 
-      # un-monkey patch the resource :records method
-      resource.define_singleton_method(:records) { |ctx| old_records.call(ctx) }
-
       meta << {
         addr: [*addr, item[:key], 'meta'],
         serialized_result: {
@@ -221,3 +216,4 @@ module DeepUnrest
     end
   end
 end
+

data/lib/deep_unrest/version.rb

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

data/lib/deep_unrest/write.rb

@@ -110,7 +110,7 @@ module DeepUnrest
         update_body[:_destroy] = true if item.dig(:query, :destroy)
         DeepUnrest.set_attr(memo, item[:ar_addr].clone, update_body)
         if item[:ar_addr].size == 1
-          item[:mutate] = memo.fetch(*item[:ar_addr])
+          item[:mutate] = update_body
           item[:scope_type] = :update if item[:scope_type] == :show
         end
       end
@@ -142,9 +142,10 @@ module DeepUnrest
                    when :destroy
                      id = item.dig(:query, :id)
                      model = item[:klass].find(id)
+                     model.deep_unrest_query_uuid = item.dig(:query, :uuid)
                      resource = item[:resource].new(model, context)
                      resource.run_callbacks :remove do
-                       item[:klass].destroy(id)
+                       model.destroy!
                      end
                    end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_unrest
 version: !ruby/object:Gem::Version
-  version: 0.1.73
+  version: 0.1.77
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -147,6 +147,7 @@ files:
 - 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/concerns/resource_scope.rb
 - lib/deep_unrest/engine.rb
 - lib/deep_unrest/paginators/basic.rb
 - lib/deep_unrest/read.rb