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

data/lib/graphiti/extensions/boolean_attribute.rb

@@ -20,7 +20,7 @@ module Graphiti
         # @param [Hash] options Normal .attribute options
         def boolean_attribute(name, options = {}, &blk)
           blk ||= proc { @object.public_send(name) }
-          field_name = :"is_#{name.to_s.gsub('?', '')}"
+          field_name = :"is_#{name.to_s.delete("?")}"
           attribute field_name, options, &blk
         end
       end

data/lib/graphiti/extensions/extra_attribute.rb

@@ -1,4 +1,4 @@
-require 'jsonapi/serializable/resource/conditional_fields'
+require "jsonapi/serializable/resource/conditional_fields"
 
 module Graphiti
   module Extensions

data/lib/graphiti/extensions/temp_id.rb

@@ -13,7 +13,7 @@ module Graphiti
     # Common interface for jsonapi-rb extensions
     def as_jsonapi(*)
       super.tap do |hash|
-        if temp_id = @object.instance_variable_get(:'@_jsonapi_temp_id')
+        if (temp_id = @object.instance_variable_get(:'@_jsonapi_temp_id'))
           hash[:'temp-id'] = temp_id
         end
       end

data/lib/graphiti/filter_operators.rb

@@ -17,9 +17,15 @@ module Graphiti
         end
       end
 
+      # rubocop: disable Style/MethodMissingSuper
       def method_missing(name, *args, &blk)
         @procs[name] = blk
       end
+      # rubocop: enable Style/MethodMissingSuper
+
+      def respond_to_missing?(*args)
+        true
+      end
 
       def to_hash
         @procs

data/lib/graphiti/hash_renderer.rb

@@ -2,22 +2,22 @@ module Graphiti
   module SerializableHash
     def to_hash(fields: nil, include: {})
       {}.tap do |hash|
-        _fields = fields[jsonapi_type] if fields
-        attrs = requested_attributes(_fields).each_with_object({}) do |(k, v), h|
+        fields_list = fields[jsonapi_type] if fields
+        attrs = requested_attributes(fields_list).each_with_object({}) { |(k, v), h|
           h[k] = instance_eval(&v)
-        end
-        rels = @_relationships.select { |k,v| !!include[k] }
+        }
+        rels = @_relationships.select { |k, v| !!include[k] }
         rels.each_with_object({}) do |(k, v), h|
           serializers = v.send(:resources)
           attrs[k] = if serializers.is_a?(Array)
-              serializers.map do |rr| # use private method to avoid array casting
-                rr.to_hash(fields: fields, include: include[k])
-              end
-            elsif serializers.nil?
-              nil
-            else
-              serializers.to_hash(fields: fields, include: include[k])
+            serializers.map do |rr| # use private method to avoid array casting
+              rr.to_hash(fields: fields, include: include[k])
             end
+          elsif serializers.nil?
+            nil
+          else
+            serializers.to_hash(fields: fields, include: include[k])
+          end
         end
 
         hash[:id] = jsonapi_id
@@ -35,7 +35,7 @@ module Graphiti
       serializers = options[:data]
       opts = options.slice(:fields, :include)
       to_hash(serializers, opts).tap do |hash|
-        hash.merge!(options.slice(:meta)) if !options[:meta].empty?
+        hash.merge!(options.slice(:meta)) unless options[:meta].empty?
       end
     end
 
@@ -43,12 +43,12 @@ module Graphiti
 
     def to_hash(serializers, opts)
       {}.tap do |hash|
-        if serializers.is_a?(Array)
-          hash[:data] = serializers.map do |s|
+        hash[:data] = if serializers.is_a?(Array)
+          serializers.map do |s|
             s.to_hash(opts)
           end
         else
-          hash[:data] = serializers.to_hash(opts)
+          serializers.to_hash(opts)
         end
       end
     end

data/lib/graphiti/jsonapi_serializable_ext.rb

@@ -6,7 +6,7 @@ module Graphiti
     # Instead, this variable is assigned when the query is resolved
     # To ensure we always render with the *resource* serializer
     module RendererOverrides
-      def _build(object, exposures, klass)
+      def _build(object, exposures, _klass)
         resource = object.instance_variable_get(:@__graphiti_resource)
         klass = object.instance_variable_get(:@__graphiti_serializer)
         klass.new(exposures.merge(object: object, resource: resource))

data/lib/graphiti/query.rb

@@ -1,6 +1,6 @@
 module Graphiti
   class Query
-    attr_reader :resource, :include_hash, :association_name, :params
+    attr_reader :resource, :association_name, :params
 
     def initialize(resource, params, association_name = nil, nested_include = nil, parents = [])
       @resource = resource
@@ -18,13 +18,13 @@ module Graphiti
     end
 
     def top_level?
-      not association?
+      !association?
     end
 
     def links?
-      return false if [:json, :xml, 'json', 'xml'].include?(params[:format])
+      return false if [:json, :xml, "json", "xml"].include?(params[:format])
       if Graphiti.config.links_on_demand
-        [true, 'true'].include?(@params[:links])
+        [true, "true"].include?(@params[:links])
       else
         true
       end
@@ -32,7 +32,7 @@ module Graphiti
 
     def pagination_links?
       if Graphiti.config.pagination_links_on_demand
-        [true, 'true'].include?(@params[:pagination_links])
+        [true, "true"].include?(@params[:pagination_links])
       else
         Graphiti.config.pagination_links
       end
@@ -74,9 +74,9 @@ module Graphiti
 
     def resource_for_sideload(sideload)
       if @resource.remote?
-        Class.new(Graphiti::Resource) do
-          self.remote = '_remote_sideload_'
-        end.new
+        Class.new(Graphiti::Resource) {
+          self.remote = "_remote_sideload_"
+        }.new
       else
         sideload.resource
       end
@@ -90,9 +90,9 @@ module Graphiti
 
             if sideload || @resource.remote?
               sl_resource = resource_for_sideload(sideload)
-              _parents = parents + [self]
-              sub_hash = sub_hash[:include] if sub_hash.has_key?(:include)
-              hash[key] = Query.new(sl_resource, @params, key, sub_hash, _parents)
+              query_parents = parents + [self]
+              sub_hash = sub_hash[:include] if sub_hash.key?(:include)
+              hash[key] = Query.new(sl_resource, @params, key, sub_hash, query_parents)
             else
               handle_missing_sideload(key)
             end
@@ -132,7 +132,7 @@ module Graphiti
                 hash[filter_name] = filter_value
               end
             elsif nested?(name)
-              name = name.to_s.split('.').last.to_sym
+              name = name.to_s.split(".").last.to_sym
               validate!(name, :filterable)
               hash[name] = value
             elsif top_level? && validate!(name, :filterable)
@@ -154,11 +154,11 @@ module Graphiti
               unless @resource.remote?
                 @resource.get_attr!(key, :sortable, request: true)
               end
-              arr << { key => value }
+              arr << {key => value}
             elsif !type && top_level? && validate!(key, :sortable)
-              arr << { key => value }
+              arr << {key => value}
             elsif nested?("#{type}.#{key}")
-              arr << { key => value }
+              arr << {key => value}
             end
           end
         end
@@ -170,11 +170,11 @@ module Graphiti
         {}.tap do |hash|
           (@params[:page] || {}).each_pair do |name, value|
             if legacy_nested?(name)
-              value.each_pair do |k,v|
+              value.each_pair do |k, v|
                 hash[k.to_sym] = v.to_i
               end
             elsif nested?(name)
-              hash[name.to_s.split('.').last.to_sym] = value
+              hash[name.to_s.split(".").last.to_sym] = value
             elsif top_level? && [:number, :size].include?(name.to_sym)
               hash[name.to_sym] = value.to_i
             end
@@ -188,7 +188,7 @@ module Graphiti
         requested = include_directive.to_hash
 
         allowlist = nil
-        if @resource.context && @resource.context.respond_to?(:sideload_allowlist)
+        if @resource.context&.respond_to?(:sideload_allowlist)
           allowlist = @resource.context.sideload_allowlist
           allowlist = allowlist[@resource.context_namespace] if allowlist
         end
@@ -204,9 +204,9 @@ module Graphiti
         {}.tap do |hash|
           (@params[:stats] || {}).each_pair do |k, v|
             if legacy_nested?(k)
-              raise NotImplementedError.new('Association statistics are not currently supported')
+              raise NotImplementedError.new("Association statistics are not currently supported")
             elsif top_level?
-              v = v.split(',') if v.is_a?(String)
+              v = v.split(",") if v.is_a?(String)
               hash[k.to_sym] = Array(v).flatten.map(&:to_sym)
             end
           end
@@ -215,7 +215,7 @@ module Graphiti
     end
 
     def paginate?
-      not [false, 'false'].include?(@params[:paginate])
+      ![false, "false"].include?(@params[:paginate])
     end
 
     private
@@ -225,10 +225,10 @@ module Graphiti
     # resource names/types
     # TODO: Eventually, remove the legacy logic
     def validate!(name, flag)
-      return false if name.to_s.include?('.') # nested
+      return false if name.to_s.include?(".") # nested
       return true if @resource.remote?
 
-      if att = @resource.get_attr(name, flag, request: true)
+      if (att = @resource.get_attr(name, flag, request: true))
         return att
       else
         not_associated_name = !@resource.class.association_names.include?(name)
@@ -245,8 +245,8 @@ module Graphiti
     def nested?(name)
       return false unless association?
 
-      split = name.to_s.split('.')
-      query_names = split[0..split.length-2].map(&:to_sym)
+      split = name.to_s.split(".")
+      query_names = split[0..split.length - 2].map(&:to_sym)
       my_names = parents.map(&:association_name).compact + [association_name].compact
       query_names == my_names
     end
@@ -260,7 +260,7 @@ module Graphiti
       {}.tap do |hash|
         fieldset.each_pair do |type, fields|
           type       = type.to_sym
-          fields     = fields.split(',') unless fields.is_a?(Array)
+          fields     = fields.split(",") unless fields.is_a?(Array)
           hash[type] = fields.map(&:to_sym)
         end
       end
@@ -278,21 +278,21 @@ module Graphiti
     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
 
     def sort_hashes
-      sorts = @params[:sort].split(',')
+      sorts = @params[:sort].split(",")
       sorts.each do |s|
         attr = nil
         type = s
-        if s.include?('.')
-          split = s.split('.')
+        if s.include?(".")
+          split = s.split(".")
           attr = split.pop
-          type = split.join('.')
+          type = split.join(".")
         end
 
         if attr.nil? # top-level
@@ -300,8 +300,8 @@ module Graphiti
           hash = sort_hash(type)
           yield hash.keys.first.to_sym, hash.values.first
         else
-          if type[0] == '-'
-            type = type.sub('-', '')
+          if type[0] == "-"
+            type = type.sub("-", "")
             attr = "-#{attr}"
           end
           hash = sort_hash(attr)

data/lib/graphiti/railtie.rb

@@ -8,18 +8,18 @@ module Graphiti
     initializer "graphiti.require_activerecord_adapter" do
       config.after_initialize do |app|
         ActiveSupport.on_load(:active_record) do
-          require 'graphiti/adapters/active_record'
+          require "graphiti/adapters/active_record"
         end
       end
     end
 
-    initializer 'graphti.logger' do
+    initializer "graphti.logger" do
       config.after_initialize do
         Graphiti.logger = ::Rails.logger
       end
     end
 
-    initializer 'graphiti.init' do
+    initializer "graphiti.init" do
       if ::Rails.application.config.eager_load
         config.after_initialize do |app|
           ::Rails.application.reload_routes!
@@ -28,7 +28,7 @@ module Graphiti
       end
 
       if Mime[:jsonapi].nil? # rails 4
-        Mime::Type.register('application/vnd.api+json', :jsonapi)
+        Mime::Type.register("application/vnd.api+json", :jsonapi)
       end
       register_parameter_parser
       register_renderers
@@ -56,10 +56,10 @@ module Graphiti
         ::ActionController::Renderers.add(:jsonapi) do |proxy, options|
           self.content_type ||= Mime[:jsonapi]
 
-          opts = {}
-          if respond_to?(:default_jsonapi_render_options)
-            opts = default_jsonapi_render_options
-          end
+          # opts = {}
+          # if respond_to?(:default_jsonapi_render_options)
+          #   opts = default_jsonapi_render_options
+          # end
 
           if proxy.is_a?(Hash) # for destroy
             render(options.merge(json: proxy))
@@ -77,7 +77,7 @@ module Graphiti
             proxy.data, proxy.payload.relationships
 
           render \
-            json: { errors: validation.errors },
+            json: {errors: validation.errors},
             status: :unprocessable_entity
         end
       end
@@ -103,7 +103,11 @@ module Graphiti
             method = :DELETE
         end
 
-        route = ::Rails.application.routes.recognize_path(path, method: method) rescue nil
+        route = begin
+                  ::Rails.application.routes.recognize_path(path, method: method)
+                rescue
+                  nil
+                end
         "#{route[:controller]}_controller".classify.safe_constantize if route
       }
     end

data/lib/graphiti/renderer.rb

@@ -1,6 +1,6 @@
 module Graphiti
   class Renderer
-    CONTENT_TYPE = 'application/vnd.api+json'
+    CONTENT_TYPE = "application/vnd.api+json"
 
     attr_reader :proxy, :options
 
@@ -46,7 +46,7 @@ module Graphiti
         options[:include] = proxy.include_hash
         options[:links] = proxy.pagination.links if proxy.pagination.links?
         options[:meta] ||= {}
-        options[:meta].merge!(stats: proxy.stats) unless proxy.stats.empty?
+        options[:meta][:stats] = proxy.stats unless proxy.stats.empty?
         options[:meta][:debug] = Debugger.to_a if debug_json?
 
         renderer.render(records, options)

data/lib/graphiti/resource.rb

@@ -8,13 +8,11 @@ module Graphiti
     include Documentation
     include Persistence
 
-    attr_reader :context
-
     def around_scoping(scope, query_hash)
       extra_fields = query_hash[:extra_fields] || {}
       extra_fields = extra_fields[type] || []
       extra_fields.each do |name|
-        if config = self.class.config[:extra_attributes][name]
+        if (config = self.class.config[:extra_attributes][name])
           scope = instance_exec(scope, &config[:hook]) if config[:hook]
         end
       end
@@ -71,13 +69,13 @@ module Graphiti
         type_name = filters[name][:type]
       end
       type = Graphiti::Types[type_name]
-      return if value.nil? && type[:kind] != 'array'
+      return if value.nil? && type[:kind] != "array"
       begin
         flag = :read if flag == :readable
         flag = :write if flag == :writable
         flag = :params if [:sortable, :filterable].include?(flag)
         type[flag][value]
-      rescue Exception => e
+      rescue => e
         raise Errors::TypecastFailed.new(self, name, value, e)
       end
     end
@@ -135,7 +133,7 @@ module Graphiti
           response = yield
         end
       rescue Errors::ValidationError => e
-        response = { result: e.validation_response }
+        response = {result: e.validation_response}
       end
       response
     end

data/lib/graphiti/resource/configuration.rb

@@ -23,8 +23,8 @@ module Graphiti
         end
 
         def type=(val)
-          if val = super
-            self.serializer.type(val)
+          if (val = super)
+            serializer.type(val)
           end
         end
 
@@ -43,7 +43,7 @@ module Graphiti
         def model
           klass = super
           unless klass || abstract_class?
-            if klass = infer_model
+            if (klass = infer_model)
               self.model = klass
             else
               raise Errors::ModelNotFound.new(self)
@@ -86,11 +86,7 @@ module Graphiti
           klass.adapter ||= Adapters::Abstract
           klass.max_page_size ||= DEFAULT_MAX_PAGE_SIZE
           # re-assigning causes a new Class.new
-          if klass.serializer
-            klass.serializer = klass.serializer
-          else
-            klass.serializer = klass.infer_serializer_superclass
-          end
+          klass.serializer = (klass.serializer || klass.infer_serializer_superclass)
           klass.type ||= klass.infer_type
           default(klass, :attributes_readable_by_default, true)
           default(klass, :attributes_writable_by_default, true)
@@ -114,7 +110,7 @@ module Graphiti
         end
 
         def get_attr(name, flag, opts = {})
-          defaults = { request: false }
+          defaults = {request: false}
           opts = defaults.merge(opts)
           new.get_attr(name, flag, opts)
         end
@@ -128,7 +124,7 @@ module Graphiti
         end
 
         def abstract_class=(val)
-          if @abstract_class = val
+          if (@abstract_class = val)
             self.serializer = nil
             self.type = nil
           end
@@ -136,14 +132,14 @@ module Graphiti
 
         def infer_type
           if name.present?
-            name.demodulize.gsub('Resource','').underscore.pluralize.to_sym
+            name.demodulize.gsub("Resource", "").underscore.pluralize.to_sym
           else
             :undefined_jsonapi_type
           end
         end
 
         def infer_model
-          name.gsub('Resource', '').safe_constantize if name
+          name&.gsub("Resource", "")&.safe_constantize
         end
 
         # @api private
@@ -185,7 +181,7 @@ module Graphiti
               attributes: {},
               extra_attributes: {},
               sideloads: {},
-              callbacks: {}
+              callbacks: {},
             }
         end