switch_user 1.3.1 → 1.5.3

data/spec/support/provider.rb

@@ -1,14 +1,16 @@
-RSpec.shared_examples_for "a provider" do
+# frozen_string_literal: true
+
+RSpec.shared_examples_for 'a provider' do
   let(:user) { User.create! }
   let(:other_user) { User.create! }
 
-  it "can log a user in" do
+  it 'can log a user in' do
     provider.login(user)
 
     expect(provider.current_user).to eq user
   end
 
-  it "can log a user out" do
+  it 'can log a user out' do
     provider.login(user)
 
     provider.logout
@@ -16,30 +18,30 @@ RSpec.shared_examples_for "a provider" do
     expect(provider.current_user).to eq nil
   end
 
-  it "responds to login_exclusive" do
+  it 'responds to login_exclusive' do
     expect(provider).to respond_to(:login_exclusive)
   end
 
-  it "responds to login_exclusive" do
+  it 'responds to login_exclusive' do
     expect(provider).to respond_to(:login_inclusive)
   end
 
-  it "knows if there are any users logged in" do
-    provider.login(user)
+  it 'knows if there are any users logged in' do
+    provider.login(user, :user)
 
     expect(provider.current_users_without_scope).to eq [user]
   end
 
-  it "can lock the original user, allowing us to change current_user" do
+  it 'can lock the original user, allowing us to change current_user' do
     provider.login(user)
     provider.remember_current_user(true)
-    provider.login_exclusive(other_user, scope: "user")
+    provider.login_exclusive(other_user, scope: 'user')
 
     expect(provider.original_user).to eq user
-    expect(provider.current_user).to eq other_user
+    expect(provider.current_user(:user)).to eq other_user
   end
 
-  it "can forget the original_user" do
+  it 'can forget the original_user' do
     provider.login(user)
     provider.remember_current_user(true)
 

data/spec/switch_user/data_source_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'switch_user/data_source'
 
 module SwitchUser
@@ -5,7 +7,7 @@ module SwitchUser
     describe '#all' do
       it 'aggregates multiple data_sources' do
         user = double(:user)
-        s1 = double(:s1, :all => [user])
+        s1 = double(:s1, all: [user])
         source = DataSources.new([s1, s1])
 
         expect(source.all).to eq [user, user]
@@ -15,17 +17,17 @@ module SwitchUser
     describe '#find_scope_id' do
       it 'can find a corresponding record across data sources' do
         user = double(:user)
-        s1 = double(:s1, :find_scope_id => nil)
-        s2 = double(:s2, :find_scope_id => user)
+        s1 = double(:s1, find_scope_id: nil)
+        s2 = double(:s2, find_scope_id: user)
         source = DataSources.new([s1, s2])
 
-        expect(source.find_scope_id("user_10")).to eq user
+        expect(source.find_scope_id('user_10')).to eq user
       end
     end
   end
 
   RSpec.describe DataSource do
-    pending # it's tested in integration test, need to find a good way to test it here.
+    skip # it's tested in integration test, need to find a good way to test it here.
   end
 
   RSpec.describe GuestDataSource do

data/spec/switch_user/lambda_guard_spec.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module SwitchUser
   RSpec.describe LambdaGuard do
-    describe "#controller_available?" do
-      it "calls the controller_guard proc" do
+    describe '#controller_available?' do
+      it 'calls the controller_guard proc' do
         controller = double.as_null_object
         provider = double.as_null_object
         guard = SwitchUser::LambdaGuard.new(controller, provider)
 
-        SwitchUser.controller_guard = lambda {|a| a }
+        SwitchUser.controller_guard = ->(a) { a }
         expect(guard).to be_controller_available
 
-        SwitchUser.controller_guard = lambda {|a| !a }
+        SwitchUser.controller_guard = ->(a) { !a }
         expect(guard).not_to be_controller_available
       end
     end

data/spec/switch_user/user_loader_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user/user_loader'
 
@@ -5,52 +7,50 @@ RSpec.describe SwitchUser::UserLoader do
   let(:user) { double(:user) }
   let(:user_result) { [user] }
 
-  it "raises an exception if we are passed an invalid scope" do
-    expect { SwitchUser::UserLoader.new("useeer", 1) }.to raise_error(SwitchUser::InvalidScope)
+  it 'raises an exception if we are passed an invalid scope' do
+    expect { SwitchUser::UserLoader.new('useeer', 1) }.to raise_error(SwitchUser::InvalidScope)
   end
 
-  describe ".user" do
+  describe '.user' do
     before do
-      SwitchUser.available_users_identifiers = {:user => :id}
-      allow(User).to receive(:where).with(:id => "1").and_return(user_result)
+      SwitchUser.available_users_identifiers = { user: :id }
+      allow(User).to receive(:where).with(id: '1').and_return(user_result)
     end
-    it "can be loaded from a scope and identifier" do
-      loaded_user = SwitchUser::UserLoader.prepare("user","1").user
+    it 'can be loaded from a scope and identifier' do
+      loaded_user = SwitchUser::UserLoader.prepare('user', '1').user
 
       expect(loaded_user).to eq user
     end
-    it "can be loaded by a passing an unprocessed scope identifier" do
-      loaded_user = SwitchUser::UserLoader.prepare(:scope_identifier => "user_1").user
+    it 'can be loaded by a passing an unprocessed scope identifier' do
+      loaded_user = SwitchUser::UserLoader.prepare(scope_identifier: 'user_1').user
 
       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)
+    it 'raises an error for an invalid scope' do
+      expect { loaded_user = SwitchUser::UserLoader.prepare(nil, '1') }.to raise_error(SwitchUser::InvalidScope)
     end
   end
 
-  it "returns a user" do
-    allow(User).to receive(:where).with(:id => 1).and_return(user_result)
+  it 'returns a user' do
+    allow(User).to receive(:where).with(id: 1).and_return(user_result)
 
-    loader = SwitchUser::UserLoader.new("user", 1)
+    loader = SwitchUser::UserLoader.new('user', 1)
 
     expect(loader.user).to eq user
   end
 
-  it "returns nil if no user is found" do
-    loader = SwitchUser::UserLoader.new("user", 3)
+  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
 
-  it "loads a user with an alternate identifier column" do
-    allow(User).to receive(:where).with(:email => 2).and_return(user_result)
-    SwitchUser.available_users_identifiers = {:user => :email}
+  it 'loads a user with an alternate identifier column' do
+    allow(User).to receive(:where).with(email: 2).and_return(user_result)
+    SwitchUser.available_users_identifiers = { user: :email }
 
-    loader = SwitchUser::UserLoader.new("user", 2)
+    loader = SwitchUser::UserLoader.new('user', 2)
     expect(loader.user).to eq user
   end
 end

data/spec/switch_user/user_set_spec.rb

@@ -1,33 +1,35 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user/user_set'
 
 module SwitchUser
   RSpec.describe UserSet do
-    let!(:user) { User.create(:email => "test@example.com") }
-    let(:set) { UserSet.new(:user, :id, :email, lambda { User.all }) }
+    let!(:user) { User.create(email: 'test@example.com') }
+    let(:set) { UserSet.new(:user, :id, :email, -> { User.all }) }
     after { User.delete_all }
     it "returns an object that knows it's scope, id and label" do
       found_user = set[user.id]
 
       expect(found_user.id).to eq user.id
       expect(found_user.scope).to eq :user
-      expect(found_user.label).to eq "test@example.com"
+      expect(found_user.label).to eq 'test@example.com'
     end
-    it "returns all available users for a scope" do
+    it 'returns all available users for a scope' do
       expect(set.users).to eq [user]
     end
-    it "chains the where on to the provided scope" do
-      set = UserSet.new(:user, :id, :email, lambda { User.all })
+    it 'chains the where on to the provided scope' do
+      set = UserSet.new(:user, :id, :email, -> { User.all })
       expect(set.find_user(user.id).label).to eq user.email
     end
   end
   RSpec.describe UserSet::Record do
-    it "correctly configures the record using the set" do
-      user = double(:user, :id => 100, :email => "test@example.com")
-      set = double(:set, :identifier  => :id, :label => :email, :scope => :user)
+    it 'correctly configures the record using the set' do
+      user = double(:user, id: 100, email: 'test@example.com')
+      set = double(:set, identifier: :id, label: :email, scope: :user)
       record = UserSet::Record.build(user, set)
       expect(record.id).to eq 100
-      expect(record.label).to eq "test@example.com"
+      expect(record.label).to eq 'test@example.com'
       expect(record.scope).to eq :user
     end
   end

data/spec/switch_user_spec.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'switch_user'
 
 RSpec.describe SwitchUser do
-  describe "#available_scopes" do
-    it "returns a list of available scopes" do
+  describe '#available_scopes' do
+    it 'returns a list of available scopes' do
       expect(SwitchUser.available_scopes).to eq [:user]
     end
   end
 
-  describe "assigning the provider" do
-    it "sets the provider" do
+  describe 'assigning the provider' do
+    it 'sets the provider' do
       # ensure we aren't breaking existing functionality
       SwitchUser.provider = :sorcery
       expect(SwitchUser.provider).to eq :sorcery

data/switch_user.gemspec

@@ -1,33 +1,34 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path("../lib/switch_user/version", __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('../lib/switch_user/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "switch_user"
+  s.name        = 'switch_user'
   s.version     = SwitchUser::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Richard Huang", "Luke Cowell"]
-  s.email       = ["flyerhzm@gmail.com"]
-  s.homepage    = "http://rubygems.org/gems/switch_user"
-  s.summary     = "Easily switch current user to speed up development"
-  s.description = "Easily switch current user to speed up development"
+  s.authors     = ['Richard Huang', 'Luke Cowell']
+  s.email       = ['flyerhzm@gmail.com']
+  s.license     = 'MIT'
+  s.homepage    = 'http://rubygems.org/gems/switch_user'
+  s.summary     = 'Easily switch current user to speed up development'
+  s.description = 'Easily switch current user to speed up development'
 
-  s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "switch_user"
+  s.required_rubygems_version = '>= 1.3.6'
 
-  s.add_development_dependency "activesupport"
-  s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "actionpack"
-  s.add_development_dependency "railties"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rspec-rails"
-  s.add_development_dependency "tzinfo"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "activerecord"
-  s.add_development_dependency "awesome_print"
-  s.add_development_dependency "pry"
-  s.add_development_dependency "capybara"
+  s.add_development_dependency 'actionpack'
+  s.add_development_dependency 'activerecord'
+  s.add_development_dependency 'activesupport'
+  s.add_development_dependency 'awesome_print'
+  s.add_development_dependency 'bundler', '>= 1.0.0'
+  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'railties'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'sqlite3', '~> 1.3.6'
+  s.add_development_dependency 'tzinfo'
 
   s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.executables  = `git ls-files`.split("\n").map { |f| f =~ /^bin\/(.*)/ ? Regexp.last_match(1) : nil }.compact
   s.require_path = 'lib'
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: switch_user
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Richard Huang
 - Luke Cowell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,21 +26,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,21 +68,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tzinfo
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,21 +152,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -243,9 +243,10 @@ files:
 - spec/switch_user_spec.rb
 - switch_user.gemspec
 homepage: http://rubygems.org/gems/switch_user
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -260,9 +261,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: switch_user
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Easily switch current user to speed up development
 test_files: []