Load reqs with zeitwerk (#209)

* Modify gem files structure to match Zeitwerk requeriments

* Remove unneeded requires

* Remove support for ruby 2.3

* Require rails generator explicitely & avoid constant name clash

* Avoid using generators directory as namespace

* Address code review comments

* Add deprecation messages to legacy concerns and create new ones

* Modify generator to use new concerns

* Remove namespace of error classes after rebase

* Address code review comments

Author: 00dav00

.circleci/config.yml

@@ -47,7 +47,6 @@ workflows:
           matrix:
             parameters:
               ruby-version:
-                - '2.3'
                 - '2.4'
                 - '2.5'
                 - '2.6'
@@ -73,24 +72,6 @@ workflows:
                 - gemfiles/rails7.0_graphql1.12.gemfile
                 - gemfiles/rails7.0_graphql1.13.gemfile
             exclude:
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.0_graphql1.11.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.0_graphql1.12.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.0_graphql1.13.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.1_graphql1.11.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.1_graphql1.12.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails6.1_graphql1.13.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails7.0_graphql1.11.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails7.0_graphql1.12.gemfile
-              - ruby-version: '2.3'
-                gemfile: gemfiles/rails7.0_graphql1.13.gemfile
               - ruby-version: '2.4'
                 gemfile: gemfiles/rails6.0_graphql1.11.gemfile
               - ruby-version: '2.4'

.gitignore

@@ -30,3 +30,4 @@ README.md.*
 
 .env
 /spec/tmp/config/routes.rb
+/.byebug_history

README.md

@@ -386,7 +386,7 @@ GQL schema execution like this:
 # app/controllers/my_controller.rb
 
 class MyController < ApplicationController
-  include GraphqlDevise::Concerns::SetUserByToken
+  include GraphqlDevise::SetUserByToken
 
   def my_action
     result = DummySchema.execute(params[:query], context: gql_devise_context(User))
@@ -399,7 +399,7 @@ end
 # app/controllers/my_controller.rb
 
 class MyController < ApplicationController
-  include GraphqlDevise::Concerns::SetUserByToken
+  include GraphqlDevise::SetUserByToken
 
   def my_action
     result = DummySchema.execute(params[:query], context: gql_devise_context(User, Admin))

app/controllers/graphql_devise/concerns/additional_controller_methods.rb

@@ -4,17 +4,17 @@
 
 module GraphqlDevise
   class GraphqlController < ApplicationController
-    include GraphqlDevise::Concerns::SetUserByToken
+    include SetUserByToken
 
     def auth
       result = if params[:_json]
-        GraphqlDevise::Schema.multiplex(
+        Schema.multiplex(
           params[:_json].map do |param|
             { query: param[:query] }.merge(execute_params(param))
           end
         )
       else
-        GraphqlDevise::Schema.execute(params[:query], **execute_params(params))
+        Schema.execute(params[:query], **execute_params(params))
       end
 
       render json: result unless performed?

app/controllers/graphql_devise/concerns/set_user_by_token.rb

@@ -25,11 +25,12 @@ Gem::Specification.new do |spec|
     `git ls-files -z`.split("\x0").select { |f| f.match(%r{^spec/}) }
   end
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.4.4'
 
   spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
   spec.add_dependency 'graphql', '>= 1.8', '< 1.14.0'
   spec.add_dependency 'rails', '>= 4.2', '< 7.1'
+  spec.add_dependency 'zeitwerk'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'coveralls-ruby', '~> 0.2'

app/controllers/graphql_devise/graphql_controller.rb

@@ -18,13 +18,13 @@ def execute_dta_installer
       if File.exist?(File.expand_path("app/models/#{user_class.underscore}.rb", destination_root))
         gsub_file(
           "app/models/#{user_class.underscore}.rb",
-          'GraphqlDevise::Concerns::Model',
+          'GraphqlDevise::Authenticatable',
           'DeviseTokenAuth::Concerns::User'
         )
       end
       gsub_file(
         'app/controllers/application_controller.rb',
-        'GraphqlDevise::Concerns::SetUserByToken',
+        'GraphqlDevise::SetUserByToken',
         'DeviseTokenAuth::Concerns::SetUserByToken'
       )
 
@@ -54,15 +54,15 @@ def replace_model_concern
       gsub_file(
         "app/models/#{user_class.underscore}.rb",
         /^\s+include DeviseTokenAuth::Concerns::User/,
-        '  include GraphqlDevise::Concerns::Model'
+        '  include GraphqlDevise::Authenticatable'
       )
     end
 
     def replace_controller_concern
       gsub_file(
         'app/controllers/application_controller.rb',
         /^\s+include DeviseTokenAuth::Concerns::SetUserByToken/,
-        '  include GraphqlDevise::Concerns::SetUserByToken'
+        '  include GraphqlDevise::SetUserByToken'
       )
     end