graphql-association_batch_resolver 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1d2f53b7e68d2fde0df4435ceaf595c0cab576a7b465275e1888a11348c977f
-  data.tar.gz: b0f420d3ddaa0ceda0a5a23d724197beaff213d85b50d6e11898bd206c632258
+  metadata.gz: f0d358169832729efb0321f747663d77a5f0a6b508245b9d31f717925fb2a6a1
+  data.tar.gz: 5b051213e91cc212f7a8591088267f3f3b3004dce5c3384680ce6b96d759c2a4
 SHA512:
-  metadata.gz: f0182b2ab4ef4400eea1682fd788026068e6c1462f022b7fbfa7e18e13703533853baca820074c09dc4c26b80460230917a0c7b1fab0ed3be035aae9b4079782
-  data.tar.gz: b914a4945c385e33da8bc3881546bbdc6ddbae54317a9530194f66fa0f866e8653faf94bcbdf7e14ce8559bd4e39d965ccf78101d8210c2d55a58a1448d8398f
+  metadata.gz: 9b197fd21cc259e2950200fcb1325146306991af9b30d37e4664d43fd4569ba8157c1f63d49ac25086afdde3d4f36a92503d4f28780748fca44cde1cedb2d59d
+  data.tar.gz: c33f52fb4ca9e34c06416769708df019abf413456d83ad6c9711864a64db228934d76eca6f29311a83216d1dd1bd8f662ac3abf8d340e28f3c2bf4d903954b1c

data/.rubocop.yml

@@ -4,3 +4,5 @@ Style/Documentation:
 Metrics/LineLength:
   Max: 120
 
+Metrics/ClassLength:
+  Max: 200

data/graphql-association_batch_resolver.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'GraphQL Resolver for ActiveRecord Associations'
 
-
   # 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.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do

data/lib/graphql/association_batch_resolver.rb

@@ -19,8 +19,8 @@ module GraphQL
       end
     end
 
-    def self.for(model, association)
-      ResolverBuilder.new(model, association).resolver
+    def self.for(model, association, opts = {})
+      ResolverBuilder.new(model, association, opts).resolver
     end
 
     def self.configure

data/lib/graphql/association_batch_resolver/association_loader.rb

@@ -6,17 +6,18 @@ module GraphQL
   module AssociationBatchResolver
     class AssociationLoader < GraphQL::Batch::Loader
       attr_reader :model, :model_primary_key, :association_name, :is_collection, :association_model,
-                  :association_primary_key
-      attr_accessor :scope, :model_primary_key_to_association_primary_keys
+                  :association_primary_key, :options
+      attr_accessor :scope, :context
 
-      def self.validate(model, association_name)
-        new(model, association_name)
+      def self.validate(model, association_name, options = {})
+        new(model, association_name, options)
         nil
       end
 
-      def initialize(model, association_name)
+      def initialize(model, association_name, options = {})
         @model = model
         @association_name = association_name
+        @options = options
         validate
         @model_primary_key = model.primary_key
         association = @model.reflect_on_association(association_name)
@@ -52,16 +53,19 @@ module GraphQL
       def preload_association(records)
         select_model_primary_keys = ColumnAggregator.aggregate([model.arel_table[model_primary_key]])
 
-        id_map = model.where(model_primary_key => records)
-                      .joins(association_name)
-                      .select(association_model.arel_table[Arel.star])
-                      .select(select_model_primary_keys.as('model_primary_keys'))
-                      .group(association_model.arel_table[association_primary_key])
+        association_records = model.where(model_primary_key => records)
+                                   .joins(association_name)
+                                   .select(association_model.arel_table[Arel.star])
+                                   .select(select_model_primary_keys.as('model_primary_keys'))
+                                   .group(association_model.arel_table[association_primary_key])
+
+        association_records = options[:scope].call(association_records, context) if options[:scope].respond_to?(:call)
 
         # .merge(Pundit.policy_scope!(context[:user], association.klass))
 
-        self.scope = association_model.find_by_sql(id_map.to_sql).to_a
+        self.scope = association_model.find_by_sql(association_records.to_sql).to_a
       end
+
       # rubocop:enable Metrics/AbcSize
 
       def read_association(model_record)

data/lib/graphql/association_batch_resolver/association_resolver.rb

@@ -6,7 +6,7 @@ module GraphQL
   module AssociationBatchResolver
     class AssociationResolver < GraphQL::Schema::Resolver
       class << self
-        attr_accessor :model, :association
+        attr_accessor :model, :association, :options
 
         def validate!
           validate_model!
@@ -28,12 +28,16 @@ module GraphQL
 
       extend Forwardable
 
-      def_delegators :'self.class', :model, :association
+      def_delegators :'self.class', :model, :association, :options
       attr_accessor :loader
 
       def initialize(*args, loader_class: GraphQL::AssociationBatchResolver.configuration.loader, **keywargs, &block)
         super(*args, **keywargs, &block)
-        @loader = loader_class.for(model, association)
+        initialization_arguments = [model, association]
+        initialization_arguments << options if loader_class.method(:new).arity == 3
+
+        @loader = loader_class.for(*initialization_arguments)
+        @loader.context = context if @loader.respond_to?(:context=)
       end
 
       def resolve(*)

data/lib/graphql/association_batch_resolver/resolver_builder.rb

@@ -6,11 +6,12 @@ require 'graphql/association_batch_resolver/association_loader'
 module GraphQL
   module AssociationBatchResolver
     class ResolverBuilder
-      attr_accessor :model, :association
+      attr_accessor :model, :association, :options
 
-      def initialize(model, association)
+      def initialize(model, association, opts)
         @model = model
         @association = association
+        @options = opts
       end
 
       def resolver_class_name
@@ -31,6 +32,7 @@ module GraphQL
         resolver = Class.new(AssociationResolver)
         resolver.model = model
         resolver.association = association
+        resolver.options = options
 
         model.const_set(resolver_class_name, resolver)
 

data/lib/graphql/association_batch_resolver/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module AssociationBatchResolver
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-association_batch_resolver
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Derenge
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord