graphiti 1.0.rc.21 → 1.0.rc.22

data/lib/graphiti/schema_diff.rb

@@ -49,7 +49,7 @@ module Graphiti
 
     def compare_attributes(old_resource, new_resource)
       old_resource[:attributes].each_pair do |name, old_att|
-        unless new_att = new_resource[:attributes][name]
+        unless (new_att = new_resource[:attributes][name])
           @errors << "#{old_resource[:name]}: attribute #{name.inspect} was removed."
           next
         end
@@ -90,7 +90,7 @@ module Graphiti
 
     def compare_relationships(old_resource, new_resource)
       old_resource[:relationships].each_pair do |name, old_rel|
-        unless new_rel = new_resource[:relationships][name]
+        unless (new_rel = new_resource[:relationships][name])
           @errors << "#{old_resource[:name]}: relationship #{name.inspect} was removed."
           next
         end
@@ -112,7 +112,7 @@ module Graphiti
 
     def compare_extra_attributes(old_resource, new_resource)
       old_resource[:extra_attributes].each_pair do |name, old_att|
-        unless new_att = new_resource[:extra_attributes][name]
+        unless (new_att = new_resource[:extra_attributes][name])
           @errors << "#{old_resource[:name]}: extra attribute #{name.inspect} was removed."
           next
         end
@@ -123,7 +123,7 @@ module Graphiti
 
     def compare_sorts(old_resource, new_resource)
       old_resource[:sorts].each_pair do |name, old_sort|
-        unless new_sort = new_resource[:sorts][name]
+        unless (new_sort = new_resource[:sorts][name])
           @errors << "#{old_resource[:name]}: sort #{name.inspect} was removed."
           next
         end
@@ -146,7 +146,7 @@ module Graphiti
 
     def compare_filters(old_resource, new_resource)
       old_resource[:filters].each_pair do |name, old_filter|
-        unless new_filter = new_resource[:filters][name]
+        unless (new_filter = new_resource[:filters][name])
           @errors << "#{old_resource[:name]}: filter #{name.inspect} was removed."
           next
         end
@@ -206,13 +206,13 @@ module Graphiti
 
     def compare_endpoints
       @old[:endpoints].each_pair do |path, old_endpoint|
-        unless new_endpoint = @new[:endpoints][path]
+        unless (new_endpoint = @new[:endpoints][path])
           @errors << "Endpoint \"#{path}\" was removed."
           next
         end
 
         old_endpoint[:actions].each_pair do |name, old_action|
-          unless new_action = new_endpoint[:actions][name]
+          unless (new_action = new_endpoint[:actions][name])
             @errors << "Endpoint \"#{path}\" removed action #{name.inspect}."
             next
           end
@@ -236,7 +236,7 @@ module Graphiti
 
     def compare_types
       @old[:types].each_pair do |name, old_type|
-        unless new_type = @new[:types][name]
+        unless (new_type = @new[:types][name])
           @errors << "Type #{name.inspect} was removed."
           next
         end
@@ -255,11 +255,11 @@ module Graphiti
       end
 
       [:readable, :writable].each do |flag|
-        if [true, 'guarded'].include?(old_att[flag]) && new_att[flag] == false
+        if [true, "guarded"].include?(old_att[flag]) && new_att[flag] == false
           @errors << "#{resource_name}: #{prefix} #{att_name.inspect} changed flag #{flag.inspect} from #{old_att[flag].inspect} to #{new_att[flag].inspect}."
         end
 
-        if new_att[flag] == 'guarded' && old_att[flag] == true
+        if new_att[flag] == "guarded" && old_att[flag] == true
           @errors << "#{resource_name}: #{prefix} #{att_name.inspect} changed flag #{flag.inspect} from #{old_att[flag].inspect} to #{new_att[flag].inspect}."
         end
       end

data/lib/graphiti/scope.rb

@@ -8,26 +8,24 @@ module Graphiti
       @query     = query
       @opts      = opts
 
-      @object = @resource.around_scoping(@object, @query.hash) do |scope|
+      @object = @resource.around_scoping(@object, @query.hash) { |scope|
         apply_scoping(scope, opts)
-      end
+      }
     end
 
     def resolve
       if @query.zero_results?
         []
       else
-        resolved = broadcast_data do |payload|
+        resolved = broadcast_data { |payload|
           @object = @resource.before_resolve(@object, @query)
           payload[:results] = @resource.resolve(@object)
           payload[:results]
-        end
+        }
         resolved.compact!
         assign_serializer(resolved)
         yield resolved if block_given?
-        if @opts[:after_resolve]
-          @opts[:after_resolve].call(resolved)
-        end
+        @opts[:after_resolve]&.call(resolved)
         resolve_sideloads(resolved) unless @query.sideloads.empty?
         resolved
       end
@@ -42,11 +40,11 @@ module Graphiti
       @query.sideloads.each_pair do |name, q|
         sideload = @resource.class.sideload(name)
         next if sideload.nil? || sideload.shared_remote?
-        _parent = @resource
-        _context = Graphiti.context
+        parent_resource = @resource
+        graphiti_context = Graphiti.context
         resolve_sideload = -> {
-          Graphiti.context = _context
-          sideload.resolve(results, q, _parent)
+          Graphiti.context = graphiti_context
+          sideload.resolve(results, q, parent_resource)
           if concurrent && defined?(ActiveRecord)
             ActiveRecord::Base.clear_active_connections!
           end
@@ -60,13 +58,11 @@ module Graphiti
 
       if concurrent
         # Wait for all promises to finish
-        while !promises.all? { |p| p.fulfilled? || p.rejected? }
-          sleep 0.01
-        end
+        sleep 0.01 until promises.all? { |p| p.fulfilled? || p.rejected? }
         # Re-raise the error with correct stacktrace
         # OPTION** to avoid failing here?? if so need serializable patch
         # to avoid loading data when association not loaded
-        if rejected = promises.find(&:rejected?)
+        if (rejected = promises.find(&:rejected?))
           raise rejected.reason
         end
       end
@@ -79,7 +75,7 @@ module Graphiti
         resource: @resource,
         params: @opts[:params],
         sideload: @opts[:sideload],
-        parent: @opts[:parent]
+        parent: @opts[:parent],
       }
       Graphiti.broadcast("data", opts) do |payload|
         yield payload

data/lib/graphiti/scoping/base.rb

@@ -67,13 +67,13 @@ module Graphiti
 
       # Defines how to call/apply the default scoping logic
       def apply_standard_scope
-        raise 'override in subclass'
+        raise "override in subclass"
       end
 
       # Defines how to call/apply the custom scoping logic provided by the
       # user.
       def apply_custom_scope
-        raise 'override in subclass'
+        raise "override in subclass"
       end
 
       private
@@ -81,10 +81,10 @@ module Graphiti
       # If the user customized (by providing a block in the Resource DSL)
       # then call the custom proc. Else, call the default proc.
       def apply_standard_or_override
-        if apply_standard_scope?
-          @scope = apply_standard_scope
+        @scope = if apply_standard_scope?
+          apply_standard_scope
         else
-          @scope = apply_custom_scope
+          apply_custom_scope
         end
 
         @scope

data/lib/graphiti/scoping/default_filter.rb

@@ -47,7 +47,7 @@ module Graphiti
     private
 
     def overridden?(name)
-      if found = find_filter(name)
+      if (found = find_filter(name))
         found_aliases = found[name][:aliases]
         filter_param.keys.any? { |k| found_aliases.include?(k.to_sym) }
       else

data/lib/graphiti/scoping/filter.rb

@@ -22,7 +22,7 @@ module Graphiti
     private
 
     def filter_scope(filter, operator, value)
-      if custom_scope = filter.values[0][:operators][operator]
+      if (custom_scope = filter.values[0][:operators][operator])
         custom_scope.call(@scope, value, resource.context)
       else
         filter_via_adapter(filter, operator, value)
@@ -46,7 +46,7 @@ module Graphiti
       filter_param.each_pair do |param_name, param_value|
         filter = find_filter!(param_name)
         value, operator = normalize_param(filter, param_value)
-        operator = operator.to_s.gsub('!', 'not_').to_sym
+        operator = operator.to_s.gsub("!", "not_").to_sym
         validate_operator(filter, operator)
         unless filter.values[0][:type] == :hash || !value.is_a?(String)
           value = parse_string_value(filter.values[0], value)
@@ -62,7 +62,7 @@ module Graphiti
 
     def coerce_types(filter, name, value)
       type_name = filter[:type]
-      is_array = type_name.to_s.starts_with?('array_of') ||
+      is_array = type_name.to_s.starts_with?("array_of") ||
         Types[type_name][:canonical_name] == :array
 
       if is_array
@@ -75,7 +75,7 @@ module Graphiti
 
     def normalize_param(filter, param_value)
       unless param_value.is_a?(Hash) && param_value.present?
-        param_value = { eq: param_value }
+        param_value = {eq: param_value}
       end
       value = param_value.values.first
       operator = param_value.keys.first
@@ -106,7 +106,7 @@ module Graphiti
 
     def validate_allowlist(resource, filter, values)
       values.each do |v|
-        if allow = filter.values[0][:allow]
+        if (allow = filter.values[0][:allow])
           unless allow.include?(v)
             raise Errors::InvalidFilterValue.new(resource, filter, v)
           end
@@ -116,7 +116,7 @@ module Graphiti
 
     def validate_denylist(resource, filter, values)
       values.each do |v|
-        if deny = filter.values[0][:deny]
+        if (deny = filter.values[0][:deny])
           if deny.include?(v)
             raise Errors::InvalidFilterValue.new(resource, filter, v)
           end
@@ -131,19 +131,10 @@ module Graphiti
       end
 
       if value.is_a?(String)
-        value = value.gsub('{{{', '{').gsub('}}}', '}')
-
-        # Accomodate array of hashes
-        if value.include?('},{')
-          value = value.split('},{').map do |v|
-            if v.starts_with?('{') && !v.ends_with?('}')
-              v = "#{v}}"
-            elsif v.ends_with?('}') && !v.starts_with?('{')
-              v = "{#{v}"
-            else
-              "{#{v}}"
-            end
-          end
+        value = value.gsub("{{{", "{").gsub("}}}", "}")
+
+        if value.include?("},{") && !filter.values[0][:single]
+          value = Util::Hash.split_json(value)
         end
       end
 
@@ -162,13 +153,13 @@ module Graphiti
       type = Graphiti::Types[filter[:type]]
       array_or_string = [:string, :array].include?(type[:canonical_name])
       if (arr = value.scan(/\[.*?\]/)).present? && array_or_string
-        value = arr.map do |json|
+        value = arr.map { |json|
           begin
             JSON.parse(json)
           rescue
             raise Errors::InvalidJSONArray.new(resource, value)
           end
-        end
+        }
         value = value[0] if value.length == 1
       else
         value = parse_string_arrays(value)
@@ -180,11 +171,11 @@ module Graphiti
       # Find the quoted strings
       quotes = value.scan(/{{.*?}}/)
       # remove them from the rest
-      quotes.each { |q| value.gsub!(q, '') }
+      quotes.each { |q| value.gsub!(q, "") }
       # remove the quote characters from the quoted strings
-      quotes.each { |q| q.gsub!('{{', '').gsub!('}}', '') }
+      quotes.each { |q| q.gsub!("{{", "").gsub!("}}", "") }
       # merge everything back together into an array
-      value = Array(value.split(',')) + quotes
+      value = Array(value.split(",")) + quotes
       # remove any blanks that are left
       value.reject! { |v| v.length.zero? }
       value = value[0] if value.length == 1

data/lib/graphiti/scoping/filterable.rb

@@ -11,7 +11,7 @@ module Graphiti
     # @api private
     def find_filter!(name)
       resource.class.get_attr!(name, :filterable, request: true)
-      { name => resource.filters[name] }
+      {name => resource.filters[name]}
     end
 
     # @api private
@@ -24,18 +24,18 @@ module Graphiti
     end
 
     def required_filters
-      resource.filters.map do |k, v|
+      resource.filters.map { |k, v|
         k if v[:required]
-      end.compact
+      }.compact
     end
 
     def missing_dependent_filters
       [].tap do |arr|
         filter_param.each_pair do |key, value|
-          if df = dependent_filters[key]
+          if (df = dependent_filters[key])
             missing = df[:dependencies] - filter_param.keys
             unless missing.length.zero?
-              arr << { filter: df, missing: missing }
+              arr << {filter: df, missing: missing}
             end
           end
         end

data/lib/graphiti/scoping/paginate.rb

@@ -44,7 +44,7 @@ module Graphiti
     private
 
     def requested?
-      not [page_param[:size], page_param[:number]].all?(&:nil?)
+      ![page_param[:size], page_param[:number]].all?(&:nil?)
     end
 
     def page_param

data/lib/graphiti/scoping/sort.rb

@@ -28,10 +28,10 @@ module Graphiti
           raise Errors::UnsupportedSort.new resource,
             attribute, sort[:only], direction
         else
-          if sort[:proc]
-            @scope = sort[:proc].call(@scope, direction)
+          @scope = if sort[:proc]
+            sort[:proc].call(@scope, direction)
           else
-            @scope = resource.adapter.order(@scope, attribute, direction)
+            resource.adapter.order(@scope, attribute, direction)
           end
         end
       end
@@ -70,17 +70,17 @@ module Graphiti
 
     def normalize(sort)
       return sort if sort.is_a?(Array)
-      sorts = sort.split(',')
+      sorts = sort.split(",")
       sorts.map do |s|
         sort_hash(s)
       end
     end
 
     def sort_hash(attr)
-      value = attr[0] == '-' ? :desc : :asc
-      key   = attr.sub('-', '').to_sym
+      value = attr[0] == "-" ? :desc : :asc
+      key   = attr.sub("-", "").to_sym
 
-      { key => value }
+      {key => value}
     end
   end
 end

data/lib/graphiti/serializer.rb

@@ -43,18 +43,22 @@ module Graphiti
       end
     end
 
+    def respond_to_missing?(method_name, include_private = true)
+      @resource.respond_to?(method_name, include_private) || super
+    end
+
     private
 
     def strip_relationships!(hash)
-      hash[:relationships].select! do |name, payload|
-        payload.has_key?(:data)
-      end if hash[:relationships]
+      hash[:relationships]&.select! do |name, payload|
+        payload.key?(:data)
+      end
     end
 
     def strip_relationships?
       return false unless Graphiti.config.links_on_demand
       params = Graphiti.context[:object].params || {}
-      [false, nil, 'false'].include?(params[:links])
+      [false, nil, "false"].include?(params[:links])
     end
   end
 end

data/lib/graphiti/sideload.rb

@@ -4,14 +4,10 @@ module Graphiti
     TYPES = [:has_many, :belongs_to, :has_one, :many_to_many]
 
     attr_reader :name,
-      :resource_class,
       :parent_resource_class,
-      :foreign_key,
-      :primary_key,
       :parent,
       :group_name,
       :link,
-      :description,
       :polymorphic_as
 
     class_attribute :scope_proc,
@@ -22,7 +18,7 @@ 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]
@@ -81,15 +77,15 @@ module Graphiti
     end
 
     def create_remote_resource
-      _remote = @remote
-      klass = Class.new(Graphiti::Resource) do
+      remote_url = @remote
+      klass = Class.new(Graphiti::Resource) {
         self.adapter = Graphiti::Adapters::GraphitiAPI
         self.model = OpenStruct
-        self.remote = _remote
+        self.remote = remote_url
         self.validate_endpoints = false
-      end
+      }
       name = "#{parent_resource_class.name}.#{@name}.remote"
-      klass.class_eval("def self.name;'#{name}';end")
+      klass.class_eval("def self.name;'#{name}';end", __FILE__, __LINE__)
       klass
     end
 
@@ -163,7 +159,7 @@ module Graphiti
     end
 
     def assign_each(parent, children)
-      raise 'Override #assign_each in subclass'
+      raise "Override #assign_each in subclass"
     end
 
     def type
@@ -171,7 +167,7 @@ module Graphiti
     end
 
     def load_params(parents, query)
-      raise 'Override #load_params in subclass'
+      raise "Override #load_params in subclass"
     end
 
     def description
@@ -189,13 +185,13 @@ module Graphiti
 
     def load(parents, query, graph_parent)
       params = load_params(parents, query)
-      params_proc.call(params, parents) if params_proc
+      params_proc&.call(params, parents)
       return [] if blank_query?(params)
       opts = load_options(parents, query)
       opts[:sideload] = self
       opts[:parent] = graph_parent
       proxy = resource.class._all(params, opts, base_scope)
-      pre_load_proc.call(proxy, parents) if pre_load_proc
+      pre_load_proc&.call(proxy, parents)
       proxy.to_a
     end
 
@@ -203,7 +199,7 @@ module Graphiti
     def infer_foreign_key
       model = parent_resource_class.model
       namespace = namespace_for(model)
-      model_name = model.name.gsub("#{namespace}::", '')
+      model_name = model.name.gsub("#{namespace}::", "")
       :"#{model_name.underscore}_id"
     end
 
@@ -223,10 +219,10 @@ module Graphiti
       end
 
       parents.each do |parent|
-        if performant_assign?
-          relevant_children = children_for(parent, map) || []
+        relevant_children = if performant_assign?
+          children_for(parent, map) || []
         else
-          relevant_children = fire_assign_each(parent, children)
+          fire_assign_each(parent, children)
         end
 
         if relevant_children.is_a?(Array)
@@ -317,19 +313,17 @@ module Graphiti
 
     # @api private
     def resource_class_loaded?
-      begin
-        resource_class
-        true
-      rescue Graphiti::Errors::ResourceNotFound
-        false
-      end
+      resource_class
+      true
+    rescue Graphiti::Errors::ResourceNotFound
+      false
     end
 
     private
 
     def blank_query?(params)
-      if filter = params[:filter]
-        if filter.values == ['']
+      if (filter = params[:filter])
+        if filter.values == [""]
           return true
         end
       end
@@ -339,21 +333,11 @@ module Graphiti
     def validate_options!(opts)
       if opts[:remote]
         if opts[:resource]
-          raise Errors::SideloadConfig.new(@name, opts[:parent_resource], 'cannot pass :remote and :resource options together')
+          raise Errors::SideloadConfig.new(@name, opts[:parent_resource], "cannot pass :remote and :resource options together")
         end
 
         if opts[:link]
-          raise Errors::SideloadConfig.new(@name, opts[:parent_resource], 'remote sideloads do not currently support :link')
-        end
-      end
-    end
-
-    def apply_belongs_to_many_filter
-      _self = self
-      fk_type = parent_resource_class.attributes[:id][:type]
-      resource_class.filter true_foreign_key, fk_type do
-        eq do |scope, value|
-          _self.belongs_to_many_filter(scope, value)
+          raise Errors::SideloadConfig.new(@name, opts[:parent_resource], "remote sideloads do not currently support :link")
         end
       end
     end
@@ -391,7 +375,7 @@ module Graphiti
         instance_exec(parent_ids, parents, &self.class.scope_proc)
       else
         method = method(:scope)
-        if [2,-2].include?(method.arity)
+        if [2, -2].include?(method.arity)
           scope(parent_ids, parents)
         else
           scope(parent_ids)