switch_user 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 703c786469cf8a796e024e2ec4cca3037d75c944
-  data.tar.gz: dc4d80d1a338401476ef22205bfee5bc215b07ca
+  metadata.gz: 596db07135f6c4bdb1e194369e2adb8c8fdc63ce
+  data.tar.gz: 9eb590dff95b54d2800a93040f6fae5404a211b3
 SHA512:
-  metadata.gz: df717cc06e736487dde734d3f19fb390c0a2ffde9f69adbbd3a0ba365912e9a2c0d211ef9f865ae5b0740cd1fe558c3c72dd85160bc0ba6ec344fc464c75b7a3
-  data.tar.gz: c47e07ed11ff0bb6a0b0f7e6514e92f963c6eb5d526750d77136dff973571bd94635c9ac08faacccc2f6495f04742c4cb21f7df0f72d944a858a862a59d3b3c3
+  metadata.gz: 903229ce08e3bd292798005b756bdeef451f7c68efc639bd6c34d70c3a3e1e4815cfedc64d045dd46a32075a051319c4f0093e6463eca8ea83069c9d31649237
+  data.tar.gz: 5cff807ec71b15ff9b6bc135df6c408e17cd198742b2359f90ba908c3451a16765a9a3a7cdf84691201a93e5033b52f8413093506d38788a56def28f21113dcb

data/.gitignore

@@ -2,6 +2,8 @@ pkg/*
 *.gem
 .bundle
 .rvmrc
+.ruby-version
+.versions.conf
 Gemfile.lock
 log/*.log
 .DS_Store

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
+## 1.2.0 (12/01/2015)
+
+* Replace select option to `group_option`
+
 ## 1.1.0 (07/01/2015)
 
 * Rails 3.x compatibility

data/README.md

@@ -62,7 +62,7 @@ SwitchUser.setup do |config|
   # available_users is a hash,
   # key is the model name of user (:user, :admin, or any name you use),
   # value is a block that return the users that can be switched.
-  config.available_users = { :user => lambda { User.all } }
+  config.available_users = { :user => lambda { User.all } } # use User.scoped instead for rails 3.2
 
   # available_users_identifiers is a hash,
   # keys in this hash should match a key in the available_users hash
@@ -158,4 +158,4 @@ This feature should be used with extreme caution because of the security implica
 
 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/helpers/switch_user_helper.rb

@@ -4,15 +4,24 @@ module SwitchUserHelper
     return unless available?
 
     if provider.current_user
-      selected_user = "user_#{current_user.id}"
+      selected_user = "user_#{provider.current_user.id}"
     else
       selected_user = nil
     end
 
+    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]
+      end
+    end
+
+    option_tags = grouped_options_for_select(grouped_options_container, selected_user)
+
     render :partial => "switch_user/widget",
            :locals => {
-             :options => SwitchUser.all_users,
-             :current_scope => selected_user
+             :option_tags => option_tags
            }
   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)" %>
 <% end %>
-<%= select_tag "switch_user_identifier", options_from_collection_for_select(options, :scope_id, :label, current_scope), :onchange => "location.href = '/switch_user?scope_identifier=' + encodeURIComponent(this.options[this.selectedIndex].value)" %>
+<%= select_tag "switch_user_identifier", option_tags, :onchange => "location.href = '/switch_user?scope_identifier=' + encodeURIComponent(this.options[this.selectedIndex].value)" %>

data/lib/switch_user/version.rb

@@ -1,3 +1,3 @@
 module SwitchUser
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/helpers/switch_user_helper_spec.rb

@@ -0,0 +1,134 @@
+require 'spec_helper'
+require 'switch_user'
+require 'switch_user_helper'
+
+RSpec.describe SwitchUserHelper, :type => :helper do
+  before do
+    SwitchUser.provider = :dummy
+  end
+
+  let(:user) { double(:user, :id => 1) }
+  let(:provider) { 
+    _provider = SwitchUser::Provider::Dummy.new(controller) 
+    _provider.instance_variable_set(:@user, user)
+    _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(: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>^ }
+
+
+    before do
+      allow(SwitchUser).to receive(:switch_back).and_return(false)
+
+      allow(helper).to receive(:available?).and_return(true)
+
+      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])
+    end
+
+    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
+      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
+      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}})
+    end
+
+    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}})
+    end
+
+    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
+      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}})
+    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}})
+    end
+
+  end
+
+  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
+      user = double(:user)
+      name = ->(user){ 'user1' }
+
+      expect(helper.send(:user_tag_label, user, name)).to eq('user1')
+    end
+
+    it "when name not has call method" do
+      user = double(:name, :name => 'user1')
+      name = :name
+
+      expect(helper.send(:user_tag_label, user, name)).to eq('user1')
+    end
+  end
+
+  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
+      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
+      allow(SwitchUser::Provider).to receive(:init).with(controller).and_return(provider)
+
+      expect(helper.send(:provider)).to eq(provider)
+    end
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switch_user
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Richard Huang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -206,6 +206,7 @@ files:
 - lib/switch_user/user_set.rb
 - lib/switch_user/version.rb
 - spec/controllers/switch_user_controller_spec.rb
+- spec/helpers/switch_user_helper_spec.rb
 - spec/integration/switch_user_spec.rb
 - spec/provider/authlogic_spec.rb
 - spec/provider/clearance_spec.rb
@@ -243,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: switch_user
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Easily switch current user to speed up development