graphiti 1.2.15 → 1.2.20

data/lib/graphiti/resource/interface.rb

@@ -11,7 +11,7 @@ module Graphiti
 
         # @api private
         def _all(params, opts, base_scope)
-          runner = Runner.new(self, params, opts.delete(:query))
+          runner = Runner.new(self, params, opts.delete(:query), :all)
           opts[:params] = params
           runner.proxy(base_scope, opts)
         end
@@ -27,7 +27,7 @@ module Graphiti
           params[:filter] ||= {}
           params[:filter][:id] = id if id
 
-          runner = Runner.new(self, params)
+          runner = Runner.new(self, params, nil, :find)
           runner.proxy base_scope,
             single: true,
             raise_on_missing: true,

data/lib/graphiti/resource/links.rb

@@ -39,7 +39,7 @@ module Graphiti
           path: path,
           full_path: full_path_for(path),
           url: url_for(path),
-          actions: DEFAULT_ACTIONS.dup,
+          actions: DEFAULT_ACTIONS.dup
         }
       end
 
@@ -49,7 +49,7 @@ module Graphiti
           path: path,
           full_path: full_path_for(path),
           url: url_for(path),
-          actions: actions,
+          actions: actions
         }
       end
 
@@ -60,7 +60,7 @@ module Graphiti
           path: path,
           full_path: full_path_for(path),
           url: url_for(path),
-          actions: actions,
+          actions: actions
         }]
       end
 

data/lib/graphiti/resource/persistence.rb

@@ -89,7 +89,8 @@ module Graphiti
 
       def update(update_params, meta = nil)
         model_instance = nil
-        id = update_params.delete(:id)
+        id = update_params[:id]
+        update_params = update_params.except(:id)
 
         run_callbacks :persistence, :update, update_params, meta do
           run_callbacks :attributes, :update, update_params, meta do |params|

data/lib/graphiti/resource/polymorphism.rb

@@ -58,7 +58,7 @@ module Graphiti
         end
 
         def resource_for_type(type)
-          resource = children.find { |c| c.type == type }
+          resource = children.find { |c| c.type.to_s == type.to_s }
           if resource.nil?
             raise Errors::PolymorphicResourceChildNotFound.new(self, type: type)
           else
@@ -67,7 +67,8 @@ module Graphiti
         end
 
         def resource_for_model(model)
-          resource = children.find { |c| model.is_a?(c.model) }
+          resource = children.find { |c| model.class == c.model } ||
+            children.find { |c| model.is_a?(c.model) }
           if resource.nil?
             raise Errors::PolymorphicResourceChildNotFound.new(self, model: model)
           else

data/lib/graphiti/resource/remote.rb

@@ -19,7 +19,7 @@ module Graphiti
       end
 
       def save(model, meta)
-        if meta[:attributes] == {} && meta[:method] == :update
+        if meta[:attributes].except(:id) == {} && meta[:method] == :update
           model
         else
           raise Errors::RemoteWrite.new(self.class)

data/lib/graphiti/runner.rb

@@ -3,10 +3,11 @@ module Graphiti
     attr_reader :params
     attr_reader :deserialized_payload
 
-    def initialize(resource_class, params, query = nil)
+    def initialize(resource_class, params, query = nil, action = nil)
       @resource_class = resource_class
       @params = params
       @query = query
+      @action = action
 
       validator = RequestValidator.new(jsonapi_resource, params)
 
@@ -30,7 +31,7 @@ module Graphiti
     end
 
     def query
-      @query ||= Query.new(jsonapi_resource, params)
+      @query ||= Query.new(jsonapi_resource, params, nil, nil, [], @action)
     end
 
     def query_hash
@@ -50,7 +51,7 @@ module Graphiti
     def jsonapi_render_options
       options = {}
       options.merge!(default_jsonapi_render_options)
-      options[:meta]   ||= {}
+      options[:meta] ||= {}
       options[:expose] ||= {}
       options[:expose][:context] = jsonapi_context
       options

data/lib/graphiti/schema.rb

@@ -33,7 +33,7 @@ module Graphiti
       {
         resources: generate_resources,
         endpoints: generate_endpoints,
-        types: generate_types,
+        types: generate_types
       }
     end
 
@@ -94,7 +94,7 @@ module Graphiti
           extra_attributes: extra_attributes(r),
           sorts: sorts(r),
           filters: filters(r),
-          relationships: relationships(r),
+          relationships: relationships(r)
         }
 
         if r.default_sort
@@ -121,7 +121,7 @@ module Graphiti
           name: r.name,
           description: r.description,
           remote: r.remote_url,
-          relationships: relationships(r),
+          relationships: relationships(r)
         }
       }
 
@@ -136,7 +136,7 @@ module Graphiti
               type: config[:type].to_s,
               readable: flag(config[:readable]),
               writable: flag(config[:writable]),
-              description: resource.attribute_description(name),
+              description: resource.attribute_description(name)
             }
           end
         end
@@ -149,7 +149,7 @@ module Graphiti
           attrs[name] = {
             type: config[:type].to_s,
             readable: flag(config[:readable]),
-            description: resource.attribute_description(name),
+            description: resource.attribute_description(name)
           }
         end
       end
@@ -186,7 +186,7 @@ module Graphiti
 
           config = {
             type: filter[:type].to_s,
-            operators: filter[:operators].keys.map(&:to_s),
+            operators: filter[:operators].keys.map(&:to_s)
           }
 
           config[:single] = true if filter[:single]

data/lib/graphiti/scope.rb

@@ -3,10 +3,10 @@ module Graphiti
     attr_accessor :object, :unpaginated_object
     attr_reader :pagination
     def initialize(object, resource, query, opts = {})
-      @object    = object
-      @resource  = resource
-      @query     = query
-      @opts      = opts
+      @object = object
+      @resource = resource
+      @query = query
+      @opts = opts
 
       @object = @resource.around_scoping(@object, @query.hash) { |scope|
         apply_scoping(scope, opts)
@@ -75,7 +75,7 @@ module Graphiti
         resource: @resource,
         params: @opts[:params],
         sideload: @opts[:sideload],
-        parent: @opts[:parent],
+        parent: @opts[:parent]
         # Set once data is resolved within block
         #   results: ...
       }

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/serializer.rb

@@ -25,6 +25,7 @@ module Graphiti
     def as_jsonapi(*)
       super.tap do |hash|
         strip_relationships!(hash) if strip_relationships?
+        add_links!(hash)
       end
     end
 
@@ -49,6 +50,12 @@ module Graphiti
 
     private
 
+    def add_links!(hash)
+      return unless @resource.respond_to?(:links?)
+
+      hash[:links] = @resource.links(@object) if @resource.links?
+    end
+
     def strip_relationships!(hash)
       hash[:relationships]&.select! do |name, payload|
         payload.key?(:data)

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
@@ -132,6 +132,10 @@ module Graphiti
       end
     end
 
+    def link_filter(parents)
+      base_filter(parents)
+    end
+
     # The parent resource is a remote,
     # AND the sideload is a remote to the same endpoint
     def shared_remote?
@@ -197,7 +201,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 +430,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/sideload/has_many.rb

@@ -1,8 +1,18 @@
 class Graphiti::Sideload::HasMany < Graphiti::Sideload
+  def initialize(name, opts)
+    @inverse_filter = opts[:inverse_filter]
+
+    super(name, opts)
+  end
+
   def type
     :has_many
   end
 
+  def inverse_filter
+    @inverse_filter || foreign_key
+  end
+
   def load_params(parents, query)
     query.hash.tap do |hash|
       hash[:filter] ||= {}
@@ -11,11 +21,19 @@ class Graphiti::Sideload::HasMany < Graphiti::Sideload
   end
 
   def base_filter(parents)
-    {foreign_key => ids_for_parents(parents).join(",")}
+    {foreign_key => parent_filter(parents)}
+  end
+
+  def link_filter(parents)
+    {inverse_filter => parent_filter(parents)}
   end
 
   private
 
+  def parent_filter(parents)
+    ids_for_parents(parents).join(",")
+  end
+
   def child_map(children)
     children.group_by(&foreign_key)
   end

data/lib/graphiti/sideload/many_to_many.rb

@@ -11,8 +11,12 @@ class Graphiti::Sideload::ManyToMany < Graphiti::Sideload::HasMany
     foreign_key.values.first
   end
 
+  def inverse_filter
+    @inverse_filter || true_foreign_key
+  end
+
   def base_filter(parents)
-    {true_foreign_key => ids_for_parents(parents).join(",")}
+    {true_foreign_key => parent_filter(parents)}
   end
 
   def infer_foreign_key
@@ -32,7 +36,7 @@ class Graphiti::Sideload::ManyToMany < Graphiti::Sideload::HasMany
     self_ref = self
     fk_type = parent_resource_class.attributes[:id][:type]
     fk_type = :hash if polymorphic?
-    resource_class.filter true_foreign_key, fk_type do
+    resource_class.filter inverse_filter, fk_type do
       eq do |scope, value|
         self_ref.belongs_to_many_filter(scope, value)
       end