graphiti 2.0.0.beta.6 → 2.0.0.beta.8

data/lib/generators/graphiti/templates/controller.rb.erb

@@ -1,25 +1,43 @@
 <% module_namespacing do -%>
 class <%= controller_class_name %> < ApplicationController
   <%- if actions?('index') -%>
+  <%- if responders? -%>
   def index
     <%= file_name.pluralize %> = <%= resource_klass %>.all(params)
-    <%- if responders? -%>
     respond_with(<%= file_name.pluralize %>)
-    <%- else -%>
-    render jsonapi: <%= file_name.pluralize %>
-    <%- end -%>
   end
+  <%- else -%>
+  <%- unless omit_comments? -%>
+  # With Graphiti::Rails::Responders included, these blocks collapse to
+  # respond_with(<%= file_name.pluralize %>). See https://graphiti.dev/getting-started/installation#responders
+  <%- end -%>
+  def index
+    <%= file_name.pluralize %> = <%= resource_klass %>.all(params)
+
+    respond_to do |format|
+      format.jsonapi { render jsonapi: <%= file_name.pluralize %> }
+      format.json { render json: <%= file_name.pluralize %> }
+    end
+  end
+  <%- end -%>
   <%- end -%>
   <%- if actions?('show') -%>
 
+  <%- if responders? -%>
   def show
     <%= file_name %> = <%= resource_klass %>.find(params)
-    <%- if responders? -%>
     respond_with(<%= file_name %>)
-    <%- else -%>
-    render jsonapi: <%= file_name %>
-    <%- end -%>
   end
+  <%- else -%>
+  def show
+    <%= file_name %> = <%= resource_klass %>.find(params)
+
+    respond_to do |format|
+      format.jsonapi { render jsonapi: <%= file_name %> }
+      format.json { render json: <%= file_name %> }
+    end
+  end
+  <%- end -%>
   <%- end -%>
   <%- if actions?('create') -%>
 

data/lib/generators/graphiti/templates/index_request_spec.rb.erb

@@ -15,8 +15,8 @@ RSpec.describe "<%= type %>#index", type: :request do
       expect(<%= resource_class %>).to receive(:all).and_call_original
       make_request
       expect(response.status).to eq(200), response.body
-      expect(d.map(&:jsonapi_type).uniq).to match_array(['<%= type %>'])
-      expect(d.map(&:<%= id_or_rawid %>)).to match_array([<%= var %>1.id, <%= var %>2.id])
+      expect(jsonapi_data.map(&:jsonapi_type).uniq).to match_array(['<%= type %>'])
+      expect(jsonapi_data.map(&:<%= id_or_rawid %>)).to match_array([<%= var %>1.id, <%= var %>2.id])
     end
   end
 end

data/lib/generators/graphiti/templates/resource_reads_spec.rb.erb

@@ -11,7 +11,7 @@ RSpec.describe <%= resource_class %>, type: :resource do
       expect(data.jsonapi_type).to eq('<%= type %>')
       <%- attributes.each do |a| -%>
       <%- if [:created_at, :updated_at].include?(a.name.to_sym) -%>
-      expect(data.<%= a.name %>).to eq(datetime(<%= file_name %>.<%= a.name %>))
+      expect(data.<%= a.name %>).to eq(json_datetime(<%= file_name %>.<%= a.name %>))
       <%- else -%>
       expect(data.<%= a.name %>).to eq(<%= file_name %>.<%= a.name %>)
       <%- end -%>
@@ -31,7 +31,7 @@ RSpec.describe <%= resource_class %>, type: :resource do
 
       it 'works' do
         render
-        expect(d.map(&:<%= id_or_rawid %>)).to eq([<%= var %>2.id])
+        expect(jsonapi_data.map(&:<%= id_or_rawid %>)).to eq([<%= var %>2.id])
       end
     end
   end
@@ -48,7 +48,7 @@ RSpec.describe <%= resource_class %>, type: :resource do
 
         it 'works' do
           render
-          expect(d.map(&:<%= id_or_rawid %>)).to eq([
+          expect(jsonapi_data.map(&:<%= id_or_rawid %>)).to eq([
             <%= var %>1.id,
             <%= var %>2.id
           ]<%= sort_raw_ids %>)
@@ -62,7 +62,7 @@ RSpec.describe <%= resource_class %>, type: :resource do
 
         it 'works' do
           render
-          expect(d.map(&:<%= id_or_rawid %>)).to eq([
+          expect(jsonapi_data.map(&:<%= id_or_rawid %>)).to eq([
             <%= var %>2.id,
             <%= var %>1.id
           ]<%= sort_raw_ids_descending %>)

data/lib/generators/graphiti/templates/show_request_spec.rb.erb

@@ -14,8 +14,8 @@ RSpec.describe "<%= type %>#show", type: :request do
       expect(<%= resource_class %>).to receive(:find).and_call_original
       make_request
       expect(response.status).to eq(200)
-      expect(d.jsonapi_type).to eq('<%= type %>')
-      expect(d.<%= id_or_rawid %>).to eq(<%= var %>.id)
+      expect(jsonapi_data.jsonapi_type).to eq('<%= type %>')
+      expect(jsonapi_data.<%= id_or_rawid %>).to eq(<%= var %>.id)
     end
   end
 end

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

@@ -4,8 +4,15 @@ module Graphiti
   class Query
     attr_reader :resource, :association_name, :params, :action
 
-    # TODO: make the trailing optionals keywords once the satellite gems are rolled in - see Runner#query for the nil-padding this forces
-    def initialize(resource, params, association_name = nil, nested_include = nil, parents = [], action = nil)
+    def initialize(resource, params, *positional, association_name: nil, nested_include: nil, parents: [], action: nil)
+      if positional.any?
+        Graphiti::DEPRECATOR.warn("Passing Query.new trailing arguments positionally is deprecated. Use association_name:/nested_include:/parents:/action: keywords.")
+        association_name ||= positional[0]
+        nested_include ||= positional[1]
+        parents = positional[2] if positional.length > 2
+        action ||= positional[3]
+      end
+
       @resource = resource
       @association_name = association_name
       @params = params
@@ -21,6 +28,13 @@ module Graphiti
       !!@association_name
     end
 
+    # Concurrent::Map because sideload scopes resolve on pool threads
+    def entity_map
+      return root.entity_map unless root == self
+
+      @entity_map ||= Concurrent::Map.new
+    end
+
     def top_level?
       !association?
     end
@@ -110,9 +124,10 @@ module Graphiti
             relationship_name = sideload ? sideload.name : key
             hash[relationship_name] = Query.new sl_resource,
               @params,
-              key,
-              sub_hash,
-              query_parents, :all
+              association_name: key,
+              nested_include: sub_hash,
+              parents: query_parents,
+              action: :all
           else
             handle_missing_sideload(key)
           end
@@ -124,6 +139,10 @@ module Graphiti
       @parents ||= []
     end
 
+    def root
+      parents.first || self
+    end
+
     def fields
       @fields ||= begin
         hash = parse_fieldset(@params[:fields] || {})
@@ -216,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
@@ -292,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
@@ -324,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/interface.rb

@@ -17,7 +17,7 @@ module Graphiti
 
         # @api private
         def _all(params, opts, base_scope)
-          runner = Runner.new(self, params, opts.delete(:query), :all)
+          runner = Runner.new(self, params, query: opts.delete(:query), action: :all)
           opts[:params] = params
           runner.proxy(base_scope, opts.merge(caching_options))
         end
@@ -36,7 +36,7 @@ module Graphiti
           params[:filter] ||= {}
           params[:filter][:id] = id if id
 
-          runner = Runner.new(self, params, nil, :find)
+          runner = Runner.new(self, params, action: :find)
 
           find_options = {
             single: true,
@@ -56,7 +56,7 @@ module Graphiti
         # Wrap models fetched outside graphiti so they render like any other proxy
         def wrap(models, base_scope = nil)
           validate_wrap_models!(models)
-          runner = Runner.new(self, {}, nil, :find)
+          runner = Runner.new(self, {}, action: :find)
           runner.proxy(base_scope, bypass_required_filters: true).tap do |proxy|
             proxy.data = models
           end

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

@@ -3,8 +3,13 @@ module Graphiti
     attr_reader :params
     attr_reader :deserialized_payload
 
-    # TODO: make query and action keywords once the satellite gems are rolled in - they instantiate Runner positionally
-    def initialize(resource_class, params, query = nil, action = nil)
+    def initialize(resource_class, params, *positional, query: nil, action: nil)
+      if positional.any?
+        Graphiti::DEPRECATOR.warn("Passing query/action to Runner.new positionally is deprecated. Use query:/action: keywords.")
+        query ||= positional[0]
+        action ||= positional[1]
+      end
+
       @resource_class = resource_class
       @params = params
       @query = query
@@ -30,7 +35,7 @@ module Graphiti
     end
 
     def query
-      @query ||= Query.new(jsonapi_resource, params, nil, nil, [], @action)
+      @query ||= Query.new(jsonapi_resource, params, action: @action)
     end
 
     def query_hash

data/lib/graphiti/scope.rb

@@ -154,12 +154,25 @@ module Graphiti
         payload[:results]
       }
       resolved.compact!
+      deduplicate_entities!(resolved)
       assign_serializer(resolved)
       yield resolved if block_given?
       @opts[:after_resolve]&.call(resolved)
       resolved
     end
 
+    # Must run before sideloads assign, so every include path populates the
+    # canonical instance. The resource class in the key keeps two resources
+    # serving the same model from sharing an instance and a serializer.
+    def deduplicate_entities!(resolved)
+      resolved.map! do |record|
+        next record unless record.respond_to?(:id) && !record.id.nil?
+
+        key = [@resource.class, record.class, record.id]
+        @query.entity_map.compute_if_absent(key) { record }
+      end
+    end
+
     def each_applicable_sideload
       @query.sideloads.each_pair do |name, sideload_query|
         sideload = @resource.class.sideload(name)

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