hq-graphql 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbfd2d5dad56008b05618a89354c42ced0ddac3ee44d292b96773303488171d8
-  data.tar.gz: 862fee899d0964af9177327b73ad7befcc200985f4f6323272ebb9d9122f5a5a
+  metadata.gz: 40c69615fc4b2b0d14d3c510d5c4973aa5a0f7bf0285278ca98505af62d73fb0
+  data.tar.gz: 4f0926421e6e2f8658f9e6aaf0234756eaf66c6dbf126210f56a92f0d4701a8a
 SHA512:
-  metadata.gz: d58e0f041362550a8aea5d3a0f03ca1ba0be02ad034b8c3def9d807f3c7045913c900ee79f3058bdf2d9396388d22a236b3ff6e368fb9d4758fcde60abb92ae5
-  data.tar.gz: 305b4e50bbb1f025aa2a977e45eba2aa63091b322396ac0bcfb2ce3be3f9ba28dd166097fe594982bc705dc701220d4b5b924721eee1ed65bc18387a3c2529ac
+  metadata.gz: 945bad36e906b28a2c1444f7e87df594c306b817c61f3bdfa1176f061c645904e9206f663fe82861b0a44ee61c881d8899d6979dc57842b1920070d6a48fa6ff
+  data.tar.gz: 82cf817c3d801273c0cc4a099aa513585ba96220fc9b9ce84f996bd14cbe04d248a8d759d864fc964d7f07571bb11169c59cf670d7893ce1ea860a4d41dd86d8

data/lib/hq/graphql.rb

@@ -59,12 +59,12 @@ module HQ
 end
 
 require "hq/graphql/active_record_extensions"
+require "hq/graphql/association_loader"
 require "hq/graphql/scalars"
 require "hq/graphql/comparator"
 require "hq/graphql/enum"
 require "hq/graphql/inputs"
 require "hq/graphql/input_object"
-require "hq/graphql/loaders"
 require "hq/graphql/mutation"
 require "hq/graphql/object"
 require "hq/graphql/resource"

data/lib/hq/graphql/association_loader.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module HQ
+  module GraphQL
+    class AssociationLoader < ::GraphQL::Batch::Loader
+      def initialize(model, association_name)
+        @model = model
+        @association_name = association_name
+        validate
+      end
+
+      def load(record)
+        raise TypeError, "#{@model} loader can't load association for #{record.class}" unless record.is_a?(@model)
+        return Promise.resolve(read_association(record)) if association_loaded?(record)
+        super
+      end
+
+      # We want to load the associations on all records, even if they have the same id
+      def cache_key(record)
+        record.object_id
+      end
+
+      def perform(records)
+        preload_association(records)
+        records.each { |record| fulfill(record, read_association(record)) }
+      end
+
+      private
+
+      def validate
+        unless @model.reflect_on_association(@association_name)
+          raise ArgumentError, "No association #{@association_name} on #{@model}"
+        end
+      end
+
+      def preload_association(records)
+        ::ActiveRecord::Associations::Preloader.new.preload(records, @association_name)
+      end
+
+      def read_association(record)
+        record.public_send(@association_name)
+      end
+
+      def association_loaded?(record)
+        record.association(@association_name).loaded?
+      end
+    end
+  end
+end

data/lib/hq/graphql/field.rb

@@ -20,7 +20,7 @@ module HQ
 
       def resolve_field(object, args, ctx)
         if klass.present? && !!::GraphQL::Batch::Executor.current && object.object
-          Loaders::Association.for(klass.constantize, original_name).load(object.object).then do
+          AssociationLoader.for(klass.constantize, original_name).load(object.object).then do
             super
           end
         else

data/lib/hq/graphql/version.rb

@@ -2,6 +2,6 @@
 
 module HQ
   module GraphQL
-    VERSION = "2.0.10"
+    VERSION = "2.0.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hq-graphql
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Danny Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -247,6 +247,7 @@ files:
 - lib/hq-graphql.rb
 - lib/hq/graphql.rb
 - lib/hq/graphql/active_record_extensions.rb
+- lib/hq/graphql/association_loader.rb
 - lib/hq/graphql/comparator.rb
 - lib/hq/graphql/config.rb
 - lib/hq/graphql/engine.rb
@@ -254,8 +255,6 @@ files:
 - lib/hq/graphql/field.rb
 - lib/hq/graphql/input_object.rb
 - lib/hq/graphql/inputs.rb
-- lib/hq/graphql/loaders.rb
-- lib/hq/graphql/loaders/association.rb
 - lib/hq/graphql/mutation.rb
 - lib/hq/graphql/object.rb
 - lib/hq/graphql/resource.rb

data/lib/hq/graphql/loaders.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require "hq/graphql/loaders/association"

data/lib/hq/graphql/loaders/association.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module HQ
-  module GraphQL
-    module Loaders
-      class Association < ::GraphQL::Batch::Loader
-        def initialize(model, association_name)
-          @model = model
-          @association_name = association_name
-          validate
-        end
-
-        def load(record)
-          raise TypeError, "#{@model} loader can't load association for #{record.class}" unless record.is_a?(@model)
-          return Promise.resolve(read_association(record)) if association_loaded?(record)
-          super
-        end
-
-        # We want to load the associations on all records, even if they have the same id
-        def cache_key(record)
-          record.object_id
-        end
-
-        def perform(records)
-          preload_association(records)
-          records.each { |record| fulfill(record, read_association(record)) }
-        end
-
-        private
-
-        def validate
-          unless @model.reflect_on_association(@association_name)
-            raise ArgumentError, "No association #{@association_name} on #{@model}"
-          end
-        end
-
-        def preload_association(records)
-          ::ActiveRecord::Associations::Preloader.new.preload(records, @association_name)
-        end
-
-        def read_association(record)
-          record.public_send(@association_name)
-        end
-
-        def association_loaded?(record)
-          record.association(@association_name).loaded?
-        end
-      end
-    end
-  end
-end