graphql-pagination 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b902c58fce73cf2785b2f6a1938f9578c89e9b235c081a6e5c769f0c747acece
-  data.tar.gz: ee72aa64adb804a3a5458530cc426a3fd98a54d910eaa53cdccb088573ce9361
+  metadata.gz: f96c76a2f88c05bf35c37c40d6ad0099a19f1bfa261961d443db8b7965327a59
+  data.tar.gz: 1da7d416ffbb3920ca70ea35a5cd6835b27d98068e80496cdc0afc2ffc287b63
 SHA512:
-  metadata.gz: cef3d062eb3f7eaf42617fbe44fb4b33400df6ce03d60a6b10715e3a3066c780ad74482a2e78ec11dc382c1a415fb4c8bb96f9a6c02f1f85d89d48c49b36d940
-  data.tar.gz: 534eda25a1be3daab2259787696e1ea604d040cd8e8ade5883beea90d755acfe6246433742d19579d703bbcda14cc194dcc7b4e10717d1d53666db55cc0dc751
+  metadata.gz: 8dde45c4cf39b233bcbc07bf0860632347afc480bbfd4009afee98ec505c0c6352095ef0501eb233f7d42ba9ae4212d7efc74b7aebae1de405ab990026501795
+  data.tar.gz: 174ac6aa77bfa23a774c83aaff5d38250a9f57fec2dc673a3f02848ebe8cac06294f2b5bca5744e76552e8209bef48427cf241491585a52665003935d160f88b

data/.bundler-version

@@ -1 +1 @@
-2.3.12
+2.4.5

data/.dependabot/config.yml

@@ -14,3 +14,6 @@ update_configs:
       - match:
           dependency_type: "all"
           update_type: "security:patch"
+    labels:
+      - "automerge"
+      - "dependencies"

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

@@ -0,0 +1,24 @@
+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.5
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: squash
+          MERGE_DELETE_BRANCH: true
+          MERGE_LABELS: dependencies
+          MERGE_REMOVE_LABELS: ""

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

@@ -6,13 +6,16 @@ on:
   check_suite:
     types:
       - completed
+  label:
+    types:
+      - created
   status: {}
 jobs:
   automerge:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.12.0"
+        uses: pascalgn/automerge-action@v0.15.5
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash

data/.github/workflows/ci.yml

@@ -14,12 +14,9 @@ jobs:
         ruby-version: ['3.0', 3.1]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@bd94d6a504586da892a5753afdd1480096ed30df
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/Gemfile

@@ -1,3 +1,12 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'kaminari-activerecord'
+gem 'kaminari-core'
+gem 'pry'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'

data/Gemfile.lock

@@ -1,77 +1,82 @@
 PATH
   remote: .
   specs:
-    graphql-pagination (2.0.1)
+    graphql-pagination (2.1.1)
       graphql (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.2.4)
-      activesupport (= 7.0.2.4)
-    activerecord (7.0.2.4)
-      activemodel (= 7.0.2.4)
-      activesupport (= 7.0.2.4)
-    activesupport (7.0.2.4)
+    activemodel (7.0.4.2)
+      activesupport (= 7.0.4.2)
+    activerecord (7.0.4.2)
+      activemodel (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     diff-lcs (1.5.0)
-    graphql (2.0.7)
-    i18n (1.10.0)
+    graphql (2.0.16)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.3)
     kaminari-activerecord (1.2.2)
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
     method_source (1.0.0)
-    minitest (5.15.0)
+    minitest (5.17.0)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.2.1.0)
       ast (~> 2.4.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.3.1)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.28.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.45.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.26.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.0)
+      rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.10.0)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.18.1)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   aarch64-linux-musl
@@ -94,4 +99,4 @@ DEPENDENCIES
   rubocop-rspec
 
 BUNDLED WITH
-   2.3.12
+   2.4.1

data/README.md

@@ -73,6 +73,25 @@ Value returned by query resolver must be a kaminari object or implements its pag
 }
 ```
 
+## Custom Base
+
+By default the resulting collection_type class is a direct descendant of
+graphql-ruby's GraphQL::Schema::Object, however you may require your own
+behaviours and properties on the collection class itself such as defining
+[custom visibility](https://graphql-ruby.org/authorization/visibility.html#object-visibility).
+
+This can be done by passing in your own custom class, to be inherited from:
+
+```ruby
+class MyBaseType < GraphQL::Schema::Object
+  def self.visible?(context)
+    # ...
+  end
+end
+
+field :fruits, Types::FruitType.collection_type(collection_base: MyBaseType)
+```
+
 ## Custom Metadata
 
 By default, the following fields are present in the metadata block:

data/Rakefile

@@ -6,4 +6,4 @@ RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
 task ci: %i[spec rubocop]
-task default: %i[spec rubocop:auto_correct]
+task default: %i[spec rubocop:autocorrect_all]

data/graphql-pagination.gemspec

@@ -27,13 +27,4 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0'
 
   spec.add_dependency 'graphql', '~> 2.0'
-
-  spec.add_development_dependency 'kaminari-activerecord'
-  spec.add_development_dependency 'kaminari-core'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
 end

data/lib/graphql_pagination/collection_base_error.rb

@@ -0,0 +1,8 @@
+module GraphqlPagination
+  class CollectionBaseError < StandardError
+    def message
+      "CollectionBaseError: The collection_type attribute must inherit from
+      or be a GraphQL::Schema::Object"
+    end
+  end
+end

data/lib/graphql_pagination/collection_type.rb

@@ -1,12 +1,18 @@
 module GraphqlPagination
   module CollectionType
-    def collection_type(metadata_type: GraphqlPagination::CollectionMetadataType)
+    def collection_type(
+      collection_base: GraphQL::Schema::Object,
+      metadata_type: GraphqlPagination::CollectionMetadataType
+    )
+      fail CollectionBaseError unless collection_base <= GraphQL::Schema::Object
+
       @collection_types ||= {}
-      @collection_types[metadata_type] ||= begin
+      @collection_types[collection_base] ||= {}
+      @collection_types[collection_base][metadata_type] ||= begin
         type_name = "#{graphql_name}Collection"
         source_type = self
 
-        Class.new(GraphQL::Schema::Object) do
+        Class.new(collection_base) do
           graphql_name type_name
           field :collection, [source_type], null: false
           field :metadata, metadata_type, null: false

data/lib/graphql_pagination/version.rb

@@ -1,3 +1,3 @@
 module GraphqlPagination
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1.1'.freeze
 end

data/lib/graphql_pagination.rb

@@ -5,6 +5,7 @@ require 'graphql/schema/object'
 module GraphqlPagination
 end
 
+require 'graphql_pagination/collection_base_error'
 require 'graphql_pagination/collection_type'
 require 'graphql_pagination/collection_metadata_type'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql-pagination
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -25,118 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: kaminari-activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: kaminari-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Page-based kaminari pagination for graphql returning collection and pagination
   metadata.
 email:
@@ -153,6 +41,7 @@ files:
 - ".github/ISSUE_TEMPLATE/story.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/auto-approve.yml"
+- ".github/workflows/auto-merge-dependencies.yml"
 - ".github/workflows/auto-merge.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
@@ -165,6 +54,7 @@ files:
 - graphql-pagination.gemspec
 - lib/graphql-pagination.rb
 - lib/graphql_pagination.rb
+- lib/graphql_pagination/collection_base_error.rb
 - lib/graphql_pagination/collection_metadata_type.rb
 - lib/graphql_pagination/collection_type.rb
 - lib/graphql_pagination/version.rb
@@ -190,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Page-based kaminari pagination for graphql.