deep_unrest 0.1.75 → 0.1.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd904080ca3e663bf6e313f0b7c865cab32121f2f22ed02b89ebe28886092232
-  data.tar.gz: 2de79ffc0cefad4e403b60981f306fb4ca05d1485c88ba4a0396373f2f46c920
+  metadata.gz: 5414c5023858644639737c10519236d5d27d7d5f645a65c1a47f784b5c0f1cdc
+  data.tar.gz: e36e32772f0e662881f2d29acbbff47634d6f8cb2f214394a52aa72937a43262
 SHA512:
-  metadata.gz: 92304e27f64f7c15dd870e65f814a0ad690230a324d801680f69e9b3103025afdfdd873c69a9511dc8fda133d1527625986b38a652bcd61867d15d866375277e
-  data.tar.gz: a879168e0ac312802e28dfbdc71f8e4851f0a462e32c00ea0c3898865dbd37c72bddabd6940e7c8c225e8cb93204c0ff68e7a3e6844239cc2abf67d9025b5f51
+  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,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, old_records)
-
       meta << {
         addr: [*addr, item[:key], 'meta'],
         serialized_result: {
@@ -169,9 +164,6 @@ module DeepUnrest
         included << result
         recurse_included_queries(ctx, result, mappings, parent_context, included, meta, [*next_addr, :include])
       end
-    rescue StandardError => e
-      # un-monkey patch the resource :records method
-      resource.define_singleton_method(:records, old_records)
     end
 
     def self.get_query_type(item)
@@ -224,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.75'
+  VERSION = '0.1.76'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_unrest
 version: !ruby/object:Gem::Version
-  version: 0.1.75
+  version: 0.1.76
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-25 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