devise_masquerade 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c0668fdf45d72f5919bd9ca487fe2b664948fc9399029832cc426500c030daa
-  data.tar.gz: f61869c2877366a03922b6f0a8aecce6d9adea6a48f1f006a6311d97a2b83d2a
+  metadata.gz: 0d75ba6f4e3241b021e9ef1c838e9baf1322ec0c7731573dc1008dc8931d59e7
+  data.tar.gz: 3bb9c12ca5dbddd8b61f64f0394f659998e6cae2be67790df2224b91c1558862
 SHA512:
-  metadata.gz: d98eefe89ce90e177bffdf7d81bdcb7904351d4a8e2de9b519c91e9a81b998398339bdfbbf922146c177b739f22a140b450b5cda5afa4f578d254e02f443f0f7
-  data.tar.gz: f2120c2b253f5f306589abd2b259607e3959e6910e7a8d5cf9661198a5b36a7d0372391995ef8b633a50cc6109e90f500a4dac3603950000eff1419b509cd9ac
+  metadata.gz: 8683eca8761589df6e6349a19cddf6de9b6a7c2f90390a6d46701f6c2dd55acc964196406f35a8ad9ba67fa486787284ed62460768fe9feea85dacb612981197
+  data.tar.gz: 87ba78777ff2f926f247776bf14e21114f361711a3df95b42dc76c3352ff32c08822fdb82024179ed8d614fa54b30a6f82e38bc2d1cab6eea3a62db1d206f9ff

data/Gemfile.lock

@@ -52,7 +52,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_masquerade (2.0.3)
+    devise_masquerade (2.1.0)
       devise (>= 4.7.0)
       globalid (>= 0.3.6)
       railties (>= 5.2.0)
@@ -191,7 +191,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.18.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.13)
@@ -208,7 +208,7 @@ GEM
     multi_json (1.14.1)
     multi_test (0.1.2)
     nenv (0.3.0)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -223,15 +223,15 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (4.0.6)
-    racc (1.6.0)
+    racc (1.6.1)
     rack (2.2.3.1)
     rack-test (2.0.2)
       rack (>= 1.3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     railties (6.0.0)
       actionpack (= 6.0.0)
       activesupport (= 6.0.0)

data/README.md

@@ -145,7 +145,7 @@ For example, if you use FriendlyId:
     class Admin::MasqueradesController < Devise::MasqueradesController
       protected
 
-      def find_resource
+      def find_masqueradable_resource
         masqueraded_resource_class.friendly.find(params[:id])
       end
     end

data/app/controllers/devise/masquerades_controller.rb

@@ -148,7 +148,7 @@ class Devise::MasqueradesController < DeviseController
     resource_obj = send("current_#{masquerading_resource_name}")
 
     if Devise.masquerade_storage_method_session?
-      session[skey] = resource_obj.to_param
+      session[skey] = resource_obj.id
     else
       # skip sharing owner id via session
       Rails.cache.write(skey, resource_obj.to_sgid(for: 'masquerade'))
@@ -172,7 +172,7 @@ class Devise::MasqueradesController < DeviseController
   end
 
   def session_key(masqueradable_resource, guid)
-    "devise_masquerade_#{masqueraded_resource_name}_#{masqueradable_resource.to_param}_#{guid}".to_sym
+    "devise_masquerade_#{masqueraded_resource_name}_#{masqueradable_resource.id}_#{guid}".to_sym
   end
 
   def masquerading_current_user

data/lib/devise_masquerade/controllers/helpers.rb

@@ -67,7 +67,7 @@ module DeviseMasquerade
           private
 
           def #{name}_helper_session_key
-            ["devise_masquerade_#{name}", current_#{name}.to_param, #{name}_helper_masquerading_resource_guid].join("_")
+            ["devise_masquerade_#{name}", current_#{name}.id, #{name}_helper_masquerading_resource_guid].join("_")
           end
 
           def #{name}_helper_masquerading_resource_guid

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/spec/controllers/devise/masquerades_controller_spec.rb

@@ -14,7 +14,7 @@ describe Devise::MasqueradesController, type: :controller do
         let(:mask) { create(:student) }
 
         before do
-          get :show, params: { id: mask.to_param, masqueraded_resource_class: mask.class.name, masquerade: mask.masquerade_key }
+          get :show, params: { id: mask.id, masqueraded_resource_class: mask.class.name, masquerade: mask.masquerade_key }
         end
 
         it { expect(cache_read(mask)).to be }
@@ -33,7 +33,7 @@ describe Devise::MasqueradesController, type: :controller do
         let(:mask) { create(:user) }
 
         before do
-          get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key }
+          get :show, params: { id: mask.id, masquerade: mask.masquerade_key }
         end
 
         it { expect(cache_read(mask)).to be }
@@ -61,7 +61,7 @@ describe Devise::MasqueradesController, type: :controller do
           context 'with http referrer' do
             before do
               @request.env['HTTP_REFERER'] = 'previous_location'
-              get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key }
+              get :show, params: { id: mask.id, masquerade: mask.masquerade_key }
             end # before
 
             it { should redirect_to('previous_location') }
@@ -73,7 +73,7 @@ describe Devise::MasqueradesController, type: :controller do
                 receive(:after_masquerade_path_for).and_return("/dashboard?color=red"))
             end
 
-            before { get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key } }
+            before { get :show, params: { id: mask.id, masquerade: mask.masquerade_key } }
 
             it { should redirect_to("/dashboard?color=red") }
           end # context
@@ -81,7 +81,7 @@ describe Devise::MasqueradesController, type: :controller do
 
         context 'and back' do
           before do
-            get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key }
+            get :show, params: { id: mask.id, masquerade: mask.masquerade_key }
 
             get :back
           end
@@ -91,7 +91,7 @@ describe Devise::MasqueradesController, type: :controller do
 
         context 'and back fallback if http_referer not present' do
           before do
-            get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key }
+            get :show, params: { id: mask.id, masquerade: mask.masquerade_key }
 
             @request.env['HTTP_REFERER'] = 'previous_location'
             get :back
@@ -123,6 +123,6 @@ describe Devise::MasqueradesController, type: :controller do
   end
 
   def cache_key(user)
-    "devise_masquerade_#{mask.class.name.downcase}_#{mask.to_param}_#{guid}"
+    "devise_masquerade_#{mask.class.name.downcase}_#{mask.id}_#{guid}"
   end
 end

data/spec/controllers/masquerades_tests_controller_spec.rb

@@ -16,7 +16,7 @@ describe MasqueradesTestsController, type: :controller do
 
     let(:mask) { create(:user) }
 
-    before { get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key } }
+    before { get :show, params: { id: mask.id, masquerade: mask.masquerade_key } }
 
     it { expect(response.status).to eq(403) }
     it { expect(cache_read(mask)).not_to be }
@@ -34,7 +34,7 @@ describe MasqueradesTestsController, type: :controller do
     let(:mask) { create(:user) }
 
     before do
-      get :show, params: { id: mask.to_param, masquerade: mask.masquerade_key }
+      get :show, params: { id: mask.id, masquerade: mask.masquerade_key }
     end
 
     it { expect(response.status).to eq(302) }
@@ -52,6 +52,6 @@ describe MasqueradesTestsController, type: :controller do
   end
 
   def cache_key(user)
-    "devise_masquerade_#{mask.class.name.downcase}_#{mask.to_param}_#{guid}"
+    "devise_masquerade_#{mask.class.name.downcase}_#{mask.id}_#{guid}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler