devise_masquerade 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 765e1b2a1c4a2ae6f4708ad80b7f69745093be77070aaffb0415a71e870d3d3e
-  data.tar.gz: ccfd44dc5346385d69a5b0bd6ef69f7504cb36e4d092568744b3e3bbbda34a07
+  metadata.gz: 02fcf52821938df133246e4b36ed07ee85ab96c036cd8da0cf35ace09c229491
+  data.tar.gz: 3247bf4be6fe21dc5ba5c83d804dab155d92286ef8c8c1625e92b181cb0c01dc
 SHA512:
-  metadata.gz: 02f79998f7f9364a32628b3fa246e1e82b0b7a6007bfa344861ee5cf6fb168166cb73350733e554017922bd889709dcf29d374a08cf39cb191d68ca4e2fea811
-  data.tar.gz: 0b814c4cef685103f3a846dbdc2ee62f4b070b9be2c20e913eb63605e518e125d8aae6933c1006437a3b7fdfc5e5677820b4640c50d204e66174c6c4b1687800
+  metadata.gz: b6f6902ea81dd6d5ffef2cd48cfa7e5b4521906f912a02b3986117ef933ebea89d7b63f2d5eb43372c1ad76a84d63ae433f236394bd1c16e83891efcaa300760
+  data.tar.gz: 40b48f52e4a162e2033c13ccc6a9fabf2b882dcfd64ad236a27f08e20f54862fd3139d07cb8a0c780d50d3f3c6cc06f9e1e9ffaf2dd16ffd3e42a7a67930f144

data/Gemfile.lock

@@ -52,7 +52,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_masquerade (1.3.10)
+    devise_masquerade (1.3.11)
       devise (>= 4.7.0)
       globalid (>= 0.3.6)
       railties (>= 5.2.0)

data/README.md

@@ -167,9 +167,14 @@ in `routes.rb`:
     Devise.masquerade_bypass_warden_callback = false
     Devise.masquerade_routes_back = false # if true, route back to the page the user was on via redirect_back
     Devise.masquerading_resource_class = AdminUser
+    # optional: Devise.masquerading_resource_class = 'AdminUser'
+
     # optional, default: masquerading_resource_class.model_name.param_key
     Devise.masquerading_resource_name = :admin_user
+
     Devise.masqueraded_resource_class = User
+    # optional: Devise.masqueraded_resource_class_name = 'User'
+
     # optional, default: masqueraded_resource_class.model_name.param_key
     Devise.masqueraded_resource_name = :user
 ```

data/app/controllers/devise/masquerades_controller.rb

@@ -98,7 +98,11 @@ class Devise::MasqueradesController < DeviseController
         unless session[session_key_masqueraded_resource_class].blank?
           session[session_key_masquerading_resource_class].constantize
         else
-          Devise.masqueraded_resource_class || resource_class
+          if Devise.masqueraded_resource_class_name.present?
+            Devise.masqueraded_resource_class_name.constantize
+          else
+            Devise.masqueraded_resource_class || resource_class
+          end
         end
       end
     end
@@ -116,7 +120,11 @@ class Devise::MasqueradesController < DeviseController
         unless session[session_key_masquerading_resource_class].blank?
           session[session_key_masquerading_resource_class].constantize
         else
-          Devise.masquerading_resource_class || resource_class
+          if Devise.masquerading_resource_class_name.present?
+            Devise.masquerading_resource_class_name.constantize
+          else
+            Devise.masquerading_resource_class || resource_class
+          end
         end
       end
     end

data/lib/devise_masquerade/controllers/helpers.rb

@@ -12,7 +12,9 @@ module DeviseMasquerade
             klass = unless params[:masqueraded_resource_class].blank?
               params[:masqueraded_resource_class].constantize
             else
-              if Devise.masqueraded_resource_class
+              if Devise.masqueraded_resource_class_name.present?
+                Devise.masqueraded_resource_class_name.constantize
+              elsif Devise.masqueraded_resource_class
                 Devise.masqueraded_resource_class
               elsif defined?(User)
                 User

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = '1.3.10'.freeze
+  VERSION = '1.3.11'.freeze
 end

data/lib/devise_masquerade.rb

@@ -24,12 +24,18 @@ module Devise
   # Example: Devise.masqueraded_resource_class = User
   mattr_accessor :masqueraded_resource_class
 
+  # Example: Devise.masqueraded_resource_class_name = 'User'
+  mattr_accessor :masqueraded_resource_class_name
+
   # Example: Devise.masqueraded_resource_name = :user
   mattr_accessor :masqueraded_resource_name
 
   # Example: Devise.masquerading_resource_class = AdminUser
   mattr_accessor :masquerading_resource_class
 
+  # Example: Devise.masquerading_resource_class_name = 'AdminUser'
+  mattr_accessor :masquerading_resource_class_name
+
   # Example: Devise.masquerading_resource_name = :admin_user
   mattr_accessor :masquerading_resource_name
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler