devise_masquerade 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a3bf4cda2161401cefd72da8332396859eec1ca
-  data.tar.gz: 159a457f4a68e3c6614af51760d85cd79330df9b
+  metadata.gz: dccb830fc6fa8a047266f59757494fdbb83b4d90
+  data.tar.gz: 24994d16e78dce06af32f6c5979b713c22f290cc
 SHA512:
-  metadata.gz: cfa6702b8501684ce1dbffbf32a151bc57ef0661289e1705664dbcdd53a6b8ce41c1c6be11ae48255913607a8b11209ed0577050513a2f3b4acb38dd2a553719
-  data.tar.gz: 709c35dcf2a70ac8adf8022d7d5878990c9aabd0f862819ad50a6bac4d903358334b841ab157644aa62790af78a9a1c61e8c396b79b261aeedda821e7b69dbd5
+  metadata.gz: bbd727043d94898faf45e52be2b79a35160320a4255379b07c373473ff366508e7ac776a09aa66491635a71a871680f3b131270bfd4bea918fb56b8064caaedf
+  data.tar.gz: 5a26889496efec6ece05043d152b5d3a5828a19a3d196b6f7299e396b425f116686f1d7828d2abafd6708475fc1396f340b37d3c9fc0d1b654b00986254c1bbd

data/app/controllers/devise/masquerades_controller.rb

@@ -31,11 +31,11 @@ class Devise::MasqueradesController < DeviseController
     masquerade_sign_in(self.resource)
 
     if Devise.masquerade_routes_back && Rails::VERSION::MAJOR == 5
-      redirect_back(fallback_location: "#{after_masquerade_param_for(self.resource)}?#{after_masquerade_param_for(resource)}")
+      redirect_back(fallback_location: after_masquerade_full_path_for(resource))
     elsif Devise.masquerade_routes_back && request.env['HTTP_REFERER'].present?
       redirect_to :back
     else
-      redirect_to("#{after_masquerade_path_for(self.resource)}?#{after_masquerade_param_for(resource)}")
+      redirect_to(after_masquerade_full_path_for(resource))
     end
   end
 
@@ -105,6 +105,14 @@ class Devise::MasqueradesController < DeviseController
     "/"
   end
 
+  def after_masquerade_full_path_for(resource)
+    if after_masquerade_path_for(resource) =~ /\?/
+      "#{after_masquerade_path_for(resource)}&#{after_masquerade_param_for(resource)}"
+    else
+      "#{after_masquerade_path_for(resource)}?#{after_masquerade_param_for(resource)}"
+    end
+  end
+
   def after_masquerade_param_for(resource)
     "#{Devise.masquerade_param}=#{resource.masquerade_key}"
   end

data/devise_masquerade.gemspec

@@ -1,21 +1,22 @@
 # -*- encoding: utf-8 -*-
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'devise_masquerade/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "devise_masquerade"
+  gem.name          = 'devise_masquerade'
   gem.version       = DeviseMasquerade::VERSION
-  gem.authors       = ["Alexandr Korsak"]
-  gem.email         = ["alex.korsak@gmail.com"]
-  gem.description   = %q{devise masquerade library}
-  gem.summary       = %q{use for login as functionallity on your admin users pages}
-  gem.homepage      = "http://github.com/oivoodoo/devise_masquerade/"
+  gem.authors       = ['Alexandr Korsak']
+  gem.email         = ['alex.korsak@gmail.com']
+  gem.description   = 'devise masquerade library'
+  gem.summary       = 'use for login as functionallity on your admin users pages'
+  gem.homepage      = 'http://github.com/oivoodoo/devise_masquerade/'
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   gem.license = 'MIT'
 
@@ -24,4 +25,3 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('railties', '>= 3.0')
   gem.add_runtime_dependency('devise', '>= 2.1.0')
 end
-

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = "0.6.1"
+  VERSION = '0.6.2'.freeze
 end

data/spec/controllers/devise/masquerades_controller_spec.rb

@@ -44,9 +44,13 @@ describe Devise::MasqueradesController, type: :controller do
             end # context
 
             context '< Rails 5, fallback if http_referer not present' do
+              before do
+                allow_any_instance_of(described_class).to receive(:after_masquerade_path_for).and_return("/dashboard?color=red")
+              end
+
               before { get :show, id: mask.to_param }
 
-              it { should redirect_to("/?masquerade=secure_key") }
+              it { should redirect_to("/dashboard?color=red&masquerade=secure_key") }
             end # context
           end # context
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler