graphiti 1.2.16 → 1.2.17

data/lib/graphiti/scoping/base.rb

@@ -25,9 +25,9 @@ module Graphiti
       # @param [Hash] opts configuration options used by subclasses
       def initialize(resource, query_hash, scope, opts = {})
         @query_hash = query_hash
-        @resource   = resource
-        @scope      = scope
-        @opts       = opts
+        @resource = resource
+        @scope = scope
+        @opts = opts
       end
 
       # Apply this scoping criteria.

data/lib/graphiti/scoping/filter.rb

@@ -31,7 +31,7 @@ module Graphiti
 
     def filter_via_adapter(filter, operator, value)
       type_name = Types.name_for(filter.values.first[:type])
-      method    = :"filter_#{type_name}_#{operator}"
+      method = :"filter_#{type_name}_#{operator}"
       attribute = filter.keys.first
 
       if resource.adapter.respond_to?(method)
@@ -54,6 +54,8 @@ module Graphiti
           unless type[:canonical_name] == :hash || !value.is_a?(String)
             value = parse_string_value(filter.values[0], value)
           end
+
+          check_deny_empty_filters!(resource, filter, value)
           value = parse_string_null(filter.values[0], value)
           validate_singular(resource, filter, value)
           value = coerce_types(filter.values[0], param_name.to_sym, value)
@@ -82,11 +84,11 @@ module Graphiti
       type = Types[filter.values[0][:type]][:canonical_name]
       if param_value.is_a?(Hash) && type == :hash
         operators_keys = filter.values[0][:operators].keys
-        unless param_value.keys.all? {|k| operators_keys.include?(k)}
-          param_value = { eq: param_value }
+        unless param_value.keys.all? { |k| operators_keys.include?(k) }
+          param_value = {eq: param_value}
         end
       elsif !param_value.is_a?(Hash) || param_value.empty?
-        param_value = { eq: param_value }
+        param_value = {eq: param_value}
       end
 
       param_value.map do |operator, value|
@@ -184,10 +186,10 @@ module Graphiti
       # remove the quote characters from the quoted strings
       quotes.each { |q| q.gsub!("{{", "").gsub!("}}", "") }
       # merge everything back together into an array
-      if singular_filter
-        value = Array(value) + quotes
+      value = if singular_filter
+        Array(value) + quotes
       else
-        value = Array(value.split(",")) + quotes
+        Array(value.split(",")) + quotes
       end
       # remove any blanks that are left
       value.reject! { |v| v.length.zero? }
@@ -200,5 +202,13 @@ module Graphiti
 
       value
     end
+
+    def check_deny_empty_filters!(resource, filter, value)
+      return unless filter.values[0][:deny_empty]
+
+      if value.nil? || value.empty? || value == "null"
+        raise Errors::InvalidFilterValue.new(resource, filter, "(empty)")
+      end
+    end
   end
 end

data/lib/graphiti/scoping/sort.rb

@@ -78,7 +78,7 @@ module Graphiti
 
     def sort_hash(attr)
       value = attr[0] == "-" ? :desc : :asc
-      key   = attr.sub("-", "").to_sym
+      key = attr.sub("-", "").to_sym
 
       {key => value}
     end

data/lib/graphiti/sideload.rb

@@ -18,31 +18,31 @@ module Graphiti
       :link_proc
 
     def initialize(name, opts)
-      @name                          = name
+      @name = name
       validate_options!(opts)
-      @parent_resource_class         = opts[:parent_resource]
-      @resource_class                = opts[:resource]
-      @primary_key                   = opts[:primary_key]
-      @foreign_key                   = opts[:foreign_key]
-      @type                          = opts[:type]
-      @base_scope                    = opts[:base_scope]
-      @readable                      = evaluate_flag(opts[:readable])
-      @writable                      = evaluate_flag(opts[:writable])
-      @as                            = opts[:as]
-      @link                          = opts[:link]
-      @single                        = opts[:single]
-      @remote                        = opts[:remote]
+      @parent_resource_class = opts[:parent_resource]
+      @resource_class = opts[:resource]
+      @primary_key = opts[:primary_key]
+      @foreign_key = opts[:foreign_key]
+      @type = opts[:type]
+      @base_scope = opts[:base_scope]
+      @readable = evaluate_flag(opts[:readable])
+      @writable = evaluate_flag(opts[:writable])
+      @as = opts[:as]
+      @link = opts[:link]
+      @single = opts[:single]
+      @remote = opts[:remote]
       apply_belongs_to_many_filter if type == :many_to_many
 
-      @description                   = opts[:description]
+      @description = opts[:description]
 
       # polymorphic has_many
-      @polymorphic_as                = opts[:polymorphic_as]
+      @polymorphic_as = opts[:polymorphic_as]
       # polymorphic_belongs_to-specific
-      @group_name                    = opts[:group_name]
-      @polymorphic_child             = opts[:polymorphic_child]
-      @parent                        = opts[:parent]
-      @always_include_resource_ids   = opts[:always_include_resource_ids]
+      @group_name = opts[:group_name]
+      @polymorphic_child = opts[:polymorphic_child]
+      @parent = opts[:parent]
+      @always_include_resource_ids = opts[:always_include_resource_ids]
 
       if polymorphic_child?
         parent.resource.polymorphic << resource_class
@@ -197,7 +197,7 @@ module Graphiti
 
       with_error_handling Errors::SideloadParamsError do
         params = load_params(parents, query)
-        params_proc&.call(params, parents)
+        params_proc&.call(params, parents, context)
         return [] if blank_query?(params)
         opts = load_options(parents, query)
         opts[:sideload] = self
@@ -426,13 +426,17 @@ module Graphiti
       return false if flag.blank?
 
       case flag.class.name
-      when "Symbol","String"
+      when "Symbol", "String"
         resource.send(flag)
       when "Proc"
-        self.resource.instance_exec(&flag)
+        resource.instance_exec(&flag)
       else
         !!flag
       end
     end
+
+    def context
+      Graphiti.context[:object]
+    end
   end
 end

data/lib/graphiti/sideload/belongs_to.rb

@@ -1,6 +1,6 @@
 class Graphiti::Sideload::BelongsTo < Graphiti::Sideload
   def initialize(name, opts)
-    opts = { always_include_resource_ids: false }.merge(opts)
+    opts = {always_include_resource_ids: false}.merge(opts)
     super(name, opts)
   end
 

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

@@ -63,7 +63,7 @@ module Graphiti
             params[:filter] = @sideload.base_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.16"
+  VERSION = "1.2.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.17
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -241,8 +241,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