sybil 0.1.3 → 0.2.1

data/lib/sybil/controller.rb

@@ -1,13 +1,12 @@
 module Sybil
   class Controller < ActionController::Base
-    def login
-      instance_eval(&Rails.configuration.sybil.login)
-      render :nothing => true
-    end
-    
-    def logout
-      instance_eval(&Rails.configuration.sybil.logout)
-      render :nothing => true
+    def sybil
+      if params[:id] == 'logout'
+        instance_eval(&(Rails.configuration.sybil.logout.is_a?(Hash) ? Rails.configuration.sybil.logout[params[:layout]] : Rails.configuration.sybil.logout))
+      else
+        instance_eval(&(Rails.configuration.sybil.login.is_a?(Hash) ? Rails.configuration.sybil.login[params[:layout]] : Rails.configuration.sybil.login))
+      end
+      params[:redirect] ? redirect_to(params[:redirect]) : render(:nothing => true)
     end
   end
 end

data/lib/sybil/railtie.rb

@@ -21,28 +21,44 @@ module Sybil
       # inject_before - Either a string or a pattern that Sybil will inject itself before the last occurance of in response.body
       options.inject_before ||= /<\/body>/i
       
+      # toggle_user_picker - This is a string of JS that, if true, toggles the user picker
+      # It is run in a keyup callback registered to the document body, 'e' contains the KeyboardEvent
+      options.toggle_user_picker ||= "e.ctrlKey && (e.keyCode==85)"
+      
+      # close_user_picker - This is a string of JS that, if true, closes the user picker
+      # It is run in a keyup callback registered to the document body, 'e' contains the KeyboardEvent
+      options.close_user_picker ||= "e.keyCode == 27"
+      
+      ## The following options can also be Hashes, in the form of '_layout' => Proc, so you can use a different proc for each layout ##
+      
       # users - A proc that is run within the context of Sybil's ApplicationController :after_filter and returns any object that responds to #each
       # and returns objects that respond to #[:id] and #[:name] 
       # This means that you can simply do something like @users = User.all, if your Users have a :name attribute.
       # :id should be the id of the user, and :name will be what is displayed in Sybil's dropdown
       options.users ||= proc { User.all }
       
-      # login - A proc that is run within the context of Sybil's #login action. Should log the user identified by params[:id] in.
+      # login - A proc that is run within the context of Sybil's #sybil action. Should log the user identified by params[:id] in.
       options.login ||= proc { UserSession.create(User.find(params[:id])) }
       
-      # logout - A proc that is run within the context of Sybil's #logout action (used when 'Guest' is selected). Should log the current user out.
-      options.logout ||= proc { UserSession.find.destroy }
+      # logout - A proc that is run within the context of Sybil's #sybil action (used when 'Guest' is selected). Should log the current user out.
+      # Note: It is NOT guaranteed that this won't be called when the user is already logged out, therefore it is the developer's responsibility to account for that
+      options.logout ||= proc { UserSession.find.destroy if UserSession.find }
+      
+      # Should return the current user session (needs to return false/nil if not logged in and respond to #id)
+      options.current_user ||= proc { current_user }
     end
     
     config.to_prepare do
             
-      ApplicationController.class_eval do
+      ActionController::Base.class_eval do
         after_filter :inject_sybil
-        
+                
         private
         def inject_sybil
-          if Rails.configuration.sybil.layouts.include?(_layout) and (response.content_type =~ Rails.configuration.sybil.content_type)
-            @users = instance_eval(&Rails.configuration.sybil.users)
+          if _layout and Rails.configuration.sybil.layouts.include?(_layout) and (response.content_type =~ Rails.configuration.sybil.content_type)
+            @users = instance_eval(&(Rails.configuration.sybil.users.is_a?(Hash) ? Rails.configuration.sybil.users[_layout] : Rails.configuration.sybil.users))
+            @current_user = instance_eval(&(Rails.configuration.sybil.current_user.is_a?(Hash) ? Rails.configuration.sybil.current_user[_layout] : Rails.configuration.sybil.current_user))
+            @layout = _layout
             insert_index = response.body.rindex(Rails.configuration.sybil.inject_before)
             if insert_index
               response.body = response.body.insert(insert_index,ERB.new(File.read(File.join(File.dirname(__FILE__),'user_picker.html.erb'))).result(binding))

data/lib/sybil/user_picker.html.erb

@@ -1,49 +1,98 @@
-<div id="sybil_user_picker" style="display:none;position:fixed;left:25%;width:50%;padding: 20px; background-color:rgba(0,0,0,.8); text-align:center;border-radius:5px;box-shadow: 0 0 5px 5px rgba(0,0,0,.5);z-index:999;">
+<form id="sybil_user_picker" style="display:none;position:fixed;left:25%;top:0;width:50%;padding: 20px; background-color: #000; background-color:rgba(0,0,0,.8); text-align:center;border-radius:5px;box-shadow: 0 0 5px 5px rgba(0,0,0,.5);z-index:999;" action="<%= sybil_path %>" method="post">
 	<h1 style="color:white;border-bottom:solid white 1px;padding-bottom:5px;font-size:200%;">Sybil</h1>
 	<br />
 	<select name="id">
-		<option value="logout" <%= "selected" unless current_user %>>Guest</option>
+		<option value="logout" <%= "selected" unless @current_user %>>Guest</option>
 	<% @users.each do |u| %>
-		<option value="<%= u[:id] %>" <%= "selected" if current_user and current_user.id == u[:id] %>><%= u[:name] %></option>
+		<option value="<%= u[:id] %>" <%= "selected" if @current_user and @current_user.id == u[:id] %>><%= u[:name] %></option>
 	<% end %>
 	</select>
+	<input type="hidden" name="layout" value="<%= @layout %>">
 	<input type="submit" value="Switch">
-</div>
-<script>
-	// TODO: Either write non-jQuery version or include jQuery if it isn't already present
-	$(document).ready(function(){
-		$up = $('#sybil_user_picker');
-		$up.css('top', -($up.height()+40))
-		function hideSybilUserPicker(){
-			$up.animate({top: -($up.height()+40)}, 200, function(){$up.hide();});
+</form>
+<script>	
+	function sybilAddEvent(el, event, fn, c){
+		if(el.addEventListener)
+			el.addEventListener(event, fn, c);
+		else
+			el.attachEvent('on' + event, fn);
+	}
+	
+	sybilAddEvent(window, 'load', function(){
+		var up = document.getElementById('sybil_user_picker');
+
+		// If jQuery is present, set up a var and position userpicker, since it'll be animated
+		if(window.jQuery){
+			var $up = $(up);
+			$up.css('top', -($up.height()+40));
 		}
-		$up.find('input[type=submit]').click(function(){
-			id = $up.find('select[name=id]').val();
-			if(id == 'logout')
-				$.get('<%= sybil_logout_path %>', function(){ location.reload(true); });
+
+		// Hide UP, slide up if jQuery
+		function hideSybilUserPicker(){
+			if(window.jQuery)
+				$up.animate({top: -($up.height()+40)}, 200, function(){$up.hide();});
 			else
-				$.post('<%= sybil_login_path %>', { id: id }, function() { location.reload(true); });
-			hideSybilUserPicker();
-		});
-		$(document).keyup(function(e){
-			// TODO: Make key combination configurable
-			if(e.ctrlKey && (e.keyCode==85)){
-				if($up.filter(':visible').length==0)
+				up.style.display='none';
+		}
+
+		// Show UP, slide down if jQuery
+		function showSybilUserPicker(){
+			if(window.jQuery)
+			{
+				$up.show();
+				$up.animate({top: '0'}, 200);
+			}else{
+				up.style.display='block';
+			}
+		}
+
+		// Find submit button
+		for(var i=0;i<up.children.length;i++)
+		{
+			if(up.children[i].type=='submit')
+			{
+				up.children[i].onclick = function(){
+					// Create hidden redirect field, set value to current location, then hide the UP, and let the form submit
+					var redirectField = document.createElement('input');
+					redirectField.type="hidden";
+					redirectField.name="redirect";
+					redirectField.value=location.href;
+					up.appendChild(redirectField);
+					hideSybilUserPicker();
+				}
+			}
+		}
+
+		// Add key listener
+		sybilAddEvent(document, 'keyup', function(e){
+			if(<%= Rails.configuration.sybil.toggle_user_picker %>){
+				if(up.style.display == 'none')
 				{
-					$up.show();
-					$up.animate({top: '0'}, 200);
+					showSybilUserPicker();
 				}else{
 					hideSybilUserPicker();
 				}
 			}
-			
-			if(e.keyCode == 27) hideSybilUserPicker();
-		});
-		$('body').click(function(e){
-			$target = $(e.target);
-			if(!$target.is('#sybil_user_picker') && $target.parents('#sybil_user_picker').length==0)
-				if($up.filter(':visible').length>0)
-					hideSybilUserPicker();
-		});
-	});
+		
+			if(<%= Rails.configuration.sybil.close_user_picker %>) hideSybilUserPicker();
+		}, false);
+
+		// Add click listener to body, hide UP if click is anywhere but on the UP itself
+		sybilAddEvent(document.body, 'click', function(e){
+			var childOfUserPicker = false;
+			var curNode = (e.srcElement) ? e.srcElement : e.target;
+			// Iterate over parents of target (only check 3 nodes deep, that's as deep as the UP gets)
+			// If parent is UP, set boolean, if parent is body, break
+			for(var i=0;i<3;i++)
+			{
+				if(childOfUserPicker = (curNode === up)) break;
+				curNode = curNode.parentNode;
+				if(curNode == document.body) break;
+			}
+
+			// Hide the UP if target isn't a child of the UP or the UP itself
+			if(!childOfUserPicker)
+				hideSybilUserPicker();
+		}, false);
+	}, false);
 </script>

data/lib/sybil/version.rb

@@ -1,3 +1,3 @@
 module Sybil
-  VERSION = "0.1.3"
+  VERSION = "0.2.1"
 end

data/rails/routes.rb

@@ -1,6 +1,5 @@
 if defined?(Rails::Application)
   Rails.application.routes.draw do    
-    post '/sybil', :to => 'sybil#login', :as => :sybil_login
-    get '/sybil/logout', :to => 'sybil#logout', :as => :sybil_logout
+    post '/sybil', :to => 'sybil#sybil', :as => :sybil
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: sybil
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jim Ryan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -04:00
+date: 2011-07-06 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sybil
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Easily switch between users during development of a Rails application