devise_masquerade 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 317a51e23e1f564f04ec0f0fceca2907cb1c6231
-  data.tar.gz: c2f976d858007479d48ecabb1219473b12623d3e
+  metadata.gz: b127b79651ac3776ae412b8cd9f1af2b82302d33
+  data.tar.gz: ffadd1d279273798e0fe9a2406b95222bf865e59
 SHA512:
-  metadata.gz: 803bc2dc3c59abd936c8393c3dac0dbc6d291b9460ccb699b4dfcea5c95dc317c511ca16c6a7777d0c87d3e4c0441354e52a2bbc69bd8537e7d79872910714cf
-  data.tar.gz: 6210018f2a4d72c8124f429a1911e492c2e848e95d6f50a81a108caaa2b701f400c9086f30eeb11bc1cdec454032e31c5549e5800e885482aa0881c63fc24079
+  metadata.gz: 9d5c61c113926df4d8682ac52cc98712926a2b1f111d1ae1969be803c25e35fd4d4dd0b2c31049125f5707c78646e56d0f86d2d502cbe07db9bc82e7947fab74
+  data.tar.gz: c4deaa44ad26a2a79e9a838b4883df333860d6061efc775710cdee46466535cfd57e3c1a2b4fc2e0e8a15564c15d53167baffaa7b7be55eee94dea922893dc65

data/.ruby-version

@@ -1 +1 @@
-2.2.5
+2.3.3

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 2.2.5
   - 2.3.1
+  - 2.3.3
 gemfile:
   - Gemfile
 script: time ./script/travis.sh

data/README.md

@@ -38,7 +38,7 @@ In the model you'll need to add the parameter :masqueradable to the existing com
 
 Add into your application_controller.rb:
 
-    before_filter :masquerade_user!
+    before_action :masquerade_user!
 
 Instead of user you can use your resource name admin, student or another names.
 
@@ -74,6 +74,12 @@ helpers:
         "/custom_url"
       end
     end
+    
+#### Dont forget to update your Devise routes to point at your Custom Authorization Controller
+in `routes.rb`:
+
+    devise_for :users, controllers: { masquerades: "admin/masquerades" }
+
 
 ## You can redefine few options:
 
@@ -94,7 +100,7 @@ And check http://localhost:3000/, use for login user1@example.com and
 ## Test project
 
     cd spec/dummy
-    rake db:setup db:test:prepare
+    RAILS_ENV=test rake db:setup
     cd -
     rspec
 

data/app/controllers/devise/masquerades_controller.rb

@@ -1,8 +1,21 @@
 class Devise::MasqueradesController < DeviseController
-  prepend_before_filter :authenticate_scope!
+  if respond_to?(:prepend_before_action)
+    prepend_before_action :authenticate_scope!
+  else
+    prepend_before_filter :authenticate_scope!
+  end
+
+  if respond_to?(:before_action)
+    before_action :save_masquerade_owner_session, :only => :show
+  else
+    before_filter :save_masquerade_owner_session, :only => :show
+  end
 
-  before_filter :save_masquerade_owner_session, :only => :show
-  after_filter :cleanup_masquerade_owner_session, :only => :back
+  if respond_to?(:after_action)
+    after_action :cleanup_masquerade_owner_session, :only => :back
+  else
+    after_filter :cleanup_masquerade_owner_session, :only => :back
+  end
 
   def show
     self.resource = resource_class.to_adapter.find_first(:id => params[:id])

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/dummy/app/controllers/users/masquerades_controller.rb

@@ -0,0 +1,15 @@
+class Users::MasqueradesController < Devise::MasqueradesController
+  # Just an example showing how you would add authorization to devise_masquerade
+   def show
+    # do authorization stuff here 
+
+    super
+  end
+
+  protected
+
+  # Custom url redirect after masquerade
+  def after_masquerade_path_for(resource)
+    "/"
+  end
+end

data/spec/dummy/config/routes.rb

@@ -1,5 +1,5 @@
 Dummy::Application.routes.draw do
-  devise_for :users
+  devise_for :users, controllers: { masquerades: "users/masquerades" }
   devise_for :admin_users, :class_name => 'Admin::User'
 
   root :to => 'dashboard#index'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - spec/dummy/app/controllers/admin/dashboard_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/dashboard_controller.rb
+- spec/dummy/app/controllers/users/masquerades_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/admin.rb
 - spec/dummy/app/models/admin/user.rb
@@ -147,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: use for login as functionallity on your admin users pages
@@ -163,6 +164,7 @@ test_files:
 - spec/dummy/app/controllers/admin/dashboard_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/dashboard_controller.rb
+- spec/dummy/app/controllers/users/masquerades_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/admin.rb
 - spec/dummy/app/models/admin/user.rb