devise_masquerade 0.6.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6c87023570a8bad6035430b8d59504c57eb5b6c5
-  data.tar.gz: 71c6a3020fc870b0ce559e46a14ebbb64c37dbea
+SHA256:
+  metadata.gz: 53c11df20b59df74e7a1c60c2c895c4174583cfa8211a5922d2eafe4c5b92855
+  data.tar.gz: 8e39886ffd23cf8dcbe841da11802ffd3db437ba94ed8a38962a82cd29a8e475
 SHA512:
-  metadata.gz: 9f5305d971f2c9f158386824abb546daa1672147ae7449d673a91d3a3464a057373c9aa483606d6dc3675da7cd83a37cb32914f2f37d65a3821ea8c7ce6ac8bc
-  data.tar.gz: e9a5238986ec0cfcb8e548c2e09649270eeeea2406392ad60675cbd5a11e4d51bcb74beff76c5be64169fa2311ba4579f0de49eea9b351b5a609ae382e1f805f
+  metadata.gz: '0528ff0b74a4008536b5cbaa404d16483bc3a6fe399f00899d3297d2a8dac95bedb945c5b65c920b47c3721799e02d82644cca2152145db19b7026e3a1674e32'
+  data.tar.gz: 47123c4f6eccfc61ff5171ece7db757cd05bf7fa87f32731d4b4bfe13d1cfe542d3f8a28c251bcd6bb4a6e4de95a7d070b3fb7fee4d2aebdbbd0dfd646d9f039

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -19,4 +18,4 @@ spec/dummy/db/*.sqlite3
 tmp
 tags
 .vimrc
-
+vendor/

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.6.0

data/.travis.yml

@@ -1,12 +1,10 @@
 language: ruby
 rvm:
-  - 2.2.5
-  - 2.3.1
-  - 2.3.3
+  - 2.5.1
+  - 2.6.0
 gemfile:
   - Gemfile
 script: time ./script/travis.sh
-cache: bundler
 sudo: false
 addons:
   apt:

data/Gemfile

@@ -4,10 +4,10 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'activerecord', '~> 3.0'
-  gem 'actionmailer', '~> 3.0'
-  gem "bson_ext", "~> 1.3"
-  gem 'sqlite3'
+  gem 'activerecord', '>= 5.2'
+  gem 'actionmailer', '>= 5.2'
+  gem 'bson_ext', '~> 1.3'
+  gem 'sqlite3', '~> 1.4'
 
   gem 'test-unit'
 
@@ -19,17 +19,21 @@ group :test do
   gem 'guard-bundler'
   gem 'guard-cucumber'
 
-  gem 'rspec-rails'
   gem 'rspec'
-  gem 'rspec-mocks'
+  gem 'rspec-core', github: 'rspec/rspec-core'
+  gem 'rspec-expectations', github: 'rspec/rspec-expectations'
+  gem 'rspec-mocks', github: 'rspec/rspec-mocks'
+  gem 'rspec-rails', github: 'rspec/rspec-rails'
+  gem 'rspec-support', github: 'rspec/rspec-support'
 
   gem 'shoulda'
   gem 'rb-fsevent'
-  gem 'factory_girl_rails'
+  gem 'factory_bot_rails'
   gem 'database_cleaner', '< 1.1.0'
   gem 'cucumber'
   gem 'cucumber-rails'
   gem 'capybara'
-  gem 'capybara-webkit'
+  gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
   gem 'launchy'
 end

data/Gemfile.lock

@@ -0,0 +1,294 @@
+GIT
+  remote: https://github.com/rspec/rspec-core.git
+  revision: b7067c5da4fde57cbbff739b168008482e61db44
+  specs:
+    rspec-core (3.10.0.pre)
+      rspec-support (= 3.10.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-expectations.git
+  revision: 99f9bcaff2a6f3d82f4e350e829eca6ab015694f
+  specs:
+    rspec-expectations (3.10.0.pre)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.10.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-mocks.git
+  revision: 5b897e8f74f3059aef43f1ed5f91719f2267a04e
+  specs:
+    rspec-mocks (3.10.0.pre)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.10.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-rails.git
+  revision: 9b7ab39c027a8cb25e2ebe9e0e985756025b0549
+  specs:
+    rspec-rails (4.0.0.pre)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (= 3.10.0.pre)
+      rspec-expectations (= 3.10.0.pre)
+      rspec-mocks (= 3.10.0.pre)
+      rspec-support (= 3.10.0.pre)
+
+GIT
+  remote: https://github.com/rspec/rspec-support.git
+  revision: 673133cdd13b17077b3d88ece8d7380821f8d7dc
+  specs:
+    rspec-support (3.10.0.pre)
+
+PATH
+  remote: .
+  specs:
+    devise_masquerade (1.0.0)
+      devise (>= 4.7.0)
+      railties (>= 5.2.0)
+      zeitwerk (>= 2.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    archive-zip (0.12.0)
+      io-like (~> 0.3.0)
+    backports (3.15.0)
+    bcrypt (3.1.13)
+    bson (1.12.5)
+    bson_ext (1.12.5)
+      bson (~> 1.12.5)
+    builder (3.2.3)
+    byebug (11.0.1)
+    capybara (3.29.0)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
+    childprocess (3.0.0)
+    chromedriver-helper (2.1.1)
+      archive-zip (~> 0.10)
+      nokogiri (~> 1.8)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.5)
+    cucumber (3.1.2)
+      builder (>= 2.1.2)
+      cucumber-core (~> 3.2.0)
+      cucumber-expressions (~> 6.0.1)
+      cucumber-wire (~> 0.0.1)
+      diff-lcs (~> 1.3)
+      gherkin (~> 5.1.0)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (3.2.1)
+      backports (>= 3.8.0)
+      cucumber-tag_expressions (~> 1.1.0)
+      gherkin (~> 5.0)
+    cucumber-expressions (6.0.1)
+    cucumber-rails (1.8.0)
+      capybara (>= 2.12, < 4)
+      cucumber (>= 3.0.2, < 4)
+      mime-types (>= 2.0, < 4)
+      nokogiri (~> 1.8)
+      railties (>= 4.2, < 7)
+    cucumber-tag_expressions (1.1.1)
+    cucumber-wire (0.0.1)
+    database_cleaner (1.0.1)
+    devise (4.7.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
+    diff-lcs (1.3)
+    erubi (1.9.0)
+    factory_bot (5.1.1)
+      activesupport (>= 4.2.0)
+    factory_bot_rails (5.1.1)
+      factory_bot (~> 5.1.0)
+      railties (>= 4.2.0)
+    ffi (1.11.1)
+    formatador (0.2.5)
+    gherkin (5.1.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    guard (2.15.1)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-bundler (2.2.1)
+      bundler (>= 1.3.0, < 3)
+      guard (~> 2.2)
+      guard-compat (~> 1.1)
+    guard-compat (1.2.1)
+    guard-cucumber (1.5.4)
+      cucumber (>= 1.3.0)
+      guard-compat (~> 1.0)
+      nenv (~> 0.1)
+    guard-rspec (1.2.2)
+      guard (>= 1.1)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    io-like (0.3.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    listen (3.2.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    loofah (2.3.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    lumberjack (1.0.13)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    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.4.0)
+    minitest (5.12.2)
+    multi_json (1.14.1)
+    multi_test (0.1.2)
+    nenv (0.3.0)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    orm_adapter (0.5.0)
+    power_assert (1.1.5)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    public_suffix (4.0.1)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    regexp_parser (1.6.0)
+    responders (3.0.0)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
+    rspec (1.3.2)
+    rubyzip (2.0.0)
+    selenium-webdriver (3.142.6)
+      childprocess (>= 0.5, < 4.0)
+      rubyzip (>= 1.2.2)
+    shellany (0.0.1)
+    shoulda (3.6.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (~> 3.0)
+    shoulda-context (1.2.2)
+    shoulda-matchers (3.1.3)
+      activesupport (>= 4.0.0)
+    sqlite3 (1.4.1)
+    test-unit (3.3.4)
+      power_assert
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zeitwerk (2.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionmailer (>= 5.2)
+  activerecord (>= 5.2)
+  bson_ext (~> 1.3)
+  bundler (>= 2.0.0)
+  capybara
+  chromedriver-helper
+  cucumber
+  cucumber-rails
+  database_cleaner (< 1.1.0)
+  devise_masquerade!
+  factory_bot_rails
+  guard
+  guard-bundler
+  guard-cucumber
+  guard-rspec
+  launchy
+  pry
+  pry-byebug
+  rb-fsevent
+  rspec
+  rspec-core!
+  rspec-expectations!
+  rspec-mocks!
+  rspec-rails!
+  rspec-support!
+  selenium-webdriver
+  shoulda
+  sqlite3 (~> 1.4)
+  test-unit
+
+BUNDLED WITH
+   2.0.2

data/Makefile

@@ -1,6 +1,11 @@
+release:
+	bundle exec rake release
+.PHONY: release
+
 setup:
 	cd spec/dummy && \
-	RAILS_ENV=test rake db:setup
+	bundle exec rails db:environment:set RAILS_ENV=test && \
+	RAILS_ENV=test bundle exec rails db:setup
 .PHONY: setup
 
 rspec:

data/README.md

@@ -109,6 +109,18 @@ In your view:
     end
 ```
 
+## Custom url redirect after finishing masquerade:
+
+```ruby
+    class Admin::MasqueradesController < Devise::MasqueradesController
+      protected
+
+      def after_back_masquerade_path_for(resource)
+        "/custom_url"
+      end
+    end
+```
+
 ## Overriding the finder
 
 For example, if you use FriendlyId:

data/app/controllers/devise/masquerades_controller.rb

@@ -1,68 +1,43 @@
 class Devise::MasqueradesController < DeviseController
-  if respond_to?(:prepend_before_action)
-    prepend_before_action :authenticate_scope!, :masquerade_authorize!
-  else
-    prepend_before_filter :authenticate_scope!, :masquerade_authorize!
-  end
+  prepend_before_action :authenticate_scope!, :masquerade_authorize!
 
-  if respond_to?(:before_action)
-    before_action :save_masquerade_owner_session, :only => :show
-  else
-    before_filter :save_masquerade_owner_session, :only => :show
-  end
+  before_action :save_masquerade_owner_session, only: :show
 
-  if respond_to?(:after_action)
-    after_action :cleanup_masquerade_owner_session, :only => :back
-  else
-    after_filter :cleanup_masquerade_owner_session, :only => :back
-  end
+  after_action :cleanup_masquerade_owner_session, only: :back
 
   def show
     self.resource = find_resource
 
-    unless self.resource
+    unless resource
       flash[:error] = "#{masqueraded_resource_class} not found."
       redirect_to(new_user_session_path) and return
     end
 
-    self.resource.masquerade!
+    resource.masquerade!
     request.env["devise.skip_trackable"] = "1"
 
-    masquerade_sign_in(self.resource)
+    masquerade_sign_in(resource)
 
-    if Devise.masquerade_routes_back && Rails::VERSION::MAJOR == 5
-      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_full_path_for(resource))
-    end
+    go_back(resource, path: after_masquerade_full_path_for(resource))
   end
 
   def back
     user_id = session[session_key]
 
-    owner_user = if user_id.present?
-                   masquerading_resource_class.to_adapter.find_first(:id => user_id)
-                 else
-                   send(:"current_#{masquerading_resource_name}")
-                 end
+    resource = if user_id.present?
+      masquerading_resource_class.to_adapter.find_first(:id => user_id)
+    else
+      send(:"current_#{masquerading_resource_name}")
+    end
 
     if masquerading_resource_class != masqueraded_resource_class
       sign_out(send("current_#{masqueraded_resource_name}"))
     end
 
-    masquerade_sign_in(owner_user)
-    request.env["devise.skip_trackable"] = nil
+    masquerade_sign_in(resource)
+    request.env['devise.skip_trackable'] = nil
 
-    if Devise.masquerade_routes_back && Rails::VERSION::MAJOR == 5
-      # If using the masquerade_routes_back and Rails 5
-      redirect_back(fallback_location: after_back_masquerade_path_for(owner_user))
-    elsif Devise.masquerade_routes_back && request.env['HTTP_REFERER'].present?
-      redirect_to :back
-    else
-      redirect_to after_back_masquerade_path_for(owner_user)
-    end
+    go_back(resource, path: after_back_masquerade_path_for(resource))
   end
 
   protected
@@ -76,7 +51,15 @@ class Devise::MasqueradesController < DeviseController
   end
 
   def find_resource
-    masqueraded_resource_class.to_adapter.find_first(:id => params[:id])
+    masqueraded_resource_class.to_adapter.find_first(id: params[:id])
+  end
+
+  def go_back(user, path:)
+    if Devise.masquerade_routes_back
+      redirect_back(fallback_location: path)
+    else
+      redirect_to path
+    end
   end
 
   private
@@ -98,11 +81,11 @@ class Devise::MasqueradesController < DeviseController
   end
 
   def authenticate_scope!
-    send(:"authenticate_#{masquerading_resource_name}!", :force => true)
+    send(:"authenticate_#{masquerading_resource_name}!", force: true)
   end
 
   def after_masquerade_path_for(resource)
-    "/"
+    '/'
   end
 
   def after_masquerade_full_path_for(resource)

data/devise_masquerade.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   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.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) }
@@ -20,8 +20,9 @@ Gem::Specification.new do |gem|
 
   gem.license = 'MIT'
 
-  gem.add_development_dependency('bundler', '>= 1.1.0')
+  gem.add_development_dependency('bundler', '>= 2.0.0')
 
-  gem.add_runtime_dependency('railties', '>= 3.0')
-  gem.add_runtime_dependency('devise', '>= 2.1.0')
+  gem.add_runtime_dependency('railties', '>= 5.2.0')
+  gem.add_runtime_dependency('devise', '>= 4.7.0')
+  gem.add_runtime_dependency('zeitwerk', '>= 2.2.0')
 end

data/features/support/env.rb

@@ -1,5 +1,5 @@
 require 'cucumber/rails'
-require 'factory_girl'
+require 'factory_bot'
 require 'database_cleaner'
 require 'cucumber/rspec/doubles'
 
@@ -9,9 +9,11 @@ ENV["RAILS_ENV"] = "test"
 
 Capybara.default_selector = :css
 
-ActionController::Base.allow_rescue = false
+ActiveSupport.on_load(:action_controller) do
+  self.allow_rescue = false
+end
 
-World(FactoryGirl::Syntax::Methods)
+World(FactoryBot::Syntax::Methods)
 
 begin
   DatabaseCleaner.strategy = :transaction
@@ -20,7 +22,24 @@ rescue NameError
 end
 
 Cucumber::Rails::Database.javascript_strategy = :truncation
-Capybara.javascript_driver = :webkit
+
+Capybara.register_driver :chrome do |app|
+  Capybara::Selenium::Driver.new(app, browser: :chrome)
+end
+
+Capybara.register_driver :headless_chrome do |app|
+  caps = Selenium::WebDriver::Remote::Capabilities.chrome(loggingPrefs: { browser: 'ALL' })
+  opts = Selenium::WebDriver::Chrome::Options.new
+
+  chrome_args = %w[--headless --window-size=1920,1080 --no-sandbox --disable-dev-shm-usage]
+  chrome_args.each { |arg| opts.add_argument(arg) }
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: opts, desired_capabilities: caps)
+end
+
+Capybara.configure do |config|
+  # change this to :chrome to observe tests in a real browser
+  config.javascript_driver = :headless_chrome
+end
 
 Before do
   allow_any_instance_of(DeviseController).to receive(:devise_mapping) { Devise.mappings[:user] }

data/lib/devise_masquerade/controllers/helpers.rb

@@ -50,5 +50,3 @@ module DeviseMasquerade
     end
   end
 end
-
-ActionController::Base.send(:include, DeviseMasquerade::Controllers::Helpers)

data/lib/devise_masquerade/controllers/url_helpers.rb

@@ -1,16 +1,18 @@
 module DeviseMasquerade
   module Controllers
+
     module UrlHelpers
-      def masquerade_path(resource)
+      def masquerade_path(resource, *args)
         scope = Devise::Mapping.find_scope!(resource)
-        send("#{scope}_masquerade_path", resource)
+        send("#{scope}_masquerade_path", resource, *args)
       end
 
-      def back_masquerade_path(resource)
+      def back_masquerade_path(resource, *args)
         scope = Devise::Mapping.find_scope!(resource)
-        send("back_#{scope}_masquerade_index_path")
+        send("back_#{scope}_masquerade_index_path", *args)
       end
     end
+
   end
 end
 

data/lib/devise_masquerade/{model.rb → models/masqueradable.rb}

@@ -1,20 +1,17 @@
-module Devise
+module DeviseMasquerade
   module Models
     module Masqueradable
-      def self.included(base)
-        base.class_eval do
-          attr_reader :masquerade_key
+      extend ActiveSupport::Concern
 
-          include InstanceMethods
-          extend ClassMethods
-        end
-      end
+      included do
+        attr_reader :masquerade_key
 
-      module InstanceMethods
         def masquerade!
-          @masquerade_key = SecureRandom.urlsafe_base64(Devise.masquerade_key_size)
+          @masquerade_key = SecureRandom.urlsafe_base64(
+            Devise.masquerade_key_size)
           cache_key = self.class.cache_masquerade_key_by(@masquerade_key)
-          Rails.cache.write(cache_key, id, :expires_in => Devise.masquerade_expires_in)
+          ::Rails.cache.write(
+            cache_key, id, expires_in: Devise.masquerade_expires_in)
         end
       end
 
@@ -24,11 +21,11 @@ module Devise
         end
 
         def remove_masquerade_key!(key)
-          Rails.cache.delete(cache_masquerade_key_by(key))
+          ::Rails.cache.delete(cache_masquerade_key_by(key))
         end
 
         def find_by_masquerade_key(key)
-          id = Rails.cache.read(cache_masquerade_key_by(key))
+          id = ::Rails.cache.read(cache_masquerade_key_by(key))
 
           # clean up the cached masquerade key value
           remove_masquerade_key!(key)
@@ -39,4 +36,3 @@ module Devise
     end
   end
 end
-

data/lib/devise_masquerade/models.rb

@@ -0,0 +1,9 @@
+require 'devise_masquerade/models/masqueradable'
+
+module DeviseMasquerade
+  module Models
+
+  end
+end
+
+Devise::Models.send :include, DeviseMasquerade::Models

data/lib/devise_masquerade/rails.rb

@@ -1,7 +1,19 @@
+require 'devise_masquerade/routes'
+require 'devise_masquerade/models'
+
 module DeviseMasquerade
-  class Engine < ::Rails::Engine
-    ActiveSupport.on_load(:action_controller) { include DeviseMasquerade::Controllers::UrlHelpers }
-    ActiveSupport.on_load(:action_view)       { include DeviseMasquerade::Controllers::UrlHelpers }
+  module Rails
+
+    class Engine < ::Rails::Engine
+      ActiveSupport.on_load(:action_controller) do
+        include DeviseMasquerade::Controllers::Helpers
+        include DeviseMasquerade::Controllers::UrlHelpers
+      end
+
+      ActiveSupport.on_load(:action_view) do
+        include DeviseMasquerade::Controllers::UrlHelpers
+      end
+    end
+
   end
 end
-

data/lib/devise_masquerade/routes.rb

@@ -1,17 +1,19 @@
-module ActionDispatch::Routing
-  class Mapper
-
-    protected
+module DeviseMasquerade
+  module Routes
 
     def devise_masquerade(mapping, controllers)
       resources :masquerade,
-        :only => :show,
-        :path => mapping.path_names[:masquerade],
-        :controller => controllers[:masquerades] do
+        only: :show,
+        path: mapping.path_names[:masquerade],
+        controller: controllers[:masquerades] do
 
-        get :back, :on => :collection
+        collection do
+          get :back
+        end
       end
     end
+
   end
 end
 
+ActionDispatch::Routing::Mapper.send :include, DeviseMasquerade::Routes

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = '0.6.4'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/devise_masquerade.rb

@@ -1,16 +1,10 @@
-require 'devise'
+require 'zeitwerk'
+loader = Zeitwerk::Loader.for_gem
+loader.setup # ready!
 
-require 'action_controller'
-require 'action_controller/base'
-require 'devise_masquerade/version'
-require 'devise_masquerade/routes'
-require 'devise_masquerade/controllers/helpers'
-require 'devise_masquerade/controllers/url_helpers'
+require 'devise'
 require 'devise_masquerade/rails'
 
-module DeviseMasquerade
-end
-
 module Devise
   mattr_accessor :masquerade_param
   @@masquerade_param = 'masquerade'
@@ -42,5 +36,5 @@ module Devise
   @@helpers << DeviseMasquerade::Controllers::Helpers
 end
 
-Devise.add_module :masqueradable, :controller => :masquerades,
-  :model => 'devise_masquerade/model', :route => :masquerade
+Devise.add_module :masqueradable, controller: :masquerades,
+  model: 'devise_masquerade/models', route: :masquerade

data/spec/controllers/admin/dashboard_controller_spec.rb

@@ -9,7 +9,7 @@ describe Admin::DashboardController, type: :controller do
 
       before do
         user.masquerade!
-        get :index, :masquerade => user.masquerade_key
+        get :index, params: { masquerade: user.masquerade_key }
       end
 
       it { expect(current_admin_user.reload).to eq(user) }

data/spec/controllers/dashboard_controller_spec.rb

@@ -10,7 +10,7 @@ describe DashboardController, type: :controller do
       before do
         user.masquerade!
 
-        get :index, :masquerade => user.masquerade_key
+        get :index, params: { masquerade: user.masquerade_key }
       end
 
       it { expect(current_user.reload).to eq(user) }

data/spec/controllers/devise/masquerades_controller_spec.rb

@@ -12,7 +12,7 @@ describe Devise::MasqueradesController, type: :controller do
 
         before do
           expect(SecureRandom).to receive(:urlsafe_base64) { "secure_key" }
-          get :show, :id => mask.to_param
+          get :show, params: { id: mask.to_param }
         end
 
         it { expect(session.keys).to include('devise_masquerade_user') }
@@ -29,26 +29,29 @@ describe Devise::MasqueradesController, type: :controller do
 
         # Configure masquerade_routes_back setting
         describe 'config#masquerade_routes_back' do
-          before { Devise.setup {|c| c.masquerade_routes_back = true } }
+          before { Devise.setup { |c| c.masquerade_routes_back = true } }
+
+          after { Devise.masquerade_routes_back = false }
 
           context 'show' do
             before { expect(SecureRandom).to receive(:urlsafe_base64) { "secure_key" } }
 
-            context '< Rails 5 version' do
+            context 'with http referrer' do
               before do
                 @request.env['HTTP_REFERER'] = 'previous_location'
-                get :show, id: mask.to_param
+                get :show, params: { id: mask.to_param }
               end # before
 
               it { should redirect_to('previous_location') }
             end # context
 
-            context '< Rails 5, fallback if http_referer not present' do
+            context 'no http referrer' do
               before do
-                allow_any_instance_of(described_class).to receive(:after_masquerade_path_for).and_return("/dashboard?color=red")
+                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 }
+              before { get :show, params: { id: mask.to_param } }
 
               it { should redirect_to("/dashboard?color=red&masquerade=secure_key") }
             end # context
@@ -73,7 +76,7 @@ describe Devise::MasqueradesController, type: :controller do
     end
 
     context 'when not logged in' do
-      before { get :show, :id => 'any_id' }
+      before { get :show, params: { id: 'any_id' } }
 
       it { should redirect_to(new_user_session_path) }
     end

data/spec/controllers/masquerades_controller_spec.rb

@@ -13,7 +13,7 @@ describe MasqueradesController, type: :controller do
 
     let(:mask) { create(:user) }
 
-    before { get :show, :id => mask.to_param }
+    before { get :show, params: { :id => mask.to_param } }
 
     it { expect(response.status).to eq(403) }
     it { expect(session.keys).not_to include('devise_masquerade_user') }
@@ -32,7 +32,7 @@ describe MasqueradesController, type: :controller do
 
     before do
       expect(SecureRandom).to receive(:urlsafe_base64) { "secure_key" }
-      get :show, :id => mask.to_param
+      get :show, params: { id: mask.to_param }
     end
 
     it { expect(response.status).to eq(302) }

data/spec/dummy/app/controllers/admin/dashboard_controller.rb

@@ -1,6 +1,6 @@
 class Admin::DashboardController < ApplicationController
-  before_filter :authenticate_admin_user!
-  before_filter :masquerade_admin_user!
+  before_action :authenticate_admin_user!
+  before_action :masquerade_admin_user!
 
   def index
     @users = Admin::User.where("admin_users.id != ?", current_admin_user.id).all

data/spec/dummy/app/controllers/dashboard_controller.rb

@@ -1,6 +1,6 @@
 class DashboardController < ApplicationController
-  before_filter :authenticate_user!
-  before_filter :masquerade_user!
+  before_action :authenticate_user!
+  before_action :masquerade_user!
 
   def index
     @users = User.where("users.id != ?", current_user.id).all

data/spec/dummy/app/models/admin/user.rb

@@ -1,13 +1,6 @@
 class Admin::User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable,
-  # :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable,
          :masqueradable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-  # attr_accessible :title, :body
 end
 

data/spec/dummy/app/models/user.rb

@@ -1,12 +1,3 @@
 class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable,
-  # :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable,
-         :masqueradable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-  # attr_accessible :title, :body
+  devise :database_authenticatable, :validatable, :masqueradable
 end

data/spec/dummy/config/application.rb

@@ -16,6 +16,8 @@ module Dummy
     config.encoding = "utf-8"
 
     config.filter_parameters += [:password]
+
+    config.eager_load = false
   end
 end
 

data/spec/dummy/config/environment.rb

@@ -2,4 +2,5 @@
 require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
+#
 Dummy::Application.initialize!

data/spec/dummy/db/.gitignore

@@ -0,0 +1 @@
+test.sqlite3*

data/spec/dummy/db/migrate/20121119085620_devise_create_users.rb

@@ -1,4 +1,4 @@
-class DeviseCreateUsers < ActiveRecord::Migration
+class DeviseCreateUsers < ActiveRecord::Migration[5.2]
   def change
     create_table(:users) do |t|
       ## Database authenticatable

data/spec/dummy/db/migrate/20140418160449_create_admin_users.rb

@@ -1,4 +1,4 @@
-class CreateAdminUsers < ActiveRecord::Migration
+class CreateAdminUsers < ActiveRecord::Migration[5.2]
   def change
     create_table(:admin_users) do |t|
       ## Database authenticatable

data/spec/dummy/db/schema.rb

@@ -1,52 +1,49 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140418160449) do
+ActiveRecord::Schema.define(version: 2014_04_18_160449) do
 
-  create_table "admin_users", :force => true do |t|
-    t.string   "email",                  :default => "", :null => false
-    t.string   "encrypted_password",     :default => "", :null => false
-    t.string   "reset_password_token"
+  create_table "admin_users", force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          :default => 0
+    t.integer "sign_in_count", default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["email"], name: "index_admin_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true
   end
 
-  add_index "admin_users", ["email"], :name => "index_admin_users_on_email", :unique => true
-  add_index "admin_users", ["reset_password_token"], :name => "index_admin_users_on_reset_password_token", :unique => true
-
-  create_table "users", :force => true do |t|
-    t.string   "email",                  :default => "", :null => false
-    t.string   "encrypted_password",     :default => "", :null => false
-    t.string   "reset_password_token"
+  create_table "users", force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          :default => 0
+    t.integer "sign_in_count", default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
-  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
-  add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
-
 end

data/spec/orm/active_record.rb

@@ -1,5 +1,8 @@
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 
-ActiveRecord::Migrator.migrate(File.expand_path("../dummy/db/migrate/", __FILE__))
-
+ActiveRecord::MigrationContext.
+  new(
+    File.expand_path("../../dummy/db/migrate/", __FILE__),
+    ActiveRecord::Base.connection.schema_migration
+  ).migrate

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'devise_masquerade'
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rails/test_help'
 require 'rspec/rails'
-require 'factory_girl'
+require 'factory_bot'
 require 'database_cleaner'
 
 Rails.backtrace_cleaner.remove_silencers!
@@ -18,9 +18,9 @@ RSpec.configure do |config|
   require 'rspec/expectations'
   config.include RSpec::Matchers
 
-  config.include Devise::TestHelpers, :type => :controller
+  config.include Devise::Test::ControllerHelpers, :type => :controller
   config.include Warden::Test::Helpers
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.include Authentication
 
   config.raise_errors_for_deprecations!

data/spec/support/factories.rb

@@ -1,16 +1,16 @@
-FactoryGirl.define do
+FactoryBot.define do
   sequence(:email) { |i| "john#{i}@example.com" }
 
   factory :user do
     email
-    password 'password'
-    password_confirmation 'password'
+    password  { 'password' }
+    password_confirmation { 'password' }
   end
 
   factory :admin_user, :class => 'Admin::User' do
     email
-    password 'password'
-    password_confirmation 'password'
+    password  { 'password' }
+    password_confirmation { 'password' }
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 4.7.0
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 description: devise masquerade library
 email:
 - alex.korsak@gmail.com
@@ -65,6 +79,7 @@ files:
 - ".rvmrc"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - Makefile
@@ -80,7 +95,8 @@ files:
 - lib/devise_masquerade.rb
 - lib/devise_masquerade/controllers/helpers.rb
 - lib/devise_masquerade/controllers/url_helpers.rb
-- lib/devise_masquerade/model.rb
+- lib/devise_masquerade/models.rb
+- lib/devise_masquerade/models/masqueradable.rb
 - lib/devise_masquerade/rails.rb
 - lib/devise_masquerade/routes.rb
 - lib/devise_masquerade/version.rb
@@ -120,6 +136,7 @@ files:
 - spec/dummy/config/locales/devise.en.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/.gitignore
 - spec/dummy/db/migrate/20121119085620_devise_create_users.rb
 - spec/dummy/db/migrate/20140418160449_create_admin_users.rb
 - spec/dummy/db/schema.rb
@@ -131,7 +148,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/authentication.rb
 - spec/support/factories.rb
-homepage: http://github.com/oivoodoo/devise_masquerade/
+homepage: http://github.com/oivoodoo/devise_masquerade
 licenses:
 - MIT
 metadata: {}
@@ -150,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: use for login as functionallity on your admin users pages
@@ -195,6 +211,7 @@ test_files:
 - spec/dummy/config/locales/devise.en.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/.gitignore
 - spec/dummy/db/migrate/20121119085620_devise_create_users.rb
 - spec/dummy/db/migrate/20140418160449_create_admin_users.rb
 - spec/dummy/db/schema.rb