graphql-extras 0.3.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb6a2324dfea95555ab147de0f4d79601603e21ca7dde008939795b12d40064c
-  data.tar.gz: ef735334a0b5be7ac0286c45886aa60d507482b73a95c0af89a2d1b5dfae27cc
+  metadata.gz: 8f3927449d4c9cea85828d5df7ea64954fa489c602ba39e35f938248962d65da
+  data.tar.gz: 3b9564bc9e6d32832e868c983826d007ad99d490c9316ecd8b20ca6eef4ec121
 SHA512:
-  metadata.gz: b412b43cd6d6c3865726770b1bd54d121e5a122fdafcd0f4f0e141edb6cd9e83ca13c47f73530025be3d16498144f97f3ddc40c02897049679bfebad8189ed56
-  data.tar.gz: '018ccec04e7e67b563e460fcbe7d1649a097087846b488985c34072004bcd2839162e4a3f3131c76718ea99a1d15633bc5c9f7ec3190cef65de203eb6c533a4b'
+  metadata.gz: ac5e8a5230c0543d7897ef73ee6634ef44b932adf7af91d6ce1e4f5711955965967ebed75d8b3c23ce97af9e2c24915dc423be3b32aa9af9219f9cd590183acd
+  data.tar.gz: 973a08ada1e4e313299c0f8724d338e2b2b405374e7fb91f7791a3a1d2ead7cf2788564367f747aef563b8be7a2e8e258f2eba7cc18acbbed2484637892626b0

data/.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Setup Ruby
         uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.6.x
+          ruby-version: 3.1.x
 
       - name: Install packages
         run: sudo apt-get install libsqlite3-dev

data/README.md

@@ -14,8 +14,8 @@ A collection of utilities for building GraphQL APIs.
 - [Installation](#installation)
 - [Usage](#usage)
   - [GraphQL::Extras::Controller](#graphqlextrascontroller)
-  - [GraphQL::Extras::AssociationLoader](#graphqlextrasassociationloader)
   - [GraphQL::Extras::Preload](#graphqlextraspreload)
+  - [GraphQL::Extras::PreloadSource](#graphqlextraspreloadsource)
   - [GraphQL::Extras::Types](#graphqlextrastypes)
     - [Date](#date)
     - [DateTime](#datetime)
@@ -53,21 +53,15 @@ class GraphqlController < ApplicationController
 end
 ```
 
-### GraphQL::Extras::AssociationLoader
-
-This is a subclass of [`GraphQL::Batch::Loader`](https://github.com/Shopify/graphql-batch) that performs eager loading of Active Record associations.
-
-```ruby
-loader = GraphQL::Extras::AssociationLoader.for(:blog)
-loader.load(Post.first)
-loader.load_many(Post.all)
-```
-
 ### GraphQL::Extras::Preload
 
 This allows you to preload associations before resolving fields.
 
 ```ruby
+class Schema < GraphQL::Schema
+  use GraphQL::Dataloader
+end
+
 class BaseField < GraphQL::Schema::Field
   prepend GraphQL::Extras::Preload
 end
@@ -87,6 +81,16 @@ class PostType < BaseObject
 end
 ```
 
+### GraphQL::Extras::PreloadSource
+
+This is a subclass of [`GraphQL::Dataloader::Source`](https://graphql-ruby.org/dataloader/overview.html) that performs eager loading of Active Record associations.
+
+```ruby
+loader = dataloader.with(GraphQL::Extras::PreloadSource, :blog)
+loader.load(Post.first)
+loader.load_many(Post.all)
+```
+
 ### GraphQL::Extras::Types
 
 In your base classes, you should include the `GraphQL::Extras::Types`.

data/graphql-extras.gemspec

@@ -25,8 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport", ">= 5.2"
-  spec.add_dependency "graphql", "~> 1.12"
-  spec.add_dependency "graphql-batch", "~> 0.4"
+  spec.add_dependency "graphql", [">= 1.12", "< 3"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"

data/lib/graphql/extras/preload.rb

@@ -1,7 +1,26 @@
-require "graphql/extras/association_loader"
-
 module GraphQL
   module Extras
+    class PreloadSource < GraphQL::Dataloader::Source
+      def initialize(preload)
+        @preload = preload
+      end
+
+      def fetch(records)
+        if ActiveRecord::VERSION::MAJOR >= 7
+          preloader = ActiveRecord::Associations::Preloader.new(
+            records: records,
+            associations: @preload
+          )
+          preloader.call
+        else
+          preloader = ActiveRecord::Associations::Preloader.new
+          preloader.preload(records, @preload)
+        end
+
+        records
+      end
+    end
+
     module Preload
       # @override
       def initialize(*args, preload: nil, **opts, &block)
@@ -10,13 +29,13 @@ module GraphQL
       end
 
       # @override
-      def resolve(object, args, ctx)
-        return super unless @preload
-
-        loader = AssociationLoader.for(@preload)
-        loader.load(object.object).then do
-          super(object, args, ctx)
+      def resolve(object, args, context)
+        if @preload
+          loader = context.dataloader.with(PreloadSource, @preload)
+          loader.load(object.object)
         end
+
+        super
       end
     end
   end

data/lib/graphql/extras/types.rb

@@ -34,8 +34,8 @@ module GraphQL
       class Decimal < GraphQL::Schema::Scalar
         description <<~DESC
         The `Decimal` scalar type represents signed double-precision fractional
-        values parsed by the `Decimal` library. The Decimal appears in a JSON
-        response as a string to preserve precision.
+        values. The Decimal appears in a JSON response as a string to preserve
+        precision.
         DESC
 
         def self.coerce_input(value, _context)

data/lib/graphql/extras/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Extras
-    VERSION = "0.3.2"
+    VERSION = "0.4.2"
   end
 end

data/lib/graphql/extras.rb

@@ -1,7 +1,6 @@
 require "graphql/extras/version"
 require "graphql/extras/types"
 require "graphql/extras/controller"
-require "graphql/extras/association_loader"
 require "graphql/extras/preload"
 
 module GraphQL

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-extras
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.2
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,30 +28,22 @@ dependencies:
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: graphql-batch
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +160,6 @@ files:
 - bin/setup
 - graphql-extras.gemspec
 - lib/graphql/extras.rb
-- lib/graphql/extras/association_loader.rb
 - lib/graphql/extras/controller.rb
 - lib/graphql/extras/preload.rb
 - lib/graphql/extras/test.rb
@@ -197,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Utiltities for building GraphQL APIs.

data/lib/graphql/extras/association_loader.rb

@@ -1,24 +0,0 @@
-require "graphql/batch"
-
-module GraphQL
-  module Extras
-    class AssociationLoader < GraphQL::Batch::Loader
-      def initialize(preload)
-        @preload = preload
-      end
-
-      def cache_key(record)
-        record.object_id
-      end
-
-      def perform(records)
-        preloader = ActiveRecord::Associations::Preloader.new
-        preloader.preload(records, @preload)
-
-        records.each do |record|
-          fulfill(record, nil) unless fulfilled?(record)
-        end
-      end
-    end
-  end
-end