batch-loader 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c89e0468fac3840ce82631d0a0f9ac61eeda081
-  data.tar.gz: ec6c5021e04a5bc067356305659325431caa2753
+  metadata.gz: a7165f52041d179cfe8de386a0d761d35d1cbca2
+  data.tar.gz: 0d4f594bea1a9d78cb3b94f41c90cf14860dedee
 SHA512:
-  metadata.gz: 6551811eace7cb180cdea08c28b77695d8c243af3e6675e9da8d172645cab35ba51803f036359c4ecd8a6cc65a1ec2b95e2b1824f829c0454da2c0570748e396
-  data.tar.gz: 78c0481961a045060a64c155ddb196f125da805944014ad59052464fb7b3a884e41cd6462ab5ceb186931cbcbd1e210f61d963007e4af8f1124809a2ec698e62
+  metadata.gz: 157d5e17609ef8dc6df9ee49755441083d5d49f5b482e14087d8fba3d004ecb2e1a721ae28eb77a5b23be399c99383cf8cc29cdc0e0efe7d88d051bd44c80412
+  data.tar.gz: a2ad4e96c32219022efa84d7d27bfb90244ce8e8c54072370d5e667031bbc2bf37faee159f645d632b72d440b45a6c2e0b5074c216572ff7b3bf9cc334362cc3

data/CHANGELOG.md

@@ -8,10 +8,14 @@ one of the following labels: `Added`, `Changed`, `Deprecated`,
 to manage the versions of this gem so
 that you can set version constraints properly.
 
-#### [Unreleased](https://github.com/exAspArk/batch-loader/compare/v1.2.2...HEAD)
+#### [Unreleased](https://github.com/exAspArk/batch-loader/compare/v1.3.0...HEAD)
 
 * WIP
 
+#### [v1.3.0](https://github.com/exAspArk/batch-loader/compare/v1.2.2...v1.3.0)
+
+* `Added`: `BatchLoader::GraphQL` to make it work with `graphql` gem version `>= 1.8.7`. [#30](https://github.com/exAspArk/batch-loader/issues/30)
+
 #### [v1.2.2](https://github.com/exAspArk/batch-loader/compare/v1.2.1...v1.2.2)
 
 * `Fixed`: Identify item by `key` object instead of `key` string representation. [#27](https://github.com/exAspArk/batch-loader/pull/27)

data/README.md

@@ -258,13 +258,13 @@ query = "
 Schema.execute(query)
 ```
 
-To avoid this problem, all we have to do is to change the resolver to return `BatchLoader`:
+To avoid this problem, all we have to do is to change the resolver to return `BatchLoader::GraphQL` ([#32](https://github.com/exAspArk/batch-loader/pull/32) explains why not just `BatchLoader`):
 
 ```ruby
 PostType = GraphQL::ObjectType.define do
   name "Post"
   field :user, !UserType, resolve: ->(post, args, ctx) do
-    BatchLoader.for(post.user_id).batch do |user_ids, loader|
+    BatchLoader::GraphQL.for(post.user_id).batch do |user_ids, loader|
       User.where(id: user_ids).each { |user| loader.call(user.id, user) }
     end
   end
@@ -314,7 +314,7 @@ def lazy_association(post)
 
   BatchLoader.for(id).batch(key: key) do |ids, loader, args|
     model = Object.const_get(args[:key])
-    model.where(id: ids).each { |record| record.call(record.id, record) }
+    model.where(id: ids).each { |record| loader.call(record.id, record) }
   end
 end
 post1 = Post.save(association_id: 1, association_type: 'Tag')

data/lib/batch_loader/graphql.rb

@@ -2,18 +2,9 @@
 
 class BatchLoader
   class GraphQL
-    class Wrapper
-      def initialize(batch_loader)
-        @batch_loader = batch_loader
-      end
-
-      def sync
-        @batch_loader.__sync
-      end
-    end
-
     def self.use(schema_definition)
-      schema_definition.lazy_resolve(BatchLoader::GraphQL::Wrapper, :sync)
+      schema_definition.lazy_resolve(BatchLoader::GraphQL, :sync)
+      # for graphql gem versions <= 1.8.6 which work with BatchLoader instead of BatchLoader::GraphQL
       schema_definition.instrument(:field, self)
     end
 
@@ -21,10 +12,35 @@ class BatchLoader
       old_resolve_proc = field.resolve_proc
       new_resolve_proc = ->(object, arguments, context) do
         result = old_resolve_proc.call(object, arguments, context)
-        result.respond_to?(:__sync) ? BatchLoader::GraphQL::Wrapper.new(result) : result
+        result.respond_to?(:__sync) ? BatchLoader::GraphQL.wrap(result) : result
       end
 
       field.redefine { resolve(new_resolve_proc) }
     end
+
+    def self.wrap(batch_loader)
+      BatchLoader::GraphQL.new.tap do |graphql|
+        graphql.batch_loader = batch_loader
+      end
+    end
+
+    def self.for(item)
+      new(item)
+    end
+
+    attr_writer :batch_loader
+
+    def initialize(item = nil)
+      @batch_loader = BatchLoader.for(item)
+    end
+
+    def batch(*args, &block)
+      @batch_loader.batch(*args, &block)
+      self
+    end
+
+    def sync
+      @batch_loader.__sync
+    end
   end
 end

data/lib/batch_loader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class BatchLoader
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch-loader
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - exAspArk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler