graphql-extras 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29213c20e07ca49b31f25ee4c66a1b60537c746ac3a66030eee023eb33d35f65
-  data.tar.gz: 45694df9fb4e00159e7394bcab9f9253de8dd949b891cc6b78a6e28fa548a99e
+  metadata.gz: 98e38072429fdb32cbd085ce64d1ac8fa5e295989580b8f2cab3008ef232a7bb
+  data.tar.gz: c7fa03896dd5f5122dff890f5c2e97fcf2d02450a3efd269e14582de4b402a6b
 SHA512:
-  metadata.gz: 22ca80f894bdae011ee6707f35a43097b699534dfc4295e5369100f993dced3a6906df29518dff0729683320db7dd72d9186c0edc8d0378ffb2b5bee24941e0d
-  data.tar.gz: e6df88738196ecf8b02b15fcad0da085ee6cfca9762a27dc06942458797b73a624fa300252338e3f04c92aff73a52a59543eeee29bc5f9ee2631c27563223423
+  metadata.gz: 962ff3bb31aaa27d4bac5028fa6dd2400e2330d51d0b2172abd3e7627bbcb206517bc962bc25fcb6687f5660f36403d91e7a0bb20ca0e13087c26ae968cda3e2
+  data.tar.gz: 263a13b184ff89f7f28f60d7b74ab0dc1a454fefb33f27f2ef6fe2e6dca0c2134f4ba828b65e9409f30a80ef3c2fdd692033dac42c333044afac73004dd87be4

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

@@ -10,10 +10,10 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Utiltities for building GraphQL APIs.}
   spec.description   = %q{A set of modules and types for buildign GraphQL APIs.}
-  spec.homepage      = "https://github.com/promptworks/graphql-extras"
+  spec.homepage      = "https://github.com/rzane/graphql-extras"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/promptworks/graphql-extras"
+  spec.metadata["source_code_uri"] = "https://github.com/rzane/graphql-extras"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", ">= 5.2"
   spec.add_dependency "graphql", "~> 1.12"
-  spec.add_dependency "graphql-batch", "~> 0.4"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"

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

data/lib/graphql/extras/preload.rb

@@ -1,7 +1,17 @@
-require "graphql/extras/association_loader"
-
 module GraphQL
   module Extras
+    class PreloadSource < GraphQL::Dataloader::Source
+      def initialize(preload)
+        @preload = preload
+      end
+
+      def fetch(records)
+        preloader = ActiveRecord::Associations::Preloader.new
+        preloader.preload(records, @preload)
+        records
+      end
+    end
+
     module Preload
       # @override
       def initialize(*args, preload: nil, **opts, &block)
@@ -10,13 +20,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/test/schema.rb

@@ -1,6 +1,6 @@
 require "securerandom"
 require "active_support/inflector"
-require "active_support/core_ext/hash/deep_transform_values"
+require "active_support/core_ext/hash"
 require "graphql/extras/test/loader"
 require "graphql/extras/test/response"
 
@@ -33,6 +33,10 @@ module GraphQL
         def __execute(schema, query, variables)
           uploads = {}
 
+          variables = variables.deep_transform_keys do |key|
+            key.to_s.camelize(:lower)
+          end
+
           variables = variables.deep_transform_values do |value|
             if value.respond_to? :tempfile
               id = SecureRandom.uuid

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.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-extras
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ray Zane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +154,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
@@ -177,11 +162,11 @@ files:
 - lib/graphql/extras/test/schema.rb
 - lib/graphql/extras/types.rb
 - lib/graphql/extras/version.rb
-homepage: https://github.com/promptworks/graphql-extras
+homepage: https://github.com/rzane/graphql-extras
 licenses: []
 metadata:
-  homepage_uri: https://github.com/promptworks/graphql-extras
-  source_code_uri: https://github.com/promptworks/graphql-extras
+  homepage_uri: https://github.com/rzane/graphql-extras
+  source_code_uri: https://github.com/rzane/graphql-extras
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -197,7 +182,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