deep_unrest 0.1.55 → 0.1.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9439a12cece497a2f6c344216e2f71c443dcfe6e9bc8b29b2a0a6bd88aa280e
-  data.tar.gz: 13886a9c1f9dcb8384e0c80f1ebf14073bd16403ac6098ab5f463346af8c58b3
+  metadata.gz: e13381b727ec0a2812128993e0fd888ac8c5acb03f5f5602d098415f33a84132
+  data.tar.gz: bea7cdd18acdb17ba2fa03bfb1ea47695107b588d76959d19cd6e83ff4fda5e1
 SHA512:
-  metadata.gz: bad6eb16bc28178c2bcb04b5ea88bb63e9dee5326c9da52f52e5c1ea2b2df045255cf52810d36f409cab0f9832b8f7aaa1ab2165a47a2e641344508aef897b2a
-  data.tar.gz: 165b21701d238820f826283708940f60bdbb9a10376b8980742565a8cb2e706879e2947380733f22a3b0ed8b0a999d5a76aa536397f27707b92c7cf14a51233c
+  metadata.gz: 7f6449677c53c33f1196d42134a7eb7aed6d0bf926fb1d29bf71cbadd8eaa7a8dde901984f5b9bb664052f7a56ecce7678c634079818c7cf716e8f44cf729596
+  data.tar.gz: e6451b27a0e51830475f8a9aca4fb3b3502a58debe241ee00d4dfdba760461758c07ae39b7d56286d5382ec5cbe2305a67472d71cc6e228bebdb704706d170ac

data/lib/deep_unrest/read.rb

@@ -16,7 +16,6 @@ module DeepUnrest
            addr: resource_addr,
            key: k.camelize(:lower),
            uuid: uuid,
-           current_user: user,
            query: DeepUnrest.deep_underscore_keys(v) },
          *create_read_mappings(v[:include], user, [*resource_addr, :include])]
       end.flatten.compact
@@ -52,18 +51,18 @@ module DeepUnrest
       query
     end
 
-    def self.recurse_included_queries(item, mappings, parent_context, included, meta, addr)
+    def self.recurse_included_queries(ctx, item, mappings, parent_context, included, meta, addr)
       return unless item[:query].key?(:include)
 
       item[:query][:include].each do |_k, v|
         next_context = parent_context.clone
         next_context[item[:key].singularize] = item[:record]
         next_mapping = mappings.find { |m| m[:uuid] == v[:uuid] }.clone
-        execute_query(next_mapping, mappings, next_context, included, meta, addr, item)
+        execute_query(ctx, next_mapping, mappings, next_context, included, meta, addr, item)
       end
     end
 
-    def self.query_item(mapping, mappings, parent_context, included, meta, addr, _parent)
+    def self.query_item(ctx, mapping, mappings, parent_context, included, meta, addr, _parent)
       query = resolve_conditions(mapping[:query].deep_dup, parent_context)
 
       raise DeepUnrest::InvalidQuery unless query[:id] || query[:find]
@@ -88,7 +87,7 @@ module DeepUnrest
 
       included << result
 
-      recurse_included_queries(result, mappings, parent_context, included, meta, [*next_addr, :include])
+      recurse_included_queries(ctx, result, mappings, parent_context, included, meta, [*next_addr, :include])
     end
 
     def self.get_paginator(query, _parent)
@@ -103,7 +102,7 @@ module DeepUnrest
       end
     end
 
-    def self.query_list(item, mappings, parent_context, included, meta, addr, parent)
+    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) || {}
       query = resolve_conditions(base_query.deep_merge(extension),
@@ -120,22 +119,20 @@ module DeepUnrest
         item[:scope].merge(records_original(ctx))
       }
 
-      begin
-        # transform sort value casing for rails
-        sort_criteria = query[:sort]&.map { |s| s.clone.merge(field: s[:field].underscore) }
-
-        processor = JSONAPI::Processor.new(resource,
-                                          :find,
-                                          filters: query[:filter] || {},
-                                          context: { current_user: item[:current_user] },
-                                          sort_criteria: sort_criteria,
-                                          paginator: paginator)
-
-        jsonapi_result = processor.process
-      ensure
-        # un-monkey patch the resource :records method
-        r_metaclass.send(:alias_method, :records, :records_original)
-      end
+      # transform sort value casing for rails
+      sort_criteria = query[:sort]&.map { |s| s.clone.merge(field: s[:field].underscore) }
+
+      processor = JSONAPI::Processor.new(resource,
+                                         :find,
+                                         filters: query[:filter] || {},
+                                         context: ctx,
+                                         sort_criteria: sort_criteria,
+                                         paginator: paginator)
+
+      jsonapi_result = processor.process
+
+      # un-monkey patch the resource :records method
+      r_metaclass.send(:alias_method, :records, :records_original)
 
       meta << {
         addr: [*addr, item[:key], 'meta'],
@@ -165,7 +162,7 @@ module DeepUnrest
         }
 
         included << result
-        recurse_included_queries(result, mappings, parent_context, included, meta, [*next_addr, :include])
+        recurse_included_queries(ctx, result, mappings, parent_context, included, meta, [*next_addr, :include])
       end
     end
 
@@ -175,17 +172,17 @@ module DeepUnrest
       :list
     end
 
-    def self.execute_query(item, mappings, parent_context, included, meta, addr, parent = nil)
+    def self.execute_query(ctx, item, mappings, parent_context, included, meta, addr, parent = nil)
       if get_query_type(item) == :list
-        query_list(item, mappings, parent_context, included, meta, addr, parent)
+        query_list(ctx, item, mappings, parent_context, included, meta, addr, parent)
       else
-        query_item(item, mappings, parent_context, included, meta, addr, parent)
+        query_item(ctx, item, mappings, parent_context, included, meta, addr, parent)
       end
     end
 
-    def self.execute_queries(mappings, parent_context = {}, included = [], meta = [], addr = [])
+    def self.execute_queries(ctx, mappings, parent_context = {}, included = [], meta = [], addr = [])
       mappings.select { |m| m[:addr].size == 1 }.each do |item|
-        item[:results] = execute_query(item, mappings, parent_context, included, meta, addr)
+        item[:results] = execute_query(ctx, item, mappings, parent_context, included, meta, addr)
       end
       [included, meta]
     end
@@ -209,7 +206,7 @@ module DeepUnrest
       DeepUnrest.collect_authorized_scopes(mappings, user)
 
       # read data
-      data, meta = execute_queries(mappings)
+      data, meta = execute_queries(ctx, mappings)
 
       # serialize using JSONAPI resource serializers
       serialize_results(ctx, data)

data/lib/deep_unrest/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_unrest
 version: !ruby/object:Gem::Version
-  version: 0.1.55
+  version: 0.1.56
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails