deep_unrest 0.1.70 → 0.1.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ef68924e90a33009700f08b985e9855d1d66710be4d11f059c075bb921cbe5c
-  data.tar.gz: 657a8ec04cdc0b0809a2210333df22915ab4611cdbb01bd9479c82766950db0f
+  metadata.gz: f9f759a8a661f9e17e38792d8a1b1525f2366c554c37b21708671fd4cfc63124
+  data.tar.gz: 57866a9548c6efd013e57872fe34423b710e76783aa23ad7798f5c2ff6aad279
 SHA512:
-  metadata.gz: 6d3ff2ef8aba1c1b7d7fbf9f804bc39a67f75b0c4db85afdc2dec1c5fc05121d9e3724b57b0deffabe1ca0f94626b6bb591d17a51bdbfcc3d063cc49739d28c3
-  data.tar.gz: c5ae82beb75ac2772f162710bf978f0ca9960a83ef428c2d67dea685d34427e7ddaa95f9c265fc1e579784e86f0a59dc2083c6e8ea0248e780e9a94f50607b76
+  metadata.gz: b50e0b5ab780e76598391fdca43ec421b6274594bc4654a5757bf761e1fcfb165a0452f6a24fa1dfd5894db3b53ab2a3d0d61b9fb287a2afef220b43fab9cb7c
+  data.tar.gz: 994156063a734d4e729789fb677a1f7a091f884d357d7eee0eaa3cb58c95ef7a49651eeaf641204548eb53b1188dca2fea14df32fd75b6cb66cf376fae3be3f9

data/lib/deep_unrest/authorization/pundit_strategy.rb

@@ -17,12 +17,19 @@ module DeepUnrest
       end
 
       def self.auth_error_message(user, scope)
-        actor = "#{user.class.name} with id '#{user.id}'"
-        target = scope[:type].classify
+        if user
+          actor = "#{user.class.name} with id '#{user.id}' is"
+        else
+          actor = "Anonymous users are"
+        end
+
+        target = (scope[:type] || scope[:key]).to_s.classify
         unless %i[create update_all].include? scope[:scope_type]
-          target += " with id '#{scope[:scope][:arguments].first}'"
+          target_id = (scope[:id] || scope.dig(:query, :id)).to_s.gsub('.', '')
+          target += " with id '#{target_id.to_s.gsub('.', '')}'"
         end
-        msg = "#{actor} is not authorized to #{scope[:scope_type]} #{target}"
+
+        msg = "#{actor} not authorized to #{scope[:scope_type].to_s.downcase} #{target}"
 
         [{ title: msg,
            source: { pointer: scope[:path] } }].to_json

data/lib/deep_unrest/read.rb

@@ -117,16 +117,11 @@ module DeepUnrest
       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)
-      # 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))
-      }
+      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,
@@ -142,7 +137,7 @@ module DeepUnrest
       resource_results = format_processor_results(resource, jsonapi_result)
 
       # un-monkey patch the resource :records method
-      r_metaclass.send(:alias_method, :records, :records_original)
+      resource.define_singleton_method(:records, old_records)
 
       meta << {
         addr: [*addr, item[:key], 'meta'],
@@ -174,6 +169,9 @@ 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)

data/lib/deep_unrest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeepUnrest
-  VERSION = '0.1.70'
+  VERSION = '0.1.74'
 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.74
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails