deep_unrest 0.1.46 → 0.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e415f7ba0062481c879d60a64e3f7bd7796f641d0be61d5288783d4f51bee215
-  data.tar.gz: d0b5e839fa072dec11ad4c44ae977346cf207c5d22f4072ab7160066442a9c57
+  metadata.gz: b5eb1f49228c25c6bf01ba850fb3ff14badfeb7b7b40ba3f7175e37f422c6538
+  data.tar.gz: edbb9ec4e3e1626627525305a552bdd5c090c356c6d4623c129196dab1320a34
 SHA512:
-  metadata.gz: 907b11f20a169e6607ae3a49cf0bbc6dfc440d8b08f7858a4836825c5097a9c424cb53665a2eacd735ca7824d4b399eb2b26da6ba0893e33100ef97ee55a5336
-  data.tar.gz: d1d989d75bb822f366501f13be9e509eda2a954eb3521a493a68d805d568c0c0ebb724d2cbd17ab839bb21b23b7c1398c6db1d4614c8ab90aab19b3648b06859
+  metadata.gz: 0e85bb3015a45cdc21920cddafc5bfe12981f0d328acb0bb07f127683a6b11d291454d0a32e62377842305300a9e56593b99b66df33cadfa009ea91fef3b7f0e
+  data.tar.gz: 622ad42af8adfaf335ac7341f9fd5446ae6885dce3acd05808e556cd1c186daef58629428141022f6131103a78c099aa057f7e23b7bf78f73375ec063bdd1db0

data/lib/deep_unrest/read.rb

@@ -4,6 +4,7 @@ module DeepUnrest
   module Read
     def self.create_read_mappings(params, addr = [])
       return unless params
+
       params.map do |k, v|
         resource_addr = [*addr, k]
         uuid = SecureRandom.uuid
@@ -36,9 +37,11 @@ module DeepUnrest
       elsif query.is_a? Hash
         query.each do |k, v|
           next unless v.is_a? Hash
+
           if v[:from_context]
             name, attr = v[:from_context].split('.')
             next unless parent_context[name]
+
             query[k] = parent_context[name].send(attr.underscore)
           else
             resolve_conditions(v, parent_context)
@@ -50,6 +53,7 @@ module DeepUnrest
 
     def self.recurse_included_queries(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]
@@ -61,6 +65,7 @@ module DeepUnrest
     def self.query_item(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]
+
       record = if query.key?(:id)
                  mapping[:scope].find(query[:id]) if query.key?(:id)
                else
@@ -94,7 +99,7 @@ module DeepUnrest
 
     def self.query_list(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) || {}
+      extension = base_query.dig(:extend, parent&.fetch(:record)&.id&.to_s&.underscore) || {}
       query = resolve_conditions(base_query.deep_merge(extension),
                                  parent_context)
 
@@ -105,13 +110,13 @@ module DeepUnrest
       r_metaclass = class << resource; self; end
       r_metaclass.send(:define_method, :records) { |_ctx| item[:scope] }
 
-      # transform sort value casing
-      query[:sort]&.each { |s| s[:field] = s[:field].underscore }
+      # transform sort value casing for rails
+      sort_criteria = query[:sort]&.map { |s| s.clone.merge(field: s[:field].underscore) }
 
       processor = JSONAPI::Processor.new(item[:resource],
                                          :find,
                                          filters: query[:filter] || {},
-                                         sort_criteria: query[:sort],
+                                         sort_criteria: sort_criteria,
                                          paginator: paginator)
 
       jsonapi_result = processor.process
@@ -121,6 +126,8 @@ module DeepUnrest
         serialized_result: {
           paginationParams: jsonapi_result.pagination_params,
           recordCount: jsonapi_result.record_count,
+          sort: query[:sort],
+          recordCount: jsonapi_result.record_count
         }
       }
 
@@ -139,6 +146,7 @@ module DeepUnrest
 
     def self.get_query_type(item)
       return :detail unless plural?(item[:key])
+
       :list
     end
 
@@ -157,7 +165,6 @@ module DeepUnrest
       [included, meta]
     end
 
-
     def self.format_response(mappings)
       response = {}
       mappings.each do |mapping|

data/lib/deep_unrest/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deep_unrest
 version: !ruby/object:Gem::Version
-  version: 0.1.46
+  version: 0.1.47
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails