graphiti 2.0.0.beta.7 → 2.0.0.beta.8

data/lib/graphiti/audit/report.rb

@@ -60,7 +60,7 @@ module Graphiti
 
         section_heading(label, color, ISSUE_HEADINGS.fetch(check, check.to_s.tr("_", " "))) +
           lines_grouped_by_resource(group.map { |row, finding| [row, finding.message] }) +
-          (fixes.size == 1 ? [fix_line(fixes.first), ""] : [])
+          ((fixes.size == 1) ? [fix_line(fixes.first), ""] : [])
       end
 
       def loading_section
@@ -71,7 +71,7 @@ module Graphiti
           lines_grouped_by_resource(rows.map { |row| [row, nil] }) +
           ["  #{paint("That is a query per record rendered.", :dim)}",
             fix_line("preload the association in base_scope, or drop `resource_ids`"),
-            "  #{paint("See www.graphiti.dev/concepts/relationships#customizing-relationships", :dim)}",
+            "  #{paint("See graphiti.dev/concepts/relationships#customizing-relationships", :dim)}",
             ""]
       end
 
@@ -83,7 +83,7 @@ module Graphiti
         rows = @rows.select(&:would_start_loading?)
         return [] if rows.empty?
 
-        verb = rows.size == 1 ? "renders" : "render"
+        verb = (rows.size == 1) ? "renders" : "render"
 
         section_heading("FYI", :blue, "#{count(rows.size, "belongs_to relationship")} #{verb} no resource ids") +
           lines_grouped_by_resource(rows.map { |row| [row, nil] }) +
@@ -95,7 +95,7 @@ module Graphiti
           ["",
             "  #{paint("Either would load the association on every render. That potential performance cost is why ids are opt-in.", :dim)}",
             "  #{paint("Preloading the association in base_scope keeps that load cheap.", :dim)}",
-            "  #{paint("See www.graphiti.dev/concepts/relationships#belongs-to-resource-ids", :dim)}",
+            "  #{paint("See graphiti.dev/concepts/relationships#belongs-to-resource-ids", :dim)}",
             ""]
       end
 
@@ -189,7 +189,7 @@ module Graphiti
 
         rows.map do |cells|
           line = cells.each_with_index.map { |cell, index|
-            index == cells.size - 1 ? cell.painted : cell.pad_to(widths[index])
+            (index == cells.size - 1) ? cell.painted : cell.pad_to(widths[index])
           }.join("  ")
           indent + line
         end
@@ -203,7 +203,7 @@ module Graphiti
         counts = [
           count(@rows.group_by(&:resource).size, "resource"),
           count(@rows.size, "relationship"),
-          paint(count(errors, "error"), errors > 0 ? :red : nil)
+          paint(count(errors, "error"), (errors > 0) ? :red : nil)
         ]
         counts << paint("#{loading} loading ids without preloading", :yellow) if loading > 0
         counts << "#{no_ids} without resource ids" if no_ids > 0

data/lib/graphiti/audit.rb

@@ -1,7 +1,7 @@
 module Graphiti
   # Resources register themselves as they load, so eager load before auditing.
   class Audit
-    Finding = Struct.new(:severity, :check, :message, :remedy, keyword_init: true) do
+    Finding = Struct.new(:severity, :check, :message, :remedy) do
       def error?
         severity == :error
       end
@@ -18,8 +18,7 @@ module Graphiti
       :resource_ids_blocker,
       :preloaded,
       :options,
-      :findings,
-      keyword_init: true
+      :findings
     ) do
       def would_start_loading?
         return false if resource_ids_default == :never
@@ -75,7 +74,7 @@ module Graphiti
         resource_ids_source_if_always: resource_ids_source_if_always(resource_class, sideload),
         resource_ids_default: resource_class.belongs_to_resource_ids_by_default,
         resource_ids_blocker: sideload.resource_ids_blocker,
-        preloaded: source == :load ? association_preloaded?(resource_class, sideload) : nil,
+        preloaded: (source == :load) ? association_preloaded?(resource_class, sideload) : nil,
         options: declaration_options(sideload),
         findings: [
           missing_association_method(sideload, model),

data/lib/graphiti/delegates/pagination.rb

@@ -32,7 +32,7 @@ module Graphiti
       private
 
       def pagination_params
-        @pagination_params ||= @proxy.query.params.reject { |key, _| [:action, :controller, :format].include?(key) }
+        @pagination_params ||= @proxy.query.params.except(:action, :controller, :format)
       end
 
       def pagination_link(page)
@@ -109,7 +109,7 @@ module Graphiti
       end
 
       def page_param
-        @page_param ||= (@proxy.query.hash[:page] || {})
+        @page_param ||= @proxy.query.hash[:page] || {}
       end
     end
   end

data/lib/graphiti/deserializer.rb

@@ -85,7 +85,7 @@ class Graphiti::Deserializer
   def meta(action: :update)
     {
       type: data[:type],
-      temp_id: data[:'temp-id'],
+      temp_id: data[:"temp-id"],
       method: action,
       payload_path: ["data"]
     }
@@ -162,12 +162,12 @@ class Graphiti::Deserializer
   end
 
   def process_relationship_datum(datum)
-    temp_id = datum[:'temp-id']
+    temp_id = datum[:"temp-id"]
     included_object = included.find { |i|
       next unless i[:type] == datum[:type]
 
       (i[:id] && i[:id] == datum[:id]) ||
-        (i[:'temp-id'] && i[:'temp-id'] == temp_id)
+        (i[:"temp-id"] && i[:"temp-id"] == temp_id)
     }
     included_idx = included.index(included_object)
 

data/lib/graphiti/errors.rb

@@ -270,7 +270,7 @@ module Graphiti
           #{@resource_class.name}: error occurred while sideloading "#{@sideload_name}"!
 
           The error was raised while attempting to build query parameters for the associated Resource.
-          Read more about sideload scoping here: www.graphiti.dev/concepts/relationships#customizing-scope
+          Read more about sideload scoping here: graphiti.dev/concepts/relationships#customizing-scope
 
           A good way to debug is to put a debugger within the 'params' block.
 
@@ -294,7 +294,7 @@ module Graphiti
 
           The error was raised while attempting to build the scope for the associated Resource.
 
-          Read more about sideload scoping here: www.graphiti.dev/concepts/relationships#customizing-scope
+          Read more about sideload scoping here: graphiti.dev/concepts/relationships#customizing-scope
 
           Here's the original, underlying error:
 
@@ -315,7 +315,7 @@ module Graphiti
           #{@resource_class.name}: error occurred while sideloading "#{@sideload_name}"!
 
           The error was raised while attempting to assign relevant model instances. Read
-          more about sideload assignment here: www.graphiti.dev/concepts/relationships#customizing-assignment
+          more about sideload assignment here: graphiti.dev/concepts/relationships#customizing-assignment
 
           A good way to debug is to put a debugger within the 'assign' block.
 
@@ -449,7 +449,7 @@ module Graphiti
 
           self.validate_endpoints = false
 
-          See https://www.graphiti.dev/concepts/links for more information.
+          See https://graphiti.dev/concepts/links for more information.
 
           The current endpoints allowed for this resource are: #{@resource_class.endpoints.inspect}
         MSG
@@ -731,7 +731,7 @@ module Graphiti
 
         <<~MSG
 
-          resource_ids is set on this relationship, so every render reads the association, not just requests that include it. See www.graphiti.dev/concepts/relationships#customizing-relationships.
+          resource_ids is set on this relationship, so every render reads the association, not just requests that include it. See graphiti.dev/concepts/relationships#customizing-relationships.
         MSG
       end
     end
@@ -909,7 +909,7 @@ module Graphiti
       def initialize(resource, filter_names, required)
         @resource = resource
         @filter_names = filter_names
-        @required_label = required == :all ? "All" : "One"
+        @required_label = (required == :all) ? "All" : "One"
       end
 
       def message

data/lib/graphiti/extensions/temp_id.rb

@@ -14,7 +14,7 @@ module Graphiti
     def as_jsonapi(*)
       super.tap do |hash|
         if (temp_id = @object.instance_variable_get(:@_jsonapi_temp_id))
-          hash[:'temp-id'] = temp_id
+          hash[:"temp-id"] = temp_id
         end
       end
     end

data/lib/graphiti/query.rb

@@ -235,7 +235,7 @@ module Graphiti
 
         scrubbed.filter do |key, value|
           sideload = @resource.class.sideload(key)
-          sideload.nil? ? true : sideload.readable?
+          sideload.nil? || sideload.readable?
         end
       end
     end
@@ -311,7 +311,7 @@ module Graphiti
       return false unless association?
 
       split = name.to_s.split(".")
-      query_names = split[0..split.length - 2].map(&:to_sym)
+      query_names = split[0..-2].map(&:to_sym)
       my_names = parents.map(&:association_name).compact + [association_name].compact
       query_names == my_names
     end
@@ -343,7 +343,7 @@ module Graphiti
     end
 
     def sort_hash(attr)
-      value = attr[0] == "-" ? :desc : :asc
+      value = (attr[0] == "-") ? :desc : :asc
       key = attr.sub("-", "").to_sym
 
       {key => value}

data/lib/graphiti/rails/context.rb

@@ -1,11 +1,12 @@
 module Graphiti
   module Rails
-    # Wraps controller actions in a [Graphiti Context](https://www.graphiti.dev/concepts/resources#context) which points to the
+    # Wraps controller actions in a [Graphiti Context](https://graphiti.dev/concepts/resources#context) which points to the
     # controller instance by default.
     module Context
       def self.included(klass)
         klass.class_eval do
           include Graphiti::Context
+
           around_action :wrap_graphiti_context
         end
       end

data/lib/graphiti/rails/controller.rb

@@ -17,6 +17,9 @@ module Graphiti
       included do
         include Graphiti::Rails::Context
         include Graphiti::Rails::Debugging
+        # ActionController::API strips this out, but Graphiti serves multiple
+        # formats (jsonapi/json/xml), so respond_to has to work everywhere.
+        include ActionController::MimeResponds
 
         # Broad, but the handler only renders formats listed in
         # config.graphiti.handled_exception_formats and hands everything else

data/lib/graphiti/rails/debugging.rb

@@ -1,6 +1,6 @@
 module Graphiti
   module Rails
-    # Wraps controller actions in a [Graphiti Debugger](https://www.graphiti.dev/topics/debugging#debugger).
+    # Wraps controller actions in a [Graphiti Debugger](https://graphiti.dev/topics/debugging#debugger).
     module Debugging
       def self.included(klass)
         klass.around_action :debug_graphiti

data/lib/graphiti/rails/responders.rb

@@ -6,6 +6,7 @@ module Graphiti
 
       included do
         include ActionController::MimeResponds
+
         respond_to(*Graphiti::Rails.respond_to_formats)
       end
 
@@ -14,7 +15,7 @@ module Graphiti
         opts = args.extract_options!
         opts[:location] = nil
         args << opts
-        super(*args, &blk)
+        super
       end
     end
   end

data/lib/graphiti/resource/configuration.rb

@@ -60,6 +60,7 @@ module Graphiti
         def remote=(val)
           super
           include ::Graphiti::Resource::Remote
+
           self.endpoint = {
             path: val,
             full_path: val,

data/lib/graphiti/resource/dsl.rb

@@ -9,7 +9,7 @@ module Graphiti
           opts = args.extract_options!
           type_override = args[0]
 
-          if (att = (attributes[name] || extra_attributes[name]))
+          if (att = attributes[name] || extra_attributes[name])
             # We're opting in to filtering, so force this
             # UNLESS the filter is guarded at the attribute level
             att[:filterable] = true if att[:filterable] == false
@@ -27,7 +27,7 @@ module Graphiti
             end
 
             required = att[:filterable] == :required || !!opts[:required]
-            schema = !!opts[:via_attribute_dsl] ? att[:schema] : opts[:schema] != false
+            schema = (!!opts[:via_attribute_dsl]) ? att[:schema] : opts[:schema] != false
 
             config[:filters][name.to_sym] = {
               aliases: aliases,

data/lib/graphiti/resource/links.rb

@@ -41,7 +41,7 @@ module Graphiti
       def infer_endpoint
         return unless name
 
-        path = "/#{name.gsub("Resource", "").pluralize.underscore}".to_sym
+        path = :"/#{name.gsub("Resource", "").pluralize.underscore}"
         {
           path: path,
           full_path: full_path_for(path),

data/lib/graphiti/resource/persistence.rb

@@ -65,7 +65,7 @@ module Graphiti
         def add_callback(kind, lifecycle, method, only, &blk)
           config[:callbacks][kind] ||= {}
           config[:callbacks][kind][lifecycle] ||= []
-          config[:callbacks][kind][lifecycle] << {callback: (method || blk), only: Array(only)}
+          config[:callbacks][kind][lifecycle] << {callback: method || blk, only: Array(only)}
         end
       end
 

data/lib/graphiti/resource/polymorphism.rb

@@ -56,7 +56,7 @@ module Graphiti
             on_type, name = split_on[1].split("--").map(&:to_sym)
           end
 
-          sl = super(name)
+          sl = super
           if !polymorphic_child? && sl.nil?
             children.each do |c|
               next if on_type && c.type != on_type

data/lib/graphiti/resource.rb

@@ -137,14 +137,14 @@ module Graphiti
 
     # TODO: make foreign_key a keyword once the satellite gems are rolled in - they call these positionally
     def assign_with_relationships(meta, attributes, relationships, caller_model = nil, foreign_key = nil, model_instance: nil)
-      persistence = Graphiti::Util::Persistence \
+      persistence = Graphiti::Util::Persistence
         .new(self, meta, attributes, relationships, caller_model, foreign_key,
           assigned_model: model_instance)
       persistence.assign
     end
 
     def persist_with_relationships(meta, attributes, relationships, caller_model = nil, foreign_key = nil, assigned_model: nil)
-      persistence = Graphiti::Util::Persistence \
+      persistence = Graphiti::Util::Persistence
         .new(self, meta, attributes, relationships, caller_model, foreign_key,
           assigned_model: assigned_model)
       persistence.run

data/lib/graphiti/resource_proxy.rb

@@ -16,7 +16,6 @@ module Graphiti
       cache_expires_in: nil,
       cache_tag: nil
     )
-
       @resource = resource
       @scope = scope
       @query = query

data/lib/graphiti/scoping/filter.rb

@@ -82,7 +82,7 @@ module Graphiti
       if is_array
         @resource.typecast(name, value, :filterable)
       else
-        value = value.nil? || value.is_a?(Hash) ? [value] : Array(value)
+        value = (value.nil? || value.is_a?(Hash)) ? [value] : Array(value)
         value.map { |v| @resource.typecast(name, v, :filterable) }
       end
     end
@@ -100,7 +100,7 @@ module Graphiti
 
       param_value.map do |operator, value|
         if type == :hash
-          value, operator = \
+          value, operator =
             parse_hash_value(filter, param_value, value, operator)
         end
 
@@ -209,7 +209,9 @@ module Graphiti
     end
 
     def parse_string_null(filter, value)
-      return if value == "null" && filter[:allow_nil]
+      return value unless filter[:allow_nil]
+      return value.map { |item| (item == "null") ? nil : item } if value.is_a?(Array)
+      return if value == "null"
 
       value
     end

data/lib/graphiti/scoping/paginate.rb

@@ -61,7 +61,7 @@ module Graphiti
     end
 
     def page_param
-      @page_param ||= (query_hash[:page] || {})
+      @page_param ||= query_hash[:page] || {}
     end
 
     def offset

data/lib/graphiti/scoping/sort.rb

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

data/lib/graphiti/sideload/has_many.rb

@@ -2,7 +2,7 @@ class Graphiti::Sideload::HasMany < Graphiti::Sideload
   def initialize(name, opts)
     @inverse_filter = opts[:inverse_filter]
 
-    super(name, opts)
+    super
   end
 
   def type

data/lib/graphiti/spec_helpers/errors_proxy.rb

@@ -62,7 +62,7 @@ module Graphiti
 
       def method_missing(id, *args, &blk)
         matches = @errors.select { |e| e.attribute.to_sym == id }
-        matches.length == 1 ? matches[0] : matches
+        (matches.length == 1) ? matches[0] : matches
       end
 
       # Any name is answered: an attribute with no matching error yields an empty

data/lib/graphiti/spec_helpers/matchers.rb

@@ -73,7 +73,7 @@ module Graphiti
         attr_reader :target, :opts, :resource
 
         def assert_opt(opt)
-          asserted_opt = opt == :resource ? :resource_class : opt
+          asserted_opt = (opt == :resource) ? :resource_class : opt
           return true if config.send(asserted_opt) == opts[opt]
 
           @opt_failures << opt_failure_message(opt, opts[opt], config.send(asserted_opt))

data/lib/graphiti/types.rb

@@ -82,6 +82,10 @@ module Graphiti
       Dry::Types["params.hash"][input]
     }
 
+    ParamArray = Dry::Types["strict.array"].constructor { |input|
+      input.is_a?(String) ? [input] : input
+    }
+
     REQUIRED_KEYS = [:params, :read, :write, :kind, :description]
 
     def self.map
@@ -193,7 +197,7 @@ module Graphiti
 
           arrays[:"array_of_#{name.to_s.pluralize}"] = {
             canonical_name: name,
-            params: Dry::Types["strict.array"].of(map[:params]),
+            params: ParamArray.of(map[:params]),
             read: Dry::Types["strict.array"].of(map[:read]),
             test: Dry::Types["strict.array"].of(map[:test]),
             write: Dry::Types["strict.array"].of(map[:write]),

data/lib/graphiti/util/cache_debug.rb

@@ -28,7 +28,7 @@ module Graphiti
           expires_in: proxy.cache_expires_in,
           etag: proxy.etag,
           miss_count: last_version[:miss_count].to_i + (changed_key? ? 1 : 0),
-          hit_count: last_version[:hit_count].to_i + (!changed_key? && !new_key? ? 1 : 0),
+          hit_count: last_version[:hit_count].to_i + ((!changed_key? && !new_key?) ? 1 : 0),
           request_count: last_version[:request_count].to_i + (last_version.present? ? 1 : 0)
         }
       end
@@ -76,8 +76,8 @@ module Graphiti
       end
 
       def changes
-        sub_keys_old = last_version[:cache_key]&.scan(/\w+\/query-[a-z0-9-]+\/args-[a-z0-9-]+/).to_a || []
-        sub_keys_new = current_version[:cache_key]&.scan(/\w+\/query-[a-z0-9-]+\/args-[a-z0-9-]+/).to_a || []
+        sub_keys_old = last_version[:cache_key]&.scan(/\w+\/query-[a-z0-9-]+\/args-[a-z0-9-]+/).to_a
+        sub_keys_new = current_version[:cache_key]&.scan(/\w+\/query-[a-z0-9-]+\/args-[a-z0-9-]+/).to_a
 
         [sub_keys_old, sub_keys_new]
       end

data/lib/graphiti/util/hash.rb

@@ -43,7 +43,7 @@ module Graphiti
       # @return [Hash] the merged hash
       # @api private
       def self.deep_merge!(hash, other)
-        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+        merger = proc { |key, v1, v2| (Hash === v1 && Hash === v2) ? v1.merge(v2, &merger) : v2 }
         hash.merge!(other, &merger)
       end
 

data/lib/graphiti/util/persistence.rb

@@ -156,12 +156,12 @@ class Graphiti::Util::Persistence
 
   def persist_object(method, attributes)
     case method
-      when :destroy
-        call_resource_method(:destroy, attributes[:id], @caller_model)
-      when :update, nil, :disassociate
-        call_resource_method(:update, attributes, @caller_model)
-      else
-        call_resource_method(:create, attributes, @caller_model)
+    when :destroy
+      call_resource_method(:destroy, attributes[:id], @caller_model)
+    when :update, nil, :disassociate
+      call_resource_method(:update, attributes, @caller_model)
+    else
+      call_resource_method(:create, attributes, @caller_model)
     end
   end
 

data/lib/graphiti/util/serializer_relationships.rb

@@ -173,7 +173,7 @@ module Graphiti
       def validate_link_for_sideload!(sideload)
         return if sideload.resource.remote?
 
-        action = sideload.type == :belongs_to ? :show : :index
+        action = (sideload.type == :belongs_to) ? :show : :index
         cache_key = :"#{@sideload.object_id}-#{action}"
         return if self.class.validated_link_cache.include?(cache_key)
         prc = Graphiti.config.context_for_endpoint

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "2.0.0.beta.7"
+  VERSION = "2.0.0.beta.8"
 end

data/lib/tasks/graphiti.rake

@@ -20,7 +20,7 @@ namespace :graphiti do
   task audit: [:environment] do
     helpers.setup_rails!
     rows = Graphiti::Audit.run
-    puts Graphiti::Audit::Report.new(rows).to_s
+    puts Graphiti::Audit::Report.new(rows)
 
     exit 1 if rows.any?(&:error?)
   end