switch_user 0.9.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 924cc5fa100afa7570a5123a211b67c238c7d502
-  data.tar.gz: 499e47bb57936f4ba85346dd715de82f7992754e
+  metadata.gz: ea596325fc5e142d307dd24c245ec8e80528fddc
+  data.tar.gz: 32f79b7b8d3d67b364c3973d01efc8a0c308ed06
 SHA512:
-  metadata.gz: 9f64a50974a3e93a2d880b1d09e3b122d0bfcbbf76be3f9cd0211a95e827c5e1a6e1924d9354c5106688211bd4c52a25b45856e32efed9ceba5df83fdbf2b545
-  data.tar.gz: 8afe11f071e813f079299dddbc235409ab0284811f33c55429022ad3e35bfc5826a85d70938a3b7f62eb3211c9319a46803736403d81748cb61b8a926795eca2
+  metadata.gz: f85b9832f7b1efd694ce7be400f3668089db86b7f8f0b8ff7cdcfa59e116824bd84e91ad8feecebb51d3f554c9fbd30bcfbc03ef8a567422a234927751508bbb
+  data.tar.gz: f2ccfc25f69f7f6671c936515a6c4990fd1ef64a6058486234deae968c97dc904abcd905dde65f6e7baedda922817845f06f5eb0926a1b860a02b396b6be2dc6

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.2
+env:
+  - DB=sqlite
+script: bundle exec rspec spec

data/CHANGELOG.md

@@ -0,0 +1,126 @@
+# Next Release
+
+## 4.14.8
+
+* compatible with `composite_primary_keys` gem
+
+## 4.14.7
+
+* Fix AR 4.2 SingularAssociation#reader result can be nil
+* `perform_out_of_channel_notifications` should always be triggered
+
+## 4.14.6
+
+* Fix false positive with `belongs_to` -> `belongs_to` for active\_record 4.2
+* Activate active\_record hacks only when Bullet already start
+
+## 4.14.5
+
+* Don't execute query when running `to_sql`
+* Send backtrace to `uniform_notifier`
+* Fix sse response check
+* Dynamically delegate available notifiers to UniformNotifier
+
+## 4.14.4
+
+* Fix false N + 1 warnings on Rails 4.2
+
+## 4.14.3
+
+* Fix false positive on create
+
+## 4.14.2
+
+* Hotfix nil object when `add_impossible_object`
+
+## 4.14.1
+
+* Fix `has_one` then `has_many` associations in rails 4.2
+* Append js and dom to html body in proper position
+
+## 4.14.0 (10/03/2014)
+
+* Support rails 4.2
+* Polish notification output
+* Fix warning: `*' interpreted as argument prefix
+
+## 4.13.0 (07/19/2014)
+
+* Support include? call on ar associations
+
+## 4.12.0 (07/13/2014)
+
+* Fix false n+1 queries caused by inversed objects.
+* Replace .id with .primary_key_value
+* Rename bullet_ar_key to bullet_key
+* Fix rails sse detect
+* Fix bullet using in test environment
+* Memoize whoami
+
+## 4.11.0 (06/24/2014)
+
+* Support empty? call on ar associations
+* Skip detecting if object is a new record
+
+## 4.10.0 (06/06/2014)
+
+* Handle join query smarter
+* Support mongoid 4.0
+* Thread safe
+* Add debug mode
+
+## 4.9.0 (04/30/2014)
+
+* Add Bullet.stacktrace_includes option
+* Applied keyword argument fixes on Ruby 2.2.0
+* Add bugsnag notifier
+* Support rails 4.1.0
+
+## 4.8.0 (02/16/2014)
+
+* Support rails 4.1.0.beta1
+* Update specs to be RSpec 3.0 compatible
+* Update latest minor version activerecord and mongoid on travis
+
+## 4.7.0 (11/03/2013)
+
+* Add coverall support
+* Add helper to profile code outside a request
+* Add activesupport dependency
+* Add Bullet.raise notification
+* Add Bullet.add_footer notification
+* Fix activerecord4 warnings in test code
+
+## 4.6.0 (04/18/2013)
+
+* Fix Bullet::Rack to support sinatra
+
+## 4.5.0 (03/24/2013)
+
+* Add api way to access captured associatioin
+* Allow disable n_plus_one_query, unused_eager_loading and counter_cache respectively
+* Add whitelist
+
+## 4.4.0 (03/15/2013)
+
+* Remove disable_browser_cache option
+* Compatible with Rails 4.0.0.beta1
+
+## 4.3.0 (12/28/2012)
+
+* Fix content-length for non ascii html
+* Add mongoid 2.5.x support
+
+## 4.2.0 (09/29/2012)
+
+* Add Bullet::Dependency to check AR and mongoid version
+* Add Rails 4 support
+* Add airbrake notifier support
+
+## 4.1.0 (05/30/2012)
+
+* Add mongoid 3 support
+
+## 4.0.0 (05/09/2012)
+
+* Add mongoid support

data/README.md

@@ -1,5 +1,7 @@
 # switch_user
 
+[![Build Status](https://secure.travis-ci.org/flyerhzm/switch_user.png)](http://travis-ci.org/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.
 
 ## Use Case
@@ -45,9 +47,9 @@ If there are too many users (on production), the switch_user_select is not a goo
 If you have a wildcard route in your project, add a route before the wildcard route.
 ```ruby
 # config/routes.rb
-match 'switch_user' => 'switch_user#set_current_user'
-# wildcard route that will match anything
-match ':id' => 'pages#show'
+get 'switch_user' => 'switch_user#set_current_user'
+# wildcard route that will get
+get ':id' => 'pages#show'
 ```
 ## Configuration
 
@@ -138,7 +140,7 @@ This example would allow an admin user to user switch_user, but would only let y
 ### How it works
 
 Click the checkbox next to switch_user_select menu to remember that user for this session. Once this
-has been checked, that user is passed in as the 3rd option to the view and controller guards. 
+has been checked, that user is passed in as the 3rd option to the view and controller guards.
 This allows you to check against current_user as well as that original_user to see if the
 switch_user action should be allowed.
 
@@ -146,8 +148,14 @@ switch_user action should be allowed.
 
 This feature should be used with extreme caution because of the security implications. This is especially true in a production environment.
 
+## Contributing
+
+#### Run tests
+
+`bundle exec rspec spec`
+
 ## Credit
 
-Copyright © 2010 - 2012 Richard Huang (flyerhzm@gmail.com), released under the MIT license
+Copyright © 2010 - 2015 Richard Huang (flyerhzm@gmail.com), released under the MIT license
 
-[0]: https://github.com/tablatom/hobo
+[0]: https://github.com/tablatom/hobo

data/app/controllers/switch_user_controller.rb

@@ -19,7 +19,7 @@ class SwitchUserController < ApplicationController
   private
 
   def developer_modes_only
-    render :text => "Permission Denied", :status => 403 unless available?
+    raise ActionController::RoutingError.new('Do not try to hack us.') unless available?
   end
 
   def available?

data/lib/switch_user.rb

@@ -38,7 +38,7 @@ module SwitchUser
   end
 
   def self.all_users
-    data_sources.users
+    data_sources.all
   end
 
   def self.data_sources
@@ -47,7 +47,7 @@ module SwitchUser
       name = available_users_names.fetch(scope)
       DataSource.new(loader, scope, identifier, name)
     end
-    sources.unshift(GuestDataSource.new("Guest")) if helper_with_guest
+    sources.unshift(GuestDataSource.new) if helper_with_guest
     DataSources.new(sources)
   end
 

data/lib/switch_user/data_source.rb

@@ -1,50 +1,55 @@
 module SwitchUser
-  DataSource = Struct.new(:loader, :scope, :identifier, :name) do
-    def users
-      loader.call.map {|u| Record.new(u, self) }
-    end
-  end
+  class DataSources
+    attr_reader :sources
 
-  GuestRecord = Struct.new(:scope) do
-    def equivalent?(other_scope_id)
-      scope_id == other_scope_id
+    def initialize(sources)
+      @sources = sources
     end
 
-    def label
-      "Guest"
+    def all
+      sources.flat_map { |source| source.all }
     end
 
-    def scope_id
+    def find_scope_id(scope_id)
+      sources.map {|source| source.find_scope_id(scope_id) }.compact.first
     end
   end
 
-  class GuestDataSource
-    def initialize(name)
+  class DataSource
+    attr_reader :loader, :scope, :identifier, :name
+
+    def initialize(loader, scope, identifier, name)
+      @loader = loader
+      @scope = scope
+      @identifier = identifier
       @name = name
     end
 
-    def users
-      [ GuestRecord.new(self) ]
+    def all
+      loader.call.select(identifier, name).map { |user| Record.new(user, self) }
+    end
+
+    def find_scope_id(scope_id)
+      user = loader.call.find_by identifier => scope_id.delete("#{scope}_")
+      Record.new(user, self)
     end
   end
 
-  DataSources = Struct.new(:sources) do
+  class GuestDataSource
     def users
-      sources.flat_map {|source| source.users }
+      [ GuestRecord.new ]
     end
 
     def find_scope_id(scope_id)
-      users.flat_map.detect {|u| u.scope_id == scope_id }
     end
   end
 
-  Record = Struct.new(:user, :source) do
-    def equivalent?(other_scope_id)
-      scope_id == other_scope_id
-    end
+  class Record
+    attr_reader :user, :source
 
-    def scope_id
-      "#{source.scope}_#{user.send(source.identifier)}"
+    def initialize(user, source)
+      @user = user
+      @source = source
     end
 
     def label
@@ -54,5 +59,18 @@ module SwitchUser
     def scope
       source.scope
     end
+
+    def scope_id
+      "#{source.scope}_#{user.send(source.identifier)}"
+    end
+  end
+
+  class GuestRecord
+    def label
+      "Guest"
+    end
+
+    def scope_id
+    end
   end
 end

data/lib/switch_user/provider/devise.rb

@@ -7,7 +7,7 @@ module SwitchUser
       end
 
       def login(user, scope = :user)
-        @warden.set_user(user, :scope => scope)
+        @warden.session_serializer.store(user, scope)
       end
 
       def logout(scope = :user)

data/lib/switch_user/provider/sorcery.rb

@@ -10,7 +10,23 @@ module SwitchUser
       end
 
       def logout(scope = nil)
+        if SwitchUser.switch_back
+          save_original_user_identifier
+        end
+
         @controller.logout
+
+        restore_original_user_identifier
+      end
+
+      def save_original_user_identifier
+        @original_user_scope_identifier = @controller.session[:original_user_scope_identifier]
+      end
+
+      def restore_original_user_identifier
+        if @original_user_scope_identifier
+          @controller.session[:original_user_scope_identifier] = @original_user_scope_identifier
+        end
       end
 
       def current_user(scope = nil)

data/lib/switch_user/user_set.rb

@@ -48,10 +48,10 @@ module SwitchUser
         if scoped.respond_to?(:scoped)
           scoped
         else
-          user_class.scoped
+          user_class.respond_to?(:scoped) ? user_class.scoped : user_class.all
         end
       else
-        user_class.scoped
+        user_class.respond_to?(:scoped) ? user_class.scoped : user_class.all
       end
     end
     class Record < Struct.new(:id, :label, :scope)

data/lib/switch_user/version.rb

@@ -1,3 +1,3 @@
 module SwitchUser
-  VERSION = "0.9.5"
+  VERSION = "1.0.0"
 end

data/spec/controllers/switch_user_controller_spec.rb

@@ -2,30 +2,30 @@ require 'spec_helper'
 require 'switch_user'
 require 'switch_user_controller'
 
-describe SwitchUserController, :type => :controller do
+RSpec.describe SwitchUserController, :type => :controller do
   before do
     SwitchUser.provider = :dummy
   end
 
-  let(:admin) { stub(:admin, :admin? => true) }
-  let(:provider) { stub(:provider,
+  let(:admin) { double(:admin, :admin? => true) }
+  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 = lambda {|_,_| "/path"}
-      controller.stub(:available? => true)
+      allow(controller).to receive(:available?).and_return(true)
       get :set_current_user, :scope_identifier => "user_1"
 
-      response.should redirect_to("/path")
+      expect(response).to redirect_to("/path")
     end
 
     it "denies access according to the guard block" do
       SwitchUser.controller_guard = lambda {|_,_,_| false }
-      get :set_current_user
-
-      response.should be_forbidden
+      expect {
+        get :set_current_user
+      }.to raise_error(ActionController::RoutingError)
     end
 
     describe "requests with a privileged original_user" do
@@ -35,35 +35,35 @@ describe SwitchUserController, :type => :controller do
         }
       end
       it "allows access using the original_user param" do
-        controller.stub(:provider => provider)
+        allow(controller).to receive(:provider).and_return(provider)
 
-        provider.should_receive(:logout_all)
+        expect(provider).to receive(:logout_all)
 
         get :set_current_user
 
-        response.should be_redirect
+        expect(response).to be_redirect
       end
     end
   end
 
   describe "#remember_user" do
     before do
-      controller.stub(:provider => provider)
+      allow(controller).to receive(:provider).and_return(provider)
       SwitchUser.switch_back = true
     end
     it "can remember the current user" do
-      provider.should_receive(:remember_current_user).with(true)
+      expect(provider).to receive(:remember_current_user).with(true)
 
       get :remember_user, :remember => "true"
     end
     it "can forget the current user" do
-      provider.should_receive(:remember_current_user).with(false)
+      expect(provider).to receive(:remember_current_user).with(false)
 
       get :remember_user, :remember => "false"
     end
     it "does nothing if switch_back is not enabled" do
       SwitchUser.switch_back = false
-      provider.should_not_receive(:remember_current_user)
+      expect(provider).not_to receive(:remember_current_user)
 
       get :remember_user, :remember => "true"
     end

data/spec/integration/switch_user_spec.rb

@@ -1,26 +1,29 @@
 require 'spec_helper'
 
-describe "Using SwitchUser", :type => :request do
+RSpec.describe "Using SwitchUser", :type => :request do
   let(:user) { User.create!(:email => "foo@bar.com", :admin => true) }
   let(:other_user) { User.create!(:email => "other@bar.com", :admin => false) }
+
   before do
     SwitchUser.reset_config
     SwitchUser.provider = :session
     SwitchUser.controller_guard = lambda { |current_user, request| Rails.env.test? }
     SwitchUser.redirect_path = lambda {|_,_| "/dummys/open"}
   end
+
   it "signs a user in using switch_user" do
     # can't access protected url
     get "/dummy/protected"
-    response.should be_redirect
+    expect(response).to be_redirect
 
     get "/switch_user?scope_identifier=user_#{other_user.id}"
-    response.should be_redirect
+    expect(response).to be_redirect
 
     # now that we are logged in via switch_user we can access
     get "/dummy/protected"
-    response.should be_success
+    expect(response).to be_success
   end
+
   context "using switch_back" do
     before do
       SwitchUser.switch_back = true
@@ -28,6 +31,7 @@ describe "Using SwitchUser", :type => :request do
         current_user && current_user.admin? || original_user && original_user.admin?
       }
     end
+
     it "can switch back to a different user" do
       # login
       post "/login", :id => user.id
@@ -35,23 +39,23 @@ describe "Using SwitchUser", :type => :request do
 
       # have SwitchUser remember us
       get "/switch_user/remember_user", :remember => true
-      session["original_user_scope_identifier"].should be_present
+      expect(session["original_user_scope_identifier"]).to be_present
 
       # check that we can switch to another user
       get "/switch_user?scope_identifier=user_#{other_user.id}"
-      session["user_id"].should == other_user.id
+      expect(session["user_id"]).to eq other_user.id
 
       # logout
       get "/logout"
-      session["user_id"].should be_nil
+      expect(session["user_id"]).to be_nil
 
       # check that we can still switch to another user
       get "/switch_user?scope_identifier=user_#{user.id}"
-      session["user_id"].should == user.id
+      expect(session["user_id"]).to eq user.id
 
       # check that we can be un-remembered
       get "/switch_user/remember_user", :remember => false
-      session["original_user"].should be_nil
+      expect(session["original_user"]).to be_nil
     end
   end
 end

data/spec/provider/authlogic_spec.rb

@@ -29,7 +29,7 @@ class AuthlogicController < TestController
   end
 end
 
-describe SwitchUser::Provider::Authlogic do
+RSpec.describe SwitchUser::Provider::Authlogic do
   let(:controller) { AuthlogicController.new }
   let(:provider) { SwitchUser::Provider::Authlogic.new(controller) }
 

data/spec/provider/clearance_spec.rb

@@ -15,7 +15,7 @@ class ClearanceController < TestController
   end
 end
 
-describe SwitchUser::Provider::Clearance do
+RSpec.describe SwitchUser::Provider::Clearance do
   let(:controller) { ClearanceController.new }
   let(:provider) { SwitchUser::Provider::Clearance.new(controller) }
 

data/spec/provider/devise_spec.rb

@@ -1,6 +1,17 @@
 require 'spec_helper'
 require 'switch_user/provider/devise'
 
+class FakeWardenSessionSerializer
+  attr_accessor :user_hash
+
+
+  def store(user, scope)
+    return unless user
+    user_hash[scope] = user
+  end
+
+end
+
 class FakeWarden
   attr_reader :user_hash
 
@@ -13,6 +24,12 @@ class FakeWarden
     @user_hash[scope] = user
   end
 
+  def session_serializer
+    serializer = FakeWardenSessionSerializer.new
+    serializer.user_hash = @user_hash
+    serializer
+  end
+
   def user(scope)
     @user_hash[scope]
   end
@@ -32,55 +49,55 @@ class DeviseController < TestController
   end
 end
 
-describe SwitchUser::Provider::Devise do
+RSpec.describe SwitchUser::Provider::Devise do
   let(:controller) { DeviseController.new }
   let(:provider) { SwitchUser::Provider::Devise.new(controller) }
-  let(:user) { stub(:user) }
+  let(:user) { double(:user) }
 
   it_behaves_like "a provider"
 
   it "can use alternate scopes" do
-    user = stub(:user)
+    user = double(:user)
     provider.login(user, :admin)
 
-    provider.current_user(:admin).should == user
+    expect(provider.current_user(:admin)).to eq user
   end
 
   describe "#login_exclusive" do
     before do
-      SwitchUser.stub(:available_users => {:user => nil, :admin => nil})
+      allow(SwitchUser).to receive(:available_users).and_return({:user => nil, :admin => nil})
       provider.login(user, :admin)
       provider.login_exclusive(user, :scope => "user")
     end
 
     it "logs the user in" do
-      provider.current_user.should == user
+      expect(provider.current_user).to eq user
     end
 
     it "logs out other scopes" do
-      provider.current_user(:admin).should be_nil
+      expect(provider.current_user(:admin)).to be_nil
     end
   end
 
   describe "#logout_all" do
     it "logs out users under all scopes" do
-      SwitchUser.stub(:available_users => {:user => nil, :admin => nil})
+      allow(SwitchUser).to receive(:available_users).and_return({:user => nil, :admin => nil})
       provider.login(user, :admin)
       provider.login(user, :user)
 
       provider.logout_all
 
-      provider.current_user(:admin).should be_nil
-      provider.current_user(:user).should be_nil
+      expect(provider.current_user(:admin)).to be_nil
+      expect(provider.current_user(:user)).to be_nil
     end
   end
 
   describe "#all_current_users" do
     it "pulls users from an alternate scope" do
-      SwitchUser.stub(:available_users => {:user => nil, :admin => nil})
+      allow(SwitchUser).to receive(:available_users).and_return({:user => nil, :admin => nil})
       provider.login(user, :admin)
 
-      provider.current_users_without_scope.should == [user]
+      expect(provider.current_users_without_scope).to eq [user]
     end
   end
 end

data/spec/provider/dummy_spec.rb

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

data/spec/provider/restful_authentication_spec.rb

@@ -9,7 +9,7 @@ class RestfulAuthenticationController < TestController
   end
 end
 
-describe SwitchUser::Provider::RestfulAuthentication do
+RSpec.describe SwitchUser::Provider::RestfulAuthentication do
   let(:controller) { RestfulAuthenticationController.new }
   let(:provider) { SwitchUser::Provider::RestfulAuthentication.new(controller) }
 

data/spec/provider/session_spec.rb

@@ -7,7 +7,7 @@ class SessionController < TestController
   end
 end
 
-describe SwitchUser::Provider::Session do
+RSpec.describe SwitchUser::Provider::Session do
   before do
     SwitchUser.session_key = :uid
   end

data/spec/provider/sorcery_spec.rb

@@ -4,6 +4,7 @@ require 'switch_user/provider/sorcery'
 class SorceryController < TestController
   def logout
     @user = nil
+    reset_session
   end
 
   def auto_login(user)
@@ -15,7 +16,7 @@ class SorceryController < TestController
   end
 end
 
-describe SwitchUser::Provider::Sorcery do
+RSpec.describe SwitchUser::Provider::Sorcery do
   let(:controller) { SorceryController.new }
   let(:provider) { SwitchUser::Provider::Sorcery.new(controller) }
 

data/spec/provider_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 module SwitchUser
-  describe Provider do
+  RSpec.describe Provider do
     it "initializes the provider" do
       SwitchUser.provider = :dummy
-      Provider.init(stub(:controller)).should be_a(Provider::Dummy)
+      expect(Provider.init(double(:controller))).to be_a(Provider::Dummy)
     end
   end
 end

data/spec/spec_helper.rb

@@ -10,10 +10,15 @@ RSpec.configure do |config|
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
   config.use_transactional_fixtures = true
+  config.expose_dsl_globally = false
 end
 
 class TestController
   def session
     @session_hash ||= {}
   end
+
+  def reset_session
+    @session_hash = {}
+  end
 end

data/spec/support/application.rb

@@ -43,7 +43,6 @@ end
 module MyApp
   class Application < Rails::Application
     config.active_support.deprecation = :log
-    config.threadsafe!
     config.secret_key_base = "abc123"
     config.eager_load = true
     config.secret_token = '153572e559247c7aedd1bca5a246874d'

data/spec/support/provider.rb

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

data/spec/switch_user/data_source_spec.rb

@@ -1,49 +1,87 @@
 require 'switch_user/data_source'
 
 module SwitchUser
-  describe DataSource do
-    it "can load users" do
-      loader = lambda { [ double, double] }
-      source = DataSource.new(loader, :user, :id, :email)
+  RSpec.describe DataSources do
+    describe '#all' do
+      it 'aggregates multiple data_sources' do
+        user = double(:user)
+        s1 = double(:s1, :all => [user])
+        source = DataSources.new([s1, s1])
 
-      source.users.should have(2).records
+        expect(source.all).to eq [user, user]
+      end
+    end
+
+    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)
+        source = DataSources.new([s1, s2])
+
+        expect(source.find_scope_id("user_10")).to eq user
+      end
     end
   end
 
-  describe DataSources do
-    it "aggregates multiple data_sources" do
-      user = double(:user)
-      s1 = double(:s1, :users => [user])
-      source = DataSources.new([s1,s1])
+  RSpec.describe DataSource do
+    pending # it's tested in integration test, need to find a good way to test it here.
+  end
 
-      source.users.should == [user, user]
+  RSpec.describe GuestDataSource do
+    let(:source) { GuestDataSource.new }
+
+    describe '#users' do
+      it 'gets a GuestRecord' do
+        expect(source.users.size).to eq 1
+        expect(source.users.first).to be_instance_of GuestRecord
+      end
     end
 
-    describe "#find_source_id" do
-      it "can find a corresponding record across data sources" do
-        user = double(:user, :scope_id => "user_10")
-        s1 = double(:s1, :users => [])
-        s2 = double(:s1, :users => [user])
-        source = DataSources.new([s1,s2])
+    describe '#find_scope_id' do
+      it 'gets nil' do
+        expect(source.find_scope_id('')).to be_nil
+      end
+    end
+  end
 
-        source.find_scope_id("user_10").should == user
+  RSpec.describe Record do
+    let(:source) { DataSource.new({}, :user, :id, :email) }
+    let(:user) { double(:user, id: '1', email: 'flyerhzm@gmail.com') }
+    let(:record) { Record.new(user, source) }
+
+    describe '#label' do
+      it 'gets user email' do
+        expect(record.label).to eq 'flyerhzm@gmail.com'
+      end
+    end
+
+    describe '#scope' do
+      it 'gets user' do
+        expect(record.scope).to eq :user
+      end
+    end
+
+    describe '#scope_id' do
+      it 'gets scope and id' do
+        expect(record.scope_id).to eq 'user_1'
       end
     end
   end
 
-  describe Record do
-    it "can be compared to a identifier string" do
-      id1 = "user_100"
-      id2 = "user_101"
-      id3 = "staff_100"
-      user = double(:user, :id => 100, :email => "test@example.com")
-      source = DataSource.new(nil, :user, :id, :email)
+  RSpec.describe GuestRecord do
+    let(:record) { GuestRecord.new }
 
-      record = Record.new(user, source)
+    describe '#label' do
+      it 'gets Guest' do
+        expect(record.label).to eq 'Guest'
+      end
+    end
 
-      record.should be_equivalent(id1)
-      record.should_not be_equivalent(id2)
-      record.should_not be_equivalent(id3)
+    describe '#scope_id' do
+      it 'gets nil' do
+        expect(record.scope_id).to be_nil
+      end
     end
   end
 end

data/spec/switch_user/lambda_guard_spec.rb

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

data/spec/switch_user/user_loader_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'switch_user/user_loader'
 
-describe SwitchUser::UserLoader do
-  let(:user) { stub(:user) }
+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
@@ -12,17 +12,17 @@ describe SwitchUser::UserLoader do
   describe ".user" do
     before do
       SwitchUser.available_users_identifiers = {:user => :id}
-      User.stub(:where).with(:id => "1").and_return(user_result)
+      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
 
-      loaded_user.should == 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
 
-      loaded_user.should == user
+      expect(loaded_user).to eq user
     end
     it "raises an error for an invalid scope" do
       expect {
@@ -32,25 +32,25 @@ describe SwitchUser::UserLoader do
   end
 
   it "returns a user" do
-    User.stub(:where).with(:id => 1).and_return(user_result)
+    allow(User).to receive(:where).with(:id => 1).and_return(user_result)
 
     loader = SwitchUser::UserLoader.new("user", 1)
 
-    loader.user.should == user
+    expect(loader.user).to eq user
   end
 
   it "returns nil if no user is found" do
     loader = SwitchUser::UserLoader.new("user", 3)
 
-    User.find_by_id(3).should be_nil
-    loader.user.should == 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
-    User.stub(:where).with(:email => 2).and_return(user_result)
+    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.user.should == user
+    expect(loader.user).to eq user
   end
 end

data/spec/switch_user/user_set_spec.rb

@@ -2,33 +2,33 @@ require 'spec_helper'
 require 'switch_user/user_set'
 
 module SwitchUser
-  describe UserSet do
+  RSpec.describe UserSet do
     let!(:user) { User.create(:email => "test@example.com") }
-    let(:set) { UserSet.new(:user, :id, :email, lambda { User.scoped}) }
+    let(:set) { UserSet.new(:user, :id, :email, lambda { User.all }) }
     after { User.delete_all }
     it "returns an object that knows it's scope, id and label" do
       found_user = set[user.id]
 
-      found_user.id.should == user.id
-      found_user.scope.should == :user
-      found_user.label.should == "test@example.com"
+      expect(found_user.id).to eq user.id
+      expect(found_user.scope).to eq :user
+      expect(found_user.label).to eq "test@example.com"
     end
     it "returns all available users for a scope" do
-      set.users.should == [user]
+      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 })
-      set.find_user(user.id).label.should == user.email
+      expect(set.find_user(user.id).label).to eq user.email
     end
   end
-  describe UserSet::Record do
+  RSpec.describe UserSet::Record do
     it "correctly configures the record using the set" do
-      user = stub(:user, :id => 100, :email => "test@example.com")
-      set = stub(:set, :identifier  => :id, :label => :email, :scope => :user)
+      user = double(:user, :id => 100, :email => "test@example.com")
+      set = double(:set, :identifier  => :id, :label => :email, :scope => :user)
       record = UserSet::Record.build(user, set)
-      record.id.should == 100
-      record.label.should == "test@example.com"
-      record.scope.should == :user
+      expect(record.id).to eq 100
+      expect(record.label).to eq "test@example.com"
+      expect(record.scope).to eq :user
     end
   end
 end

data/spec/switch_user_spec.rb

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

data/switch_user.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "actionpack"
   s.add_development_dependency "railties"
-  s.add_development_dependency "rspec-rails", "~> 2.11.0"
+  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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switch_user
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Richard Huang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,20 +67,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +174,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -227,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: switch_user
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Easily switch current user to speed up development