switch_user 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b175adec75aec167e65b5c1269743f536dbdeb7
-  data.tar.gz: 208fbd14a66917e00d9f9bcac28776bff5b92684
+  metadata.gz: f5884c55c483cc8783d01b9826a61036e4c8c0f8
+  data.tar.gz: c427f1b701df9bf6689f75ec46c12422421bd494
 SHA512:
-  metadata.gz: 2c40a13d365afe03d78be753805be4b30f54a9a30813a11771b68f05046c0a808fe2cf36f87dbf58deb9e483b73bd4d0709f203c2ea7542656232fb36f46c5b6
-  data.tar.gz: 132785e64d55ba85b06b80a3677177268ae4f0773d27c84a119f31eb76cb8faae1bd13b88af4faa81e559d94084d3ec26519d5526213a39b5f22e626e8effe56
+  metadata.gz: dce7ff61f4148662b60ef5e7763bb46c31f4250de7ff986679a4a96554744be4b9d57dcfd63c9c102cb0485bb043c73a3a0d885b17503eae19f3e4da6e9e623e
+  data.tar.gz: c03171c6b23c247638253224d5fc9a2016abb8a90bbc409f4e3492284d1e2857c29bb6830b3818768bd939b6988e846202f2ad485b4334cbd5eb93cc1fc719d9

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Next Release
 
+## 1.3.1
+
+* Respect `relative_url_root`
+* Fix `selected_user_of_helper` bug
+
 ## 1.3.0 (07/23/2016)
 
 * Add capybara support

data/app/helpers/switch_user_helper.rb

@@ -3,17 +3,21 @@ module SwitchUserHelper
   def switch_user_select(options = {})
     return unless available?
 
-    if provider.current_user
-      selected_user = "user_#{provider.current_user.id}"
-    else
-      selected_user = nil
-    end
+    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]
+
+        if selected_user.nil?
+          unless record.is_a?(SwitchUser::GuestRecord)
+            if provider.current_user?(record.user, record.scope)
+              selected_user = record.scope_id
+            end
+          end
+        end
       end
     end
 

data/app/views/switch_user/_widget.html.erb

@@ -1,4 +1,4 @@
 <% if SwitchUser.switch_back %>
-  <%= check_box_tag "remember_user", "remember_user", provider.original_user.present?, :onchange => "location.href = '/switch_user/remember_user?remember=' + encodeURIComponent(this.checked)" %>
+  <%= check_box_tag "remember_user", "remember_user", provider.original_user.present?, :onchange => "location.href = '#{ActionController::Base.relative_url_root || '/'}switch_user/remember_user?remember=' + encodeURIComponent(this.checked)" %>
 <% end %>
-<%= select_tag "switch_user_identifier", option_tags, :onchange => "location.href = '/switch_user?scope_identifier=' + encodeURIComponent(this.options[this.selectedIndex].value)", :class => classes, :style => styles %>
+<%= select_tag "switch_user_identifier", option_tags, :onchange => "location.href = '#{ActionController::Base.relative_url_root || '/'}switch_user?scope_identifier=' + encodeURIComponent(this.options[this.selectedIndex].value)", :class => classes, :style => styles %>

data/lib/switch_user/provider/base.rb

@@ -55,6 +55,11 @@ module SwitchUser
       def clear_original_user
         @controller.session.delete(:original_user_scope_identifier)
       end
+
+      def current_user?(user, scope = :user)
+        current_user(scope) == user
+      end
+
     end
   end
 end

data/lib/switch_user/version.rb

@@ -1,3 +1,3 @@
 module SwitchUser
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/helpers/switch_user_helper_spec.rb

@@ -8,19 +8,22 @@ RSpec.describe SwitchUserHelper, :type => :helper do
   end
 
   let(:user) { double(:user, :id => 1) }
-  let(:provider) { 
-    _provider = SwitchUser::Provider::Dummy.new(controller) 
-    _provider.instance_variable_set(:@user, user)
+  let(:admin) { double(:admin, :id => 1) }
+  let(:provider) {
+    _provider = SwitchUser::Provider::Dummy.new(controller)
     _provider
   }
 
   describe "#switch_user_select" do
     let(:guest_record) { SwitchUser::GuestRecord.new }
-    let(:user_record) { double(:user_record, :scope => :user, :label => 'user1', :scope_id => 'user_1') }
-    
+    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>^ }
 
 
     before do
@@ -28,7 +31,9 @@ RSpec.describe SwitchUserHelper, :type => :helper do
 
       allow(helper).to receive(:available?).and_return(true)
 
+      provider.instance_variable_set(:@user, user)
       allow(helper).to receive(:provider).and_return(provider)
+
       allow(provider).to receive(:current_user).and_return(user)
 
       allow(SwitchUser).to receive(:all_users).and_return([guest_record, user_record])
@@ -82,6 +87,40 @@ RSpec.describe SwitchUserHelper, :type => :helper do
       expect(helper.switch_user_select).to match(%r{#{user_selected_option_tags}})
     end
 
+    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}})
+    end
+
+    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)
+
+      allow(provider).to receive(:current_user).and_return(admin)
+
+      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}})
+    end
+
+    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)
+
+      allow(provider).to receive(:current_user).and_return(admin)
+
+      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}})
+    end
   end
 
   describe "#user_tag_value" do

data/spec/provider/devise_spec.rb

@@ -100,4 +100,14 @@ RSpec.describe SwitchUser::Provider::Devise do
       expect(provider.current_users_without_scope).to eq [user]
     end
   end
+
+  describe "#current_user?" do
+    it "logs the user in" do
+      user = double(:user)
+      provider.login(user, :user)
+
+      expect(provider.current_user?(user, :user)).to eq true
+      expect(provider.current_user?(user, :admin)).to eq false
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switch_user
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Richard Huang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport