devise_masquerade 0.1.5 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- Y2IwNTZiZjYzNWFkZDgxMWYyZTMzZmE2ZmI0M2FlZjZlN2ViMDk3ZQ==
4
+ OTk1YzdjZmI4ZjMxN2RkN2I0ODMwN2JjN2Q1MTE5ZGZmYzUxOWFjYw==
5
5
  data.tar.gz: !binary |-
6
- MTE4OGQ3MDc4ZTM0NjUzNzE5Njg4YWJmMmEyNTNmYWNhMzRhZDYxYg==
6
+ MWJkOTY5ODQ0NjUxZWY3NWFmODQ4NjM3OWFjZTgzODNiMjk3MDhlNA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YzE2MmNkMDc0NDIyYjk1ZGExMGFhYWNiMzEwYWQzMWY2OTE1Yjg2ODA0ZTY5
10
- OTdjY2MyMWJmMmMyOGJkZDE5Y2I0ZDk1YmU1NWM0MTIzMjJjNzMwZDI3NmIw
11
- NGY0ZmFmMjliNzAwYWM5MTFiZGE4MGI3YzUyOGE4NTA4ZDA3NmQ=
9
+ NTRhMTE0ZGZhMzU2Mjc4YzNhOTk2N2FlM2UxMjUzMDI5MTVhY2IwZTAzYzQx
10
+ ZDMwZjlhOWI2ODQ1Y2E5N2IxNjZhMWYxYjJhODc2MGU4ODc0OGMzNDA5Mzg3
11
+ NzA3NWVkZDQyMzZhNGIzMWIzMDZlMmFiNjAyYTlhYzljMTI4MzU=
12
12
  data.tar.gz: !binary |-
13
- NjFjYzA4OTg2Y2FhOWUxNjUzODJlMjYyZTAxNzFiMTZhZTdmZmI4NDM2YjUz
14
- OTAyMzQ3NzY2Y2Y0OWY2OTZiNTFiYTcxZjIwOWZkYmFmOGUwZTU0YjJjNGM2
15
- NDMxOTk1NDkyYjc4ZjRhMjdiYTViNjAzMmU4NzZiODkxMWVmMDc=
13
+ Njk4ODZmNDk0MTcyMTQxN2MwM2U2YjgxZGZiZTM2YzY0NzJkNTM5MGRjMDRk
14
+ ZmMwMTYzYjkxZWJjZDQ4OTIwZDdiYThiZDc5YjZhNWIwNDY0NTVkYWQ4YzRm
15
+ OTgyMGUxODZmMDRmYzA4ODAxNDczYjE3NmE4OGZlOWUxMjA1NDY=
@@ -17,7 +17,13 @@ class Devise::MasqueradesController < DeviseController
17
17
  end
18
18
 
19
19
  def back
20
- owner_user = resource_class.to_adapter.find_first(:id => session[session_key])
20
+ user_id = session[session_key]
21
+
22
+ owner_user = if user_id.present?
23
+ resource_class.to_adapter.find_first(:id => user_id)
24
+ else
25
+ send(:"current_#{resouce_name}")
26
+ end
21
27
 
22
28
  sign_in(owner_user, :bypass => Devise.masquerade_bypass_warden_callback)
23
29
 
@@ -1,3 +1,3 @@
1
1
  module DeviseMasquerade
2
- VERSION = "0.1.5"
2
+ VERSION = "0.1.6"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: devise_masquerade
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.5
4
+ version: 0.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexandr Korsak
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-23 00:00:00.000000000 Z
11
+ date: 2014-09-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler