Merge branch 'master' into refactor_routes [ci skip]

Author: mcelicalderon

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [v0.10.1](https://github.com/graphql-devise/graphql_devise/tree/v0.10.1) (2020-03-21)
+
+[Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v0.10.0...v0.10.1)
+
+**Fixed bugs:**
+
+- Routes mount\_graphql\_devise\_for with module not work [\#69](https://github.com/graphql-devise/graphql_devise/issues/69)
+- Fix mounting models inside another module [\#70](https://github.com/graphql-devise/graphql_devise/pull/70) ([mcelicalderon](https://github.com/mcelicalderon))
+
 ## [v0.10.0](https://github.com/graphql-devise/graphql_devise/tree/v0.10.0) (2020-02-04)
 
 [Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v0.9.2...v0.10.0)

graphql_devise.gemspec

@@ -35,7 +35,7 @@ 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'
+  spec.add_development_dependency 'pry', '~> 0.12.2'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec-rails'

lib/graphql_devise/rails/routes.rb

@@ -35,8 +35,9 @@ def mount_graphql_devise_for(resource, opts = {})
 
       devise_for(
         resource.pluralize.underscore.tr('/', '_').to_sym,
-        module: :devise,
-        skip:   DEVISE_OPERATIONS
+        module:     :devise,
+        class_name: resource,
+        skip:       DEVISE_OPERATIONS
       )
 
       prepared_mutations = GraphqlDevise::MutationsPreparer.call(

lib/graphql_devise/version.rb

@@ -1,3 +1,3 @@
 module GraphqlDevise
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.10.1'.freeze
 end

spec/dummy/app/models/users.rb

@@ -0,0 +1,5 @@
+module Users
+  def self.table_name_prefix
+    'users_'
+  end
+end

spec/dummy/app/models/users/customer.rb

@@ -0,0 +1,9 @@
+module Users
+  class Customer < ApplicationRecord
+    devise :database_authenticatable, :validatable
+
+    include GraphqlDevise::Concerns::Model
+
+    validates :name, presence: true
+  end
+end

spec/dummy/config/routes.rb

@@ -21,5 +21,11 @@
     at:   '/api/v1/guest/graphql_auth'
   )
 
+  mount_graphql_devise_for(
+    'Users::Customer',
+    only: [:login],
+    at:   '/api/v1/user_customer/graphql_auth'
+  )
+
   post '/api/v1/graphql', to: 'api/v1/graphql#graphql'
 end

spec/dummy/db/migrate/20200321121807_create_users_customers.rb

@@ -0,0 +1,22 @@
+class CreateUsersCustomers < ActiveRecord::Migration[6.0]
+  def change
+    create_table :users_customers do |t|
+      ## Required
+      t.string :provider, null: false, default: 'email'
+      t.string :uid, null: false, default: ''
+
+      ## Database authenticatable
+      t.string :encrypted_password, null: false, default: ''
+
+      ## User Info
+      t.string :email
+
+      ## Tokens
+      t.text :tokens
+
+      t.string :name, null: false
+
+      t.timestamps
+    end
+  end
+end

spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_10_13_213045) do
+ActiveRecord::Schema.define(version: 2020_03_21_121807) do
 
   create_table "admins", force: :cascade do |t|
     t.string "provider", default: "email", null: false
@@ -87,4 +87,15 @@
     t.index ["unlock_token"], name: "index_users_on_unlock_token", unique: true
   end
 
+  create_table "users_customers", force: :cascade do |t|
+    t.string "provider", default: "email", null: false
+    t.string "uid", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "email"
+    t.text "tokens"
+    t.string "name", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
 end

spec/factories/users_customers.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :users_customer, class: 'Users::Customer' do
+    name      { Faker::FunnyName.two_word_name }
+    email     { Faker::Internet.unique.email }
+    password  { Faker::Internet.password }
+  end
+end