switch_user 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bfca8e1275bfff1ea79c5940ccbc7a0ca5230eaeaa0813e9bf8e6cb766d5996
-  data.tar.gz: 5a4a3a7c8dfa3095621294521224f779030171f07503fac7f6774d3564e4d715
+  metadata.gz: 4211c3d6aa5b7360b61069cc07798462adf5341a7d139809c8435de17854b617
+  data.tar.gz: b63ea0d7464484cbb099153c2f96f4a100f907a719647dd8f45d8461455c8afe
 SHA512:
-  metadata.gz: 786b82c5c9e76a77a44adaaaba5c98cb629b966c10e663487eba47f6b1190ed61e9c15a826be7ad010c4c61227f5dd8f112ccdd76478519153e6bbabab6a8054
-  data.tar.gz: df4c18185eaf7819d3121b681c244f4df0524e8622c2c7710a964683ec678e6d558bf108d31b4396f5756fedb99bdfab2b5c4aa34b256467a3e5fe4d7d3c44d3
+  metadata.gz: 1286a0855b08342856252ac8b7db07cf9cbb0c65b01c702c4d8aac7d59ace250bf51957606183843ea5fb3d0be1c312f2de2bcc58cedb7c494f6f85b69c8b50c
+  data.tar.gz: d52d65016d91198f69e78dedc9dfff53c788debe24a589dfc98619621ad054abf774f31df87289dd067fff948130fe5126c17737f1d45a44f8e667ce0a10b35f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
+## 1.5.3 (10/20/2020)
+
+* Fix zeitwerk autloading issue
+
 ## 1.5.2 (03/01/2019)
 
 * Clearance has moved their controller methods to be private

data/README.md

@@ -1,6 +1,6 @@
 # switch_user
 
-[![Build Status](https://secure.travis-ci.org/flyerhzm/switch_user.png)](http://travis-ci.org/flyerhzm/switch_user)
+[![Build Status](https://secure.travis-ci.org/flyerhzm/switch_user.svg)](http://travis-ci.org/flyerhzm/switch_user)
 [![AwesomeCode Status for flyerhzm/switch_user](https://awesomecode.io/projects/5f029f36-047b-4332-8405-9c7913b195bc/status)](https://awesomecode.io/repos/flyerhzm/switch_user)
 
 Inspired from [hobo][0], switch_user provides a convenient way to switch current user without needing to log out and log in manually.
@@ -15,7 +15,7 @@ switch_user is very useful in such use cases
 
 ## Example
 
-Visit here: <http://switch-user-example.heroku.com/admin>, switch the current user in the select box.
+Visit here: <http://switch-user-example.herokuapp.com/admin>, switch the current user in the select box.
 
 And source code here: <https://github.com/flyerhzm/switch_user_example>
 

data/app/helpers/switch_user_helper.rb

@@ -2,33 +2,30 @@
 
 module SwitchUserHelper
   SelectOption = Struct.new(:label, :scope_id)
+
   def switch_user_select(options = {})
     return unless available?
 
     selected_user = nil
 
-    grouped_options_container = {}.tap do |h|
-      SwitchUser.all_users.each do |record|
-        scope = record.is_a?(SwitchUser::GuestRecord) ? :Guest : record.scope.to_s.capitalize
-        h[scope] ||= []
-        h[scope] << [record.label, record.scope_id]
+    grouped_options_container =
+      {}.tap do |h|
+        SwitchUser.all_users.each do |record|
+          scope = record.is_a?(SwitchUser::GuestRecord) ? :Guest : record.scope.to_s.capitalize
+          h[scope] ||= []
+          h[scope] << [record.label, record.scope_id]
+
+          next unless selected_user.nil?
+          next if record.is_a?(SwitchUser::GuestRecord)
 
-        next unless selected_user.nil?
-        next if record.is_a?(SwitchUser::GuestRecord)
-        if provider.current_user?(record.user, record.scope)
-          selected_user = record.scope_id
+          selected_user = record.scope_id if provider.current_user?(record.user, record.scope)
         end
       end
-    end
 
     option_tags = grouped_options_for_select(grouped_options_container.to_a, selected_user)
 
     render partial: 'switch_user/widget',
-           locals: {
-             option_tags: option_tags,
-             classes: options[:class],
-             styles: options[:style]
-           }
+           locals: { option_tags: option_tags, classes: options[:class], styles: options[:style] }
   end
 
   private

data/lib/generators/switch_user/install/install_generator.rb

@@ -3,7 +3,7 @@
 module SwitchUser
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      TEMPLATES_PATH = File.expand_path('../templates', __FILE__)
+      TEMPLATES_PATH = File.expand_path('templates', __dir__)
       source_root File.expand_path(Engine.root, __FILE__)
 
       def install_initializer

data/lib/switch_user.rb

@@ -23,7 +23,7 @@ module SwitchUser
   mattr_accessor :login_exclusive
   mattr_accessor :controller_guard
   mattr_accessor :view_guard
-  mattr_reader   :guard_class
+  mattr_reader :guard_class
 
   def self.setup
     yield self
@@ -42,11 +42,12 @@ module SwitchUser
   end
 
   def self.data_sources
-    sources = available_users.map do |scope, loader|
-      identifier = available_users_identifiers.fetch(scope)
-      name = available_users_names.fetch(scope)
-      DataSource.new(loader, scope, identifier, name)
-    end
+    sources =
+      available_users.map do |scope, loader|
+        identifier = available_users_identifiers.fetch(scope)
+        name = available_users_names.fetch(scope)
+        DataSource.new(loader, scope, identifier, name)
+      end
     sources.unshift(GuestDataSource.new) if helper_with_guest
     DataSources.new(sources)
   end

data/lib/switch_user/base_guard.rb

@@ -5,9 +5,9 @@ module SwitchUser
     # TODO: is this the best arguments for the initializer ?
     # TODO should @provider be set and current/original_user be added as # accessors ?
     def initialize(controller, provider)
-      @controller    = controller
-      @request       = controller.request
-      @current_user  = provider.current_user
+      @controller = controller
+      @request = controller.request
+      @current_user = provider.current_user
       @original_user = provider.original_user
     end
 

data/lib/switch_user/provider.rb

@@ -12,11 +12,12 @@ module SwitchUser
     autoload :Session, 'switch_user/provider/session'
 
     def self.init(controller)
-      klass_part = if SwitchUser.provider.is_a?(Hash)
-                     SwitchUser.provider[:name]
-                   else
-                     SwitchUser.provider
-                   end
+      klass_part =
+        if SwitchUser.provider.is_a?(Hash)
+          SwitchUser.provider[:name]
+        else
+          SwitchUser.provider
+        end
 
       klass_part = klass_part.to_s.classify
 

data/lib/switch_user/provider/base.rb

@@ -33,14 +33,12 @@ module SwitchUser
       def original_user
         user_identifier = @controller.session[:original_user_scope_identifier]
 
-        if user_identifier
-          UserLoader.prepare(scope_identifier: user_identifier).user
-        end
+        UserLoader.prepare(scope_identifier: user_identifier).user if user_identifier
       end
 
       def original_user=(user)
-        user_type       = user.class.to_s.underscore
-        column_name     = SwitchUser.available_users_identifiers[user_type.to_sym]
+        user_type = user.class.to_s.underscore
+        column_name = SwitchUser.available_users_identifiers[user_type.to_sym]
         user_identifier = "#{user_type}_#{user.send(column_name)}"
 
         @controller.session[:original_user_scope_identifier] = user_identifier

data/lib/switch_user/provider/sorcery.rb

@@ -24,9 +24,8 @@ module SwitchUser
       end
 
       def restore_original_user_identifier
-        if @original_user_scope_identifier
-          @controller.session[:original_user_scope_identifier] = @original_user_scope_identifier
-        end
+        @controller.session[:original_user_scope_identifier] =
+          @original_user_scope_identifier if @original_user_scope_identifier
       end
 
       def current_user(_scope = nil)

data/lib/switch_user/rails.rb

@@ -3,8 +3,10 @@
 module SwitchUser
   class Engine < Rails::Engine
     initializer 'switch_user.view' do
-      ActiveSupport.on_load(:action_view) do
-        include SwitchUserHelper
+      config.to_prepare do
+        ActiveSupport.on_load(:action_view) do
+          include SwitchUserHelper
+        end
       end
     end
   end

data/lib/switch_user/rspec/feature_helpers.rb

@@ -15,25 +15,25 @@ module SwitchUser
 
       _user_scope = _user_scope.to_s
 
-      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
+      raise SwitchUser::InvalidScope,
+            "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)
 
       _user_id =
         case user_record_or_scope
         when ActiveRecord::Base
-          identifier = SwitchUser.available_users_identifiers[_user_scope] || SwitchUser.available_users_identifiers[_user_scope.to_sym]
-          if identifier.nil?
-            raise SwitchUser::InvalidScope, "don't allow switch this user, please check config.available_users_identifiers"
-          end
+          identifier =
+            SwitchUser.available_users_identifiers[_user_scope] ||
+              SwitchUser.available_users_identifiers[_user_scope.to_sym]
+          raise SwitchUser::InvalidScope,
+                "don't allow switch this user, please check config.available_users_identifiers" if identifier.nil?
+
           user_record_or_scope.send identifier
         else
           user_id
         end
 
-      if _user_id.to_s.empty?
-        raise InvalidArgument, "don't allow switch this user, user_id is empty"
-      end
+      raise InvalidArgument, "don't allow switch this user, user_id is empty" if _user_id.to_s.empty?
 
       scope_identifier = "#{_user_scope}_#{_user_id}"
 

data/lib/switch_user/user_set.rb

@@ -5,7 +5,7 @@ module SwitchUser
     def self.init_from_config
       SwitchUser.available_users.map do |scope, base_scope|
         identifier = SwitchUser.available_users_identifiers[scope]
-        label      = SwitchUser.available_users_names[scope]
+        label = SwitchUser.available_users_names[scope]
         new(scope, identifier, label, base_scope)
       end
     end
@@ -17,17 +17,19 @@ module SwitchUser
     end
 
     attr_reader :scope, :user_class, :identifier, :label, :base_scope
+
     def initialize(scope, identifier, label, base_scope)
-      @scope      = scope
+      @scope = scope
       @user_class = normalize_class(scope)
       @identifier = identifier
-      @label      = label
+      @label = label
       @base_scope = normalize_scope(base_scope)
     end
 
     def find_user(id)
       Record.build(users.where(id: id).first, self)
     end
+
     alias [] find_user
 
     def users
@@ -56,9 +58,10 @@ module SwitchUser
         user_class.respond_to?(:scoped) ? user_class.scoped : user_class.all
       end
     end
+
     class Record < Struct.new(:id, :label, :scope)
       def self.build(user, set)
-        id    = user.send(set.identifier)
+        id = user.send(set.identifier)
         label = user.send(set.label)
         scope = set.scope
 

data/lib/switch_user/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SwitchUser
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

data/spec/controllers/switch_user_controller_spec.rb

@@ -10,11 +10,7 @@ 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' }
@@ -26,14 +22,14 @@ RSpec.describe SwitchUserController, type: :controller do
 
     it 'denies access according to the guard block' do
       SwitchUser.controller_guard = ->(_, _, _) { false }
-      expect {
-        get :set_current_user
-      }.to raise_error(ActionController::RoutingError)
+      expect { get :set_current_user }.to raise_error(ActionController::RoutingError)
     end
 
     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?) }
+        SwitchUser.controller_guard = lambda do |current_user, _, original_user|
+          current_user.try(:admin?) || original_user.try(:admin?)
+        end
       end
       it 'allows access using the original_user param' do
         allow(controller).to receive(:provider).and_return(provider)

data/spec/helpers/switch_user_helper_spec.rb

@@ -11,10 +11,10 @@ RSpec.describe SwitchUserHelper, type: :helper do
 
   let(:user) { double(:user, id: 1) }
   let(:admin) { double(:admin, id: 1) }
-  let(:provider) {
+  let(:provider) do
     _provider = SwitchUser::Provider::Dummy.new(controller)
     _provider
-  }
+  end
 
   describe '#switch_user_select' do
     let(:guest_record) { SwitchUser::GuestRecord.new }
@@ -23,9 +23,13 @@ RSpec.describe SwitchUserHelper, type: :helper do
 
     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(:user_selected_option_tags) do
+      '<optgroup label="User"><option selected="selected" value="user_1">user1</option></optgroup>'
+    end
     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>' }
+    let(:admin_selected_option_tags) do
+      '<optgroup label="Admin"><option selected="selected" value="admin_1">admin1</option></optgroup>'
+    end
 
     before do
       allow(SwitchUser).to receive(:switch_back).and_return(false)

data/spec/integration/switch_user_spec.rb

@@ -29,7 +29,9 @@ RSpec.describe 'Using SwitchUser', type: :request do
   context 'using switch_back' do
     before do
       SwitchUser.switch_back = true
-      SwitchUser.controller_guard = ->(current_user, _request, original_user) { current_user && current_user.admin? || original_user && original_user.admin? }
+      SwitchUser.controller_guard = lambda do |current_user, _request, original_user|
+        current_user && current_user.admin? || original_user && original_user.admin?
+      end
     end
 
     it 'can switch back to a different user through remember_user endpoint' do

data/spec/provider/devise_spec.rb

@@ -8,6 +8,7 @@ class FakeWardenSessionSerializer
 
   def store(user, scope)
     return unless user
+
     user_hash[scope] = user
   end
 end

data/spec/provider/dummy_spec.rb

@@ -3,8 +3,7 @@
 require 'spec_helper'
 require 'switch_user/provider/dummy'
 
-class SessionController < TestController
-end
+class SessionController < TestController; end
 
 RSpec.describe SwitchUser::Provider::Session do
   let(:controller) { SessionController.new }

data/spec/provider/session_spec.rb

@@ -5,7 +5,7 @@ require 'switch_user/provider/session'
 
 class SessionController < TestController
   def current_user
-    User.find_by_id(session[:uid]) if session[:uid]
+    User.find_by(id: session[:uid]) if session[:uid]
   end
 end
 

data/spec/support/application.rb

@@ -10,7 +10,7 @@ class ApplicationController < ActionController::Base
   end
 
   def current_user
-    User.find_by_id(session[SwitchUser.session_key])
+    User.find_by(id: session[SwitchUser.session_key])
   end
 
   def login
@@ -66,6 +66,7 @@ module MyApp
     config.action_dispatch.show_exceptions = false
   end
 end
+
 Rails.application.initialize!
 Rails.application.routes.draw do
   get 'dummy/protected', to: 'dummy#protected'
@@ -83,12 +84,10 @@ connection.create_table :users do |t|
   t.column :admin, :boolean
 end
 
-class User < ActiveRecord::Base
-end
+class User < ActiveRecord::Base; end
 
 connection.create_table :clients do |t|
   t.column :email, :string
 end
 
-class Client < ActiveRecord::Base
-end
+class Client < ActiveRecord::Base; end

data/spec/switch_user/user_loader_spec.rb

@@ -27,9 +27,7 @@ RSpec.describe SwitchUser::UserLoader do
       expect(loaded_user).to eq user
     end
     it 'raises an error for an invalid scope' do
-      expect {
-        loaded_user = SwitchUser::UserLoader.prepare(nil, '1')
-      }.to raise_error(SwitchUser::InvalidScope)
+      expect { loaded_user = SwitchUser::UserLoader.prepare(nil, '1') }.to raise_error(SwitchUser::InvalidScope)
     end
   end
 
@@ -44,7 +42,7 @@ RSpec.describe SwitchUser::UserLoader do
   it 'returns nil if no user is found' do
     loader = SwitchUser::UserLoader.new('user', 3)
 
-    expect(User.find_by_id(3)).to be_nil
+    expect(User.find_by(id: 3)).to be_nil
     expect(loader.user).to eq nil
   end
 

data/switch_user.gemspec

@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
   s.description = 'Easily switch current user to speed up development'
 
   s.required_rubygems_version = '>= 1.3.6'
-  s.rubyforge_project         = 'switch_user'
 
   s.add_development_dependency 'actionpack'
   s.add_development_dependency 'activerecord'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: switch_user
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Richard Huang
 - Luke Cowell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -246,7 +246,7 @@ homepage: http://rubygems.org/gems/switch_user
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -261,8 +261,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Easily switch current user to speed up development
 test_files: []