graphiti 1.0.rc.8 → 1.0.rc.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5bb7bbf101a447f9036ac8dd26e8ac958180411
-  data.tar.gz: 8634cc52129745771738c95def507df6cf71d73e
+  metadata.gz: b671896a39d2dbafcbba2aeff6f28b84975716c5
+  data.tar.gz: '08d51b340c5311838a386a6b623140b52b4f9109'
 SHA512:
-  metadata.gz: a9e7dfafa6429aa5ebe4e5dbd273d2cd6294e599c2ac8ee7539917af343f05c9a4f395d0b50dc2ccf8f734986b3b7c38f5f74bc74788b6d3530765965e350a65
-  data.tar.gz: 3cdf7674cd137181b41edbe187ebfd8debb68e50ef0c1f6f15f9de725080dea8b33b4112480f991ae76266f112866a7584349b56c9db693c5919f0ef93ceadba
+  metadata.gz: 656b61085599d072b1af3d04e0356170e796c0bb02b1d7dabea43fffcc61ad14c4df6c9ef2c7fdb309e3c1fabcf5cfdecb694d99e66243a18fc11a1e982c6611
+  data.tar.gz: fa1068a26baeae8bdadcd3fe3406e8b15cfc7baa86e50edba8cd073916b9266df6fbd7d599bc147c0f01e29c59e80290775820c12bc7232da300fbff76279f87

data/lib/graphiti/query.rb

@@ -210,24 +210,6 @@ module Graphiti
       not [false, 'false'].include?(@params[:paginate])
     end
 
-    # If this is a remote call, we don't care about local parents
-    def chain
-      if @resource.remote
-        top_remote_parent = parents.find { |p| p.resource.remote? }
-        [].tap do |chain|
-          parents.select { |p| p.resource.remote? }.each do |p|
-            chain << p.association_name unless p == top_remote_parent
-          end
-          immediate_parent = parents.reverse[0]
-          # This is not currently checking that it is a remote of the same API
-          chain << association_name if immediate_parent && immediate_parent.resource.remote
-          chain.compact
-        end.compact
-      else
-        parents.map(&:association_name).compact + [association_name].compact
-      end
-    end
-
     private
 
     # Try to find on this resource

data/lib/graphiti/sideload/polymorphic_belongs_to.rb

@@ -114,6 +114,7 @@ class Graphiti::Sideload::PolymorphicBelongsTo < Graphiti::Sideload::BelongsTo
   # but not others. Remove anything we don't support.
   def remove_invalid_sideloads(resource, query)
     query = query.dup
+    query.instance_variable_set(:@hash, nil)
     query.sideloads.each_pair do |key, value|
       unless resource.class.sideload(key)
         query.sideloads.delete(key)

data/lib/graphiti/util/persistence.rb

@@ -12,16 +12,16 @@ class Graphiti::Util::Persistence
     @relationships = relationships
     @caller_model  = caller_model
 
-    @attributes.each_pair do |key, value|
-      @attributes[key] = @resource.typecast(key, value, :writable)
-    end
-
     # Find the correct child resource for a given jsonapi type
     if meta_type = @meta[:type].try(:to_sym)
       if @resource.type != meta_type && @resource.polymorphic?
         @resource = @resource.class.resource_for_type(meta_type).new
       end
     end
+
+    @attributes.each_pair do |key, value|
+      @attributes[key] = @resource.typecast(key, value, :writable)
+    end
   end
 
   # Perform the actual save logic.
@@ -80,6 +80,9 @@ class Graphiti::Util::Persistence
     return if x[:sideload].type == :many_to_many
 
     if [:destroy, :disassociate].include?(x[:meta][:method])
+      if x[:sideload].polymorphic_has_many?
+        attrs[:"#{x[:sideload].polymorphic_as}_type"] = nil
+      end
       attrs[x[:foreign_key]] = nil
       update_foreign_type(attrs, x, null: true) if x[:is_polymorphic]
     else

data/lib/graphiti/util/remote_params.rb

@@ -21,7 +21,7 @@ module Graphiti
         if include_hash = @query.include_hash.presence
           @params[:include] = trim_sideloads(include_hash)
         end
-        collect_params(@query)
+        collect_params(@query, @resource)
         @params[:sort] = @sorts.join(',') if @sorts.present?
         @params[:filter] = @filters if @filters.present?
         @params[:page] = @pagination if @pagination.present?
@@ -33,13 +33,32 @@ module Graphiti
 
       private
 
-      def collect_params(query)
+      # If this is a remote call, we don't care about local parents
+      # When polymorphic, query is top-level (ie, query.resource is
+      # the parent, not a child type implementation).
+      # This is why we pass BOTH the resource and the query
+      def query_chain(resource, query)
+        top_remote_parent = query.parents.find { |p| p.resource.remote? }
+        [].tap do |chain|
+          query.parents.select { |p| p.resource.remote? }.each do |p|
+            chain << p.association_name unless p == top_remote_parent
+          end
+          immediate_parent = query.parents.reverse[0]
+          # This is not currently checking that it is a remote of the same API
+          chain << query.association_name if immediate_parent && immediate_parent.resource.remote
+          chain.compact
+        end.compact
+      end
+
+      def collect_params(query, resource = nil)
         query_hash = query.hash
-        process_sorts(query_hash[:sort], query)
+        resource ||= query.resource
+        chain = query_chain(resource, query)
+        process_sorts(query_hash[:sort], chain)
         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_filters(query_hash[:filter], chain)
+        process_pagination(query_hash[:page], chain)
         process_stats(query_hash[:stats])
 
         query.sideloads.each_pair do |assn_name, nested_query|
@@ -54,22 +73,22 @@ module Graphiti
         @stats = { stats.keys.first => stats.values.join(',') }
       end
 
-      def process_pagination(page, query)
+      def process_pagination(page, chain)
         return unless page.present?
         if size = page[:size]
-          key = (query.chain + [:size]).join('.')
+          key = (chain + [:size]).join('.')
           @pagination[key.to_sym] = size
         end
         if number = page[:number]
-          key = (query.chain + [:number]).join('.')
+          key = (chain + [:number]).join('.')
           @pagination[key.to_sym] = number
         end
       end
 
-      def process_filters(filters, query)
+      def process_filters(filters, chain)
         return unless filters.present?
         filters.each_pair do |att, config|
-          att = (query.chain + [att]).join('.')
+          att = (chain + [att]).join('.')
           @filters[att.to_sym] = config
         end
       end
@@ -90,14 +109,14 @@ module Graphiti
         end
       end
 
-      def process_sorts(sorts, query)
+      def process_sorts(sorts, chain)
         return unless sorts
 
         if sorts.is_a?(String) # manually assigned
           @sorts << sorts
         else
           sorts.each do |s|
-            sort = (query.chain + [s.keys.first]).join('.')
+            sort = (chain + [s.keys.first]).join('.')
             sort = "-#{sort}" if s.values.first == :desc
             @sorts << sort
           end

data/lib/graphiti/version.rb

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

metadata

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