switch_user 1.5.0 → 1.5.1

data/lib/switch_user/provider/session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchUser
   module Provider
     class Session < Base
@@ -5,15 +7,15 @@ module SwitchUser
         @controller = controller
       end
 
-      def login(user, scope = nil)
+      def login(user, _scope = nil)
         @controller.session[session_key] = user.id
       end
 
-      def logout(scope = nil)
+      def logout(_scope = nil)
         @controller.session.delete(session_key)
       end
 
-      def current_user(scope = nil)
+      def current_user(_scope = nil)
         @controller.current_user
       end
 

data/lib/switch_user/provider/sorcery.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchUser
   module Provider
     class Sorcery < Base
@@ -5,14 +7,12 @@ module SwitchUser
         @controller = controller
       end
 
-      def login(user, scope = nil)
+      def login(user, _scope = nil)
         @controller.auto_login(user)
       end
 
-      def logout(scope = nil)
-        if SwitchUser.switch_back
-          save_original_user_identifier
-        end
+      def logout(_scope = nil)
+        save_original_user_identifier if SwitchUser.switch_back
 
         @controller.logout
 
@@ -29,7 +29,7 @@ module SwitchUser
         end
       end
 
-      def current_user(scope = nil)
+      def current_user(_scope = nil)
         @controller.current_user
       end
     end

data/lib/switch_user/rails.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module SwitchUser
   class Engine < Rails::Engine
-    initializer "switch_user.view" do
+    initializer 'switch_user.view' do
       ActiveSupport.on_load(:action_view) do
         include SwitchUserHelper
       end

data/lib/switch_user/rspec.rb

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 require 'switch_user/rspec/feature_helpers'
 
 require 'rspec/core'
 
 RSpec.configure do |config|
-
   config.include SwitchUser::RSpecFeatureHelpers, type: :feature
 
   config.before(:each, type: :feature) do
     allow_any_instance_of(SwitchUserController).to receive(:available?).and_return(true)
   end
-
 end

data/lib/switch_user/rspec/feature_helpers.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module SwitchUser
   module RSpecFeatureHelpers
-
     class InvalidArgument < StandardError; end
 
     def switch_user(user_record_or_scope, user_id = nil)
@@ -14,8 +15,8 @@ module SwitchUser
 
       _user_scope = _user_scope.to_s
 
-      unless (SwitchUser.available_scopes.include?(_user_scope) or SwitchUser.available_scopes.include?(_user_scope.to_sym))
-        raise SwitchUser::InvalidScope.new("don't allow this user sign in, please check config.available_users")
+      unless SwitchUser.available_scopes.include?(_user_scope) || SwitchUser.available_scopes.include?(_user_scope.to_sym)
+        raise SwitchUser::InvalidScope, "don't allow this user sign in, please check config.available_users"
       end
 
       _user_id =
@@ -23,7 +24,7 @@ module SwitchUser
         when ActiveRecord::Base
           identifier = SwitchUser.available_users_identifiers[_user_scope] || SwitchUser.available_users_identifiers[_user_scope.to_sym]
           if identifier.nil?
-            raise SwitchUser::InvalidScope.new("don't allow switch this user, please check config.available_users_identifiers")
+            raise SwitchUser::InvalidScope, "don't allow switch this user, please check config.available_users_identifiers"
           end
           user_record_or_scope.send identifier
         else
@@ -31,14 +32,12 @@ module SwitchUser
         end
 
       if _user_id.to_s.empty?
-        raise InvalidArgument.new("don't allow switch this user, user_id is empty")
+        raise InvalidArgument, "don't allow switch this user, user_id is empty"
       end
 
       scope_identifier = "#{_user_scope}_#{_user_id}"
 
       visit "/switch_user?scope_identifier=#{scope_identifier}"
     end
-
   end
-
 end

data/lib/switch_user/user_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchUser
   class UserLoader
     attr_reader :scope
@@ -8,7 +10,8 @@ module SwitchUser
 
       if options[:scope_identifier]
         options[:scope_identifier] =~ /^(.*)_([^_]+)$/
-        scope, id = $1, $2
+        scope = Regexp.last_match(1)
+        id = Regexp.last_match(2)
       else
         scope, id = args
       end
@@ -30,7 +33,7 @@ module SwitchUser
       if scope && SwitchUser.available_scopes.include?(scope.to_sym)
         @scope = scope
       else
-        raise InvalidScope.new("#{scope} is invalid and is not listed in SwitchUser#available_users")
+        raise InvalidScope, "#{scope} is invalid and is not listed in SwitchUser#available_users"
       end
     end
 

data/lib/switch_user/user_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchUser
   class UserSet
     def self.init_from_config
@@ -9,9 +11,9 @@ module SwitchUser
     end
 
     def self.users
-      init_from_config.flat_map { |user_set|
+      init_from_config.flat_map do |user_set|
         user_set.users.map { |user| Record.build(user, user_set) }
-      }
+      end
     end
 
     attr_reader :scope, :user_class, :identifier, :label, :base_scope
@@ -26,7 +28,7 @@ module SwitchUser
     def find_user(id)
       Record.build(users.where(id: id).first, self)
     end
-    alias :[] :find_user
+    alias [] find_user
 
     def users
       base_scope

data/lib/switch_user/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SwitchUser
-  VERSION = "1.5.0"
+  VERSION = '1.5.1'
 end

data/spec/controllers/switch_user_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user'
 require 'switch_user_controller'
@@ -8,31 +10,32 @@ RSpec.describe SwitchUserController, type: :controller do
   end
 
   let(:admin) { double(:admin, admin?: true) }
-  let(:provider) { double(:provider,
-                        original_user: admin,
-                        current_user: nil)
+  let(:provider) {
+    double(:provider,
+           original_user: admin,
+           current_user: nil)
   }
-  describe "#set_current_user" do
-    it "redirects the user to the specified location" do
-      SwitchUser.redirect_path = ->(_, _) { "/path" }
+  describe '#set_current_user' do
+    it 'redirects the user to the specified location' do
+      SwitchUser.redirect_path = ->(_, _) { '/path' }
       allow(controller).to receive(:available?).and_return(true)
-      get :set_current_user, params: { scope_identifier: "user_1" }
+      get :set_current_user, params: { scope_identifier: 'user_1' }
 
-      expect(response).to redirect_to("/path")
+      expect(response).to redirect_to('/path')
     end
 
-    it "denies access according to the guard block" do
+    it 'denies access according to the guard block' do
       SwitchUser.controller_guard = ->(_, _, _) { false }
       expect {
         get :set_current_user
       }.to raise_error(ActionController::RoutingError)
     end
 
-    describe "requests with a privileged original_user" do
+    describe 'requests with a privileged original_user' do
       before do
         SwitchUser.controller_guard = ->(current_user, _, original_user) { current_user.try(:admin?) || original_user.try(:admin?) }
       end
-      it "allows access using the original_user param" do
+      it 'allows access using the original_user param' do
         allow(controller).to receive(:provider).and_return(provider)
 
         expect(provider).to receive(:logout_all)
@@ -44,26 +47,26 @@ RSpec.describe SwitchUserController, type: :controller do
     end
   end
 
-  describe "#remember_user" do
+  describe '#remember_user' do
     before do
       allow(controller).to receive(:provider).and_return(provider)
       SwitchUser.switch_back = true
     end
-    it "can remember the current user" do
+    it 'can remember the current user' do
       expect(provider).to receive(:remember_current_user).with(true)
 
-      get :remember_user, params: { remember: "true" }
+      get :remember_user, params: { remember: 'true' }
     end
-    it "can forget the current user" do
+    it 'can forget the current user' do
       expect(provider).to receive(:remember_current_user).with(false)
 
-      get :remember_user, params: { remember: "false" }
+      get :remember_user, params: { remember: 'false' }
     end
-    it "does nothing if switch_back is not enabled" do
+    it 'does nothing if switch_back is not enabled' do
       SwitchUser.switch_back = false
       expect(provider).not_to receive(:remember_current_user)
 
-      get :remember_user, params: { remember: "true" }
+      get :remember_user, params: { remember: 'true' }
     end
   end
 end

data/spec/helpers/switch_user_helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user'
 require 'switch_user_helper'
@@ -14,17 +16,16 @@ RSpec.describe SwitchUserHelper, type: :helper do
     _provider
   }
 
-  describe "#switch_user_select" do
+  describe '#switch_user_select' do
     let(:guest_record) { SwitchUser::GuestRecord.new }
     let(:user_record) { double(:user_record, user: user, scope: :user, label: 'user1', scope_id: 'user_1') }
     let(:admin_record) { double(:admin_record, user: admin, scope: :admin, label: 'admin1', scope_id: 'admin_1') }
 
-    let(:guest_option_tags) { %Q^<optgroup label="Guest"><option value="">Guest</option></optgroup>^ }
-    let(:user_option_tags) { %Q^<optgroup label="User"><option value="user_1">user1</option></optgroup>^ }
-    let(:user_selected_option_tags) { %Q^<optgroup label="User"><option selected="selected" value="user_1">user1</option></optgroup>^ }
-    let(:admin_option_tags) { %Q^<optgroup label="Admin"><option value="admin_1">admin1</option></optgroup>^ }
-    let(:admin_selected_option_tags) { %Q^<optgroup label="Admin"><option selected="selected" value="admin_1">admin1</option></optgroup>^ }
-
+    let(:guest_option_tags) { '<optgroup label="Guest"><option value="">Guest</option></optgroup>' }
+    let(:user_option_tags) { '<optgroup label="User"><option value="user_1">user1</option></optgroup>' }
+    let(:user_selected_option_tags) { '<optgroup label="User"><option selected="selected" value="user_1">user1</option></optgroup>' }
+    let(:admin_option_tags) { '<optgroup label="Admin"><option value="admin_1">admin1</option></optgroup>' }
+    let(:admin_selected_option_tags) { '<optgroup label="Admin"><option selected="selected" value="admin_1">admin1</option></optgroup>' }
 
     before do
       allow(SwitchUser).to receive(:switch_back).and_return(false)
@@ -39,64 +40,64 @@ RSpec.describe SwitchUserHelper, type: :helper do
       allow(SwitchUser).to receive(:all_users).and_return([guest_record, user_record])
     end
 
-    it "when unavailable" do
+    it 'when unavailable' do
       allow(helper).to receive(:available?).and_return(false)
 
       expect(helper.switch_user_select).to eq(nil)
     end
 
-    it "when current_user is nil and all_users is []" do
+    it 'when current_user is nil and all_users is []' do
       allow(provider).to receive(:current_user).and_return(nil)
       allow(SwitchUser).to receive(:all_users).and_return([])
 
       expect(helper.switch_user_select).not_to match(%r{</option>})
     end
 
-    it "when current_user is nil and all_users is [guest_record]" do
+    it 'when current_user is nil and all_users is [guest_record]' do
       allow(provider).to receive(:current_user).and_return(nil)
       allow(SwitchUser).to receive(:all_users).and_return([guest_record])
 
-      expect(helper.switch_user_select).to match(%r{#{guest_option_tags}})
+      expect(helper.switch_user_select).to match(/#{guest_option_tags}/)
     end
 
-    it "when current_user is nil and all_users is [guest_record, user_record]" do
+    it 'when current_user is nil and all_users is [guest_record, user_record]' do
       allow(provider).to receive(:current_user).and_return(nil)
       allow(SwitchUser).to receive(:all_users).and_return([guest_record, user_record])
 
-      expect(helper.switch_user_select).to match(%r{#{guest_option_tags}})
-      expect(helper.switch_user_select).to match(%r{#{user_option_tags}})
+      expect(helper.switch_user_select).to match(/#{guest_option_tags}/)
+      expect(helper.switch_user_select).to match(/#{user_option_tags}/)
     end
 
-    it "when current_user is user and all_users is []" do
+    it 'when current_user is user and all_users is []' do
       allow(provider).to receive(:current_user).and_return(user)
       allow(SwitchUser).to receive(:all_users).and_return([])
 
       expect(helper.switch_user_select).not_to match(%r{</option>})
     end
 
-    it "when current_user is user and all_users is [guest_record, user_record]" do
+    it 'when current_user is user and all_users is [guest_record, user_record]' do
       allow(provider).to receive(:current_user).and_return(user)
       allow(SwitchUser).to receive(:all_users).and_return([guest_record, user_record])
 
-      expect(helper.switch_user_select).to match(%r{#{guest_option_tags}})
-      expect(helper.switch_user_select).to match(%r{#{user_selected_option_tags}})
+      expect(helper.switch_user_select).to match(/#{guest_option_tags}/)
+      expect(helper.switch_user_select).to match(/#{user_selected_option_tags}/)
     end
 
-    it "when current_user is default allow and all_users is default allow" do
-      expect(helper.switch_user_select).to match(%r{#{guest_option_tags}})
-      expect(helper.switch_user_select).to match(%r{#{user_selected_option_tags}})
+    it 'when current_user is default allow and all_users is default allow' do
+      expect(helper.switch_user_select).to match(/#{guest_option_tags}/)
+      expect(helper.switch_user_select).to match(/#{user_selected_option_tags}/)
     end
 
-    it "when current_user is user and all_users is [guest_record, user_record, admin_record]" do
+    it 'when current_user is user and all_users is [guest_record, user_record, admin_record]' do
       allow(provider).to receive(:current_user).and_return(user)
       allow(SwitchUser).to receive(:all_users).and_return([guest_record, user_record, admin_record])
 
-      expect(helper.switch_user_select).to match(%r{#{guest_option_tags}})
-      expect(helper.switch_user_select).to match(%r{#{user_selected_option_tags}})
-      expect(helper.switch_user_select).to match(%r{#{admin_option_tags}})
+      expect(helper.switch_user_select).to match(/#{guest_option_tags}/)
+      expect(helper.switch_user_select).to match(/#{user_selected_option_tags}/)
+      expect(helper.switch_user_select).to match(/#{admin_option_tags}/)
     end
 
-    it "when current_user is admin and all_users is [guest_record, user_record, admin_record]" do
+    it 'when current_user is admin and all_users is [guest_record, user_record, admin_record]' do
       provider.instance_variable_set(:@user, admin)
       allow(helper).to receive(:provider).and_return(provider)
 
@@ -104,12 +105,12 @@ RSpec.describe SwitchUserHelper, type: :helper do
 
       allow(SwitchUser).to receive(:all_users).and_return([guest_record, user_record, admin_record])
 
-      expect(helper.switch_user_select).to match(%r{#{guest_option_tags}})
-      expect(helper.switch_user_select).to match(%r{#{user_option_tags}})
-      expect(helper.switch_user_select).to match(%r{#{admin_selected_option_tags}})
+      expect(helper.switch_user_select).to match(/#{guest_option_tags}/)
+      expect(helper.switch_user_select).to match(/#{user_option_tags}/)
+      expect(helper.switch_user_select).to match(/#{admin_selected_option_tags}/)
     end
 
-    it "when current_user is admin and all_users is [guest_record, user_record]" do
+    it 'when current_user is admin and all_users is [guest_record, user_record]' do
       provider.instance_variable_set(:@user, admin)
       allow(helper).to receive(:provider).and_return(provider)
 
@@ -117,29 +118,29 @@ RSpec.describe SwitchUserHelper, type: :helper do
 
       allow(SwitchUser).to receive(:all_users).and_return([guest_record, user_record])
 
-      expect(helper.switch_user_select).to match(%r{#{guest_option_tags}})
-      expect(helper.switch_user_select).to match(%r{#{user_option_tags}})
-      expect(helper.switch_user_select).to_not match(%r{#{admin_option_tags}})
+      expect(helper.switch_user_select).to match(/#{guest_option_tags}/)
+      expect(helper.switch_user_select).to match(/#{user_option_tags}/)
+      expect(helper.switch_user_select).to_not match(/#{admin_option_tags}/)
     end
   end
 
-  describe "#user_tag_value" do
-    it "for user" do
+  describe '#user_tag_value' do
+    it 'for user' do
       user = double(:user, id: 1)
 
       expect(helper.send(:user_tag_value, user, :id, :user)).to eq('user_1')
     end
   end
 
-  describe "#user_tag_label" do
-    it "when name has call method" do
+  describe '#user_tag_label' do
+    it 'when name has call method' do
       user = double(:user)
-      name = ->(user) { 'user1' }
+      name = ->(_user) { 'user1' }
 
       expect(helper.send(:user_tag_label, user, name)).to eq('user1')
     end
 
-    it "when name not has call method" do
+    it 'when name not has call method' do
       user = double(:name, name: 'user1')
       name = :name
 
@@ -147,27 +148,25 @@ RSpec.describe SwitchUserHelper, type: :helper do
     end
   end
 
-  describe "#available?" do
-    it "return true" do
+  describe '#available?' do
+    it 'return true' do
       allow_any_instance_of(SwitchUser.guard_class).to receive(:view_available?).and_return(true)
 
       expect(helper.send(:available?)).to eq(true)
     end
 
-    it "return false" do
+    it 'return false' do
       allow_any_instance_of(SwitchUser.guard_class).to receive(:view_available?).and_return(false)
 
       expect(helper.send(:available?)).to eq(false)
     end
   end
 
-  describe "#provider" do
-    it "normal" do
+  describe '#provider' do
+    it 'normal' do
       allow(SwitchUser::Provider).to receive(:init).with(controller).and_return(provider)
 
       expect(helper.send(:provider)).to eq(provider)
     end
   end
-
-
 end