deep_unrest 0.1.70 → 0.1.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ef68924e90a33009700f08b985e9855d1d66710be4d11f059c075bb921cbe5c
-  data.tar.gz: 657a8ec04cdc0b0809a2210333df22915ab4611cdbb01bd9479c82766950db0f
+  metadata.gz: b194593cf43cb152738a7a45f748af7ebebcdc8e1eef0e65cb4e66cb5afead0b
+  data.tar.gz: c64a30a21918ad72e44269e652962ac73c11129b7a43b8ae8fe430e1ff081dd9
 SHA512:
-  metadata.gz: 6d3ff2ef8aba1c1b7d7fbf9f804bc39a67f75b0c4db85afdc2dec1c5fc05121d9e3724b57b0deffabe1ca0f94626b6bb591d17a51bdbfcc3d063cc49739d28c3
-  data.tar.gz: c5ae82beb75ac2772f162710bf978f0ca9960a83ef428c2d67dea685d34427e7ddaa95f9c265fc1e579784e86f0a59dc2083c6e8ea0248e780e9a94f50607b76
+  metadata.gz: 0cbc2b6412e32c94173f074d205d5d04b8b24f50acaa036e5ec6aa9faa70edda2cd5811ee9b07dfc72e5e1dae59b7b8386a97a83f53cf6bca989d005cffff1d4
+  data.tar.gz: 206e06dbbb0fa9991acb0ac8dac8ce14f2348b7aa57d7cb79688312d3c0f073ede6570605e1db49f216b1ae52e9225ce1879d6b3a4cba9c77e0be87ad2136277

data/lib/deep_unrest/read.rb

@@ -116,19 +116,27 @@ module DeepUnrest
       paginator = get_paginator(query, parent)
       resource = item[:resource]
 
-      # monkey patch the resource to only show authorized records
       r_metaclass = class << resource; self; end
-      r_metaclass.send(:alias_method, :records_original, :records)
+      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
-      r_metaclass.define_singleton_method(:records) { |ctx|
-        item[:scope].merge(records_original(ctx))
+      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)
       }
 
       # 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] || {},
@@ -138,12 +146,8 @@ module DeepUnrest
                                          paginator: paginator)
 
       jsonapi_result = processor.process
-
       resource_results = format_processor_results(resource, jsonapi_result)
 
-      # un-monkey patch the resource :records method
-      r_metaclass.send(:alias_method, :records, :records_original)
-
       meta << {
         addr: [*addr, item[:key], 'meta'],
         serialized_result: {
@@ -174,6 +178,15 @@ 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.70'
+  VERSION = '0.1.71'
 end

data/lib/deep_unrest/write.rb

@@ -82,7 +82,7 @@ module DeepUnrest
 
         p.parse_params(resource, { attributes: attributes }, opts)[:attributes]
       rescue JSONAPI::Exceptions::ParameterNotAllowed
-        unpermitted_keys = attributes.keys.map(&:to_sym) - opts
+        unpermitted_keys = attributes.keys.map(&:underscore).map(&:to_sym) - opts
         item[:errors] = unpermitted_keys.each_with_object({}) do |attr_key, memo|
           memo[attr_key] = 'Unpermitted parameter'
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_unrest
 version: !ruby/object:Gem::Version
-  version: 0.1.70
+  version: 0.1.71
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails