Address code review comments

Author: David Revelo

graphql_devise.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   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', '~> 2.2'
+  spec.add_dependency 'zeitwerk'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'coveralls-ruby', '~> 0.2'

lib/graphql_devise.rb

@@ -5,25 +5,26 @@
 require 'graphql'
 require 'devise_token_auth'
 require 'zeitwerk'
-require_relative '../app/models/graphql_devise/concerns/model'
-require_relative '../app/models/graphql_devise/concerns/additional_model_methods'
-require_relative 'graphql_devise/concerns/controller_methods'
 
 GraphQL::Field.accepts_definitions(authenticate: GraphQL::Define.assign_metadata_key(:authenticate))
 GraphQL::Schema::Field.accepts_definition(:authenticate)
 
 loader = Zeitwerk::Loader.for_gem
 
-controller_methods_concern = "#{__dir__}/graphql_devise/concerns/controller_methods.rb"
-loader.ignore(controller_methods_concern)
+['additional_model_methods', 'controller_methods', 'model'].each do |concern_name|
+  require_relative "graphql_devise/concerns/#{concern_name}"
+  loader.ignore("#{__dir__}/graphql_devise/concerns/#{concern_name}.rb")
+end
+
 loader.collapse("#{__dir__}/graphql_devise/errors")
 loader.collapse("#{__dir__}/generators")
+
 loader.inflector.inflect('error_codes' => 'ERROR_CODES')
 loader.inflector.inflect('supported_options' => 'SUPPORTED_OPTIONS')
 
 loader.setup
 
-ActionDispatch::Routing::Mapper.send(:include, GraphqlDevise::RoutesMounter)
+ActionDispatch::Routing::Mapper.include(GraphqlDevise::RouteMounter)
 
 module GraphqlDevise
   class Error < StandardError; end

…ise/concerns/additional_model_methods.rb …ise/concerns/additional_model_methods.rbapp/models/graphql_devise/concerns/additional_model_methods.rb renamed to lib/graphql_devise/concerns/additional_model_methods.rb app/models/graphql_devise/concerns/additional_model_methods.rb renamed to lib/graphql_devise/concerns/additional_model_methods.rb

@@ -1,5 +1,5 @@
 module GraphqlDevise
-  module RoutesMounter
+  module RouteMounter
     def mount_graphql_devise_for(resource, options = {})
       clean_options = GraphqlDevise::ResourceLoader.new(resource, options, true).call(
         GraphqlDevise::Types::QueryType,