graphiti 1.0.rc.17 → 1.0.rc.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b8be3f292174af6955e7e7d07680dea6a6c17c7
-  data.tar.gz: 265d4c776f7804139ffc52f7b1bba30c6a858f34
+  metadata.gz: afaf92e3ca234c7c84974f05ebd8feae5b532fe0
+  data.tar.gz: ad2985a29b2601440f52d86d5458d70f736a5ff5
 SHA512:
-  metadata.gz: e840ed2899472615ce1fb032eecf7e84a1aa9c1395c4a196badd9282aa1e7c53e21d9f84be72879b8c9497eeec4a78672c083010f60fc9b79d33d5f86c8dfa2e
-  data.tar.gz: 1852b8a6ac1e2a3ae3d3c360547b566b43ef33fc57a47ed5434ac1eb2621e492415e1948e6eb571abd83658c8845f45669c7b0f2120480a6b9809bfcaa1b982f
+  metadata.gz: 06cada17b7a5d38dbe04cfccf481b5a52c1218fe87fb04cd665e35ee777c0c726484467173367e5b375d9f42626526c4627875a1eec7533c4e63628d4d4f5305
+  data.tar.gz: b4b7ba5cbce5c57e45b5789e3e36cff0467b62ae0208b6dfadee59ad95b98ab9ff498be68816e6404bb9d0772fd0d411bed129b7785cf3b14507853fda6c0771

data/lib/graphiti/errors.rb

@@ -94,7 +94,7 @@ The adapter #{@adapter.class} does not implement method '#{@method}', which was
 
       def message
         <<-MSG
-#{@resource.class}: Tried to persist sideload #{@sideload.name.inspect} but marked writable: false
+#{@resource.class}: Tried to persist association #{@sideload.name.inspect} but marked writable: false
         MSG
       end
     end

data/lib/graphiti/resource.rb

@@ -94,9 +94,9 @@ module Graphiti
       adapter.disassociate(parent, child, association_name, type)
     end
 
-    def persist_with_relationships(meta, attributes, relationships, caller_model = nil)
+    def persist_with_relationships(meta, attributes, relationships, caller_model = nil, foreign_key = nil)
       persistence = Graphiti::Util::Persistence \
-        .new(self, meta, attributes, relationships, caller_model)
+        .new(self, meta, attributes, relationships, caller_model, foreign_key)
       persistence.run
     end
 

data/lib/graphiti/util/persistence.rb

@@ -5,12 +5,15 @@ class Graphiti::Util::Persistence
   # @param [Hash] meta see (Deserializer#meta)
   # @param [Hash] attributes see (Deserializer#attributes)
   # @param [Hash] relationships see (Deserializer#relationships)
-  def initialize(resource, meta, attributes, relationships, caller_model)
+  # @param [Model] caller_model The persisted parent object in the request graph
+  # @param [Symbol] foreign_key Attribute assigned by parent object in graph
+  def initialize(resource, meta, attributes, relationships, caller_model, foreign_key = nil)
     @resource      = resource
     @meta          = meta
     @attributes    = attributes
     @relationships = relationships
     @caller_model  = caller_model
+    @foreign_key   = foreign_key
 
     # Find the correct child resource for a given jsonapi type
     if meta_type = @meta[:type].try(:to_sym)
@@ -19,9 +22,7 @@ class Graphiti::Util::Persistence
       end
     end
 
-    @attributes.each_pair do |key, value|
-      @attributes[key] = @resource.typecast(key, value, :writable)
-    end
+    typecast_attributes
   end
 
   # Perform the actual save logic.
@@ -68,6 +69,20 @@ class Graphiti::Util::Persistence
 
   private
 
+  # In the case where we're sideposting in order to associate 2 nodes
+  # in the graph, the foreign key gets merged into the child's attributes
+  # This attribute should *not* need to be marked writable, as that
+  # would allow writing as a straight attribute instead of just an association
+  def typecast_attributes
+    @attributes.each_pair do |key, value|
+      if @foreign_key == key
+        @attributes[key] = value
+      else
+        @attributes[key] = @resource.typecast(key, value, :writable)
+      end
+    end
+  end
+
   def add_hook(prc)
     ::Graphiti::Util::Hooks.add(prc)
   end
@@ -170,7 +185,9 @@ class Graphiti::Util::Persistence
 
         if x[:sideload].writable?
           x[:object] = x[:resource]
-            .persist_with_relationships(x[:meta], x[:attributes], x[:relationships], caller_model)
+            .persist_with_relationships(x[:meta], x[:attributes], x[:relationships], caller_model, x[:foreign_key])
+        else
+          raise Graphiti::Errors::UnwritableRelationship.new(@resource, x[:sideload])
         end
 
         processed << x

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.rc.17"
+  VERSION = "1.0.rc.18"
 end

metadata

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