graphiti 1.0.rc.7 → 1.0.rc.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64397d57cb7c6414bb46e577ab78b0a603d1873a
-  data.tar.gz: 9feb0b39e7dce3d6a6899e1b78495b97bd53509a
+  metadata.gz: b5bb7bbf101a447f9036ac8dd26e8ac958180411
+  data.tar.gz: 8634cc52129745771738c95def507df6cf71d73e
 SHA512:
-  metadata.gz: f9a163bee97a77e99ad461cc5ebf48c1bdab164e1308fb0bdb13e96eb4ec9036b0e9bfc916ebe1e67ac5a5df5fea7360baef7afaf6fc37cc9132f92569988cc4
-  data.tar.gz: 44fc30042c0cbc1567b1127ebffa09c538a56dd8e0884dd23ed63d1bfbce6489e3c7d6de1f707fe6378e36bc95d09aede3646d76c47276eb2999e9c58e2af3df
+  metadata.gz: a9e7dfafa6429aa5ebe4e5dbd273d2cd6294e599c2ac8ee7539917af343f05c9a4f395d0b50dc2ccf8f734986b3b7c38f5f74bc74788b6d3530765965e350a65
+  data.tar.gz: 3cdf7674cd137181b41edbe187ebfd8debb68e50ef0c1f6f15f9de725080dea8b33b4112480f991ae76266f112866a7584349b56c9db693c5919f0ef93ceadba

data/lib/graphiti/query.rb

@@ -215,7 +215,7 @@ module Graphiti
       if @resource.remote
         top_remote_parent = parents.find { |p| p.resource.remote? }
         [].tap do |chain|
-          parents.each do |p|
+          parents.select { |p| p.resource.remote? }.each do |p|
             chain << p.association_name unless p == top_remote_parent
           end
           immediate_parent = parents.reverse[0]

data/lib/graphiti/util/remote_params.rb

@@ -36,8 +36,8 @@ module Graphiti
       def collect_params(query)
         query_hash = query.hash
         process_sorts(query_hash[:sort], query)
-        process_fields(query_hash[:fields])
-        process_extra_fields(query_hash[:extra_fields])
+        process_fields(query.fields.merge(query.hash[:fields] || {}))
+        process_extra_fields(query.extra_fields.merge(query.hash[:extra_fields] || {}))
         process_filters(query_hash[:filter], query)
         process_pagination(query_hash[:page], query)
         process_stats(query_hash[:stats])
@@ -76,12 +76,18 @@ module Graphiti
 
       def process_fields(fields)
         return unless fields
-        @fields[fields.keys.first.to_sym] = fields.values.join(',')
+
+        fields.each_pair do |type, attrs|
+          @fields[type] = attrs.join(',')
+        end
       end
 
       def process_extra_fields(fields)
         return unless fields
-        @extra_fields[fields.keys.first.to_sym] = fields.values.join(',')
+
+        fields.each_pair do |type, attrs|
+          @extra_fields[type] = attrs.join(',')
+        end
       end
 
       def process_sorts(sorts, query)

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.rc.7"
+  VERSION = "1.0.rc.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.rc.7
+  version: 1.0.rc.8
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2019-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable