devise_masquerade 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OGU0ODIyMzU2MDI5NjBjMTBhYjQ5MjNjZTk0ODc4YTA1ZTEwMGUxZg==
-  data.tar.gz: !binary |-
-    NjAyZTRiZjI0NDc3MTYxMzFiZmQwOTQ5YmMxZjEyZGNjMDMwNTJiMg==
+SHA1:
+  metadata.gz: bd90ee31c8c44319dca92d2db3f2879dcbf48313
+  data.tar.gz: d4a565eb9f84db1cf91d2f39ea61ac319c04967d
 SHA512:
-  metadata.gz: !binary |-
-    NmZjMjk5YWQ4MGVkNmFjMWZmOTA0YmIyZjk2NTRjMDRkNDJjYWI4NzNlMWZl
-    YmU4NDM1NjdjMTI5MGU1MjkxOGZjMTFmYzdkYzRiNmQwMTQ3MzMyNDU1YmRm
-    Yzk4NTU3NzEzZWQzZTVlNWZmMDU2YTRiOTI5YmFhYzY2YTcyYTQ=
-  data.tar.gz: !binary |-
-    ZDM0YjI3ZWRiMDUyODY5NmUzMjJjZjEzNzM5M2ViOTg5ZDhlMjI3ODkxODc2
-    ZThlMTA3ZmFiYjFiYjc3ZTYzMDc3ZTk0MDY3MDNkOGY4MWMxMGQ5NDUxNzQ0
-    YTIwYjQ5MjRhMmE0Y2ZjZWYyMmM1YTljZmQ2OWExMTU1MTczODQ=
+  metadata.gz: d5d61d8088ef18ee889eb0170bc643332ee4a1616e5e81c2a8daf22df847f0aedaa6477ae18e5b8740399b9688d3ef9033c4835f855a8ac69c101c95f0c0fc58
+  data.tar.gz: 4c5c81fcbae5c4e911f680ea12fcebef274d5844822610deb8276a3e6d52f4170f6c5e72da4122c64ebe11fb46e210ab9a8e094374cf54ee82794d0bf7bdb16f

data/.ruby-version

@@ -0,0 +1 @@
+2.2.5

data/.rvmrc

@@ -1 +1 @@
-rvm use --create 1.9.3@devise_masquerade
+rvm use --create 2.3.1@devise_masquerade

data/.travis.yml

@@ -1,4 +1,13 @@
 language: ruby
 rvm:
-  - "1.9.3"
-
+  - 2.2.5
+  - 2.3.1
+gemfile:
+  - Gemfile
+script: time ./script/travis.sh
+cache: bundler
+sudo: false
+addons:
+  apt:
+    packages:
+    - time

data/Gemfile

@@ -8,12 +8,21 @@ group :test do
   gem 'actionmailer', '~> 3.0'
   gem "bson_ext", "~> 1.3"
   gem 'sqlite3'
-  gem 'debugger'
+
+  gem 'test-unit'
+
+  gem 'pry'
+  gem 'pry-byebug'
+
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-bundler'
   gem 'guard-cucumber'
+
   gem 'rspec-rails'
+  gem 'rspec'
+  gem 'rspec-mocks'
+
   gem 'shoulda'
   gem 'rb-fsevent'
   gem 'factory_girl_rails'
@@ -24,4 +33,3 @@ group :test do
   gem 'capybara-webkit'
   gem 'launchy'
 end
-

data/README.md

@@ -1,4 +1,5 @@
 # Devise Masquerade
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/oivoodoo/devise_masquerade?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [![Build Status](https://secure.travis-ci.org/oivoodoo/devise_masquerade.png?branch=master)](https://travis-ci.org/oivoodoo/devise_masquerade)
 

data/Rakefile

@@ -1,7 +1 @@
 require "bundler/gem_tasks"
-
-task :default do
-  system 'cd spec/dummy/ && bundle exec rake db:setup && bundle exec rake db:test:prepare && cd ../../'
-  system 'bundle exec rspec && bundle exec cucumber'
-end
-

data/app/controllers/devise/masquerades_controller.rb

@@ -10,8 +10,17 @@ class Devise::MasqueradesController < DeviseController
     redirect_to(new_user_session_path) and return unless self.resource
 
     self.resource.masquerade!
-
-    sign_in(self.resource, :bypass => Devise.masquerade_bypass_warden_callback)
+    request.env["devise.skip_trackable"] = "1"
+
+    if Devise.masquerade_bypass_warden_callback
+      if respond_to?(:bypass_sign_in)
+        bypass_sign_in(self.resource)
+      else
+        sign_in(self.resource, :bypass => true)
+      end
+    else
+      sign_in(self.resource)
+    end
 
     redirect_to("#{after_masquerade_path_for(self.resource)}?#{after_masquerade_param_for(resource)}")
   end
@@ -25,7 +34,16 @@ class Devise::MasqueradesController < DeviseController
                    send(:"current_#{resource_name}")
                  end
 
-    sign_in(owner_user, :bypass => Devise.masquerade_bypass_warden_callback)
+    if Devise.masquerade_bypass_warden_callback
+      if respond_to?(:bypass_sign_in)
+        bypass_sign_in(owner_user)
+      else
+        sign_in(owner_user, :bypass => true)
+      end
+    else
+      sign_in(owner_user)
+    end
+    request.env["devise.skip_trackable"] = nil
 
     redirect_to after_back_masquerade_path_for(owner_user)
   end

data/features/step_definitions/auth_steps.rb

@@ -6,6 +6,5 @@ Given /^I logged in$/ do
   fill_in 'user[email]', :with => @user.email
   fill_in 'user[password]', :with => 'password'
 
-  click_on 'Sign in'
+  click_on 'Log in'
 end
-

data/lib/devise_masquerade/controllers/helpers.rb

@@ -11,16 +11,32 @@ module DeviseMasquerade
 
             #{name} = ::#{class_name}.find_by_masquerade_key(params[:masquerade])
 
-            sign_in(#{name}, :bypass => Devise.masquerade_bypass_warden_callback) if #{name}
+            if #{name}
+              if Devise.masquerade_bypass_warden_callback
+                if respond_to?(:bypass_sign_in)
+                  bypass_sign_in(#{name})
+                else
+                  sign_in(#{name}, :bypass => true)
+                end
+              else
+                sign_in(#{name})
+              end
+            end
           end
 
           def #{name}_masquerade?
             session[:"devise_masquerade_#{name}"].present?
           end
+
+          def #{name}_masquerade_owner
+            return nil unless send(:#{name}_masquerade?)
+            ::#{class_name}.to_adapter.find_first(:id => session[:"devise_masquerade_#{name}"])
+          end
         METHODS
 
         ActiveSupport.on_load(:action_controller) do
           helper_method "#{name}_masquerade?"
+          helper_method "#{name}_masquerade_owner"
         end
       end
     end

data/lib/devise_masquerade/version.rb

@@ -1,3 +1,3 @@
 module DeviseMasquerade
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/script/travis.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+function red() {
+    echo -e "\e[00;31m$1\e[00m"
+}
+
+(cd spec/dummy/ && RAILS_ENV=test bundle exec rake db:setup && cd ../../ && bundle exec rspec && bundle exec cucumber) || { red "Failed specs"; exit 1; }

data/spec/controllers/admin/dashboard_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Admin::DashboardController do
+describe Admin::DashboardController, type: :controller do
   context 'when logged in' do
     before { admin_logged_in }
 
@@ -12,8 +12,7 @@ describe Admin::DashboardController do
         get :index, :masquerade => user.masquerade_key
       end
 
-      it { current_admin_user.reload.should == user }
+      it { expect(current_admin_user.reload).to eq(user) }
     end
   end
 end
-

data/spec/controllers/dashboard_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DashboardController do
+describe DashboardController, type: :controller do
   context 'when logged in' do
     before { logged_in }
 
@@ -13,8 +13,7 @@ describe DashboardController do
         get :index, :masquerade => user.masquerade_key
       end
 
-      it { current_user.reload.should == user }
+      it { expect(current_user.reload).to eq(user) }
     end
   end
 end
-

data/spec/controllers/devise/masquerades_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Devise::MasqueradesController do
+describe Devise::MasqueradesController, type: :controller do
   context 'with configured devise app' do
     before { @request.env['devise.mapping'] = Devise.mappings[:user] }
 
@@ -11,20 +11,20 @@ describe Devise::MasqueradesController do
         let(:mask) { create(:user) }
 
         before do
-          SecureRandom.should_receive(:urlsafe_base64).and_return("secure_key")
+          expect(SecureRandom).to receive(:urlsafe_base64) { "secure_key" }
           get :show, :id => mask.to_param
         end
 
-        it { session.keys.should include('devise_masquerade_user') }
-        it { session["warden.user.user.key"].first.first.should == mask.id }
+        it { expect(session.keys).to include('devise_masquerade_user') }
+        it { expect(session["warden.user.user.key"].first.first).to eq(mask.id) }
         it { should redirect_to("/?masquerade=secure_key") }
 
         context 'and back' do
           before { get :back }
 
           it { should redirect_to(masquerade_page) }
-          it { current_user.reload.should == @user }
-          it { session.keys.should_not include('devise_masquerade_user') }
+          it { expect(current_user.reload).to eq(@user) }
+          it { expect(session.keys).not_to include('devise_masquerade_user') }
         end
       end
     end
@@ -41,4 +41,3 @@ describe Devise::MasqueradesController do
     "/"
   end
 end
-

data/spec/models/user_spec.rb

@@ -5,22 +5,22 @@ describe User do
 
   describe '#masquerade!' do
     it 'should cache special key on masquerade' do
-      SecureRandom.should_receive(:urlsafe_base64).with(16).and_return("secure_key")
+      expect(SecureRandom).to receive(:urlsafe_base64).with(16) { "secure_key" }
       user.masquerade!
     end
   end
 
   describe '#remove_masquerade_key' do
-    before { SecureRandom.stub(:urlsafe_base64).and_return("secure_key") }
+    before { allow(SecureRandom).to receive(:urlsafe_base64) { "secure_key" } }
 
     let(:key) { 'users:secure_key:masquerade' }
 
     it 'should be possible to remove cached masquerade key' do
       user.masquerade!
-      expect(Rails.cache.exist?(key)).to be_true
+      expect(Rails.cache.exist?(key)).to eq(true)
 
       User.remove_masquerade_key!('secure_key')
-      expect(Rails.cache.exist?(key)).to be_false
+      expect(Rails.cache.exist?(key)).to eq(false)
     end
   end
 
@@ -28,13 +28,12 @@ describe User do
     it 'should be possible to find user by generate masquerade key' do
       user.masquerade!
 
-      Rails.cache.should_receive(:read).with("users:#{user.masquerade_key}:masquerade").and_return(user.id)
-      Rails.cache.should_receive(:delete).with("users:#{user.masquerade_key}:masquerade")
+      allow(Rails.cache).to receive(:read).with("users:#{user.masquerade_key}:masquerade") { user.id }
+      allow(Rails.cache).to receive(:delete).with("users:#{user.masquerade_key}:masquerade")
 
       new_user = User.find_by_masquerade_key(user.masquerade_key)
 
-      new_user.should == user
+      expect(new_user).to eq(user)
     end
   end
 end
-

data/spec/spec_helper.rb

@@ -23,6 +23,8 @@ RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   config.include Authentication
 
+  config.raise_errors_for_deprecations!
+
   config.mock_with :rspec
 
   config.before(:suite) do
@@ -38,4 +40,3 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 end
-

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 description: devise masquerade library
@@ -59,10 +59,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".rvmrc"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -82,6 +83,7 @@ files:
 - lib/devise_masquerade/rails.rb
 - lib/devise_masquerade/routes.rb
 - lib/devise_masquerade/version.rb
+- script/travis.sh
 - spec/controllers/admin/dashboard_controller_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
 - spec/controllers/devise/masquerades_controller_spec.rb
@@ -135,17 +137,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: use for login as functionallity on your admin users pages