switch_user 0.6.0 → 0.7.0

data/README.md

@@ -36,12 +36,12 @@ erb
 or haml
 
     = switch_user_select
-    
+
 If there are too many users (in production), the switch_user_select is not a good choice, you should call the switch user request by yourself.
 
     <%= link_to user.login, "/switch_user?scope_identifier=user_#{user.id}" %>
     <%= link_to admin.login, "/switch_user?scope_identifier=admin_#{admin.id}" %>
-    
+
     = link_to user.login, "/switch_user?scope_identifier=user_#{user.id}"
     = link_to admin.login, "/switch_user?scope_identifier=admin_#{admin.id}"
 
@@ -56,11 +56,11 @@ Configuration
 By default, you can switch between Guest and all users in users table, you don't need to do anything. The following is the default configuration.
 
     SwitchUser.setup do |config|
-      # provider may be :devise or :authlogic
+      # provider may be :devise, :authlogic or :restful_authentication
       config.provider = :devise
 
-      # available_users is a hash, 
-      # key is the model name of user (:user, :admin, or any name you use), 
+      # 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 } }
 
@@ -72,29 +72,29 @@ By default, you can switch between Guest and all users in users table, you don't
       # expose for instance a username on a User model instead of id
       config.available_users_identifiers = { :user => :id }
 
-			# available_users_names is a hash,
-			# keys in this hash should match a key in the available_users hash
-			# value is the column name which will be displayed in select box
+      # available_users_names is a hash,
+      # keys in this hash should match a key in the available_users hash
+      # value is the column name which will be displayed in select box
       config.available_users_names = { :user => :email }
 
-      # controller_guard is a block, 
-      # if it returns true, the request will continue, 
+      # controller_guard is a block,
+      # if it returns true, the request will continue,
       # else the request will be refused and returns "Permission Denied"
       # if you switch from "admin" to user, the current_user param is "admin"
       config.controller_guard = lambda { |current_user, request| Rails.env.development? }
 
-      # view_guard is a block, 
-      # if it returns true, the switch user select box will be shown, 
+      # view_guard is a block,
+      # if it returns true, the switch user select box will be shown,
       # else the select box will not be shown
       # if you switch from admin to "user", the current_user param is "user"
-      config.view_guard == lambda { |current_user, request| Rails.env.development? }
+      config.view_guard = lambda { |current_user, request| Rails.env.development? }
 
-      # redirect_path is a block, it returns which page will be redirected 
+      # redirect_path is a block, it returns which page will be redirected
       # after switching a user.
       config.redirect_path = lambda { |request, params| '/' }
     end
 
-If the default configuration can't meet your requirement, you can define your customized configuration in <code>config/initializaers/switch_user.rb</code>
+If the default configuration can't meet your requirement, you can define your customized configuration in <code>config/initializers/switch_user.rb</code>
 
 If you want to switch both available users and available admins
 
@@ -102,24 +102,24 @@ If you want to switch both available users and available admins
 
 If you want to use name column as the user identifier
 
-		config.available_users_identifiers => { :user => :name }
-    
+    config.available_users_identifiers => { :user => :name }
+
 If you want to display the login field in switch user select box
 
     config.available_users_names = { :user => :login }
-    
+
 If you only allow switching from admin to user in production environment
 
     config.controller_guard = lambda { |current_user, request| Rails.env == "production" and current_user.admin? }
-    
+
 If you only want to display switch user select box for admins in production environment
 
     config.view_guard = lambda { |current_user, request| Rails.env == "production" and current_user and current_user.admin? }
-    
+
 If you want to redirect user to "/dashboard" page
 
     config.redirect_path = lambda { |request, params| "/dashboard" }
-    
+
 
 Copyright © 2010 Richard Huang (flyerhzm@gmail.com), released under the MIT license
 

data/app/controllers/switch_user_controller.rb

@@ -56,7 +56,22 @@ class SwitchUserController < ApplicationController
         end
       end
     end
-    
+
+    def restful_authentication_handle(params)
+      if params[:scope_identifier].blank?
+        logout_killing_session!
+      else
+        params[:scope_identifier] =~ /^([^_]+)_(.*)$/
+        scope, identifier = $1, $2
+
+        SwitchUser.available_users.keys.each do |s|
+          if scope == s.to_s && user = find_user(scope, s, identifier)
+            self.current_user = user
+          end
+        end
+      end
+    end
+
     def find_user(scope, identifier_scope, identifier)
       identifier_column = SwitchUser.available_users_identifiers[identifier_scope] || :id
       if identifier_column == :id
@@ -73,4 +88,8 @@ class SwitchUserController < ApplicationController
     def authlogic_current_user
       UserSession.find.try(:record)
     end
+
+    def restful_authentication_current_user
+      current_user
+    end
 end

data/lib/switch_user/version.rb

@@ -1,3 +1,3 @@
 module SwitchUser
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/switch_user.rb

@@ -2,7 +2,7 @@ module SwitchUser
   if defined? Rails::Engine
     class Engine < Rails::Engine
       config.to_prepare do
-        ApplicationController.helper(SwitchUserHelper)
+        ActionView::Base.send :include, SwitchUserHelper
       end
     end
   else

metadata

@@ -1,49 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: switch_user
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+version: !ruby/object:Gem::Version
+  version: 0.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Richard Huang
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-18 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70197516282760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70197516282760
 description: Easily switch current user to speed up development
-email: 
+email:
 - flyerhzm@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -57,41 +42,28 @@ files:
 - lib/switch_user/version.rb
 - rails/init.rb
 - switch_user.gemspec
-has_rdoc: true
 homepage: http://rubygems.org/gems/switch_user
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: switch_user
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Easily switch current user to speed up development
 test_files: []
-