graphql_devise 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 580d9a3a2c78687ecf7268521db9dc79a37c69a17b23ec7221b53de22ee0c137
-  data.tar.gz: ee9be896415d8b816191680aeb368d9b114b3dfc01c9ee8291461aa3ef3ebc08
+  metadata.gz: a1a520284d1b06d637b6a5438d34a0c1fc0a150643f7915afe7c62af88749a42
+  data.tar.gz: c4db3a40a6513306c51937a70a1cee0960b26ed7d25e73c9c1d4bdea8f1da4d1
 SHA512:
-  metadata.gz: dc80b028276918bab533b07e279a8572efa07b9b01afaffdfc841d578aa9bf8ea26aa31b67c422f111fdfa93b01ce3d58a448f0791d6d7df40b50616c391e835
-  data.tar.gz: 1043a114f91cc6474a6a147f93fbb0d067ad24ffcc914a578f40c8e24dca464b7562da92c0d039c0aa3559a5d918d0a0cac76827a82cafa2d55a5fcc24254513
+  metadata.gz: ea8cf460d52cf99b4113faf028541b57d8f1930ece55da23e7c6e78116d08ee20e5ccd9279fe87229e550d9f8d3f316864c015499c7d648b866a500b739b01d0
+  data.tar.gz: ae14da2bec687cb822b05e5a78a68123e9df6b581a38f793817ec80203b8dadd3b48c2af38337ae1f0f0dd957626dc4a0b018f14b3faff7f8a6bd12da1f58239

data/.travis.yml

@@ -5,6 +5,8 @@ cache: bundler
 before_install: gem install bundler -v 1.17
 before_script: RAILS_ENV=test bundle exec rake db:create db:schema:load
 
+env: EAGER_LOAD=true
+
 rvm:
   - 2.2.10
   - 2.3.8

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v0.11.2](https://github.com/graphql-devise/graphql_devise/tree/v0.11.2) (2020-05-06)
+
+[Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v0.11.1...v0.11.2)
+
+**Fixed bugs:**
+
+- Avoid multiple schema and type load \(Devise behavior\) [\#88](https://github.com/graphql-devise/graphql_devise/pull/88) ([mcelicalderon](https://github.com/mcelicalderon))
+
 ## [v0.11.1](https://github.com/graphql-devise/graphql_devise/tree/v0.11.1) (2020-05-05)
 
 [Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v0.11.0...v0.11.1)

data/config/routes.rb

@@ -1,11 +1,16 @@
 GraphqlDevise::Engine.routes.draw do
-  if GraphqlDevise::Types::QueryType.fields.blank?
-    GraphqlDevise::Types::QueryType.field(:dummy, resolver: GraphqlDevise::Resolvers::Dummy)
-  end
+  # Required as Devise forces routes to reload on eager_load
+  unless GraphqlDevise.schema_loaded?
+    if GraphqlDevise::Types::QueryType.fields.blank?
+      GraphqlDevise::Types::QueryType.field(:dummy, resolver: GraphqlDevise::Resolvers::Dummy)
+    end
 
-  if GraphqlDevise::Types::MutationType.fields.present?
-    GraphqlDevise::Schema.mutation(GraphqlDevise::Types::MutationType)
-  end
+    if GraphqlDevise::Types::MutationType.fields.present?
+      GraphqlDevise::Schema.mutation(GraphqlDevise::Types::MutationType)
+    end
 
-  GraphqlDevise::Schema.query(GraphqlDevise::Types::QueryType)
+    GraphqlDevise::Schema.query(GraphqlDevise::Types::QueryType)
+
+    GraphqlDevise.load_schema
+  end
 end

data/lib/graphql_devise.rb

@@ -6,6 +6,25 @@ module GraphqlDevise
   class Error < StandardError; end
 
   class InvalidMountOptionsError < GraphqlDevise::Error; end
+
+  @schema_loaded     = false
+  @mounted_resources = []
+
+  def self.schema_loaded?
+    @schema_loaded
+  end
+
+  def self.load_schema
+    @schema_loaded = true
+  end
+
+  def self.mount_resource(resource)
+    @mounted_resources << resource
+  end
+
+  def self.resource_mounted?(resource)
+    @mounted_resources.include?(resource)
+  end
 end
 
 require 'graphql_devise/concerns/controller_methods'

data/lib/graphql_devise/rails/routes.rb

@@ -25,10 +25,6 @@ module ActionDispatch::Routing
         ]
       ).validate!
 
-      authenticatable_type = clean_options.authenticatable_type.presence ||
-                             "Types::#{resource}Type".safe_constantize ||
-                             GraphqlDevise::Types::AuthenticatableType
-
       devise_for(
         resource.pluralize.underscore.tr('/', '_').to_sym,
         module:     :devise,
@@ -36,6 +32,18 @@ module ActionDispatch::Routing
         skip:       DEVISE_OPERATIONS
       )
 
+      devise_scope resource.underscore.tr('/', '_').to_sym do
+        post clean_options.at, to: 'graphql_devise/graphql#auth'
+        get  clean_options.at, to: 'graphql_devise/graphql#auth'
+      end
+
+      # Avoid routes reload done by Devise
+      return if GraphqlDevise.resource_mounted?(resource)
+
+      authenticatable_type = clean_options.authenticatable_type.presence ||
+                             "Types::#{resource}Type".safe_constantize ||
+                             GraphqlDevise::Types::AuthenticatableType
+
       prepared_mutations = GraphqlDevise::MountMethod::OperationPreparer.new(
         resource:              resource,
         custom:                clean_options.operations,
@@ -66,10 +74,7 @@ module ActionDispatch::Routing
 
       Devise.mailer.helper(GraphqlDevise::MailerHelper)
 
-      devise_scope resource.underscore.tr('/', '_').to_sym do
-        post clean_options.at, to: 'graphql_devise/graphql#auth'
-        get  clean_options.at, to: 'graphql_devise/graphql#auth'
-      end
+      GraphqlDevise.mount_resource(resource)
     end
   end
 end

data/lib/graphql_devise/version.rb

@@ -1,3 +1,3 @@
 module GraphqlDevise
-  VERSION = '0.11.1'.freeze
+  VERSION = '0.11.2'.freeze
 end

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

@@ -10,7 +10,7 @@ Rails.application.configure do
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
   # preloads Rails for running tests, you may have to set it to true.
-  config.eager_load = false
+  config.eager_load = ENV['EAGER_LOAD'].present?
 
   # Configure public file server for tests with Cache-Control for performance.
   if Rails::VERSION::MAJOR >= 5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_devise
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Mario Celi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_token_auth