graphql-batch 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afe26d607949310c337c3f88cb6f356ccd51923d841fa1e7e8840f0fa5b34012
-  data.tar.gz: 1f45b62562ef558a6f6b59479b198fdb548b8f03f061ebb0e6c51b6cff74c6b4
+  metadata.gz: 6fb5c2ff59d27a3474412dd661921db243b66b66263e581ff391c5285d60101b
+  data.tar.gz: f8237942cd0edd505c901176695502acf346c16778529cf64aa0c1103d193e1d
 SHA512:
-  metadata.gz: 7416844cffe48e01ca8640382e831cafdd1d64efcbcb927677a2d8833a3883400806cb94f16c8057d9c0f15ca543640b8084ba7616bb2b7376fa21f75a366179
-  data.tar.gz: 7473cb5eb3893fc61b0be940c28a8582a3316e912909ec7d2c8d1aeb9f01b1011b88c3ca754330f48152276ed0463e39508b625b5351800a53254dfc86669e5f
+  metadata.gz: a2cd9a5c2a13eeed2fde1d4065ab0158e05d3a2af767c954789004ac72084b26e54cd972ccedfe9da27eca34201985f5b9841ca78d328c76d7db3b7b39a1df15
+  data.tar.gz: 35de2220871a142aab7b49e918b5526cddcbcc28c417849c383b377f238b5b6802b55abbdf91a37118b3c3de50979c1b6e4eb9bcd138557a505bf54fab432397

data/.github/dependabot.yml

@@ -0,0 +1,24 @@
+version: 2
+registries:
+  ruby-shopify:
+    type: rubygems-server
+    url: https://pkgs.shopify.io/basic/gems/ruby
+    username: ${{secrets.RUBYGEMS_SERVER_PKGS_SHOPIFY_IO_USERNAME}}
+    password: ${{secrets.RUBYGEMS_SERVER_PKGS_SHOPIFY_IO_PASSWORD}}
+  github-com:
+    type: git
+    url: https://github.com
+    username: ${{secrets.DEPENDENCIES_GITHUB_USER}}
+    password: ${{secrets.DEPENDENCIES_GITHUB_TOKEN}}
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 100
+    insecure-external-code-execution: allow
+    registries: "*"

data/.github/workflows/ci.yml

@@ -10,16 +10,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, 3.1, 3.3]
-        graphql_version: ['~> 1.12.18', '~> 1.13', '~> 2.0']
-        include:
-          - ruby: 2.4
-            graphql_version: '~> 1.12.18'
-          - ruby: 2.4
-            graphql_version: '~> 1.13'
+        ruby: [2.7, 3.0, 3.1, 3.2, 3.3]
+        graphql_version: ['~> 1.13', '~> 2.0']
     steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # v1.257.0
       with:
         bundler-cache: true
         ruby-version: ${{ matrix.ruby }}

data/.github/workflows/dependabot_auto_merge.yml

@@ -0,0 +1,23 @@
+name: Dependabot auto-merge
+on: pull_request_target
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@08eff52bf64351f401fb50d4972fa95b9f2c2d1b # v2.4.0
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.rubocop.yml

@@ -6,6 +6,5 @@ inherit_from:
 
 AllCops:
   SuggestExtensions: false
-  TargetRubyVersion: 2.7
   Exclude:
     - vendor/**/*

data/.ruby-version

@@ -0,0 +1 @@
+3.3.1

data/Gemfile

@@ -3,7 +3,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'graphql', ENV['GRAPHQL_VERSION'] if ENV['GRAPHQL_VERSION']
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
-  gem 'rubocop', '~> 1.12.0', require: false
-  gem "rubocop-shopify", '~> 1.0.7', require: false
-end
+gem 'rubocop', '~> 1.61.0', require: false
+gem "rubocop-shopify", '~> 1.0.7', require: false

data/Rakefile

@@ -9,11 +9,9 @@ end
 
 task(default: :test)
 
-if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
-  task :rubocop do
-    require 'rubocop/rake_task'
-    RuboCop::RakeTask.new
-  end
-
-  task(default: :rubocop)
+task :rubocop do
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
 end
+
+task(default: :rubocop)

data/examples/active_storage_loader_sti.rb

@@ -0,0 +1,90 @@
+####
+# This is a loader for Active Storage attachments,
+# a little bit more complex than the `active_storage_loader.rb` example
+# because it supports STI (Single Table Inheritance) models where the
+# `has_one_attached` or `has_many_attached` is defined on any of the ancestor classes of the model.
+
+####
+# The model with an attached image and many attached pictures:
+####
+
+# class Event < ApplicationRecord
+#   has_one_attached :image
+#   has_many_attached :pictures
+# end
+
+####
+# An example data type using the AttachmentLoader:
+####
+
+# class Types::EventType < Types::BaseObject
+#   graphql_name 'Event'
+#
+#   field :id, ID, null: false
+#   field :image, String, null: true
+#   field :pictures, String, null: true
+#
+#   def image
+#     AttachmentLoader.for(:Event, :image).load(object.id).then do |image|
+#       Rails.application.routes.url_helpers.url_for(
+#         image.variant({ quality: 75 })
+#       )
+#     end
+#   end
+#
+#   def pictures
+#     AttachmentLoader.for(:Event, :pictures, association_type: :has_many_attached).load(object.id).then do |pictures|
+#       pictures.map do |picture|
+#         Rails.application.routes.url_helpers.url_for(
+#           picture.variant({ quality: 75 })
+#         )
+#       end
+#     end
+#   end
+# end
+
+class ActiveStorageLoader < GraphQL::Batch::Loader
+  attr_reader :record_type, :attachment_name, :association_type
+
+  def initialize(record_type, attachment_name, association_type: :has_one_attached)
+    super()
+    @record_type = record_type
+    @attachment_name = attachment_name
+    @association_type = association_type
+  end
+
+  def perform(record_ids)
+    attachments = ActiveStorage::Attachment.includes(:blob, :record).where(
+      record_type: ancestors_record_types, record_id: record_ids, name: attachment_name
+    )
+
+    if @association_type == :has_one_attached
+      attachments.each do |attachment|
+        fulfill(attachment.record_id, attachment)
+      end
+
+      record_ids.each { |id| fulfill(id, nil) unless fulfilled?(id) }
+    else
+      record_ids.each do |record_id|
+        fulfill(record_id, attachments.select { |attachment| attachment.record_id == record_id })
+      end
+    end
+  end
+
+  private
+
+  def ancestors_record_types
+    # Get all ancestor classes of record_type that are descendants of ActiveRecord::Base
+    # This is necessary because in a Single Table Inheritance (STI) setup,
+    # the `has_one_attached` or `has_many_attached`
+    # could be defined on any of the ancestor classes of the model, not just the model itself,
+    # which determines whether the `record_type` string is stored as the model's class name
+    # or the ancestor's class name.
+    # So we for any of the ancestor classes to ensure we don't miss the attachment
+    # we are looking for:
+
+    @record_type.to_s.constantize.ancestors.select do |ancestor|
+      ancestor < ActiveRecord::Base
+    end.map(&:to_s)
+  end
+end

data/graphql-batch.gemspec

@@ -10,6 +10,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/Shopify/graphql-batch"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 2.7"
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -17,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata['allowed_push_host'] = "https://rubygems.org"
 
-  spec.add_runtime_dependency "graphql", ">= 1.12.18", "< 3"
+  spec.add_runtime_dependency "graphql", ">= 1.13", "< 3"
   spec.add_runtime_dependency "promise.rb", "~> 0.7.2"
 
   spec.add_development_dependency "byebug" if RUBY_ENGINE == 'ruby'

data/lib/graphql/batch/loader.rb

@@ -66,7 +66,7 @@ module GraphQL::Batch
       cache[cache_key(key)] ||= ::Promise.resolve(value).tap { |p| p.source = self }
     end
 
-    def resolve #:nodoc:
+    def resolve # :nodoc:
       return if resolved?
       load_keys = queue
       @queue = nil
@@ -86,7 +86,7 @@ module GraphQL::Batch
     end
 
     # For Promise#sync
-    def wait #:nodoc:
+    def wait # :nodoc:
       if executor
         executor.resolve(self)
       else

data/lib/graphql/batch/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Batch
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/lib/graphql/batch.rb

@@ -26,7 +26,7 @@ module GraphQL
       if schema_defn.mutation
         require_relative "batch/mutation_field_extension"
 
-        schema_defn.mutation.fields.each do |name, field|
+        schema_defn.mutation.all_field_definitions.map do |field|
           field.extension(GraphQL::Batch::MutationFieldExtension)
         end
       end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: graphql-batch
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Dylan Thacker-Smith
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -16,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.18
+        version: '1.13'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -26,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.18
+        version: '1.13'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -86,18 +85,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - gems@shopify.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/cla.yml"
+- ".github/workflows/dependabot_auto_merge.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
@@ -106,6 +107,7 @@ files:
 - bin/console
 - bin/setup
 - examples/active_storage_loader.rb
+- examples/active_storage_loader_sti.rb
 - examples/association_loader.rb
 - examples/http_loader.rb
 - examples/record_loader.rb
@@ -122,7 +124,6 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -130,15 +131,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
-signing_key: 
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A query batching executor for the graphql gem
 test_files: []