graphiti 1.2.15 → 1.2.20

data/lib/graphiti/stats/payload.rb

@@ -15,10 +15,10 @@ module Graphiti
     #   }
     class Payload
       def initialize(resource, query, scope, data)
-        @resource   = resource
-        @query      = query
-        @scope      = scope
-        @data       = data
+        @resource = resource
+        @query = query
+        @scope = scope
+        @data = data
       end
 
       # Generate the payload for +{ meta: { stats: { ... } } }+

data/lib/graphiti/types.rb

@@ -93,14 +93,14 @@ module Graphiti
             read: Dry::Types["coercible.string"],
             write: Dry::Types["coercible.integer"],
             kind: "scalar",
-            description: "Base Type. Query/persist as integer, render as string.",
+            description: "Base Type. Query/persist as integer, render as string."
           },
           uuid: {
             params: Dry::Types["coercible.string"],
             read: Dry::Types["coercible.string"],
             write: Dry::Types["coercible.string"],
             kind: "scalar",
-            description: "Base Type. Like a normal string, but by default only eq/!eq and case-sensitive.",
+            description: "Base Type. Like a normal string, but by default only eq/!eq and case-sensitive."
           },
           string_enum: {
             canonical_name: :enum,
@@ -108,7 +108,7 @@ module Graphiti
             read: Dry::Types["coercible.string"],
             write: Dry::Types["coercible.string"],
             kind: "scalar",
-            description: "String enum type. Like a normal string, but only eq/!eq and case-sensitive. Limited to only the allowed values.",
+            description: "String enum type. Like a normal string, but only eq/!eq and case-sensitive. Limited to only the allowed values."
           },
           integer_enum: {
             canonical_name: :enum,
@@ -116,71 +116,71 @@ module Graphiti
             read: Dry::Types["coercible.integer"],
             write: Dry::Types["coercible.integer"],
             kind: "scalar",
-            description: "Integer enum type. Like a normal integer, but only eq/!eq filters. Limited to only the allowed values.",
+            description: "Integer enum type. Like a normal integer, but only eq/!eq filters. Limited to only the allowed values."
           },
           string: {
             params: Dry::Types["coercible.string"],
             read: Dry::Types["coercible.string"],
             write: Dry::Types["coercible.string"],
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           integer: {
             params: PresentInteger,
             read: Integer,
             write: Integer,
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           big_decimal: {
             params: ParamDecimal,
             read: Dry::Types["json.decimal"],
             write: Dry::Types["json.decimal"],
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           float: {
             params: Dry::Types["coercible.float"],
             read: Float,
             write: Float,
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           boolean: {
             params: PresentBool,
             read: Bool,
             write: Bool,
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           date: {
             params: PresentDate,
             read: Date,
             write: Date,
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           datetime: {
             params: PresentParamsDateTime,
             read: ReadDateTime,
             write: WriteDateTime,
             kind: "scalar",
-            description: "Base Type.",
+            description: "Base Type."
           },
           hash: {
             params: PresentParamsHash,
             read: Dry::Types["strict.hash"],
             write: Dry::Types["strict.hash"],
             kind: "record",
-            description: "Base Type.",
+            description: "Base Type."
           },
           array: {
             params: Dry::Types["strict.array"],
             read: Dry::Types["strict.array"],
             write: Dry::Types["strict.array"],
             kind: "array",
-            description: "Base Type.",
-          },
+            description: "Base Type."
+          }
         }
 
         hash.each_pair do |k, v|
@@ -198,7 +198,7 @@ module Graphiti
             test: Dry::Types["strict.array"].of(map[:test]),
             write: Dry::Types["strict.array"].of(map[:write]),
             kind: "array",
-            description: "Base Type.",
+            description: "Base Type."
           }
         end
         hash.merge!(arrays)

data/lib/graphiti/util/link.rb

@@ -60,10 +60,10 @@ module Graphiti
       def params
         @params ||= {}.tap do |params|
           if @sideload.type != :belongs_to || @sideload.remote?
-            params[:filter] = @sideload.base_filter([@model])
+            params[:filter] = @sideload.link_filter([@model])
           end
 
-          @sideload.params_proc&.call(params, [@model])
+          @sideload.params_proc&.call(params, [@model], context)
         end
       end
 
@@ -75,6 +75,10 @@ module Graphiti
         end
         path
       end
+
+      def context
+        Graphiti.context[:object]
+      end
     end
   end
 end

data/lib/graphiti/util/persistence.rb

@@ -8,12 +8,12 @@ class Graphiti::Util::Persistence
   # @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
+    @resource = resource
+    @meta = meta
+    @attributes = attributes
     @relationships = relationships
-    @caller_model  = caller_model
-    @foreign_key   = foreign_key
+    @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))
@@ -177,9 +177,15 @@ class Graphiti::Util::Persistence
   def process_belongs_to(relationships)
     [].tap do |processed|
       iterate(only: [:polymorphic_belongs_to, :belongs_to]) do |x|
-        x[:object] = x[:resource]
-          .persist_with_relationships(x[:meta], x[:attributes], x[:relationships])
-        processed << x
+        begin
+          id = x.dig(:attributes, :id)
+          x[:object] = x[:resource]
+            .persist_with_relationships(x[:meta], x[:attributes], x[:relationships])
+          processed << x
+        rescue Graphiti::Errors::RecordNotFound
+          path = "relationships/#{x.dig(:meta, :jsonapi_type)}"
+          raise Graphiti::Errors::RecordNotFound.new(x[:sideload].name, id, path)
+        end
       end
     end
   end
@@ -202,7 +208,7 @@ class Graphiti::Util::Persistence
   def iterate(only: [], except: [])
     opts = {
       resource: @resource,
-      relationships: @relationships,
+      relationships: @relationships
     }.merge(only: only, except: except)
 
     Graphiti::Util::RelationshipPayload.iterate(opts) do |x|
@@ -216,7 +222,7 @@ class Graphiti::Util::Persistence
       temp_id: @meta[:temp_id],
       caller_model: @caller_model,
       attributes: @attributes,
-      relationships: @relationships,
+      relationships: @relationships
     }
   end
 

data/lib/graphiti/util/relationship_payload.rb

@@ -14,9 +14,9 @@ module Graphiti
 
       def initialize(resource, payload, only: [], except: [])
         @resource = resource
-        @payload  = payload
-        @only     = only
-        @except   = except
+        @payload = payload
+        @only = only
+        @except = except
       end
 
       def iterate
@@ -67,7 +67,7 @@ module Graphiti
           foreign_key: sideload.foreign_key,
           attributes: relationship_payload[:attributes],
           meta: relationship_payload[:meta],
-          relationships: relationship_payload[:relationships],
+          relationships: relationship_payload[:relationships]
         }
       end
     end

data/lib/graphiti/util/simple_errors.rb

@@ -53,7 +53,7 @@ module Graphiti
       def add(attribute, code, message: nil)
         message ||= "is #{code.to_s.humanize.downcase}"
 
-        details[attribute.to_sym]  << {error: code}
+        details[attribute.to_sym] << {error: code}
         messages[attribute.to_sym] << message
       end
 

data/lib/graphiti/util/transaction_hooks_recorder.rb

@@ -65,7 +65,7 @@ module Graphiti
           Thread.current[:_graphiti_hooks] = {
             after_graph_persist: [],
             before_commit: [],
-            after_commit: [],
+            after_commit: []
           }
         end
 

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.2.15"
+  VERSION = "1.2.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.2.15
+  version: 1.2.20
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -28,16 +28,22 @@ dependencies:
   name: jsonapi-renderer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
@@ -184,20 +190,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.beta.4
-- !ruby/object:Gem::Dependency
-  name: standard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - richmolj@gmail.com
@@ -241,8 +233,12 @@ files:
 - exe/graphiti
 - gemfiles/.bundle/config
 - gemfiles/rails_4.gemfile
-- gemfiles/rails_5.gemfile
-- gemfiles/rails_5_graphiti_rails.gemfile
+- gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_0_graphiti_rails.gemfile
+- gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_1_graphiti_rails.gemfile
+- gemfiles/rails_5_2.gemfile
+- gemfiles/rails_5_2_graphiti_rails.gemfile
 - gemfiles/rails_6.gemfile
 - gemfiles/rails_6_graphiti_rails.gemfile
 - graphiti.gemspec