Add types to the schema in the mapper

Author: dlederle

README.md

@@ -117,7 +117,7 @@ Additional queries and mutations is usually a good place for other
 operations on your schema that require no authentication (like sign_up).
 Also by adding them through the mount method, your mutations and
 resolvers can inherit from our [base mutation](https://github.com/graphql-devise/graphql_devise/blob/master/app/graphql/graphql_devise/mutations/base.rb)
-or [base resover](https://github.com/graphql-devise/graphql_devise/blob/master/app/graphql/graphql_devise/resolvers/base.rb)
+or [base resolver](https://github.com/graphql-devise/graphql_devise/blob/master/app/graphql/graphql_devise/resolvers/base.rb)
 respectively, to take advantage of some of the methods provided by devise
 just like with `devise_scope`
 

lib/graphql_devise/engine.rb

@@ -3,13 +3,5 @@
 module GraphqlDevise
   class Engine < ::Rails::Engine
     isolate_namespace GraphqlDevise
-
-    config.before_initialize do
-      GraphqlDevise::Schema.mutation(GraphqlDevise::Types::MutationType)
-
-      if GraphqlDevise::Types::QueryType.fields.blank?
-        GraphqlDevise::Types::QueryType.field(:dummy, resolver: GraphqlDevise::Resolvers::Dummy)
-      end
-    end
   end
 end

lib/graphql_devise/rails/routes.rb

@@ -27,7 +27,11 @@ def mount_graphql_devise_for(resource, opts = {})
         skipped: skipped_operations
       }
 
-      validate_gql_devise_operations!(param_operations)
+      GraphqlDevise::OperationChecker.call(
+        mutations: GraphqlDevise::MutationsPreparer::DEFAULT_MUTATIONS,
+        queries:   GraphqlDevise::QueriesPreparer::DEFAULT_QUERIES,
+        **param_operations
+      )
 
       devise_for(
         resource.pluralize.underscore.tr('/', '_').to_sym,
@@ -54,26 +58,26 @@ def mount_graphql_devise_for(resource, opts = {})
       prepared_mutations.merge(additional_mutations).each do |action, mutation|
         GraphqlDevise::Types::MutationType.field(action, mutation: mutation)
       end
+
+      if (prepared_mutations.present? || additional_mutations.present?) &&
+          (Gem::Version.new(GraphQL::VERSION) <= Gem::Version.new('1.10.0') || GraphqlDevise::Schema.mutation.nil?)
+        GraphqlDevise::Schema.mutation(GraphqlDevise::Types::MutationType)
+      end
+
       prepared_queries.merge(additional_queries).each do |action, resolver|
         GraphqlDevise::Types::QueryType.field(action, resolver: resolver)
       end
 
+      if (prepared_queries.blank? || additional_queries.present?) && GraphqlDevise::Types::QueryType.fields.blank?
+        GraphqlDevise::Types::QueryType.field(:dummy, resolver: GraphqlDevise::Resolvers::Dummy)
+      end
+
       Devise.mailer.helper(GraphqlDevise::MailerHelper)
 
       devise_scope mapping_name do
         post path, to: 'graphql_devise/graphql#auth'
         get  path, to: 'graphql_devise/graphql#auth'
       end
     end
-
-    private
-
-    def validate_gql_devise_operations!(param_operations)
-      GraphqlDevise::OperationChecker.call(
-        mutations: GraphqlDevise::MutationsPreparer::DEFAULT_MUTATIONS,
-        queries:   GraphqlDevise::QueriesPreparer::DEFAULT_QUERIES,
-        **param_operations
-      )
-    end
   end
 end

spec/mutations_preparer_spec.rb

@@ -11,10 +11,10 @@
     end
 
     let(:resource)  { 'User' }
-    let(:class_1)   { Class.new(GraphQL::Schema::Mutation) }
-    let(:class_2)   { GraphQL::Schema::Mutation }
+    let(:class1)    { Class.new(GraphQL::Schema::Mutation) }
+    let(:class2)    { GraphQL::Schema::Mutation }
     let(:auth_type) { GraphqlDevise::Types::AuthenticatableType }
-    let(:mutations) { { mutation_1: class_1, mutation_2: class_2 } }
+    let(:mutations) { { mutation_1: class1, mutation_2: class2 } }
 
     context 'when mutations is *NOT* empty' do
       it 'assign gql attibutes to mutations and changes keys using resource map' do

spec/operation_checker_spec.rb

@@ -14,8 +14,8 @@
       }
     end
 
-    let(:mutations) { { mutation_1: Class.new, mutation_2: Class.new } }
-    let(:queries)   { { query_1: Class.new, query_2: Class.new } }
+    let(:mutations) { { mutation1: Class.new, mutation2: Class.new } }
+    let(:queries)   { { query1: Class.new, query2: Class.new } }
     let(:custom)    { {} }
     let(:only)      { [] }
     let(:skipped)   { [] }
@@ -25,26 +25,26 @@
     end
 
     context 'when custom mutations and queries passed are among the defaults' do
-      let(:custom) { { mutation_1: Class.new, query_2: Class.new } }
+      let(:custom) { { mutation1: Class.new, query2: Class.new } }
 
       it { is_expected.not_to raise_error }
     end
 
     context 'when only operations are among the defaults' do
-      let(:only) { [:mutation_1, :query_2] }
+      let(:only) { [:mutation1, :query2] }
 
       it { is_expected.not_to raise_error }
     end
 
     context 'when skipped operations are among the defaults' do
-      let(:skipped) { [:mutation_2, :query_1] }
+      let(:skipped) { [:mutation2, :query1] }
 
       it { is_expected.not_to raise_error }
     end
 
     context 'when only and skipped operations are both defined' do
-      let(:only)    { [:mutation_1, :query_2] }
-      let(:skipped) { [:mutation_2, :query_1] }
+      let(:only)    { [:mutation1, :query2] }
+      let(:skipped) { [:mutation2, :query1] }
 
       it {
         is_expected.to(
@@ -57,39 +57,39 @@
     end
 
     context 'when custom operations include a not supported item' do
-      let(:custom) { { mutation_3: Class.new, query_2: Class.new } }
+      let(:custom) { { mutation3: Class.new, query2: Class.new } }
 
       it {
         is_expected.to(
           raise_error(
             GraphqlDevise::Error,
-            'Custom operation "mutation_3" is not supported. Check for typos.'
+            'Custom operation "mutation3" is not supported. Check for typos.'
           )
         )
       }
     end
 
     context 'when skipped operations include a not supported item' do
-      let(:skipped) { [:mutation_3, :query_2] }
+      let(:skipped) { [:mutation3, :query2] }
 
       it {
         is_expected.to(
           raise_error(
             GraphqlDevise::Error,
-            'Trying to skip unsupported operation "mutation_3". Check for typos.'
+            'Trying to skip unsupported operation "mutation3". Check for typos.'
           )
         )
       }
     end
 
     context 'when only operations include a not supported item' do
-      let(:only) { [:mutation_3, :query_2] }
+      let(:only) { [:mutation3, :query2] }
 
       it {
         is_expected.to(
           raise_error(
             GraphqlDevise::Error,
-            'The "only" operation "mutation_3" is not supported. Check for typos.'
+            'The "only" operation "mutation3" is not supported. Check for typos.'
           )
         )
       }

spec/operation_sanitizer_spec.rb

@@ -4,36 +4,36 @@
   describe '.call' do
     subject { described_class.call(default: default, custom: custom, only: only, skipped: skipped) }
 
-    let(:op_class_1) { Class.new }
-    let(:op_class_2) { Class.new }
-    let(:op_class_3) { Class.new }
+    let(:op_class1) { Class.new }
+    let(:op_class2) { Class.new }
+    let(:op_class3) { Class.new }
 
     context 'when the operations passed are mutations' do
       let(:custom)   { {} }
       let(:skipped)  { [] }
       let(:only)     { [] }
-      let(:default)  { { operation_1: op_class_1, operation_2: op_class_2 } }
+      let(:default)  { { operation1: op_class1, operation2: op_class2 } }
 
       context 'when no other option besides default is passed' do
         it { is_expected.to eq(default) }
       end
 
       context 'when there are custom operations' do
-        let(:custom) { { operation_1:   op_class_3, bad_operation: GraphQL::Schema::Resolver } }
+        let(:custom) { { operation1: op_class3, bad_operation: GraphQL::Schema::Resolver } }
 
-        it { is_expected.to eq(operation_1: op_class_3, operation_2: op_class_2) }
+        it { is_expected.to eq(operation1: op_class3, operation2: op_class2) }
       end
 
       context 'when there are only operations' do
-        let(:only) { [:operation_1] }
+        let(:only) { [:operation1] }
 
-        it { is_expected.to eq(operation_1: op_class_1) }
+        it { is_expected.to eq(operation1: op_class1) }
       end
 
       context 'when there are skipped operations' do
-        let(:skipped) { [:operation_2] }
+        let(:skipped) { [:operation2] }
 
-        it { is_expected.to eq(operation_1: op_class_1) }
+        it { is_expected.to eq(operation1: op_class1) }
       end
     end
   end

spec/queries_preparer_spec.rb

@@ -11,16 +11,16 @@
     end
 
     let(:resource)  { 'User' }
-    let(:class_1)   { Class.new(GraphQL::Schema::Resolver) }
-    let(:class_2)   { GraphQL::Schema::Resolver }
+    let(:class1)    { Class.new(GraphQL::Schema::Resolver) }
+    let(:class2)    { GraphQL::Schema::Resolver }
     let(:auth_type) { GraphqlDevise::Types::AuthenticatableType }
-    let(:queries)   { { query_1: class_1, query_2: class_2 } }
+    let(:queries)   { { query1: class1, query2: class2 } }
 
     context 'when queries is *NOT* empty' do
       it 'assign gql attibutes to queries and changes keys using resource map' do
         result = subject
 
-        expect(result.keys).to contain_exactly(:user_query_1, :user_query_2)
+        expect(result.keys).to contain_exactly(:user_query1, :user_query2)
         expect(result.values.map(&:graphql_name)).to contain_exactly(
           'UserQuery1', 'UserQuery2'
         )

spec/requests/mutations/login_spec.rb

@@ -138,7 +138,7 @@
       GRAPHQL
     end
 
-    before { post_request('/api/v1/guest/graphql_auth') }
+    before { post_request }
 
     it 'works alongside the user mount point' do
       expect(json_response[:data][:guestLogin]).to include(

spec/requests/mutations/sign_up_spec.rb

@@ -123,7 +123,7 @@
     end
 
     it 'works without the confirmable module' do
-      expect { post_request('/api/v1/guest/graphql_auth') }.to change(Guest, :count).by(1)
+      expect { post_request }.to change(Guest, :count).from(0).to(1)
     end
   end
 end