graphql_devise 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f51f6bf7fe463ff0ea364fe89ba48c3d5823ee965f044b49c4417ea051e8ec1
-  data.tar.gz: d0d974ad589b3549d90764b9afe7841fe71ec9731f4bba2386d6f329e10d55ac
+  metadata.gz: c4bc4895a435e3cc07f19f26547d8266a564282712d1e25e1e79dc55da2cf166
+  data.tar.gz: 1c8b16d151fe06ebe989419f529d023f2dd6d48aefd0f886feaba5dc480198e5
 SHA512:
-  metadata.gz: d914975173e11956b19e7c3591967e8332297b5f779e1e61088ee0f43a09348cbeba2514d1a91987562194e5c05d8a7b273a8a31eb208dc382a00cf65e56159d
-  data.tar.gz: c779b95176de43a738514eb1b4e06da6c30d4bb8bbf915d342e57ed6e57c733410e717e5777d0ebebd56a72d515b99dae67dd33c3246a0ae6ce11ee38f30cc27
+  metadata.gz: ca8c2c1a5ec146f252c2b207f92a066df1f6f07c534b7488b785b0a8442e1dfcc36777bfd96a205522bc7e39fe5d8b3541beb4dc0b74c69db3909eed674d3069
+  data.tar.gz: dda448483ea753d99b0abfb10ad878b426e7647a1088b3b30b82d57b82acc8b18f6145a615c4f6ab64b1aa93399d1104f7e100034239cf68e817a85f989ca7f6

data/.circleci/config.yml

@@ -13,11 +13,12 @@ jobs:
       - image: 'ruby:<< parameters.ruby-version >>'
     environment:
       BUNDLE_GEMFILE: << parameters.gemfile >>
-      COVERALLS_PARALLEL: true
+      COVERALLS_PARALLEL: 'true'
       EAGER_LOAD: 'true'
+      RUBYOPT: '-rostruct'
     steps:
       - checkout
-      - run: gem install bundler -v '1.17'
+      - run: ruby bin/install_bundler.rb
       - run:
           name: Install dependencies
           command: bundle install
@@ -27,7 +28,7 @@ jobs:
             bundle exec rspec
   report-coverage:
     docker:
-      - image: 'circleci/node:10.0.0'
+      - image: 'cimg/node:22.1.0'
     steps:
       - coveralls/upload:
           parallel_finished: true
@@ -39,20 +40,12 @@ workflows:
           matrix:
             parameters:
               ruby-version:
-                - '2.5'
-                - '2.6'
                 - '2.7'
                 - '3.0'
+                - '3.1'
+                - '3.2'
+                - '3.3'
               gemfile:
-                - gemfiles/rails4.2_graphql1.8.gemfile
-                - gemfiles/rails5.0_graphql1.8.gemfile
-                - gemfiles/rails5.0_graphql1.9.gemfile
-                - gemfiles/rails5.1_graphql1.8.gemfile
-                - gemfiles/rails5.1_graphql1.9.gemfile
-                - gemfiles/rails5.2_graphql1.8.gemfile
-                - gemfiles/rails5.2_graphql1.9.gemfile
-                - gemfiles/rails5.2_graphql1.10.gemfile
-                - gemfiles/rails5.2_graphql1.11.gemfile
                 - gemfiles/rails6.0_graphql1.11.gemfile
                 - gemfiles/rails6.0_graphql1.12.gemfile
                 - gemfiles/rails6.0_graphql1.13.gemfile
@@ -65,85 +58,52 @@ workflows:
                 - gemfiles/rails7.0_graphql1.13.gemfile
                 - gemfiles/rails7.0_graphql2.0.gemfile
                 - gemfiles/rails7.0_graphql2.1.gemfile
+                - gemfiles/rails7.0_graphql2.2.gemfile
+                - gemfiles/rails7.0_graphql2.3.gemfile
+                - gemfiles/rails7.0_graphql2.4.gemfile
+                - gemfiles/rails7.1_graphql2.0.gemfile
+                - gemfiles/rails7.1_graphql2.1.gemfile
+                - gemfiles/rails7.1_graphql2.2.gemfile
+                - gemfiles/rails7.1_graphql2.3.gemfile
+                - gemfiles/rails7.1_graphql2.4.gemfile
+                - gemfiles/rails7.2_graphql2.0.gemfile
+                - gemfiles/rails7.2_graphql2.1.gemfile
+                - gemfiles/rails7.2_graphql2.2.gemfile
+                - gemfiles/rails7.2_graphql2.3.gemfile
+                - gemfiles/rails7.2_graphql2.4.gemfile
             exclude:
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.0_graphql1.11.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.0_graphql1.12.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.0_graphql1.13.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.1_graphql1.11.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.1_graphql1.12.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.1_graphql1.13.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails6.1_graphql2.0.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails7.0_graphql1.11.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails7.0_graphql1.12.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails7.0_graphql1.13.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails7.0_graphql2.0.gemfile
-              - ruby-version: '2.4'
-                gemfile: gemfiles/rails7.0_graphql2.1.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails7.0_graphql1.11.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails6.0_graphql1.13.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails6.1_graphql1.13.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails7.0_graphql1.12.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails7.0_graphql1.13.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails7.0_graphql2.0.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails7.0_graphql2.1.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails6.1_graphql2.0.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails6.1_graphql1.12.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails6.1_graphql1.11.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails6.0_graphql1.12.gemfile
-              - ruby-version: '2.5'
-                gemfile: gemfiles/rails6.0_graphql1.11.gemfile
-              - ruby-version: '2.6'
-                gemfile: gemfiles/rails7.0_graphql1.11.gemfile
-              - ruby-version: '2.6'
-                gemfile: gemfiles/rails7.0_graphql1.12.gemfile
-              - ruby-version: '2.6'
-                gemfile: gemfiles/rails7.0_graphql1.13.gemfile
-              - ruby-version: '2.6'
-                gemfile: gemfiles/rails7.0_graphql2.0.gemfile
-              - ruby-version: '2.6'
-                gemfile: gemfiles/rails7.0_graphql2.1.gemfile
               - ruby-version: '2.7'
-                gemfile: gemfiles/rails4.2_graphql1.8.gemfile
-              - ruby-version: '3.0'
-                gemfile: gemfiles/rails4.2_graphql1.8.gemfile
-              - ruby-version: '3.0'
-                gemfile: gemfiles/rails5.0_graphql1.8.gemfile
-              - ruby-version: '3.0'
-                gemfile: gemfiles/rails5.0_graphql1.9.gemfile
-              - ruby-version: '3.0'
-                gemfile: gemfiles/rails5.1_graphql1.8.gemfile
+                gemfile: gemfiles/rails7.2_graphql2.0.gemfile
+              - ruby-version: '2.7'
+                gemfile: gemfiles/rails7.2_graphql2.1.gemfile
+              - ruby-version: '2.7'
+                gemfile: gemfiles/rails7.2_graphql2.2.gemfile
+              - ruby-version: '2.7'
+                gemfile: gemfiles/rails7.2_graphql2.3.gemfile
+              - ruby-version: '2.7'
+                gemfile: gemfiles/rails7.2_graphql2.4.gemfile
               - ruby-version: '3.0'
-                gemfile: gemfiles/rails5.1_graphql1.9.gemfile
+                gemfile: gemfiles/rails7.2_graphql2.0.gemfile
               - ruby-version: '3.0'
-                gemfile: gemfiles/rails5.2_graphql1.8.gemfile
+                gemfile: gemfiles/rails7.2_graphql2.1.gemfile
               - ruby-version: '3.0'
-                gemfile: gemfiles/rails5.2_graphql1.9.gemfile
+                gemfile: gemfiles/rails7.2_graphql2.2.gemfile
               - ruby-version: '3.0'
-                gemfile: gemfiles/rails5.2_graphql1.10.gemfile
+                gemfile: gemfiles/rails7.2_graphql2.3.gemfile
               - ruby-version: '3.0'
-                gemfile: gemfiles/rails5.2_graphql1.11.gemfile
+                gemfile: gemfiles/rails7.2_graphql2.4.gemfile
+              - ruby-version: '3.2'
+                gemfile: gemfiles/rails6.0_graphql1.11.gemfile
+              - ruby-version: '3.2'
+                gemfile: gemfiles/rails6.1_graphql1.11.gemfile
+              - ruby-version: '3.2'
+                gemfile: gemfiles/rails7.0_graphql1.11.gemfile
+              - ruby-version: '3.3'
+                gemfile: gemfiles/rails6.0_graphql1.11.gemfile
+              - ruby-version: '3.3'
+                gemfile: gemfiles/rails6.1_graphql1.11.gemfile
+              - ruby-version: '3.3'
+                gemfile: gemfiles/rails7.0_graphql1.11.gemfile
       - report-coverage:
           requires:
             - test

data/.rubocop.yml

@@ -4,7 +4,7 @@ require:
   - rubocop-rails
 
 AllCops:
-  TargetRubyVersion: 2.4.4
+  TargetRubyVersion: 2.7
   DisplayCopNames: true
   Exclude:
     - bin/**/*

data/Appraisals

@@ -1,115 +1,30 @@
-appraise 'rails4.2-graphql1.8' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'bundler', '~> 1.17'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '4-2-stable'
-  gem 'graphql', '~> 1.8.0'
-  gem 'devise_token_auth', '< 1.2'
-  gem 'rspec-rails', '< 4.0'
-end
-
-appraise 'rails5.0-graphql1.8' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '5-0-stable'
-  gem 'graphql', '~> 1.8.0'
-  gem 'devise_token_auth', '0.1.43'
-  gem 'devise', '>= 4.0'
-  gem 'rspec-rails', '< 4.0'
-end
-
-appraise 'rails5.0-graphql1.9' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '5-0-stable'
-  gem 'graphql', '~> 1.9.0'
-  gem 'devise_token_auth', '< 1.2'
-  gem 'rspec-rails', '< 4.0'
-end
-
-appraise 'rails5.1-graphql1.8' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '5-1-stable'
-  gem 'graphql', '~> 1.8.0'
-  gem 'devise_token_auth', '0.1.43'
-  gem 'devise', '>= 4.3'
-  gem 'rspec-rails', '< 4.0'
-end
-
-appraise 'rails5.1-graphql1.9' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '5-1-stable'
-  gem 'graphql', '~> 1.9.0'
-  gem 'devise_token_auth', '< 1.2'
-  gem 'rspec-rails', '< 4.0'
-end
-
-appraise 'rails5.2-graphql1.8' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '5-2-stable'
-  gem 'graphql', '~> 1.8.0'
-  gem 'devise_token_auth', '0.1.43'
-  gem 'devise', '>= 4.4.2'
-  gem 'rspec-rails', '< 4.0'
-end
-
-appraise 'rails5.2-graphql1.9' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '5-2-stable'
-  gem 'graphql', '~> 1.9.0'
-  gem 'devise_token_auth', '< 1.2'
-  gem 'rspec-rails', '< 4.0'
-end
-
-appraise 'rails5.2-graphql1.10' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '5-2-stable'
-  gem 'graphql', '~> 1.10.0'
-  gem 'devise_token_auth', '< 1.2'
-  gem 'rspec-rails', '< 4.0'
-end
-
-appraise 'rails5.2-graphql1.11' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '5-2-stable'
-  gem 'graphql', '~> 1.11.0'
-  gem 'devise_token_auth', '< 1.2'
-  gem 'rspec-rails', '< 4.0'
-end
-
-appraise 'rails5.2-graphql1.12' do
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '5-2-stable'
-  gem 'graphql', '~> 1.12.0'
-  gem 'devise_token_auth', '< 1.2'
-  gem 'rspec-rails', '< 4.0'
-end
-
-appraise 'rails6.0-graphql1.10' do
-  gem 'sqlite3', '~> 1.5.4'
-  gem 'devise', '>= 4.7'
-  gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
-  gem 'graphql', '~> 1.10.0'
-end
-
 appraise 'rails6.0-graphql1.11' do
+  gem 'psych', '< 4'
   gem 'sqlite3', '~> 1.5.4'
   gem 'public_suffix', '< 5'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.11.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.0-graphql1.12' do
+  gem 'psych', '< 4'
   gem 'sqlite3', '~> 1.5.4'
   gem 'public_suffix', '< 5'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.12.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.0-graphql1.13' do
+  gem 'psych', '< 4'
   gem 'sqlite3', '~> 1.5.4'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
   gem 'graphql', '~> 1.13.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.1-graphql1.10' do
@@ -117,6 +32,7 @@ appraise 'rails6.1-graphql1.10' do
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.10.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.1-graphql1.11' do
@@ -125,6 +41,7 @@ appraise 'rails6.1-graphql1.11' do
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.11.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.1-graphql1.12' do
@@ -133,6 +50,7 @@ appraise 'rails6.1-graphql1.12' do
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.12.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.1-graphql1.13' do
@@ -140,6 +58,7 @@ appraise 'rails6.1-graphql1.13' do
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 1.13.0'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails6.1-graphql2.0' do
@@ -148,6 +67,7 @@ appraise 'rails6.1-graphql2.0' do
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '6-1-stable'
   gem 'graphql', '~> 2.0.1'
+  gem 'factory_bot', '<= 6.4.4'
 end
 
 appraise 'rails7.0-graphql1.11' do
@@ -183,7 +103,7 @@ appraise 'rails7.0-graphql2.0' do
   gem 'devise_token_auth', '>= 1.2.1'
   gem 'devise', '>= 4.7'
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
-  gem 'graphql', '~> 2.0.1'
+  gem 'graphql', '>= 2.0', '< 2.1'
 end
 
 appraise 'rails7.0-graphql2.1' do
@@ -194,3 +114,115 @@ appraise 'rails7.0-graphql2.1' do
   gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
   gem 'graphql', '>= 2.1', '< 2.2'
 end
+
+appraise 'rails7.0-graphql2.2' do
+  gem 'sassc-rails'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
+  gem 'graphql', '>= 2.2', '< 2.3'
+end
+
+appraise 'rails7.0-graphql2.3' do
+  gem 'sassc-rails'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
+  gem 'graphql', '>= 2.3', '< 2.4'
+end
+
+appraise 'rails7.0-graphql2.4' do
+  gem 'sassc-rails'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-0-stable'
+  gem 'graphql', '>= 2.4', '< 2.5'
+end
+
+appraise 'rails7.1-graphql2.0' do
+  gem 'sassc-rails'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-1-stable'
+  gem 'graphql', '>= 2.0', '< 2.1'
+end
+
+appraise 'rails7.1-graphql2.1' do
+  gem 'sassc-rails'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-1-stable'
+  gem 'graphql', '>= 2.1', '< 2.2'
+end
+
+appraise 'rails7.1-graphql2.2' do
+  gem 'sassc-rails'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-1-stable'
+  gem 'graphql', '>= 2.2', '< 2.3'
+end
+
+appraise 'rails7.1-graphql2.3' do
+  gem 'sassc-rails'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-1-stable'
+  gem 'graphql', '>= 2.3', '< 2.4'
+end
+
+appraise 'rails7.1-graphql2.4' do
+  gem 'sassc-rails'
+  gem 'sqlite3', '~> 1.5.4'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-1-stable'
+  gem 'graphql', '>= 2.4', '< 2.5'
+end
+
+appraise 'rails7.2-graphql2.0' do
+  gem 'sassc-rails'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-2-stable'
+  gem 'graphql', '>= 2.0', '< 2.1'
+end
+
+appraise 'rails7.2-graphql2.1' do
+  gem 'sassc-rails'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-2-stable'
+  gem 'graphql', '>= 2.1', '< 2.2'
+end
+
+appraise 'rails7.2-graphql2.2' do
+  gem 'sassc-rails'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-2-stable'
+  gem 'graphql', '>= 2.2', '< 2.3'
+end
+
+appraise 'rails7.2-graphql2.3' do
+  gem 'sassc-rails'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-2-stable'
+  gem 'graphql', '>= 2.3', '< 2.4'
+end
+
+appraise 'rails7.2-graphql2.4' do
+  gem 'sassc-rails'
+  gem 'devise_token_auth', '>= 1.2.1'
+  gem 'devise', '>= 4.7'
+  gem 'rails', git: 'https://github.com/rails/rails', branch: '7-2-stable'
+  gem 'graphql', '>= 2.4', '< 2.5'
+end

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [v2.0.0](https://github.com/graphql-devise/graphql_devise/tree/v2.0.0) (2024-12-10)
+
+[Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v1.5.0...v2.0.0)
+
+**Breaking changes:**
+
+- Drop support for Rails \< 6.0 and Ruby \< 2.7 [\#276](https://github.com/graphql-devise/graphql_devise/pull/276) ([HeyNonster](https://github.com/HeyNonster))
+
+**Implemented enhancements:**
+
+- Add support for GraphQL 2.4 [\#281](https://github.com/graphql-devise/graphql_devise/pull/281) ([mcelicalderon](https://github.com/mcelicalderon))
+- Test with Ruby 3.2 and 3.3 [\#279](https://github.com/graphql-devise/graphql_devise/pull/279) ([mcelicalderon](https://github.com/mcelicalderon))
+- Add support for Rails 7.2 [\#278](https://github.com/graphql-devise/graphql_devise/pull/278) ([mcelicalderon](https://github.com/mcelicalderon))
+
+## [v1.5.0](https://github.com/graphql-devise/graphql_devise/tree/v1.5.0) (2024-05-16)
+
+[Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v1.4.0...v1.5.0)
+
+**Implemented enhancements:**
+
+- Add support for graphql 2.2 and 2.3 [\#271](https://github.com/graphql-devise/graphql_devise/pull/271) ([00dav00](https://github.com/00dav00))
+- Support Rails 7.1 [\#267](https://github.com/graphql-devise/graphql_devise/pull/267) ([mcelicalderon](https://github.com/mcelicalderon))
+
 ## [v1.4.0](https://github.com/graphql-devise/graphql_devise/tree/v1.4.0) (2023-10-30)
 
 [Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v1.3.0...v1.4.0)

data/app/controllers/graphql_devise/application_controller.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlDevise
-  ApplicationController = if Rails::VERSION::MAJOR >= 5
-    Class.new(ActionController::API)
-  else
-    Class.new(ActionController::Base)
-  end
+  ApplicationController = Class.new(ActionController::API)
 end

data/bin/install_bundler.rb

@@ -0,0 +1,11 @@
+#!ruby
+
+ruby_version  = Gem::Version.new(RUBY_VERSION)
+
+if ruby_version < Gem::Version.new('2.6')
+  system('gem install bundler -v 2.3.27')
+elsif ruby_version >= Gem::Version.new('2.6') && ruby_version < Gem::Version.new('3.0')
+  system('gem install bundler -v 2.4.22')
+else
+  system('gem install bundler')
+end

data/graphql_devise.gemspec

@@ -25,11 +25,11 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").select { |f| f.match(%r{^spec/}) }
   end
 
-  spec.required_ruby_version = '>= 2.4.4'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
-  spec.add_dependency 'graphql', '>= 1.8', '< 2.2'
-  spec.add_dependency 'rails', '>= 4.2', '< 7.1'
+  spec.add_dependency 'graphql', '>= 1.8', '< 2.5'
+  spec.add_dependency 'rails', '>= 6.0', '< 7.3'
   spec.add_dependency 'zeitwerk'
 
   spec.add_development_dependency 'appraisal'
@@ -38,13 +38,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'faker'
   spec.add_development_dependency 'generator_spec'
   spec.add_development_dependency 'github_changelog_generator'
-  spec.add_development_dependency 'pry', '~> 0.12.2'
+  spec.add_development_dependency 'pry', '>= 0.14.2'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '>= 12.3.3'
-  spec.add_development_dependency 'rspec-rails', '~> 4.0'
+  spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rubocop', '< 0.82.0'
   spec.add_development_dependency 'rubocop-performance', '< 1.6.0'
   spec.add_development_dependency 'rubocop-rails', '< 2.6.0'
   spec.add_development_dependency 'rubocop-rspec', '< 1.39.0'
-  spec.add_development_dependency 'sqlite3', '~> 1.3'
+  spec.add_development_dependency 'sqlite3'
 end

data/lib/graphql_devise/field_auth_tracer.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module GraphqlDevise
+  module FieldAuthTracer
+    def initialize(authenticate_default:, public_introspection:, unauthenticated_proc:, **_rest)
+      @authenticate_default = authenticate_default
+      @public_introspection = public_introspection
+      @unauthenticated_proc = unauthenticated_proc
+
+      super
+    end
+
+    def execute_field(field:, query:, ast_node:, arguments:, object:)
+      # Authenticate only root level queries
+      return super unless query.context.current_path.count == 1
+
+      auth_required = authenticate_option(field)
+
+      if auth_required && !(public_introspection && introspection_field?(field.name))
+        raise_on_missing_resource(query.context, field, auth_required)
+      end
+
+      super
+    end
+
+    private
+
+    attr_reader :public_introspection
+
+    def authenticate_option(field)
+      auth_required = field.try(:authenticate)
+
+      auth_required.nil? ? @authenticate_default : auth_required
+    end
+
+    def introspection_field?(field_name)
+      SchemaPlugin::INTROSPECTION_FIELDS.include?(field_name.downcase)
+    end
+
+    def raise_on_missing_resource(context, field, auth_required)
+      @unauthenticated_proc.call(field.name) if context[:current_resource].blank?
+
+      if auth_required.respond_to?(:call) && !auth_required.call(context[:current_resource])
+        @unauthenticated_proc.call(field.name)
+      end
+    end
+  end
+end

data/lib/graphql_devise/model/with_email_updater.rb

@@ -52,11 +52,7 @@ module GraphqlDevise
       end
 
       def email_in_database
-        if Devise.activerecord51?
-          @resource.email_in_database
-        else
-          @resource.email_was
-        end
+        @resource.email_in_database
       end
 
       def confirmation_method_params

data/lib/graphql_devise/schema_plugin.rb

@@ -19,7 +19,16 @@ module GraphqlDevise
     end
 
     def use(schema_definition)
-      schema_definition.tracer(self)
+      if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('2.3')
+        schema_definition.trace_with(
+          FieldAuthTracer,
+          authenticate_default: @authenticate_default,
+          public_introspection: public_introspection,
+          unauthenticated_proc: @unauthenticated_proc
+        )
+      else
+        schema_definition.tracer(self)
+      end
     end
 
     def trace(event, trace_data)

data/lib/graphql_devise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlDevise
-  VERSION = '1.4.0'
+  VERSION = '2.0.0'
 end

data/spec/dummy/config/application.rb

@@ -27,9 +27,5 @@ module Dummy
     # Middleware like session, flash, cookies can be added back manually.
     # Skip views, helpers and assets when generating a new resource.
     # config.api_only = true
-
-    if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR > 1
-      config.active_record.sqlite3.represent_boolean_as_integer = true
-    end
   end
 end

data/spec/dummy/config/environments/test.rb

@@ -15,13 +15,8 @@ Rails.application.configure do
   config.eager_load = ENV['EAGER_LOAD'].present?
 
   # Configure public file server for tests with Cache-Control for performance.
-  if Rails::VERSION::MAJOR >= 5
-    config.public_file_server.enabled = true
-    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
-  else
-    config.serve_static_files = true
-    config.static_cache_control = 'public, max-age=3600'
-  end
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/generators/graphql_devise/install_generator_spec.rb

@@ -4,7 +4,14 @@
 require 'rails_helper'
 require 'generators/graphql_devise/install_generator'
 
-RSpec.describe GraphqlDevise::InstallGenerator, type: :generator do
+# NOTE: Skipping tests because of a problem between zeitwerk and GQL versions 2.1.0 & 2.2.14
+skip_generator_tests =
+  Gem::Version.new(GraphQL::VERSION).between?(
+    Gem::Version.new('2.1.0'),
+    Gem::Version.new('2.2.14')
+  ) && Gem::Version.new(Rails.version) >= Gem::Version.new('7.0.0')
+
+RSpec.describe GraphqlDevise::InstallGenerator, type: :generator, skip: skip_generator_tests do
   destination File.expand_path('../../../../gqld_dummy', __dir__)
 
   let(:routes_path)    { "#{destination_root}/config/routes.rb" }

data/spec/requests/graphql_controller_spec.rb

@@ -33,17 +33,6 @@ RSpec.describe GraphqlDevise::GraphqlController do
     end
   end
 
-  context 'when variables are not a string or hash' do
-    let(:variables) { 1 }
-    let(:query)     { "mutation($email: String!) { userLogin(email: $email, password: \"#{password}\") { user { email name signInCount } } }" }
-
-    it 'raises an error' do
-      expect do
-        post_request('/api/v1/graphql_auth')
-      end.to raise_error(ArgumentError)
-    end
-  end
-
   context 'when multiplexing queries' do
     let(:params) do
       {
@@ -74,10 +63,6 @@ RSpec.describe GraphqlDevise::GraphqlController do
   end
 
   def post_request(path)
-    if Rails::VERSION::MAJOR >= 5
-      post(path, params: params)
-    else
-      post(path, params)
-    end
+    post(path, params: params)
   end
 end

data/spec/requests/mutations/register_spec.rb

@@ -128,7 +128,7 @@ RSpec.describe 'Registration process' do
 
     it 'skips the register mutation' do
       expect(json_response[:errors]).to contain_exactly(
-        hash_including(message: "Field 'adminRegister' doesn't exist on type 'Mutation'")
+        hash_including(message: a_string_including("Field 'adminRegister' doesn't exist on type 'Mutation'"))
       )
     end
   end

data/spec/requests/queries/introspection_query_spec.rb

@@ -116,7 +116,13 @@ RSpec.describe 'Login Requests' do
 
         context 'and introspection is set to require auth' do
           before do
-            allow_any_instance_of(GraphqlDevise::SchemaPlugin).to(
+            target_class = if Gem::Version.new(GraphQL::VERSION) >= Gem::Version.new('2.3')
+              GraphqlDevise::FieldAuthTracer
+            else
+              GraphqlDevise::SchemaPlugin
+            end
+
+            allow_any_instance_of(target_class).to(
               receive(:public_introspection).and_return(false)
             )
           end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if ENV['CI'] && !ENV['SKIP_COVERALLS'] && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5')
+if ENV['CI'] && !ENV['SKIP_COVERALLS']
   require 'simplecov'
   require 'coveralls'
 

data/spec/support/contexts/graphql_request.rb

@@ -4,11 +4,7 @@ RSpec.shared_context 'with graphql query request' do
   let(:headers)   { {} }
   let(:variables) { {} }
   let(:graphql_params) do
-    if Rails::VERSION::MAJOR >= 5
-      { params: { query: query, variables: variables }, headers: headers }
-    else
-      [{ query: query, variables: variables }, headers]
-    end
+    { params: { query: query, variables: variables }, headers: headers }
   end
 
   def post_request(path = '/api/v1/graphql_auth')
@@ -20,10 +16,6 @@ RSpec.shared_context 'with graphql query request' do
   end
 
   def send_request(path, method)
-    if Rails::VERSION::MAJOR >= 5
-      public_send(method, path, **graphql_params)
-    else
-      public_send(method, path, *graphql_params)
-    end
+    public_send(method, path, **graphql_params)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_devise
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Mario Celi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_token_auth
@@ -40,7 +40,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,27 +50,27 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.3'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -173,16 +173,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -215,16 +215,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -285,16 +285,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 description: GraphQL queries and mutations on top of devise_token_auth
 email:
 - mcelicalderon@gmail.com
@@ -323,6 +323,7 @@ files:
 - app/views/graphql_devise/mailer/confirmation_instructions.html.erb
 - app/views/graphql_devise/mailer/reset_password_instructions.html.erb
 - bin/console
+- bin/install_bundler.rb
 - bin/rails
 - bin/setup
 - config/locales/en.yml
@@ -346,6 +347,7 @@ files:
 - lib/graphql_devise/errors/error_codes.rb
 - lib/graphql_devise/errors/execution_error.rb
 - lib/graphql_devise/errors/user_error.rb
+- lib/graphql_devise/field_auth_tracer.rb
 - lib/graphql_devise/model/with_email_updater.rb
 - lib/graphql_devise/mount_method/operation_preparer.rb
 - lib/graphql_devise/mount_method/operation_preparers/custom_operation_preparer.rb
@@ -522,14 +524,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.4
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: GraphQL queries and mutations on top of devise_token_auth