graphql-pagination 2.1.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4957b0f34272595a82bbdd6fd645800f324a7fcf6b0a4dbf29f9ca077d2bf47
-  data.tar.gz: efbac1904152ec230e65d4cbd964c6bd14f77ee30ee4fff86537fdf0f2ddb32b
+  metadata.gz: 7e8d0c7a992008746a3ded2753d3d6440db80b2267c213a52df2761ab7c0cd9f
+  data.tar.gz: 6a19b6dad36411021495b09dee4c3e52236ea168af90e13345991abbb5202024
 SHA512:
-  metadata.gz: b688737afcde10674e2f7a1348f6eb7c49bd172e36863a86131c933cf8aad4daf9559bd0b8a3195a178b036583b13ba1c5a701515ae1d169e25f1eda7fa4b0e0
-  data.tar.gz: f7aa28fb0557930ba5d1c6dafb237086b9ba56e17eec74d6c55c0126836d214f608329ad9182e8105b24f1dd68909b915436447a93e00d863a7131719d4e0e3b
+  metadata.gz: 1759f21fcd299077d44b9e9118e69dedeeba3bdf809331b43f78a6b12af32a9fafff5322b8de37fe1ce278b93719a67446b73c8fd458198c5ef59bc79110ce90
+  data.tar.gz: 5e05fe083686683c8b501bfba5911a1371b00f413c4d678a4f1904f8082e54133e4d061a7b71ed62cbf3b0f370cc9145fb4146425229acdada117c34fbaea19a

data/.bundler-version

@@ -1 +1 @@
-2.4.19
+2.5.23

data/.dependabot/config.yml

@@ -1,19 +1,15 @@
-version: 1
+version: 2
 
-update_configs:
-  - package_manager: "ruby:bundler"
+updates:
+  - package-ecosystem: "bundler"
     directory: "/"
-    update_schedule: "daily"
-    commit_message:
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "08:00"
+      timezone: "UTC"
+    commit-message:
       prefix: "[dependabot]"
-    allowed_updates:
-      - match:
-          dependency_type: "all"
-          update_type: "security"
-    automerged_updates:
-      - match:
-          dependency_type: "all"
-          update_type: "security:patch"
     labels:
       - "automerge"
       - "dependencies"

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "08:00"
+      timezone: "UTC"
+    commit-message:
+      prefix: "[dependabot]"
+    labels:
+      - "automerge"
+      - "dependencies"

data/.github/workflows/auto-approve.yml

@@ -1,13 +1,14 @@
 name: Auto approve dependency upgrades and hot-fix PRs
 on:
   pull_request_target:
-    types: [labeled, unlabeled, edited, ready_for_review, review_requested, auto_merge_enabled]
-
+    types:
+      - labeled
+      - ready_for_review
 jobs:
   auto-approve:
     runs-on: ubuntu-latest
     steps:
       - uses: hmarr/auto-approve-action@v3
-        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(toJson(github), 'HOTFIX-AUTO-APPROVE')
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(github.event.pull_request.labels.*.name, 'HOTFIX-AUTO-APPROVE') || contains(github.event.pull_request.labels.*.name, 'self-approve') || contains(github.event.pull_request.labels.*.name, 'dependencies')
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/auto-merge.yml

@@ -1,22 +1,31 @@
 name: automerge
 on:
+  pull_request_target:
+    types:
+      - labeled
   pull_request_review:
     types:
       - submitted
   check_suite:
     types:
       - completed
-  label:
-    types:
-      - created
   status: {}
 jobs:
   automerge:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: pascalgn/automerge-action@v0.15.6
+        uses: pascalgn/automerge-action@v0.16.4
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: squash
+          MERGE_DELETE_BRANCH: true
+          MERGE_LABELS: "automerge,!automerge blocked"
+      - name: automerge-dependencies
+        uses: pascalgn/automerge-action@v0.16.4
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash
           MERGE_DELETE_BRANCH: true
+          MERGE_LABELS: "dependencies,!automerge blocked"
+          MERGE_REMOVE_LABELS: ""

data/.github/workflows/ci.yml

@@ -7,11 +7,11 @@ on:
     branches: [ main ]
 
 jobs:
-  test:
+  ci_tests_ruby:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [3.1, 3.2]
+        ruby-version: [3.2, 3.3]
 
     steps:
     - uses: actions/checkout@v3

data/Gemfile.lock

@@ -1,91 +1,104 @@
 PATH
   remote: .
   specs:
-    graphql-pagination (2.1.3)
-      graphql (~> 2.0)
+    graphql-pagination (2.3.0)
+      graphql (>= 2.4.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.8)
-      activesupport (= 7.0.8)
-    activerecord (7.0.8)
-      activemodel (= 7.0.8)
-      activesupport (= 7.0.8)
-    activesupport (7.0.8)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (8.0.0)
+      activesupport (= 8.0.0)
+    activerecord (8.0.0)
+      activemodel (= 8.0.0)
+      activesupport (= 8.0.0)
+      timeout (>= 0.4.0)
+    activesupport (8.0.0)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     ast (2.4.2)
-    base64 (0.1.1)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.8)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    diff-lcs (1.5.0)
-    graphql (2.1.0)
-    i18n (1.14.1)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    fiber-storage (1.0.0)
+    graphql (2.4.7)
+      base64
+      fiber-storage
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    json (2.9.0)
     kaminari-activerecord (1.2.2)
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     language_server-protocol (3.17.0.3)
-    method_source (1.0.0)
-    minitest (5.20.0)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    logger (1.6.2)
+    method_source (1.1.0)
+    minitest (5.25.4)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2)
+    pry (0.15.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.1)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rake (13.2.1)
+    regexp_parser (2.9.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.56.3)
-      base64 (~> 0.1.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
+    rubocop (1.69.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.23.1)
-      rubocop (~> 1.33)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.36.2)
+      parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.24.0)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.2.0)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
+    securerandom (0.4.0)
+    timeout (0.4.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (3.1.2)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
 
 PLATFORMS
   aarch64-linux-musl
@@ -108,4 +121,4 @@ DEPENDENCIES
   rubocop-rspec
 
 BUNDLED WITH
-   2.4.19
+   2.5.23

data/README.md

@@ -16,6 +16,8 @@ Add `graphql-pagination` to your Gemfile, you can use `kaminari-activerecord` or
 
 ## Usage example
 
+Use `collection_type` instead of `connection_type` to define your type:
+
 ```ruby
   field :fruits, Types::FruitType.collection_type, null: true do
     argument :page, Integer, required: false

data/graphql-pagination.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/RenoFi/graphql-pagination'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.2.0')
+
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin/|spec/|\.rub)}) }
   end
@@ -24,7 +26,5 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.0'
-
-  spec.add_dependency 'graphql', '~> 2.0'
+  spec.add_dependency 'graphql', '>= 2.4.7'
 end

data/lib/graphql_pagination/collection_metadata_type.rb

@@ -1,5 +1,6 @@
 module GraphqlPagination
   class CollectionMetadataType < GraphQL::Schema::Object
+    description "Type for CollectionMetadataType"
     field :current_page, Integer, null: false, description: "Current Page of loaded data"
     field :limit_value, Integer, null: false, description: "The number of items per page"
     field :total_count, Integer, null: false, description: "The total number of items to be paginated"

data/lib/graphql_pagination/version.rb

@@ -1,3 +1,3 @@
 module GraphqlPagination
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/lib/graphql_pagination.rb

@@ -1,6 +1,6 @@
 require 'graphql_pagination/version'
 require 'graphql'
-require 'graphql/schema/object'
+require 'graphql/schema'
 
 module GraphqlPagination
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-pagination
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,22 +9,22 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-17 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.4.7
 description: Page-based kaminari pagination for graphql returning collection and pagination
   metadata.
 email:
@@ -40,8 +40,8 @@ files:
 - ".github/ISSUE_TEMPLATE/config.yml"
 - ".github/ISSUE_TEMPLATE/story.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/dependabot.yml"
 - ".github/workflows/auto-approve.yml"
-- ".github/workflows/auto-merge-dependencies.yml"
 - ".github/workflows/auto-merge.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
@@ -73,14 +73,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Page-based kaminari pagination for graphql.

data/.github/workflows/auto-merge-dependencies.yml

@@ -1,24 +0,0 @@
-name: automerge-dependencies
-on:
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-  label:
-    types:
-      - created
-  status: {}
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    steps:
-      - name: automerge-dependencies
-        uses: pascalgn/automerge-action@v0.15.6
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_METHOD: squash
-          MERGE_DELETE_BRANCH: true
-          MERGE_LABELS: dependencies
-          MERGE_REMOVE_LABELS: ""