deep_unrest 0.1.72 → 0.1.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66699a186572baa00ca20f983f1fe7462ee35e59785c2c73d98a9d4502036890
-  data.tar.gz: 29406a1d5a62da44de4a744f8cc55c99d74e0d186f5c44459f067ce02e38e302
+  metadata.gz: 5414c5023858644639737c10519236d5d27d7d5f645a65c1a47f784b5c0f1cdc
+  data.tar.gz: e36e32772f0e662881f2d29acbbff47634d6f8cb2f214394a52aa72937a43262
 SHA512:
-  metadata.gz: 60c92b8c2f70f1c1e83e28666e01244f1db911c1dd49889f3b38961da959afc71bbd333dddc71fcdf7c07a804d463c9bb91786c5a01742c1524bfbd339f13990
-  data.tar.gz: 6423c1817958c40e37fa27eac897acf599d43131de15c60e05279502df269e8cdc94e969c56156cb9ab673795d9f234939c398341f84d5058a241901d7c1e7f7
+  metadata.gz: afd8b1351ecfc59ae5c4ce9834cdabe02ad3fd4cf89b9e9c955b92512d2a12ca7f1b0a779b649cdc3cc538a8711d8e8071d5199a383ac7f9e11806c9add4e4fe
+  data.tar.gz: 5cc341b7eb963ad418a813087c44a24d28aef45548babc7bd35f1f150fba14dc6b804fd501cfc533c950ae7d143224de0422546414241751880b68bc542e8968

data/lib/deep_unrest/concerns/resource_scope.rb

@@ -0,0 +1,13 @@
+module DeepUnrest
+  module Concerns
+    module ResourceScope
+      extend ActiveSupport::Concern
+
+      included do
+        def records_base(opts)
+          opts[: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,36 +116,22 @@ module DeepUnrest
       paginator = get_paginator(query, parent)
       resource = item[:resource]
 
-      r_metaclass = class << resource; self; end
-      if r_metaclass.method_defined? :records
-        r_metaclass.class_eval do
-          alias_method :records_original, :records
-        end
-      end
-
-      # TODO: find a way to do this that doesn't blow out the original :records method
-      resource.define_singleton_method(:records) { |ctx|
-        full_scope = if self.respond_to? :records_original
-          records_original(ctx)
-        else
-          super(ctx)
-        end
-
-        item[:scope].merge(full_scope)
-      }
+      resource_scope = item[:scope]
 
       # transform sort value casing for rails
       sort_criteria = query[:sort]&.map { |s| s.clone.merge(field: s[:field].underscore) }
       serializer = JSONAPI::ResourceSerializer.new(resource)
+
       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)
 
       jsonapi_result = processor.process
+
       resource_results = format_processor_results(resource, jsonapi_result)
 
       meta << {
@@ -178,15 +164,6 @@ module DeepUnrest
         included << result
         recurse_included_queries(ctx, result, mappings, parent_context, included, meta, [*next_addr, :include])
       end
-    ensure
-      # un-monkey patch the resource :records method
-      if r_metaclass.method_defined? :records_original
-        r_metaclass.class_eval do
-          alias_method :records, :records_original
-        end
-      else
-        r_metaclass.undef_method :records
-      end
     end
 
     def self.get_query_type(item)
@@ -239,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.72'
+  VERSION = '0.1.76'
 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.72
+  version: 0.1.76
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-10-29 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