graphql-preload 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba8ef1cfb79ea9620cb392101e7ba7157bd19082
-  data.tar.gz: 96f464f9f3534d0b46328036ffc4a68166037c4b
+  metadata.gz: 3e0801c09f14a8e25bea9216908d7c29630d0fed
+  data.tar.gz: 753658b77f8f47724fa6766d7d04eb3adeeae217
 SHA512:
-  metadata.gz: f9d0e48b413c217329464a1410394d6602a454d434ab7bca8898ce16fcdddbc635bdd07de12a68f2461357b5f60de82a655fdcb997337b62b0e832d1178739f4
-  data.tar.gz: e4e1738b221ce13f6e42c1841b752bbfa9b4e6d63308a3f6f93085fc9f55e2a8b09edd8f701192b7740e8ec6df7e26bc44a81772712a9c817edf6dc6d1c932c0
+  metadata.gz: 31ed1b226a6a001dc9ea50cfadae9deb18ae2e12a3c72ee2bc07e6cf3d257dfb89fbe34ee57a7819cac0fbdb77474a01a2b90055938013d539d39e654a6d88b6
+  data.tar.gz: cc8eb3fa1b2451b9a1e4309884c960df09daccdd1c34b30a573bf10f42d1f3519f1357044ad00044a2fd02634ab122f73aee66c7ef3126fd5ef9a90e8eaa1f11

data/graphql-preload.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activerecord', '>= 4.1', '< 6'
-  spec.add_runtime_dependency 'graphql', '>= 1.5', '< 2'
+  spec.add_runtime_dependency 'graphql', '>= 1.8', '< 2'
   spec.add_runtime_dependency 'graphql-batch', '~> 0.3'
   spec.add_runtime_dependency 'promise.rb', '~> 0.7'
 

data/lib/graphql/preload.rb

@@ -2,25 +2,40 @@ require 'graphql'
 require 'graphql/batch'
 require 'promise.rb'
 
-GraphQL::Field.accepts_definitions(
-  preload: ->(type, *args) do
-    type.metadata[:preload] ||= []
-    type.metadata[:preload].concat(args)
-  end,
-  preload_scope: ->(type, arg) { type.metadata[:preload_scope] = arg }
-)
-
-GraphQL::Schema.accepts_definitions(
-  enable_preloading: ->(schema) do
-    schema.instrument(:field, GraphQL::Preload::Instrument.new)
-  end
-)
-
 module GraphQL
   # Provides a GraphQL::Field definition to preload ActiveRecord::Associations
   module Preload
     autoload :Instrument, 'graphql/preload/instrument'
     autoload :Loader, 'graphql/preload/loader'
     autoload :VERSION, 'graphql/preload/version'
+
+    module SchemaMethods
+      def enable_preloading
+        instrument(:field, GraphQL::Preload::Instrument.new)
+      end
+    end
+
+    module FieldMetadata
+      def initialize(*args, preload: nil, preload_scope: nil, **kwargs, &block)
+        if preload
+          @preload ||= []
+          @preload.concat Array.wrap preload
+        end
+        if preload_scope
+          @preload_scope = preload_scope
+        end
+        super(*args, **kwargs, &block)
+      end
+
+      def to_graphql
+        field_defn = super
+        field_defn.metadata[:preload] = @preload
+        field_defn.metadata[:preload_scope] = @preload_scope
+        field_defn
+      end
+    end
   end
+
+  Schema.extend Preload::SchemaMethods
+  Schema::Field.prepend Preload::FieldMetadata
 end

data/lib/graphql/preload/instrument.rb

@@ -13,7 +13,7 @@ module GraphQL
             scope = field.metadata[:preload_scope].call(args, ctx)
           end
 
-          preload(obj, field.metadata[:preload], scope).then do
+          preload(obj.object, field.metadata[:preload], scope).then do
             old_resolver.call(obj, args, ctx)
           end
         end

data/lib/graphql/preload/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Preload
-    VERSION = '2.0.1'.freeze
+    VERSION = '2.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-preload
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Ryan Foster, Etienne Tripier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Preload ActiveRecord associations with graphql-batch