deep_unrest 0.1.72 → 0.1.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66699a186572baa00ca20f983f1fe7462ee35e59785c2c73d98a9d4502036890
-  data.tar.gz: 29406a1d5a62da44de4a744f8cc55c99d74e0d186f5c44459f067ce02e38e302
+  metadata.gz: 8dc811b66aacee9eef482287d03e975dc75dbd0844d5b198ff3cff8d3acb4a6d
+  data.tar.gz: 3302fe2dfde86ab590d4e430b2a5ced5c3d97bdfcad6fe770aff1201600b6f07
 SHA512:
-  metadata.gz: 60c92b8c2f70f1c1e83e28666e01244f1db911c1dd49889f3b38961da959afc71bbd333dddc71fcdf7c07a804d463c9bb91786c5a01742c1524bfbd339f13990
-  data.tar.gz: 6423c1817958c40e37fa27eac897acf599d43131de15c60e05279502df269e8cdc94e969c56156cb9ab673795d9f234939c398341f84d5058a241901d7c1e7f7
+  metadata.gz: e5b98c8dd8a70c97d5858f4f3b2ac8cfc4f106a4109d96302e7a1cb3ae492edaf244934beec3b646975f20e1d13dfbdc8b32b8a85de609f07761b37df2531812
+  data.tar.gz: 312a209f70086b73cbf636aeefcb318e49c87b5134bc20987612e49d10fe7dae292be6216624b7b1270cd8b0c5f3253eec138b565dbc582e96b32a899818b8da

data/lib/deep_unrest/read.rb

@@ -116,27 +116,14 @@ 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)
-      }
+      # 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)) }
 
       # 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] || {},
@@ -146,8 +133,12 @@ module DeepUnrest
                                          paginator: paginator)
 
       jsonapi_result = processor.process
+
       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: {
@@ -178,15 +169,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)

data/lib/deep_unrest/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deep_unrest
 version: !ruby/object:Gem::Version
-  version: 0.1.72
+  version: 0.1.73
 platform: ruby
 authors:
 - Lynn Hurley