devise_masquerade 2.0.3 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c0668fdf45d72f5919bd9ca487fe2b664948fc9399029832cc426500c030daa
-  data.tar.gz: f61869c2877366a03922b6f0a8aecce6d9adea6a48f1f006a6311d97a2b83d2a
+  metadata.gz: b0e13952e75ddf9b6008616eccb45a46e841e9b02bb0d15855557aedab811054
+  data.tar.gz: 68197e8c30372ac89d5fd3cd7f40c1af95108fe3fa50fd5e331f499517434550
 SHA512:
-  metadata.gz: d98eefe89ce90e177bffdf7d81bdcb7904351d4a8e2de9b519c91e9a81b998398339bdfbbf922146c177b739f22a140b450b5cda5afa4f578d254e02f443f0f7
-  data.tar.gz: f2120c2b253f5f306589abd2b259607e3959e6910e7a8d5cf9661198a5b36a7d0372391995ef8b633a50cc6109e90f500a4dac3603950000eff1419b509cd9ac
+  metadata.gz: a9fb11b5a260ea9cd3091f48237beb82de6875ed27b9230b4656b1674670fe5e239467b8c0ac9bf9a085c9dcdad5816e0016f2866fcb00abe6f7bddf59899078
+  data.tar.gz: b08f92f89b5100cfa472f26ea7b5e26e09931551ab25b2f32fd839eba0520ce053a5fa27fafaf7c314a4a0eab91bbb3edfed192d8c95168382564aa05cf07513

data/.github/workflows/rubocop-analysis.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
 
     # This step is not necessary if you add the gem to your Gemfile
     - name: Install Code Scanning integration

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.6.0
-  - 2.7.3
+  - 2.7.7
+  - 3.0.4
 script: time ./script/travis.sh
 addons:
   apt:

data/Gemfile.lock

@@ -52,7 +52,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_masquerade (2.0.3)
+    devise_masquerade (2.1.2)
       devise (>= 4.7.0)
       globalid (>= 0.3.6)
       railties (>= 5.2.0)
@@ -118,7 +118,7 @@ GEM
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
     coderay (1.1.3)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     cucumber (3.2.0)
       builder (>= 2.1.2)
@@ -156,11 +156,11 @@ GEM
     factory_bot_rails (5.1.1)
       factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
-    ffi (1.11.1)
+    ffi (1.15.5)
     formatador (0.2.5)
     gherkin (5.1.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (1.0.1)
+      activesupport (>= 5.0)
     guard (2.17.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -183,7 +183,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.7.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     io-like (0.3.1)
     launchy (2.4.3)
@@ -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)
@@ -204,11 +204,11 @@ GEM
     mime-types-data (3.2019.1009)
     mini_mime (1.0.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    minitest (5.17.0)
     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)
-    rack (2.2.3.1)
+    racc (1.6.1)
+    rack (2.2.6.2)
     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)
@@ -243,9 +243,9 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     regexp_parser (2.6.0)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
+    responders (3.1.0)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     rubyzip (2.0.0)
     selenium-webdriver (3.142.6)
       childprocess (>= 0.5, < 4.0)
@@ -269,7 +269,7 @@ GEM
       rack (>= 2.0.9)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

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
@@ -92,7 +92,7 @@ module DeviseMasquerade
                 params[:masqueraded_resource_class].constantize
               else
                 unless session[session_key_masqueraded_resource_class].blank?
-                  session[session_key_masquerading_resource_class].constantize
+                  session[session_key_masqueraded_resource_class].constantize
                 else
                   if Devise.masqueraded_resource_class_name.present?
                     Devise.masqueraded_resource_class_name.constantize

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.1.2'.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.2
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler