deep_unrest 0.1.68 → 0.1.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35de41e978eb4f6893cbc164c696a5e0d19e5f4c19e1bc27fa9908564f117e53
-  data.tar.gz: 8e2e95cda81261a6a1b97908757fb9e062b577ab813a6968188a04552dd2f8aa
+  metadata.gz: 66699a186572baa00ca20f983f1fe7462ee35e59785c2c73d98a9d4502036890
+  data.tar.gz: 29406a1d5a62da44de4a744f8cc55c99d74e0d186f5c44459f067ce02e38e302
 SHA512:
-  metadata.gz: a714285e43fe4b04a81ae965b59486e1ecc6052df80ec0ec4cb41820c2835932b941d5c473c61c7f99c23e5a42c8fd680a7adc81517eb1d0cffb03db077ce555
-  data.tar.gz: bcea8c4e02a4b4c524c7655b3898ae8dd37f881dde9b5d707dbf4bd6837d374d6d0539defb2ac411e62b0a91dfb9702a7669a2e2a66b3dbc887c073e60b69eb0
+  metadata.gz: 60c92b8c2f70f1c1e83e28666e01244f1db911c1dd49889f3b38961da959afc71bbd333dddc71fcdf7c07a804d463c9bb91786c5a01742c1524bfbd339f13990
+  data.tar.gz: 6423c1817958c40e37fa27eac897acf599d43131de15c60e05279502df269e8cdc94e969c56156cb9ab673795d9f234939c398341f84d5058a241901d7c1e7f7

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

@@ -102,6 +102,11 @@ module DeepUnrest
       end
     end
 
+    def self.format_processor_results(resource_klass, processor_result)
+      results = processor_result.resource_set.resource_klasses[resource_klass] || {}
+      results.values.map {|r| r[:resource] }
+    end
+
     def self.query_list(ctx, item, mappings, parent_context, included, meta, addr, parent)
       base_query = item[:query].deep_dup
       extension = base_query.dig(:extend, parent&.fetch(:record)&.id&.to_s&.underscore) || {}
@@ -111,28 +116,37 @@ 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] || {},
                                          context: ctx,
                                          sort_criteria: sort_criteria,
+                                         serializer: serializer,
                                          paginator: paginator)
 
       jsonapi_result = processor.process
-
-      # un-monkey patch the resource :records method
-      r_metaclass.send(:alias_method, :records, :records_original)
+      resource_results = format_processor_results(resource, jsonapi_result)
 
       meta << {
         addr: [*addr, item[:key], 'meta'],
@@ -146,14 +160,14 @@ module DeepUnrest
       }
 
       # make sure to return empty array if no results are found for this node
-      if jsonapi_result.resources.empty?
+      if resource_results.empty?
         meta << {
           addr: [*addr, item[:key], 'data'],
           serialized_result: []
         }
       end
 
-      jsonapi_result.resources.each_with_index do |record, i|
+      resource_results.each_with_index do |record, i|
         next_addr = [*addr, item[:key], 'data[]', i]
         result = {
           **item,
@@ -164,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.68'
+  VERSION = '0.1.72'
 end

data/lib/deep_unrest/write.rb

@@ -73,16 +73,16 @@ module DeepUnrest
         attributes = item.dig(:query, :attributes) || {}
         resource = item[:resource]
         p = JSONAPI::RequestParser.new
-        p.resource_klass = resource
+        p.source_klass = resource
         opts = if item[:scope_type] == :create
                  resource.creatable_fields(ctx)
                else
                  resource.updatable_fields(ctx)
                end
 
-        p.parse_params({ attributes: attributes }, opts)[:attributes]
+        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

data/lib/deep_unrest.rb

@@ -162,7 +162,7 @@ module DeepUnrest
   def self.parse_attributes(type, scope_type, attributes, user)
     p = JSONAPI::RequestParser.new
     resource = get_resource(type)
-    p.resource_klass = resource
+    p.source_klass = resource
     ctx = { current_user: user }
     opts = if scope_type == :create
              resource.creatable_fields(ctx)
@@ -170,7 +170,7 @@ module DeepUnrest
              resource.updatable_fields(ctx)
            end
 
-    p.parse_params({ attributes: attributes }, opts)[:attributes]
+    p.parse_params(resource, { attributes: attributes }, opts)[:attributes]
   rescue JSONAPI::Exceptions::ParameterNotAllowed
     unpermitted_keys = attributes.keys.map(&:to_sym) - opts
     msg = "Attributes #{unpermitted_keys} of #{type.classify} not allowed"
@@ -558,6 +558,19 @@ module DeepUnrest
     DeepUnrest::Write.write(ctx, params, user)
   end
 
+  def self.serialize_resource(resource_klass, fields, id)
+    resource_identity = JSONAPI::ResourceIdentity.new(resource_klass, id)
+    id_tree = JSONAPI::PrimaryResourceIdTree.new
+    id_tree.add_resource_fragment(JSONAPI::ResourceFragment.new(resource_identity), {})
+    resource_set = JSONAPI::ResourceSet.new(id_tree)
+    serializer = JSONAPI::ResourceSerializer.new(
+        resource_klass,
+        fields: fields
+    )
+    resource_set.populate!(serializer, {}, {})
+    serializer.serialize_resource_set_to_hash_single(resource_set)['data'].except('links')
+  end
+
   def self.serialize_changes(diffs, user)
     ctx = { current_user: user }
     diffs.each do |diff|
@@ -582,10 +595,7 @@ module DeepUnrest
       keys = diff[:resource].keys.map(&:to_sym)
       fields[to_assoc(diff[:klass].to_s.pluralize)] = keys
 
-      JSONAPI::ResourceSerializer.new(
-        resource_klass,
-        fields: fields
-      ).serialize_to_hash(resource_klass.new(diff[:model], ctx))[:data]
+      serialize_resource(resource_klass, fields, diff[:model].id)
     end
     resources.select { |item| item.dig('attributes') }.compact
   end
@@ -692,10 +702,10 @@ module DeepUnrest
   def self.serialize_result(ctx, item)
     resource = item[:resource]
     resource_instance = resource.new(item[:record], ctx)
-    fields = item[:query][:fields].map(&:underscore).map(&:to_sym)
-    JSONAPI::ResourceSerializer.new(
-      resource,
-      fields: { "#{item[:key].underscore.pluralize}": fields }
-    ).serialize_to_hash(resource_instance)[:data]
+    fields = {}
+    keys = item[:query][:fields].map(&:underscore).map(&:to_sym)
+    fields[to_assoc(item[:key].pluralize)] = keys
+
+    serialize_resource(resource, fields, item[:record].id).except(:links)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_unrest
 version: !ruby/object:Gem::Version
-  version: 0.1.68
+  version: 0.1.72
 platform: ruby
 authors:
 - Lynn Hurley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: 6.1.3
 - !ruby/object:Gem::Dependency
   name: jsonapi-resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: 2.18.0
 description: Update multiple or deeply nested JSONAPI resources
 email:
 - lynn.dylan.hurley@gmail.com
@@ -157,7 +157,7 @@ homepage: https://github.com/graveflex/deep_unrest
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -172,8 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Update multiple or deeply nested JSONAPI resources
 test_files: []