devise_masquerade 1.3.9 → 1.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd8da5271e7816c4823e6208ddb3d164065463a69d0be4d12bc6b6cdd6314102
-  data.tar.gz: 55e126ffbe80364b490ed85dd7235ad9de168614d0979d00e84ed0a9f7f31390
+  metadata.gz: b25ee25719baa23bf2db526506162a1209f87286c4ad951cbe1625207e518427
+  data.tar.gz: 5e1f66d3831659776e565b8e7e2dc8039db6040218f2c5fc808a5201e9cf8620
 SHA512:
-  metadata.gz: f575ef0026f95fc117daaee22797f2a8495e20a33c2e100c70f40df91eb7c05ad4eb84fe39fd01b0a9b1403c23c0a00a657f0b9475c02ff17e1c89b1c5ffc642
-  data.tar.gz: f42b17cc00ff950387b8a44f079a575a4875788e97743e8cb923cf09e73e41da3aa9bff7cc819250d96ed1347fed1258745f8ddeaaa8a0274af651ffcda0ae09
+  metadata.gz: 27560df82bf3670a995bc155a0a6a5887fd51b9595e8596d7037e43945370013308ff7b66bd7e49336ccf411af9ff080812b08bb5b751cff9d649ce376040018
+  data.tar.gz: 99e88a1f2aa27ca855ae41094291507bb3a731a65a0c8d331ce2d76dca412eb6561b59d9c80c4489aed9d4d9208d37b20ecc7ddec485df3e98d40663c7337ebf

data/Gemfile.lock

@@ -52,7 +52,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_masquerade (1.3.9)
+    devise_masquerade (1.3.12)
       devise (>= 4.7.0)
       globalid (>= 0.3.6)
       railties (>= 5.2.0)
@@ -98,7 +98,7 @@ GEM
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
     backports (3.15.0)
-    bcrypt (3.1.16)
+    bcrypt (3.1.18)
     bson (1.12.5)
     bson_ext (1.12.5)
       bson (~> 1.12.5)
@@ -118,7 +118,7 @@ GEM
       nokogiri (~> 1.8)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
-    crass (1.0.5)
+    crass (1.0.6)
     cucumber (3.1.2)
       builder (>= 2.1.2)
       cucumber-core (~> 3.2.0)
@@ -142,7 +142,7 @@ GEM
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     database_cleaner (1.0.1)
-    devise (4.7.3)
+    devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -190,7 +190,7 @@ GEM
     listen (3.2.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.3.1)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.13)
@@ -201,13 +201,13 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
     mini_mime (1.0.2)
-    mini_portile2 (2.5.1)
+    mini_portile2 (2.8.0)
     minitest (5.12.2)
     multi_json (1.14.1)
     multi_test (0.1.2)
     nenv (0.3.0)
-    nokogiri (1.11.5)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -221,14 +221,14 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.6)
-    racc (1.5.2)
-    rack (2.2.3)
+    racc (1.6.0)
+    rack (2.2.3.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     railties (6.0.0)
       actionpack (= 6.0.0)

data/README.md

@@ -8,8 +8,6 @@
 
 [![Maintainability](https://api.codeclimate.com/v1/badges/cf63d775dc014a7ebc03/maintainability)](https://codeclimate.com/github/oivoodoo/devise_masquerade/maintainability)
 
-[![Analytics](https://ga-beacon.appspot.com/UA-46818771-1/devise_masquerade/README.md)](https://github.com/oivoodoo/devise_masquerade)
-
 [Consulting](https://bitscorp.co)
 
 It's a utility library for enabling functionallity like login as button for
@@ -169,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_name = '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

@@ -26,7 +26,7 @@ class Devise::MasqueradesController < DeviseController
 
       unless resource
         flash[:error] = "#{masqueraded_resource_class} not found."
-        redirect_to(new_user_session_path) and return
+        redirect_to(send("new_#{masqueraded_resource_name}_session_path")) and return
       end
 
       request.env['devise.skip_trackable'] = '1'
@@ -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.9'.freeze
+  VERSION = '1.3.12'.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.9
+  version: 1.3.12
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-11 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler