graphiti 1.0.alpha.25 → 1.0.alpha.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11c4f6ec02d7b26ada772125aa0a6f93adef149c
-  data.tar.gz: ff61a24878530f72a9347dee1666e3c00daedb9d
+  metadata.gz: cc547267adde832aa6910fc38c5ee48af7f38ab5
+  data.tar.gz: 9b3b27ba180c2c1d6e1b599ed7302d5ca9b6dd54
 SHA512:
-  metadata.gz: 9f39008d0879c9cae9fb68f4e259603783d873983cceb93d1fd1dfc424f9a62fdf2ad803b00229ed27fe8986d4eb6ab80ac34a2c23a5a80b730e1b85bc8e6c3f
-  data.tar.gz: 95fd32a819cd3f40965c636dc3235c996cce23621d4881aca88f9e083801f52b3473094b637dc241b382a6573dd2ad76e8d5137384a8333c732b7b503c56871b
+  metadata.gz: 92f560e227cb8084807d503b85190f631daf696d22e4c649041573ad18c4553350b5525ab52f3d3bcf4270094fc5cd1f2141409de73609140c0c3bb651130b4a
+  data.tar.gz: fb1eb584414a97b7a3afb65fb5cf397a6504868c160e0dd4cd5d844bd9249af3047de4d1702888e787a8ff2452e2f66cde2367890e3c944c6311268181c1ffe1

data/lib/graphiti/adapters/abstract.rb

@@ -447,17 +447,7 @@ module Graphiti
         raise 'you must override #update in an adapter subclass'
       end
 
-      # @param [Class] model_class The configured model class (see Resource.model)
-      # @param [Integer] id the id for this model
-      # @return the model instance just destroyed
-      # @see Resource.model
-      # @example ActiveRecord default
-      #   def destroy(model_class, id)
-      #     instance = model_class.find(id)
-      #     instance.destroy
-      #     instance
-      #   end
-      def destroy(model_class, id)
+      def destroy(model)
         raise 'you must override #destroy in an adapter subclass'
       end
 

data/lib/graphiti/adapters/active_record.rb

@@ -200,14 +200,6 @@ module Graphiti
         end
       end
 
-      def belongs_to_many_filter(sideload, scope, value)
-        scope
-          .includes(sideload.through_relationship_name)
-          .where(sideload.through_table_name => {
-            sideload.true_foreign_key => value
-          })
-      end
-
       def associate_all(parent, children, association_name, association_type)
         if activerecord_associate?(parent, children[0], association_name)
           association = parent.association(association_name)
@@ -264,11 +256,9 @@ module Graphiti
         instance
       end
 
-      # (see Adapters::Abstract#destroy)
-      def destroy(model_class, id)
-        instance = model_class.find(id)
-        instance.destroy
-        instance
+      def destroy(model)
+        model.destroy
+        model
       end
     end
   end

data/lib/graphiti/adapters/active_record/many_to_many_sideload.rb

@@ -8,10 +8,49 @@ class Graphiti::Adapters::ActiveRecord::ManyToManySideload < Graphiti::Sideload:
     foreign_key.keys.first
   end
 
-  def infer_foreign_key
+  def belongs_to_many_filter(scope, value)
+    scope
+      .includes(through_relationship_name)
+      .where(belongs_to_many_clause(value))
+  end
+
+  private
+
+  def belongs_to_many_clause(value)
+    where = { true_foreign_key => value }.tap do |c|
+      if polymorphic?
+        c[foreign_type_column] = foreign_type_value
+      end
+    end
+
+    { through_table_name => where }
+  end
+
+  def foreign_type_column
+    through_reflection.type
+  end
+
+  def foreign_type_value
+    through_reflection.active_record.name
+  end
+
+  def polymorphic?
+    !!foreign_type_column
+  end
+
+  def through_reflection
+    through = parent_reflection.options[:through]
+    parent_resource_class.model.reflections[through.to_s]
+  end
+
+  def parent_reflection
     parent_model = parent_resource_class.model
-    key = parent_model.reflections[name.to_s].options[:through]
-    value = parent_model.reflections[key.to_s].foreign_key.to_sym
+    parent_model.reflections[name.to_s]
+  end
+
+  def infer_foreign_key
+    key = parent_reflection.options[:through]
+    value = through_reflection.foreign_key.to_sym
     { key => value }
   end
 end

data/lib/graphiti/errors.rb

@@ -16,6 +16,19 @@ The adapter #{@adapter.class} does not implement method '#{@method}', which was
       end
     end
 
+    class UnwritableRelationship < Base
+      def initialize(resource, sideload)
+        @resource = resource
+        @sideload = sideload
+      end
+
+      def message
+        <<-MSG
+#{@resource.class}: Tried to persist sideload #{@sideload.name.inspect} but marked writable: false
+        MSG
+      end
+    end
+
     class SingularSideload < Base
       def initialize(sideload, parent_length)
         @sideload = sideload

data/lib/graphiti/resource.rb

@@ -88,8 +88,8 @@ module Graphiti
       adapter.update(model, update_params)
     end
 
-    def destroy(id)
-      adapter.destroy(model, id)
+    def destroy(model)
+      adapter.destroy(model)
     end
 
     def associate_all(parent, children, association_name, type)

data/lib/graphiti/resource/interface.rb

@@ -17,6 +17,10 @@ module Graphiti
 
         def find(params = {}, base_scope = nil)
           validate!(params)
+          _find(params, base_scope)
+        end
+
+        def _find(params = {}, base_scope = nil)
           id = params[:data].try(:[], :id) || params.delete(:id)
           params[:filter] ||= {}
           params[:filter].merge!(id: id) if id

data/lib/graphiti/resource/sideloading.rb

@@ -17,11 +17,15 @@ module Graphiti
             parent.children[name] = sideload
           else
             config[:sideloads][name] = sideload
-            apply_sideloads_to_serializer if rails_autoloading?
+            apply_sideload_to_serializer(name) if eagerly_apply_sideload?(sideload)
           end
           sideload
         end
 
+        def apply_sideload_to_serializer(name)
+          Util::SerializerRelationships.new(self, config[:sideloads].slice(name)).apply
+        end
+
         def apply_sideloads_to_serializer
           Util::SerializerRelationships.new(self, config[:sideloads]).apply
         end
@@ -105,8 +109,9 @@ module Graphiti
           memo
         end
 
-        def rails_autoloading?
-          defined?(::Rails) && !::Rails.application.config.eager_load
+        def eagerly_apply_sideload?(sideload)
+          autoloading = defined?(::Rails) && !::Rails.application.config.eager_load
+          autoloading || sideload.resource_class_loaded?
         end
       end
     end

data/lib/graphiti/resource_proxy.rb

@@ -89,8 +89,9 @@ module Graphiti
     end
 
     def destroy
+      record = data
       validator = @resource.transaction do
-        model = @resource.destroy(@query.filters[:id])
+        model = @resource.destroy(record)
         model.instance_variable_set(:@__serializer_klass, @resource.serializer)
         validator = ::Graphiti::Util::ValidationResponse.new \
           model, @payload

data/lib/graphiti/sideload.rb

@@ -181,8 +181,8 @@ module Graphiti
         end
 
         if relevant_children.is_a?(Array)
-            associated |= relevant_children if track_associated
-            associate_all(parent, relevant_children)
+          associated |= relevant_children if track_associated
+          associate_all(parent, relevant_children)
         else
           associated << relevant_children if track_associated && relevant_children
           associate(parent, relevant_children)
@@ -278,7 +278,7 @@ module Graphiti
       fk_type = parent_resource_class.attributes[:id][:type]
       resource_class.filter true_foreign_key, fk_type do
         eq do |scope, value|
-          _self.resource.adapter.belongs_to_many_filter(_self, scope, value)
+          _self.belongs_to_many_filter(scope, value)
         end
       end
     end

data/lib/graphiti/util/persistence.rb

@@ -149,7 +149,8 @@ class Graphiti::Util::Persistence
   def persist_object(method, attributes)
     case method
       when :destroy
-        call_resource_method(:destroy, attributes[:id], @caller_model)
+        model = @resource.class._find(attributes.slice(:id)).data
+        call_resource_method(:destroy, model, @caller_model)
       when :update, nil, :disassociate
         call_resource_method(:update, attributes, @caller_model)
       else
@@ -172,8 +173,12 @@ class Graphiti::Util::Persistence
   def process_belongs_to(relationships)
     [].tap do |processed|
       iterate(only: [:polymorphic_belongs_to, :belongs_to]) do |x|
-        x[:object] = x[:sideload].resource
-          .persist_with_relationships(x[:meta], x[:attributes], x[:relationships])
+        if x[:sideload].writable?
+          x[:object] = x[:sideload].resource
+            .persist_with_relationships(x[:meta], x[:attributes], x[:relationships])
+        else
+          raise Graphiti::Errors::UnwritableRelationship.new(@resource, x[:sideload])
+        end
         processed << x
       end
     end

data/lib/graphiti/util/serializer_relationships.rb

@@ -62,7 +62,7 @@ module Graphiti
       def data_proc
         _sl = @sideload
         ->(_) {
-          if records = @object.public_send(_sl.name)
+          if records = @object.public_send(_sl.association_name)
             if records.respond_to?(:to_ary)
               records.each { |r| _sl.resource.decorate_record(r) }
             else

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.alpha.25"
+  VERSION = "1.0.alpha.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha.25
+  version: 1.0.alpha.26
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable