graphiti 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4afe1b88c18d728d9a2fc0a3f80cb425c08ee5effa28f1e5237bde5b08d944ce
-  data.tar.gz: 1a2545e6c20612bf12b0684c0a4e92d95fb618ca210b8b3db80a7822ffd9821c
+  metadata.gz: 787f7fb976a85d75236bafedc2fc5c2e798757dc82a0cf17d6ec6d46ca2beef5
+  data.tar.gz: d1fa1569f15b1cdc336b722985bf64f929167cd151201efbb694d78ace9eccef
 SHA512:
-  metadata.gz: efbc08d434992a6d797e0c0b29b97d6a6f074094c09e2248faac1b9a4f109f743d40591b2d6bb8fd0d39bda89755c510273aaaceb51bac57b9fcf451fcd9f7e6
-  data.tar.gz: 13b954fe3312e9b6652a20c85b86e0fd28b42cd572062e83665251305242a056f060986b0e4e122738f92ccdff8d9d33e6b65092c8948c591524394ef1b6dc8f
+  metadata.gz: 9cf5251b0dc07f16affcd69dc2ee6ef7e8ff756bf0170d1a1a5c881cbc2510ae0e5d0e5465d8accfd8dbd17a2ab4d9fe4d1d87fde16af8b2d4f2e59eae748f5d
+  data.tar.gz: f05e5bb7f5b88bcf71a94023f71cd1c29da8ddcc6d71c719d6285a9acdc49cf411d4e4b89fb62e8ddfaec13fc0b45ae1284af654bfa23947bda579136fc90002

data/.gitignore

@@ -8,6 +8,7 @@
 /gemfiles/*.lock
 /tmp/
 .byebug_history
+spec/.rspec-examples
 spec/dummy/log/*
 *~
 .vscode/

data/.travis.yml

@@ -9,6 +9,8 @@ gemfile:
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_5.gemfile
   - gemfiles/rails_6.gemfile
+  - gemfiles/rails_5_graphiti_rails.gemfile
+  - gemfiles/rails_6_graphiti_rails.gemfile
 env:
   - COMMAND=standardrb --no-fix --format progress
   - COMMAND=rspec
@@ -21,6 +23,10 @@ matrix:
       gemfile: gemfiles/rails_5.gemfile
     - env: COMMAND=standardrb --no-fix --format progress
       gemfile: gemfiles/rails_6.gemfile
+    - env: COMMAND=standardrb --no-fix --format progress
+      gemfile: gemfiles/rails_5_graphiti_rails.gemfile
+    - env: COMMAND=standardrb --no-fix --format progress
+      gemfile: gemfiles/rails_6_graphiti_rails.gemfile
     - env: COMMAND=rspec APPRAISAL_INITIALIZED=true
       gemfile: Gemfile
     - env: COMMAND=rspec
@@ -29,8 +35,14 @@ matrix:
       gemfile: gemfiles/rails_5.gemfile
     - env: COMMAND=rspec
       gemfile: gemfiles/rails_6.gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_5_graphiti_rails.gemfile
+    - env: COMMAND=rspec
+      gemfile: gemfiles/rails_6_graphiti_rails.gemfile
     - gemfile: gemfiles/rails_6.gemfile
       rvm: 2.4
+    - gemfile: gemfiles/rails_6_graphiti_rails.gemfile
+      rvm: 2.4
     - gemfile: gemfiles/rails_4.gemfile
       rvm: 2.5
     - gemfile: gemfiles/rails_4.gemfile

data/Appraisals

@@ -3,7 +3,6 @@ appraise "rails-4" do
   gem "rspec-rails"
   gem "sqlite3", "~> 1.3.6"
   gem "database_cleaner"
-  gem "kaminari", "~> 0.17"
 end
 
 appraise "rails-5" do
@@ -11,13 +10,29 @@ appraise "rails-5" do
   gem "rspec-rails"
   gem "sqlite3", "~> 1.3.6"
   gem "database_cleaner"
-  gem "kaminari", "~> 0.17"
 end
 
-appraise "rails-6" do
-  gem "rails", "~> 6.0.0.beta2"
+appraise "rails-5-graphiti-rails" do
+  gem "rails", "~> 5.2"
   gem "rspec-rails"
   gem "sqlite3", "~> 1.3.6"
   gem "database_cleaner"
-  gem "kaminari", "~> 0.17"
+  gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
+  gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+end
+
+appraise "rails-6" do
+  gem "rails", "~> 6.0.0.rc1"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.4.0"
+  gem "database_cleaner"
+end
+
+appraise "rails-6-graphiti-rails" do
+  gem "rails", "~> 6.0.0.rc1"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.4.0"
+  gem "database_cleaner"
+  gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
+  gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
 end

data/{lib/generators → deprecated_generators}/graphiti/api_test_generator.rb

@@ -1,11 +1,10 @@
-$:.unshift File.dirname(__FILE__)
-require "generator_mixin"
+require_relative "generator_mixin"
 
 module Graphiti
   class ApiTestGenerator < ::Rails::Generators::Base
     include GeneratorMixin
 
-    source_root File.expand_path("../templates", __FILE__)
+    source_root File.expand_path("templates", __dir__)
 
     argument :resource, type: :string
     class_option :actions,

data/{lib/generators → deprecated_generators}/graphiti/install_generator.rb

@@ -1,5 +1,4 @@
-$:.unshift File.dirname(__FILE__)
-require "generator_mixin"
+require_relative "generator_mixin"
 
 module Graphiti
   class InstallGenerator < ::Rails::Generators::Base

data/{lib/generators → deprecated_generators}/graphiti/resource_generator.rb

@@ -1,5 +1,4 @@
-$:.unshift File.dirname(__FILE__)
-require "generator_mixin"
+require_relative "generator_mixin"
 
 module Graphiti
   class ResourceGenerator < ::Rails::Generators::NamedBase

data/{lib/generators → deprecated_generators}/graphiti/resource_test_generator.rb

@@ -1,5 +1,4 @@
-$:.unshift File.dirname(__FILE__)
-require "generator_mixin"
+require_relative "generator_mixin"
 
 module Graphiti
   class ResourceTestGenerator < ::Rails::Generators::Base

data/gemfiles/rails_4.gemfile

@@ -6,7 +6,6 @@ gem "rails", "~> 4.1"
 gem "rspec-rails"
 gem "sqlite3", "~> 1.3.6"
 gem "database_cleaner"
-gem "kaminari", "~> 0.17"
 
 group :test do
   gem "pry"

data/gemfiles/rails_5.gemfile

@@ -6,7 +6,6 @@ gem "rails", "~> 5.2"
 gem "rspec-rails"
 gem "sqlite3", "~> 1.3.6"
 gem "database_cleaner"
-gem "kaminari", "~> 0.17"
 
 group :test do
   gem "pry"

data/gemfiles/rails_5_graphiti_rails.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.3.6"
+gem "database_cleaner"
+gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
+gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -2,11 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0.beta2"
+gem "rails", "~> 6.0.0.rc1"
 gem "rspec-rails"
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 1.4.0"
 gem "database_cleaner"
-gem "kaminari", "~> 0.17"
 
 group :test do
   gem "pry"

data/gemfiles/rails_6_graphiti_rails.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0.rc1"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.4.0"
+gem "database_cleaner"
+gem "rescue_registry", git: "https://github.com/wagenet/rescue_registry.git", branch: "master"
+gem "graphiti-rails", git: "https://github.com/wagenet/graphiti-rails.git", branch: "master"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

data/graphiti.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-types", "~> 0.15"
   spec.add_dependency "graphiti_errors", "~> 1.1.0"
   spec.add_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_dependency "activesupport", [">= 4.1", "< 6"]
+  spec.add_dependency "activesupport", ">= 4.1"
 
   spec.add_development_dependency "faraday", "~> 0.15"
   spec.add_development_dependency "kaminari", "~> 0.17"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "activemodel", [">= 4.1", "< 6"]
+  spec.add_development_dependency "activemodel", ">= 4.1"
   spec.add_development_dependency "graphiti_spec_helpers", "1.0.beta.4"
   spec.add_development_dependency "standard"
 end

data/lib/graphiti.rb

@@ -12,84 +12,9 @@ require "graphiti_errors"
 
 require "jsonapi/serializable"
 
-require "graphiti/version"
-require "graphiti/jsonapi_serializable_ext"
-require "graphiti/configuration"
-require "graphiti/context"
-require "graphiti/errors"
-require "graphiti/types"
-require "graphiti/schema"
-require "graphiti/schema_diff"
-require "graphiti/adapters/abstract"
-require "graphiti/resource/sideloading"
-require "graphiti/resource/links"
-require "graphiti/resource/configuration"
-require "graphiti/resource/dsl"
-require "graphiti/resource/interface"
-require "graphiti/resource/polymorphism"
-require "graphiti/resource/documentation"
-require "graphiti/resource/persistence"
-require "graphiti/resource/remote"
-require "graphiti/sideload"
-require "graphiti/sideload/has_many"
-require "graphiti/sideload/belongs_to"
-require "graphiti/sideload/has_one"
-require "graphiti/sideload/many_to_many"
-require "graphiti/sideload/polymorphic_belongs_to"
-require "graphiti/resource"
-require "graphiti/resource_proxy"
-require "graphiti/request_validator"
-require "graphiti/query"
-require "graphiti/scope"
-require "graphiti/deserializer"
-require "graphiti/renderer"
-require "graphiti/hash_renderer"
-require "graphiti/filter_operators"
-require "graphiti/scoping/base"
-require "graphiti/scoping/sort"
-require "graphiti/scoping/paginate"
-require "graphiti/scoping/extra_attributes"
-require "graphiti/scoping/filterable"
-require "graphiti/scoping/default_filter"
-require "graphiti/scoping/filter"
-require "graphiti/stats/dsl"
-require "graphiti/stats/payload"
-require "graphiti/delegates/pagination"
-require "graphiti/util/include_params"
-require "graphiti/util/field_params"
-require "graphiti/util/hash"
-require "graphiti/util/relationship_payload"
-require "graphiti/util/persistence"
-require "graphiti/util/validation_response"
-require "graphiti/util/sideload"
-require "graphiti/util/simple_errors"
-require "graphiti/util/transaction_hooks_recorder"
-require "graphiti/util/attribute_check"
-require "graphiti/util/serializer_attributes"
-require "graphiti/util/serializer_relationships"
-require "graphiti/util/class"
-require "graphiti/util/link"
-require "graphiti/util/remote_serializer"
-require "graphiti/util/remote_params"
-require "graphiti/adapters/null"
-require "graphiti/adapters/graphiti_api"
-require "graphiti/extensions/extra_attribute"
-require "graphiti/extensions/boolean_attribute"
-require "graphiti/extensions/temp_id"
-require "graphiti/serializer"
-require "graphiti/debugger"
-
-if defined?(ActiveRecord)
-  require "graphiti/adapters/active_record"
-end
-
-if defined?(Rails)
-  require "graphiti/railtie"
-  require "graphiti/rails"
-  require "graphiti/responders"
-end
-
 module Graphiti
+  DEPRECATOR = ActiveSupport::Deprecation.new('2.0', 'Graphiti')
+
   # @api private
   def self.context
     Thread.current[:context] ||= {}
@@ -128,7 +53,9 @@ module Graphiti
   end
 
   def self.broadcast(name, payload)
-    name = "graphiti.#{name}"
+    # AS::N prefers domain naming format with more specific towards end
+    name = "#{name}.graphiti"
+
     ActiveSupport::Notifications.instrument(name, payload) do
       yield payload if block_given?
     end
@@ -170,6 +97,89 @@ module Graphiti
   end
 end
 
+require "graphiti/version"
+require "graphiti/jsonapi_serializable_ext"
+require "graphiti/configuration"
+require "graphiti/context"
+require "graphiti/errors"
+require "graphiti/types"
+require "graphiti/schema"
+require "graphiti/schema_diff"
+require "graphiti/adapters/abstract"
+require "graphiti/resource/sideloading"
+require "graphiti/resource/links"
+require "graphiti/resource/configuration"
+require "graphiti/resource/dsl"
+require "graphiti/resource/interface"
+require "graphiti/resource/polymorphism"
+require "graphiti/resource/documentation"
+require "graphiti/resource/persistence"
+require "graphiti/resource/remote"
+require "graphiti/sideload"
+require "graphiti/sideload/has_many"
+require "graphiti/sideload/belongs_to"
+require "graphiti/sideload/has_one"
+require "graphiti/sideload/many_to_many"
+require "graphiti/sideload/polymorphic_belongs_to"
+require "graphiti/resource"
+require "graphiti/resource_proxy"
+require "graphiti/request_validator"
+require "graphiti/query"
+require "graphiti/scope"
+require "graphiti/deserializer"
+require "graphiti/renderer"
+require "graphiti/hash_renderer"
+require "graphiti/filter_operators"
+require "graphiti/scoping/base"
+require "graphiti/scoping/sort"
+require "graphiti/scoping/paginate"
+require "graphiti/scoping/extra_attributes"
+require "graphiti/scoping/filterable"
+require "graphiti/scoping/default_filter"
+require "graphiti/scoping/filter"
+require "graphiti/stats/dsl"
+require "graphiti/stats/payload"
+require "graphiti/delegates/pagination"
+require "graphiti/util/include_params"
+require "graphiti/util/field_params"
+require "graphiti/util/hash"
+require "graphiti/util/relationship_payload"
+require "graphiti/util/persistence"
+require "graphiti/util/validation_response"
+require "graphiti/util/sideload"
+require "graphiti/util/simple_errors"
+require "graphiti/util/transaction_hooks_recorder"
+require "graphiti/util/attribute_check"
+require "graphiti/util/serializer_attributes"
+require "graphiti/util/serializer_relationships"
+require "graphiti/util/class"
+require "graphiti/util/link"
+require "graphiti/util/remote_serializer"
+require "graphiti/util/remote_params"
+require "graphiti/adapters/null"
+require "graphiti/adapters/graphiti_api"
+require "graphiti/extensions/extra_attribute"
+require "graphiti/extensions/boolean_attribute"
+require "graphiti/extensions/temp_id"
+require "graphiti/serializer"
+require "graphiti/debugger"
+
+if defined?(ActiveRecord)
+  require "graphiti/adapters/active_record"
+end
+
+if defined?(Rails)
+  require "graphiti/rails"
+  require "graphiti/responders"
+
+  # graphiti-rails has own Railtie
+  begin
+    require "graphiti-rails"
+  rescue LoadError
+    require "graphiti/railtie"
+  end
+end
+
 require "graphiti/runner"
 
 # Because we set 2 magic variables when processing the graph,

data/lib/graphiti/configuration.rb

@@ -32,15 +32,20 @@ module Graphiti
       self.debug = ENV.fetch("GRAPHITI_DEBUG", true)
       self.debug_models = ENV.fetch("GRAPHITI_DEBUG_MODELS", false)
 
-      if defined?(::Rails)
-        if File.exist?("#{::Rails.root}/.graphiticfg.yml")
-          cfg = YAML.load_file("#{::Rails.root}/.graphiticfg.yml")
-          @schema_path = "#{::Rails.root}/public#{cfg["namespace"]}/schema.json"
+      # FIXME: Don't duplicate graphiti-rails efforts
+      if defined?(::Rails.root) && (root = ::Rails.root)
+        config_file = root.join(".graphiticfg.yml")
+        if config_file.exist?
+          cfg = YAML.load_file(config_file)
+          @schema_path = root.join("public#{cfg["namespace"]}/schema.json")
         else
-          @schema_path = "#{::Rails.root}/public/schema.json"
+          @schema_path = root.join("public/schema.json")
+        end
+
+        if (logger = ::Rails.logger)
+          self.debug = logger.level.zero?
+          Graphiti.logger = logger
         end
-        self.debug = ::Rails.logger.level.zero?
-        Graphiti.logger = ::Rails.logger
       end
     end
 
@@ -66,4 +71,7 @@ module Graphiti
       send(:"#{key}=", original)
     end
   end
+
+  msg = "Use graphiti-rails's `config.graphiti.respond_to_formats`"
+  DEPRECATOR.deprecate_methods(Configuration, respond_to: msg, "respond_to=": msg)
 end

data/lib/graphiti/debugger.rb

@@ -59,9 +59,10 @@ module Graphiti
         add_chunk(payload[:resource], payload[:parent]) do |logs, json|
           logs << [" \\_ #{sideload.name}", :yellow, true]
           json[:name] = sideload.name
-          query = "#{payload[:resource].class.name}.all(#{params.inspect})"
-          unless payload[:resource]
-            query = "#{sideload.resource.class.name}: Manual sideload via .scope"
+          if sideload.class.scope_proc
+            query = "#{payload[:resource].class.name}: Manual sideload via .scope"
+          else
+            query = "#{payload[:resource].class.name}.all(#{params.inspect})"
           end
           logs << ["    #{query}", :cyan, true]
           json[:query] = query
@@ -121,7 +122,7 @@ module Graphiti
       end
 
       def flush
-        Graphiti.broadcast("debug.flush", {}) do |payload|
+        Graphiti.broadcast(:flush_debug, {}) do |payload|
           payload[:chunks] = chunks
           graph_statements.each do |chunk|
             flush_chunk(chunk)
@@ -187,8 +188,8 @@ module Graphiti
     end
 
     ActiveSupport::Notifications.subscribe \
-      "graphiti.data", method(:on_data)
+      "resolve.graphiti", method(:on_data)
     ActiveSupport::Notifications.subscribe \
-      "graphiti.render", method(:on_render)
+      "render.graphiti", method(:on_render)
   end
 end

data/lib/graphiti/rails.rb

@@ -8,6 +8,9 @@ module Graphiti
   # @see Base#wrap_context
   module Rails
     def self.included(klass)
+      backtrace = ::Rails::VERSION::MAJOR == 4 ? caller(2) : caller_locations(2)
+      Graphiti::DEPRECATOR.deprecation_warning("Including Graphiti::Rails", "Use graphiti-rails instead. See https://www.graphiti.dev/guides/graphiti-rails-migration for details.", backtrace)
+
       klass.class_eval do
         include Graphiti::Context
         include GraphitiErrors

data/lib/graphiti/railtie.rb

@@ -1,8 +1,14 @@
 module Graphiti
+  # @deprecated Use graphiti-rails's Graphiti::Rails::Railtie
   class Railtie < ::Rails::Railtie
     rake_tasks do
-      path = File.expand_path(__dir__)
-      load "#{path}/tasks.rb"
+      load File.expand_path("deprecated_tasks.rb", __dir__)
+    end
+
+    generators do
+      Dir[File.expand_path("../../deprecated_generators/**/*.rb", __dir__)].each do |f|
+        require f
+      end
     end
 
     initializer "graphiti.require_activerecord_adapter" do

data/lib/graphiti/renderer.rb

@@ -38,7 +38,8 @@ module Graphiti
     private
 
     def render(renderer)
-      Graphiti.broadcast(:render, records: records, options: options) do
+      Graphiti.broadcast(:render, records: records, proxy: proxy, options: options) do
+        # TODO: If these aren't expensive to compute, set them before the broadcast block
         options[:fields] = proxy.fields
         options[:expose] ||= {}
         options[:expose][:extra_fields] = proxy.extra_fields

data/lib/graphiti/resource/remote.rb

@@ -38,6 +38,7 @@ module Graphiti
       # Forward all headers
       def request_headers
         {}.tap do |headers|
+          # TODO: Maybe handle this in graphiti-rails
           if defined?(Rails) && context
             raw = context.request.headers.to_h
             if (auth = raw["HTTP_AUTHORIZATION"])

data/lib/graphiti/resource/sideloading.rb

@@ -114,8 +114,9 @@ module Graphiti
         # If eager loading, ensure routes are loaded first, then apply
         # This happens in Railtie
         def eagerly_apply_sideload?(sideload)
-          if defined?(::Rails)
-            ::Rails.application.config.eager_load ? false : true
+          # TODO: Maybe handle this in graphiti-rails
+          if defined?(::Rails) && (app = ::Rails.application)
+            app.config.eager_load ? false : true
           else
             sideload.resource_class_loaded?
           end

data/lib/graphiti/responders.rb

@@ -4,6 +4,8 @@ module Graphiti
     extend ActiveSupport::Concern
 
     included do
+      backtrace = ::Rails::VERSION::MAJOR == 4 ? caller(2) : caller_locations(2)
+      DEPRECATOR.deprecation_warning("Including Graphiti::Responders", "Use graphiti-rails instead. See https://www.graphiti.dev/guides/graphiti-rails-migration for details.", backtrace)
       include ActionController::MimeResponds
       respond_to(*Graphiti.config.respond_to)
     end

data/lib/graphiti/schema.rb

@@ -3,6 +3,7 @@ module Graphiti
     attr_reader :resources
 
     def self.generate(resources = nil)
+      # TODO: Maybe handle this in graphiti-rails
       ::Rails.application.eager_load! if defined?(::Rails)
       resources ||= Graphiti.resources.reject(&:abstract_class?)
       resources.reject! { |r| r.name.nil? }
@@ -17,7 +18,7 @@ module Graphiti
         errors = Graphiti::SchemaDiff.new(old, schema).compare
         return errors if errors.any?
       end
-      FileUtils.mkdir_p(Graphiti.config.schema_path.gsub("/schema.json", ""))
+      FileUtils.mkdir_p(Graphiti.config.schema_path.to_s.gsub("/schema.json", ""))
       File.write(Graphiti.config.schema_path, JSON.pretty_generate(schema))
       []
     end

data/lib/graphiti/scope.rb

@@ -76,8 +76,10 @@ module Graphiti
         params: @opts[:params],
         sideload: @opts[:sideload],
         parent: @opts[:parent],
+        # Set once data is resolved within block
+        #   results: ...
       }
-      Graphiti.broadcast("data", opts) do |payload|
+      Graphiti.broadcast(:resolve, opts) do |payload|
         yield payload
       end
     end

data/lib/graphiti/sideload.rb

@@ -249,19 +249,16 @@ module Graphiti
       end
 
       if self.class.scope_proc
-        Graphiti.broadcast("data", resource_class: resource.class, sideload: self) do |payload|
-          sideload_scope = fire_scope(parents)
-          sideload_scope = Scope.new sideload_scope,
-            resource,
-            query,
-            parent: graph_parent,
-            sideload: self,
-            sideload_parent_length: parents.length,
-            default_paginate: false
-          sideload_scope.resolve do |sideload_results|
-            payload[:results] = sideload_results
-            fire_assign(parents, sideload_results)
-          end
+        sideload_scope = fire_scope(parents)
+        sideload_scope = Scope.new sideload_scope,
+          resource,
+          query,
+          parent: graph_parent,
+          sideload: self,
+          sideload_parent_length: parents.length,
+          default_paginate: false
+        sideload_scope.resolve do |sideload_results|
+          fire_assign(parents, sideload_results)
         end
       else
         load(parents, query, graph_parent)

data/lib/graphiti/util/serializer_relationships.rb

@@ -83,8 +83,9 @@ module Graphiti
       end
 
       def eagerly_validate_links?
-        if defined?(::Rails)
-          ::Rails.application.config.eager_load
+        # TODO: Maybe handle this in graphiti-rails
+        if defined?(::Rails) && (app = ::Rails.application)
+          app.config.eager_load
         else
           true
         end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -73,9 +73,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,9 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -149,9 +143,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -159,9 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: graphiti_spec_helpers
   requirement: !ruby/object:Gem::Requirement
@@ -215,27 +203,29 @@ files:
 - bin/console
 - bin/rspec
 - bin/setup
+- deprecated_generators/graphiti/api_test_generator.rb
+- deprecated_generators/graphiti/generator_mixin.rb
+- deprecated_generators/graphiti/install_generator.rb
+- deprecated_generators/graphiti/resource_generator.rb
+- deprecated_generators/graphiti/resource_test_generator.rb
+- deprecated_generators/graphiti/templates/application_resource.rb.erb
+- deprecated_generators/graphiti/templates/controller.rb.erb
+- deprecated_generators/graphiti/templates/create_request_spec.rb.erb
+- deprecated_generators/graphiti/templates/destroy_request_spec.rb.erb
+- deprecated_generators/graphiti/templates/index_request_spec.rb.erb
+- deprecated_generators/graphiti/templates/resource.rb.erb
+- deprecated_generators/graphiti/templates/resource_reads_spec.rb.erb
+- deprecated_generators/graphiti/templates/resource_writes_spec.rb.erb
+- deprecated_generators/graphiti/templates/show_request_spec.rb.erb
+- deprecated_generators/graphiti/templates/update_request_spec.rb.erb
 - exe/graphiti
 - gemfiles/.bundle/config
 - gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
+- gemfiles/rails_5_graphiti_rails.gemfile
 - gemfiles/rails_6.gemfile
+- gemfiles/rails_6_graphiti_rails.gemfile
 - graphiti.gemspec
-- lib/generators/graphiti/api_test_generator.rb
-- lib/generators/graphiti/generator_mixin.rb
-- lib/generators/graphiti/install_generator.rb
-- lib/generators/graphiti/resource_generator.rb
-- lib/generators/graphiti/resource_test_generator.rb
-- lib/generators/graphiti/templates/application_resource.rb.erb
-- lib/generators/graphiti/templates/controller.rb.erb
-- lib/generators/graphiti/templates/create_request_spec.rb.erb
-- lib/generators/graphiti/templates/destroy_request_spec.rb.erb
-- lib/generators/graphiti/templates/index_request_spec.rb.erb
-- lib/generators/graphiti/templates/resource.rb.erb
-- lib/generators/graphiti/templates/resource_reads_spec.rb.erb
-- lib/generators/graphiti/templates/resource_writes_spec.rb.erb
-- lib/generators/graphiti/templates/show_request_spec.rb.erb
-- lib/generators/graphiti/templates/update_request_spec.rb.erb
 - lib/graphiti.rb
 - lib/graphiti/adapters/abstract.rb
 - lib/graphiti/adapters/active_record.rb
@@ -251,6 +241,7 @@ files:
 - lib/graphiti/context.rb
 - lib/graphiti/debugger.rb
 - lib/graphiti/delegates/pagination.rb
+- lib/graphiti/deprecated_tasks.rb
 - lib/graphiti/deserializer.rb
 - lib/graphiti/errors.rb
 - lib/graphiti/extensions/boolean_attribute.rb
@@ -296,7 +287,6 @@ files:
 - lib/graphiti/sideload/polymorphic_belongs_to.rb
 - lib/graphiti/stats/dsl.rb
 - lib/graphiti/stats/payload.rb
-- lib/graphiti/tasks.rb
 - lib/graphiti/types.rb
 - lib/graphiti/util/attribute_check.rb
 - lib/graphiti/util/class.rb