devise_masquerade 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b21015ee6b3b1561bcf507063f84e0eea7f0bd4db78bee58c2122b287628cc56
-  data.tar.gz: 6817e192073914e507c1ba3cf7b9bef3178e733b3b83314ff80914f827e612d6
+  metadata.gz: 0d75ba6f4e3241b021e9ef1c838e9baf1322ec0c7731573dc1008dc8931d59e7
+  data.tar.gz: 3bb9c12ca5dbddd8b61f64f0394f659998e6cae2be67790df2224b91c1558862
 SHA512:
-  metadata.gz: db0d98e2513d372a40896dfd4453359e5d04a3865300c0c96407582e1a6601d52528dced610830bb95b527ea416ea60b212d8de1a286a1b56706d6c4dbb41451
-  data.tar.gz: 70fdb0e0e55321832ce09c00613ca5c26faff9f2dc7587523b09d61cbcdcfc66fbf3e3368a898cc39564057cae97a1b96ad668c53812e8b5bfbc5e28749eafe2
+  metadata.gz: 8683eca8761589df6e6349a19cddf6de9b6a7c2f90390a6d46701f6c2dd55acc964196406f35a8ad9ba67fa486787284ed62460768fe9feea85dacb612981197
+  data.tar.gz: 87ba78777ff2f926f247776bf14e21114f361711a3df95b42dc76c3352ff32c08822fdb82024179ed8d614fa54b30a6f82e38bc2d1cab6eea3a62db1d206f9ff

data/Gemfile.lock

@@ -52,7 +52,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_masquerade (2.0.2)
+    devise_masquerade (2.1.0)
       devise (>= 4.7.0)
       globalid (>= 0.3.6)
       railties (>= 5.2.0)
@@ -104,22 +104,23 @@ GEM
       bson (~> 1.12.5)
     builder (3.2.3)
     byebug (11.0.1)
-    capybara (3.29.0)
+    capybara (3.37.1)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     childprocess (3.0.0)
     chromedriver-helper (2.1.1)
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.1.5)
     crass (1.0.6)
-    cucumber (3.1.2)
+    cucumber (3.2.0)
       builder (>= 2.1.2)
       cucumber-core (~> 3.2.0)
       cucumber-expressions (~> 6.0.1)
@@ -148,7 +149,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     erubi (1.9.0)
     factory_bot (5.1.1)
       activesupport (>= 4.2.0)
@@ -160,7 +161,7 @@ GEM
     gherkin (5.1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    guard (2.15.1)
+    guard (2.17.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -169,8 +170,8 @@ GEM
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-bundler (2.2.1)
-      bundler (>= 1.3.0, < 3)
+    guard-bundler (3.0.0)
+      bundler (>= 2.1, < 3)
       guard (~> 2.2)
       guard-compat (~> 1.1)
     guard-compat (1.2.1)
@@ -184,29 +185,30 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    io-like (0.3.0)
+    io-like (0.3.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    listen (3.2.0)
+    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)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    matrix (0.4.2)
     method_source (0.9.2)
     mime-types (3.3)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
     mini_mime (1.0.2)
     mini_portile2 (2.8.0)
-    minitest (5.12.2)
+    minitest (5.16.3)
     multi_json (1.14.1)
     multi_test (0.1.2)
     nenv (0.3.0)
-    nokogiri (1.13.6)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -217,19 +219,19 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    pry-byebug (3.8.0)
       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 (1.1.0)
-      rack (>= 1.0, < 3)
+    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)
@@ -240,7 +242,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    regexp_parser (1.6.0)
+    regexp_parser (2.6.0)
     responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
@@ -255,7 +257,8 @@ GEM
     shoulda-context (1.2.2)
     shoulda-matchers (3.1.3)
       activesupport (>= 4.0.0)
-    sqlite3 (1.4.1)
+    sqlite3 (1.5.3)
+      mini_portile2 (~> 2.8.0)
     test-unit (3.3.4)
       power_assert
     thor (0.20.3)
@@ -266,7 +269,7 @@ GEM
       rack (>= 2.0.9)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.2.0)
+    zeitwerk (2.6.1)
 
 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

@@ -80,7 +80,7 @@ class Devise::MasqueradesController < DeviseController
     if Devise.masquerade_storage_method_session?
       resource_id = session[skey]
 
-      masqueraded_resource_class.find(resource_id)
+      masquerading_resource_class.find(resource_id)
     else
       data = Rails.cache.read(skey)
 
@@ -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.2'.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.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler