From d440b6c5223a7a4e71153316e2c53e3a18fad42e Mon Sep 17 00:00:00 2001
From: "Gun.io Whitespace Robot" <contact@gun.io>
Date: Thu, 27 Oct 2011 11:25:47 -0400
Subject: [PATCH] Remove whitespace [Gun.io WhitespaceBot]

---
 README                                        |  22 +--
 app/controllers/application.rb                |  12 +-
 app/controllers/tags_controller.rb            |   2 +-
 app/controllers/users_controller.rb           |   6 +-
 app/controllers/video_replies_controller.rb   |   6 +-
 app/controllers/videos_controller.rb          |   6 +-
 app/controllers/videos_controller.rb~         |   6 +-
 app/models/thumbnail.rb                       |   8 +-
 app/models/video.rb                           |  20 +--
 app/models/video.rb~                          |  20 +--
 app/views/layouts/application.html.erb        |  16 +-
 app/views/layouts/application.html.erb~       |  16 +-
 app/views/videos/index.html.erb               |   6 +-
 app/views/videos/index.html.erb~              |   6 +-
 app/views/videos/new.html.erb                 |   2 +-
 app/views/videos/new.html.erb~                |   2 +-
 app/views/videos/show.html.erb                |  20 +--
 app/views/videos/show.html.erb~               |  20 +--
 config/amazon_s3.yml                          |  12 +-
 config/environment.rb                         |   8 +-
 config/initializers/inflections.rb            |   2 +-
 config/routes.rb                              |   2 +-
 config/routes.rb~                             |   2 +-
 .../20090305184450_create_thumbnails.rb       |   6 +-
 db/schema.rb                                  |   2 +-
 lib/script/railscasts.rb                      |   6 +-
 public/flowplayer/LICENSE.txt                 |   6 +-
 public/flowplayer/README.txt                  |   4 +-
 public/flowplayer/example/index.html          |  62 +++----
 public/javascripts/flowplayer.js              |  14 +-
 public/stylesheets/style.css                  |  46 ++---
 test/test_helper.rb                           |   2 +-
 .../lib/acts_as_state_machine.rb              |  64 +++----
 .../test/acts_as_state_machine_test.rb        |  52 +++---
 .../test/fixtures/conversation.rb             |   4 +-
 .../test/fixtures/conversations.yml           |   2 +-
 .../acts_as_state_machine/test/schema.rb      |   2 +-
 .../acts_as_state_machine/test/test_helper.rb |   2 +-
 .../lib/acts_as_taggable.rb                   |  86 ++++-----
 .../acts_as_taggable_on_steroids/lib/tag.rb   |  30 ++--
 .../lib/tagging.rb                            |   2 +-
 .../test/abstract_unit.rb                     |  24 +--
 .../test/acts_as_taggable_test.rb             | 166 +++++++++---------
 .../test/fixtures/user.rb                     |   2 +-
 vendor/plugins/attachment_fu/CHANGELOG        |   2 +-
 vendor/plugins/attachment_fu/README           |  24 +--
 .../plugins/attachment_fu/amazon_s3.yml.tpl   |  12 +-
 vendor/plugins/attachment_fu/lib/geometry.rb  |   4 +-
 .../attachment_fu/backends/db_file_backend.rb |   6 +-
 .../backends/file_system_backend.rb           |  20 +--
 .../attachment_fu/backends/s3_backend.rb      |  30 ++--
 .../processors/core_image_processor.rb        |   8 +-
 .../attachment_fu/processors/gd2_processor.rb |   6 +-
 .../test/backends/db_file_test.rb             |   2 +-
 .../test/backends/file_system_test.rb         |  24 +--
 .../test/backends/remote/s3_test.rb           |   6 +-
 .../test/base_attachment_tests.rb             |  14 +-
 .../plugins/attachment_fu/test/basic_test.rb  |  18 +-
 .../test/extra_attachment_test.rb             |  14 +-
 .../attachment_fu/test/fixtures/attachment.rb |   2 +-
 .../attachment_fu/test/geometry_test.rb       |  20 +--
 .../test/processors/core_image_test.rb        |   6 +-
 .../attachment_fu/test/processors/gd2_test.rb |   6 +-
 .../test/processors/image_science_test.rb     |   6 +-
 .../test/processors/mini_magick_test.rb       |   6 +-
 .../test/processors/rmagick_test.rb           |  66 +++----
 vendor/plugins/attachment_fu/test/schema.rb   |  18 +-
 .../plugins/attachment_fu/test/test_helper.rb |  18 +-
 .../attachment_fu/test/validation_test.rb     |  12 +-
 .../red_artisan/core_image/filters/color.rb   |  12 +-
 .../red_artisan/core_image/filters/effects.rb |  14 +-
 .../core_image/filters/perspective.rb         |   8 +-
 .../red_artisan/core_image/filters/quality.rb |  12 +-
 .../red_artisan/core_image/filters/scale.rb   |   8 +-
 .../core_image/filters/watermark.rb           |  10 +-
 .../red_artisan/core_image/processor.rb       |  24 +--
 vendor/plugins/authlogic/README.rdoc          |   8 +-
 .../lib/authlogic/acts_as_authentic/base.rb   |  12 +-
 .../lib/authlogic/acts_as_authentic/email.rb  |  14 +-
 .../acts_as_authentic/logged_in_status.rb     |  10 +-
 .../lib/authlogic/acts_as_authentic/login.rb  |  12 +-
 .../acts_as_authentic/magic_columns.rb        |   2 +-
 .../authlogic/acts_as_authentic/password.rb   |  58 +++---
 .../acts_as_authentic/perishable_token.rb     |  24 +--
 .../acts_as_authentic/persistence_token.rb    |  16 +-
 .../restful_authentication.rb                 |  10 +-
 .../acts_as_authentic/session_maintenance.rb  |  28 +--
 .../acts_as_authentic/single_access_token.rb  |  14 +-
 .../acts_as_authentic/validations_scope.rb    |   2 +-
 .../authenticates_many/association.rb         |   6 +-
 .../lib/authlogic/authenticates_many/base.rb  |   4 +-
 .../controller_adapters/abstract_adapter.rb   |  10 +-
 .../controller_adapters/merb_adapter.rb       |   4 +-
 .../controller_adapters/rails_adapter.rb      |   8 +-
 .../lib/authlogic/crypto_providers/aes256.rb  |   6 +-
 .../lib/authlogic/crypto_providers/bcrypt.rb  |  10 +-
 .../lib/authlogic/crypto_providers/md5.rb     |  12 +-
 .../lib/authlogic/crypto_providers/sha1.rb    |   6 +-
 .../lib/authlogic/crypto_providers/sha512.rb  |   6 +-
 .../plugins/authlogic/lib/authlogic/i18n.rb   |   2 +-
 .../plugins/authlogic/lib/authlogic/random.rb |  12 +-
 .../lib/authlogic/session/activation.rb       |  12 +-
 .../session/active_record_trickery.rb         |  10 +-
 .../authlogic/lib/authlogic/session/base.rb   |   8 +-
 .../session/brute_force_protection.rb         |  18 +-
 .../lib/authlogic/session/callbacks.rb        |  14 +-
 .../lib/authlogic/session/cookies.rb          |  30 ++--
 .../lib/authlogic/session/existence.rb        |  12 +-
 .../lib/authlogic/session/foundation.rb       |  10 +-
 .../lib/authlogic/session/http_auth.rb        |   4 +-
 .../authlogic/lib/authlogic/session/id.rb     |   6 +-
 .../authlogic/lib/authlogic/session/klass.rb  |  14 +-
 .../lib/authlogic/session/magic_columns.rb    |  16 +-
 .../lib/authlogic/session/magic_states.rb     |   6 +-
 .../authlogic/lib/authlogic/session/params.rb |  16 +-
 .../lib/authlogic/session/password.rb         |  30 ++--
 .../lib/authlogic/session/perishable_token.rb |   2 +-
 .../lib/authlogic/session/persistence.rb      |   4 +-
 .../lib/authlogic/session/priority_record.rb  |   6 +-
 .../authlogic/lib/authlogic/session/scopes.rb |  14 +-
 .../lib/authlogic/session/session.rb          |  10 +-
 .../lib/authlogic/session/timeout.rb          |  10 +-
 .../authlogic/session/unauthorized_record.rb  |   8 +-
 .../lib/authlogic/session/validation.rb       |  16 +-
 .../authlogic/lib/authlogic/test_case.rb      |   4 +-
 .../authlogic/test_case/controller_adapter.rb |   8 +-
 .../authlogic/test_case/mock_controller.rb    |  16 +-
 .../authlogic/test_case/mock_cookie_jar.rb    |   2 +-
 .../authlogic/lib/authlogic/version.rb        |   4 +-
 .../test/acts_as_authentic_test/email_test.rb |  30 ++--
 .../logged_in_status_test.rb                  |   8 +-
 .../test/acts_as_authentic_test/login_test.rb |  30 ++--
 .../magic_columns_test.rb                     |   6 +-
 .../acts_as_authentic_test/password_test.rb   |  70 ++++----
 .../perishable_token_test.rb                  |  20 +--
 .../persistence_token_test.rb                 |  10 +-
 .../restful_authentication_test.rb            |  10 +-
 .../session_maintenance_test.rb               |   4 +-
 .../single_access_test.rb                     |  12 +-
 .../authlogic/test/authenticates_many_test.rb |   6 +-
 .../test/crypto_provider_test/aes256_test.rb  |   2 +-
 .../test/crypto_provider_test/bcrypt_test.rb  |   2 +-
 .../test/crypto_provider_test/sha1_test.rb    |   4 +-
 .../test/crypto_provider_test/sha512_test.rb  |   2 +-
 .../authlogic/test/fixtures/companies.yml     |   2 +-
 .../authlogic/test/fixtures/employees.yml     |   2 +-
 .../plugins/authlogic/test/fixtures/users.yml |   2 +-
 .../plugins/authlogic/test/libs/employee.rb   |   2 +-
 vendor/plugins/authlogic/test/random_test.rb  |   6 +-
 .../test/session_test/activation_test.rb      |   8 +-
 .../active_record_trickery_test.rb            |   6 +-
 .../brute_force_protection_test.rb            |  30 ++--
 .../test/session_test/cookies_test.rb         |  34 ++--
 .../test/session_test/existence_test.rb       |  14 +-
 .../authlogic/test/session_test/id_test.rb    |   2 +-
 .../authlogic/test/session_test/klass_test.rb |   6 +-
 .../test/session_test/magic_columns_test.rb   |  18 +-
 .../test/session_test/magic_states_test.rb    |  20 +--
 .../test/session_test/params_test.rb          |  18 +-
 .../test/session_test/password_test.rb        |  22 +--
 .../test/session_test/perishability_test.rb   |   2 +-
 .../test/session_test/persistence_test.rb     |   2 +-
 .../test/session_test/scopes_test.rb          |  22 +--
 .../test/session_test/session_test.rb         |  12 +-
 .../test/session_test/timeout_test.rb         |  16 +-
 .../test/session_test/validation_test.rb      |   4 +-
 vendor/plugins/authlogic/test/test_helper.rb  |  34 ++--
 vendor/plugins/spawn/README                   |  10 +-
 vendor/plugins/spawn/lib/spawn.rb             |   4 +-
 169 files changed, 1182 insertions(+), 1182 deletions(-)

diff --git a/README b/README
index 23e0dbf..39024c9 100755
--- a/README
+++ b/README
@@ -5,32 +5,32 @@ Portfolio: http://www.ralphedge.com
   Video-App is a YouTube-like site written in rails.  It converts video to flash(ffmpeg) and plays videos using FlowPlayer(an open-source flash video player).  Has Pagination(will_paginate), Tagging/Tag Cloud(acts_as_taggable_on_steroids), User Authentication(authlogic), Video Replies, and Video Thumbnails.  Video conversion is done in a seperate process, using the Spawn plugin.  Uses Rails Version 2.2.2...you can change the Rails version it uses in config/environment.rb
 
 To Install: (let me know if I need to add anything to this)
-  *Download the code: 
+  *Download the code:
 
     git clone git://github.com/balgarath/video-app.git
     cd video-app
 
-  *(Optional) switch to branch 0.2:  
+  *(Optional) switch to branch 0.2:
 
     git fetch origin 0.2:0.2
     git checkout 0.2
-    
+
   *Edit your config/databases.yml
-  
+
   *Install will_paginate - if you don't have it already
     sudo gem install will_paginate
-  
+
   *install ffmpeg - you may need to download and compile from source - http://www.ffmpeg.org/download.html
-  
+
     In Ubuntu:
       sudo apt-get install ffmpeg
-      
+
   *create and migrate database
     rake db:create
     rake db:migrate
-    
+
   *launch server
     ./script/server
-    
-    
-    
+
+
+
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 18e6770..236f8ae 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -7,14 +7,14 @@ class ApplicationController < ActionController::Base
   # See ActionController::RequestForgeryProtection for details
   # Uncomment the :secret if you're not using the cookie session store
   protect_from_forgery # :secret => '8406dc20b6131ea8a90ec68109f869b1'
-  
-  # See ActionController::Base for details 
+
+  # See ActionController::Base for details
   # Uncomment this to filter the contents of submitted sensitive data parameters
-  # from your application log (in this case, all fields with names like "password"). 
+  # from your application log (in this case, all fields with names like "password").
   # filter_parameter_logging :password
-  
+
   before_filter :get_tag_cloud
-  
+
 
   filter_parameter_logging :password, :password_confirmation
   helper_method :current_user_session, :current_user
@@ -53,5 +53,5 @@ def redirect_back_or_default(default)
       session[:return_to] = nil
     end
 
-	
+
 end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 87c9f46..a02d0b5 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -2,7 +2,7 @@ class TagsController < ApplicationController
 	def index
 		@tags = Tag.find :all
 	end
-	
+
 	def show
 		@tag = Tag.find_by_name(params[:id])
 		@videos = Video.paginate_by_id(Video.find_tagged_with(@tag), :page => params[:page], :per_page => 10)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f0da457..736aa98 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,7 +1,7 @@
 class UsersController < ApplicationController
 
-  before_filter :require_user, :only => [:show, :edit, :update]	
-	
+  before_filter :require_user, :only => [:show, :edit, :update]
+
   # GET /users
   # GET /users.xml
   def index
@@ -63,5 +63,5 @@ def destroy
 
     redirect_to(users_url)
   end
-  
+
 end
diff --git a/app/controllers/video_replies_controller.rb b/app/controllers/video_replies_controller.rb
index 19ce94e..886f325 100644
--- a/app/controllers/video_replies_controller.rb
+++ b/app/controllers/video_replies_controller.rb
@@ -9,9 +9,9 @@ def create
       redirect_to @reply.video
     else
       render @reply.video
-			
+
 		end
-		
+
 	end
 
 	def delete
@@ -20,5 +20,5 @@ def delete
     @reply.destroy
     redirect_to	@video
 	end
-	
+
 end
diff --git a/app/controllers/videos_controller.rb b/app/controllers/videos_controller.rb
index 45dd7be..36bd25e 100644
--- a/app/controllers/videos_controller.rb
+++ b/app/controllers/videos_controller.rb
@@ -1,7 +1,7 @@
 class VideosController < ApplicationController
-  
+
     before_filter :require_user, :only => [:new, :delete, :create]
-  
+
   def index
     @videos = Video.paginate :page => params[:page], :order => 'created_at DESC', :per_page => 10
   end
@@ -26,7 +26,7 @@ def show
     @video = Video.find(params[:id])
     @reply = VideoReply.new
   end
-  
+
   def delete
     @video = Video.find(params[:id])
     @video.destroy
diff --git a/app/controllers/videos_controller.rb~ b/app/controllers/videos_controller.rb~
index 65582b8..d00b1f7 100644
--- a/app/controllers/videos_controller.rb~
+++ b/app/controllers/videos_controller.rb~
@@ -1,7 +1,7 @@
 class VideosController < ApplicationController
-  
+
     before_filter :require_user, :only => [:new, :delete, :create]
-  
+
   def index
     @videos = Video.paginate :page => params[:page], :order => 'created_at DESC', :per_page => 10
   end
@@ -25,7 +25,7 @@ class VideosController < ApplicationController
     @video = Video.find(params[:id])
     @reply = VideoReply.new
   end
-  
+
   def delete
     @video = Video.find(params[:id])
     @video.destroy
diff --git a/app/models/thumbnail.rb b/app/models/thumbnail.rb
index 0356b73..0cc4d55 100644
--- a/app/models/thumbnail.rb
+++ b/app/models/thumbnail.rb
@@ -1,12 +1,12 @@
 class Thumbnail < ActiveRecord::Base
-  has_attachment :content_type => :image, 
-                 :storage => :file_system                 
+  has_attachment :content_type => :image,
+                 :storage => :file_system
   has_one :video
-  
+
   def self.create!(vpath)
 	    tpath = vpath + ".jpg"
 	    system "ffmpeg -i #{vpath} -ss 20 -s 150x100 -vframes 1 -f image2 -an #{tpath}"
 	    t = Thumbnail.new(:filename => File.basename(tpath), :content_type => 'image/jpeg', :temp_path => tpath)
-	    t.save ? t : false		
+	    t.save ? t : false
   end
 end
diff --git a/app/models/video.rb b/app/models/video.rb
index 2338063..ab6b04f 100644
--- a/app/models/video.rb
+++ b/app/models/video.rb
@@ -1,15 +1,15 @@
 class Video < ActiveRecord::Base
-	
+
 	acts_as_taggable
-	
+
   belongs_to :thumbnail
 	belongs_to :user
 	has_many :replies, :class_name => 'VideoReply'
-  
+
   before_create :save_thumbnail
 
-	has_attachment :content_type => :video, 
-                 :storage => :file_system, 
+	has_attachment :content_type => :video,
+                 :storage => :file_system,
                  :max_size => 300.megabytes
 
   #acts as state machine plugin
@@ -30,7 +30,7 @@ class Video < ActiveRecord::Base
   event :failure do
     transitions :from => :converting, :to => :error
   end
-  
+
 	def rename_file
 		true
 	end
@@ -61,18 +61,18 @@ def save_thumbnail
 
 
   protected
-  
+
   def convert_command
-		
+
 		#construct new file extension
     flv =  "." + id.to_s + ".flv"
 
 		#build the command to execute ffmpeg
     command = <<-end_command
      ffmpeg -i #{ RAILS_ROOT + '/public' + public_filename } -ar 22050 -s 720x480 -f flv -y #{ RAILS_ROOT + '/public' + public_filename + flv }
-      
+
     end_command
-    
+
     logger.debug "Converting video...command: " + command
     command
   end
diff --git a/app/models/video.rb~ b/app/models/video.rb~
index 2338063..ab6b04f 100644
--- a/app/models/video.rb~
+++ b/app/models/video.rb~
@@ -1,15 +1,15 @@
 class Video < ActiveRecord::Base
-	
+
 	acts_as_taggable
-	
+
   belongs_to :thumbnail
 	belongs_to :user
 	has_many :replies, :class_name => 'VideoReply'
-  
+
   before_create :save_thumbnail
 
-	has_attachment :content_type => :video, 
-                 :storage => :file_system, 
+	has_attachment :content_type => :video,
+                 :storage => :file_system,
                  :max_size => 300.megabytes
 
   #acts as state machine plugin
@@ -30,7 +30,7 @@ class Video < ActiveRecord::Base
   event :failure do
     transitions :from => :converting, :to => :error
   end
-  
+
 	def rename_file
 		true
 	end
@@ -61,18 +61,18 @@ class Video < ActiveRecord::Base
 
 
   protected
-  
+
   def convert_command
-		
+
 		#construct new file extension
     flv =  "." + id.to_s + ".flv"
 
 		#build the command to execute ffmpeg
     command = <<-end_command
      ffmpeg -i #{ RAILS_ROOT + '/public' + public_filename } -ar 22050 -s 720x480 -f flv -y #{ RAILS_ROOT + '/public' + public_filename + flv }
-      
+
     end_command
-    
+
     logger.debug "Converting video...command: " + command
     command
   end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 781c1a1..315daf3 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -6,22 +6,22 @@
     <title>Video App</title>
       <%= stylesheet_link_tag 'style' %>
 
-  		<%= javascript_include_tag 'flowplayer', 'jquery' %>   
+  		<%= javascript_include_tag 'flowplayer', 'jquery' %>
   </head>
 
   <body>
 
-    
+
     <div id = "body">
 	  	<div id = "header">
 	  		<input id = "search" type = "text" value = "Search"/>
 	  		<div id = "logo"><a href = "/">video_app</a></div>
 	  	</div>
 
-    	
+
     	<div id = "main">
 				<div id = "main_col">
-				  <div class = "innertube">  
+				  <div class = "innertube">
 				    <% flash.each do |key,value| %>
 
 				      <div id="flash" class="flash_<%= key %>" >
@@ -31,14 +31,14 @@
 				    <% end -%>
 
 				    <%= yield :layout %>
-						
+
 					</div><!-- /innertube -->
-	
+
 				</div><!-- /main_col -->
 			</div><!-- /main -->
 
     	<div id = "sidebar">
-	    	<div class = "innertube">	
+	    	<div class = "innertube">
 				  <%= link_to 'New Video', new_video_url, :class => 'new' %><br /><br />
 					<% if !current_user %>
 					  <%= link_to "Register", new_account_path %><br />
@@ -65,7 +65,7 @@
 				Portfolio: <a href = "http://www.ralphedge.com/" target = "_new">http://www.ralphedge.com</a>
 			</div>
 		</div><!-- /#body -->
-		
+
   </body>
 
 </html>
diff --git a/app/views/layouts/application.html.erb~ b/app/views/layouts/application.html.erb~
index 9daae80..7987d59 100644
--- a/app/views/layouts/application.html.erb~
+++ b/app/views/layouts/application.html.erb~
@@ -6,22 +6,22 @@
     <title>Video App</title>
       <%= stylesheet_link_tag 'style' %>
 
-  		<%= javascript_include_tag 'flowplayer', 'jquery' %>   
+  		<%= javascript_include_tag 'flowplayer', 'jquery' %>
   </head>
 
   <body>
 
-    
+
     <div id = "body">
 	  	<div id = "header">
 	  		<input id = "search" type = "text" value = "Search"/>
 	  		<div id = "logo"><a href = "/">video_app</a></div>
 	  	</div>
 
-    	
+
     	<div id = "main">
 				<div id = "main_col">
-				  <div class = "innertube">  
+				  <div class = "innertube">
 				    <% flash.each do |key,value| %>
 
 				      <div id="flash" class="flash_<%= key %>" >
@@ -31,14 +31,14 @@
 				    <% end -%>
 
 				    <%= yield :layout %>
-						
+
 					</div><!-- /innertube -->
-	
+
 				</div><!-- /main_col -->
 			</div><!-- /main -->
 
     	<div id = "sidebar">
-	    	<div class = "innertube">	
+	    	<div class = "innertube">
 				  <%= link_to 'New Video', new_video_url, :class => 'new' %><br /><br />
 					<% if !current_user %>
 					  <%= link_to "Register", new_account_path %><br />
@@ -65,7 +65,7 @@
 				Portfolio: <a href = "http://www.ralphedge.com/" target = "_new">http://www.ralphedge.com</a>
 			</div>
 		</div><!-- /#body -->
-		
+
   </body>
 
 </html>
diff --git a/app/views/videos/index.html.erb b/app/views/videos/index.html.erb
index f05daaa..e142f29 100644
--- a/app/views/videos/index.html.erb
+++ b/app/views/videos/index.html.erb
@@ -4,10 +4,10 @@
 		<% for video in @videos do %>
 
 		  <a href = "<%= video_url(video) %>" class = "video_thumb">
-			  
+
 		  		<%= video.thumbnail ? image_tag(video.thumbnail.public_filename) : "No Thumbnail Available" %>
 		  		<p><%= video.title %></p>
-					<p>Uploaded By: <%= video.user.login %></p>		  	
+					<p>Uploaded By: <%= video.user.login %></p>
 		 	</a>
 
 		<% end %>
@@ -15,6 +15,6 @@
 	</div><!-- /video_container -->
 <div class = "clear-right">.</div>
 		<%= will_paginate @videos, :class => "pagination page-wide" %>
-		 	
+
 	<br />
 
diff --git a/app/views/videos/index.html.erb~ b/app/views/videos/index.html.erb~
index c6c8e20..69e4394 100644
--- a/app/views/videos/index.html.erb~
+++ b/app/views/videos/index.html.erb~
@@ -4,10 +4,10 @@
 		<% for video in @videos do %>
 
 		  <a href = "<%= video_url(video) %>" class = "video_thumb">
-			  
+
 		  		<%= video.thumbnail ? image_tag(video.thumbnail.public_filename) : "No Thumbnail Available" %>
 		  		<p><%= video.title %></p>
-		  	
+
 		 	</a>
 
 		<% end %>
@@ -15,6 +15,6 @@
 	</div><!-- /video_container -->
 <div class = "clear-right">.</div>
 		<%= will_paginate @videos, :class => "pagination page-wide" %>
-		 	
+
 	<br />
 
diff --git a/app/views/videos/new.html.erb b/app/views/videos/new.html.erb
index 27bd88c..67839c9 100644
--- a/app/views/videos/new.html.erb
+++ b/app/views/videos/new.html.erb
@@ -14,7 +14,7 @@
     </tr>
     <tr>
       <td><%= f.label :video %>: </td><td><%= f.file_field :uploaded_data %></td>
-    </tr>    
+    </tr>
     <tr><td><%= f.submit 'Submit' %> - <%= link_to 'Back', videos_path %></td></tr>
   </table>
 
diff --git a/app/views/videos/new.html.erb~ b/app/views/videos/new.html.erb~
index fd962f7..8e9f203 100644
--- a/app/views/videos/new.html.erb~
+++ b/app/views/videos/new.html.erb~
@@ -11,7 +11,7 @@
     </tr>
     <tr>
       <td><%= f.label :video %>: </td><td><%= f.file_field :uploaded_data %></td>
-    </tr>    
+    </tr>
     <tr><td><%= f.submit 'Submit' %> - <%= link_to 'Back', videos_path %></td></tr>
   </table>
 
diff --git a/app/views/videos/show.html.erb b/app/views/videos/show.html.erb
index e734ec2..fc9a8fe 100644
--- a/app/views/videos/show.html.erb
+++ b/app/views/videos/show.html.erb
@@ -4,12 +4,12 @@
 	<span class = "tags">Tagged with: <span><%= @video.tag_list %></span></span>
 		<% if @video.state == "converted" %>
 			<p id = "video">
-				<a  
-					 href="<%= @video.public_filename %>"  
-					 style="display:block;width:720px;height:480px"  
-					 id="player"> 
-				</a> 
-			  
+				<a
+					 href="<%= @video.public_filename %>"
+					 style="display:block;width:720px;height:480px"
+					 id="player">
+				</a>
+
 				<!-- this will install flowplayer inside previous A- tag. -->
 				<script>
 					flowplayer("player", "/flowplayer/flowplayer-3.0.3.swf");
@@ -17,9 +17,9 @@
 			</p>
 		<% else %>
 			<% if @video.state == "error" %>
-				<h2>Error Converting Video, it will be removed shortly</h2>	
+				<h2>Error Converting Video, it will be removed shortly</h2>
 			<% else %>
-				<h2>Video is being converted, check back in a few minutes</h2>		
+				<h2>Video is being converted, check back in a few minutes</h2>
 			<% end %>
 
 		<% end %>
@@ -28,7 +28,7 @@
 
 	<div id = "video_replies">
 		<%= render :partial => 'reply' %>
-		
+
 		<% for reply in @video.replies do %>
 			<div class = "reply">
 				<p class = "author">Posted By: <%= link_to reply.user.login, reply.user %> on <%= reply.created_at %></p>
@@ -37,4 +37,4 @@
 		<% end %>
 	</div>
 
-</div><!-- /video_show -->		
+</div><!-- /video_show -->
diff --git a/app/views/videos/show.html.erb~ b/app/views/videos/show.html.erb~
index 575dd48..b894636 100644
--- a/app/views/videos/show.html.erb~
+++ b/app/views/videos/show.html.erb~
@@ -4,12 +4,12 @@
 	<span class = "tags">Tagged with: <span><%= @video.tag_list %></span></span>
 		<% if @video.state == "converted" %>
 			<p id = "video">
-				<a  
-					 href="<%= @video.public_filename %>"  
-					 style="display:block;width:720px;height:480px"  
-					 id="player"> 
-				</a> 
-			  
+				<a
+					 href="<%= @video.public_filename %>"
+					 style="display:block;width:720px;height:480px"
+					 id="player">
+				</a>
+
 				<!-- this will install flowplayer inside previous A- tag. -->
 				<script>
 					flowplayer("player", "/flowplayer/flowplayer-3.0.3.swf");
@@ -17,9 +17,9 @@
 			</p>
 		<% else %>
 			<% if @video.state == "error" %>
-				<h2>Error Converting Video, it will be removed shortly</h2>	
+				<h2>Error Converting Video, it will be removed shortly</h2>
 			<% else %>
-				<h2>Video is being converted, check back in a few minutes</h2>		
+				<h2>Video is being converted, check back in a few minutes</h2>
 			<% end %>
 
 		<% end %>
@@ -28,7 +28,7 @@
 
 	<div id = "video_replies">
 		<%= render :partial => 'reply' %>
-		
+
 		<% for reply in @video.replies do %>
 			<div class = "reply">
 				<p class = "author">Posted By: <%= link_to @reply.user.login, @reply.user %> on <%= @reply.created_at %></p>
@@ -37,4 +37,4 @@
 		<% end %>
 	</div>
 
-</div><!-- /video_show -->		
+</div><!-- /video_show -->
diff --git a/config/amazon_s3.yml b/config/amazon_s3.yml
index 81cb807..44a89ec 100644
--- a/config/amazon_s3.yml
+++ b/config/amazon_s3.yml
@@ -1,14 +1,14 @@
 development:
   bucket_name: appname_development
-  access_key_id: 
-  secret_access_key: 
+  access_key_id:
+  secret_access_key:
 
 test:
   bucket_name: appname_test
-  access_key_id: 
-  secret_access_key: 
+  access_key_id:
+  secret_access_key:
 
 production:
   bucket_name: appname
-  access_key_id: 
-  secret_access_key: 
+  access_key_id:
+  secret_access_key:
diff --git a/config/environment.rb b/config/environment.rb
index 714f024..edc903f 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -20,7 +20,7 @@
   # you must remove the Active Record framework.
   # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
 
-  # Specify gems that this application depends on. 
+  # Specify gems that this application depends on.
   # They can then be installed with "rake gems:install" on new installations.
   # You have to specify the :lib option for libraries, where the Gem name (sqlite3-ruby) differs from the file itself (sqlite3)
   # config.gem "bj"
@@ -28,7 +28,7 @@
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
 
-  # Only load the plugins named here, in the order given. By default, all plugins 
+  # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.
   # :all can be used as a placeholder for all plugins not explicitly named
   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
@@ -52,7 +52,7 @@
 
   # Your secret key for verifying cookie session data integrity.
   # If you change this key, all old sessions will become invalid!
-  # Make sure the secret is at least 30 characters and all random, 
+  # Make sure the secret is at least 30 characters and all random,
   # no regular words or you'll be exposed to dictionary attacks.
   config.action_controller.session = {
     :session_key => '_videoapp_session',
@@ -77,5 +77,5 @@
 
 end
 
-require "will_paginate" 
+require "will_paginate"
 
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index d531b8b..9e8b013 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format 
+# Add new inflection rules using the following format
 # (all these examples are active by default):
 # ActiveSupport::Inflector.inflections do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
diff --git a/config/routes.rb b/config/routes.rb
index f8309ad..8077e32 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -25,7 +25,7 @@
 
   # Sample resource route with sub-resources:
   #   map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
-  
+
   # Sample resource route with more complex sub-resources
   #   map.resources :products do |products|
   #     products.resources :comments
diff --git a/config/routes.rb~ b/config/routes.rb~
index aa546db..85c4708 100644
--- a/config/routes.rb~
+++ b/config/routes.rb~
@@ -25,7 +25,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # Sample resource route with sub-resources:
   #   map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
-  
+
   # Sample resource route with more complex sub-resources
   #   map.resources :products do |products|
   #     products.resources :comments
diff --git a/db/migrate/20090305184450_create_thumbnails.rb b/db/migrate/20090305184450_create_thumbnails.rb
index 3ba6b95..4d55415 100644
--- a/db/migrate/20090305184450_create_thumbnails.rb
+++ b/db/migrate/20090305184450_create_thumbnails.rb
@@ -1,7 +1,7 @@
 
 class CreateThumbnails < ActiveRecord::Migration
   def self.up
-  	
+
   	#create new table
     create_table :thumbnails do |t|
       t.string :content_type
@@ -9,10 +9,10 @@ def self.up
       t.string :filename
       t.timestamps
     end
-    
+
     #add foreign key to video table
     add_column :videos, :thumbnail_id, :integer
-    
+
   end
 
   def self.down
diff --git a/db/schema.rb b/db/schema.rb
index fbaaa73..6fc19c5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,4 +1,4 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# This file is auto-generated from the current state of the database. Instead of editing this file,
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #
diff --git a/lib/script/railscasts.rb b/lib/script/railscasts.rb
index 2b9e72d..7229bb7 100644
--- a/lib/script/railscasts.rb
+++ b/lib/script/railscasts.rb
@@ -3,10 +3,10 @@
 
 data = Scrubyt::Extractor.define do
 	fetch 'http://railscasts.com/episodes/archive'
-	
+
 	link "/html/body/div/div[2]/div/div/a" do
 		title "/html/body/div/div[2]/div/div/a"
-		url("href", { :type => :attribute })	
+		url("href", { :type => :attribute })
 	end
 end
 
@@ -27,5 +27,5 @@
 	        end
 	end
 	puts data.to_xml
-	
+
 end
diff --git a/public/flowplayer/LICENSE.txt b/public/flowplayer/LICENSE.txt
index e99bd22..55be6e2 100644
--- a/public/flowplayer/LICENSE.txt
+++ b/public/flowplayer/LICENSE.txt
@@ -1,16 +1,16 @@
-The FlowPlayer Free version is released under GNU GENERAL PUBLIC LICENSE 
+The FlowPlayer Free version is released under GNU GENERAL PUBLIC LICENSE
 Version 3 (GPL). GPL allows you to integrate Flowplayer into any website
 provided that you don't remove the Flowplayer logo images or texts from the
 software.
 
-If you do remove the logos, you are required to place a Flowplayer link into the 
+If you do remove the logos, you are required to place a Flowplayer link into the
 site that uses Flowplayer. This link must point to http://flowplayer.org. This
 is because the GPL requires you to provide the users of your site an easy access
 to the Flowplayer source code. The logos act as such links, and if you remove
 them, you must provide an alternative link.
 
 Commercial licenses are available. These unburden you from the requirement
-to offer these links. Additionally, the commercial player version does 
+to offer these links. Additionally, the commercial player version does
 not have any Flowplayer logos or texts.
 
 ========================================================================
diff --git a/public/flowplayer/README.txt b/public/flowplayer/README.txt
index cd6bc30..3b2d712 100644
--- a/public/flowplayer/README.txt
+++ b/public/flowplayer/README.txt
@@ -21,7 +21,7 @@ Version history:
 - now displays a live feed even when the RTMP server does not send any metadata and the onStart method is not therefore dispatched
 - added onMetaData clip event
 - fixed 'orig' scaling: the player went to 'fit' scaling after coming back from fullscreen. This is now fixed and the original dimensions are preserved in non-fullscreen mode.
-- cuepoint times are now given in milliseconds, the firing precision is 100 ms. All cuepoint times are rounded to the nearest 100 ms value (for example 1120 rounds to 1100) 
+- cuepoint times are now given in milliseconds, the firing precision is 100 ms. All cuepoint times are rounded to the nearest 100 ms value (for example 1120 rounds to 1100)
 - backgroundGradient was drawn over the background image in the canvas and in the content and controlbar plugins. Now it's drawn below the image.
 - added cuepointMultiplier property to clips. This can be used to multiply the time values read from cuepoint metadata embedded into video files.
 - the player's framerate was increased to 24 FPS, makes all animations smoother
@@ -68,7 +68,7 @@ RC4
 - Should not stop playback too early before the clip is really completed
 - The START event is now delayed so that the metadata is available when the event is fired, METADATA event was removed,
   new event BEGIN that is dispatched when the playback has been successfully started. Metadata is not normally
-  available when BEGIN is fired. 
+  available when BEGIN is fired.
 
 RC3
 ---
diff --git a/public/flowplayer/example/index.html b/public/flowplayer/example/index.html
index fefb18f..546a86a 100644
--- a/public/flowplayer/example/index.html
+++ b/public/flowplayer/example/index.html
@@ -1,61 +1,61 @@
 <html><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <!-- A minimal Flowplayer setup to get you started -->
-  
 
-	<!-- 
-		include flowplayer JavaScript file that does  
+
+	<!--
+		include flowplayer JavaScript file that does
 		Flash embedding and provides the Flowplayer API.
 	-->
 	<script type="text/javascript" src="flowplayer-3.0.3.min.js"></script>
-	
+
 	<!-- some minimal styling, can be removed -->
 	<link rel="stylesheet" type="text/css" href="style.css">
-	
+
 	<!-- page title -->
 	<title>Minimal Flowplayer setup</title>
 
 </head><body>
 
 	<div id="page">
-		
+
 		<h1>Minimal Flowplayer setup</h1>
-	
+
 		<p>View commented source code to get familiar with Flowplayer installation.</p>
-		
+
 		<!-- this A tag is where your Flowplayer will be placed. it can be anywhere -->
-		<a  
-			 href="http://blip.tv/file/get/KimAronson-TwentySeconds73213.flv"  
-			 style="display:block;width:400px;height:300px"  
-			 id="player"> 
-		</a> 
-	
+		<a
+			 href="http://blip.tv/file/get/KimAronson-TwentySeconds73213.flv"
+			 style="display:block;width:400px;height:300px"
+			 id="player">
+		</a>
+
 		<!-- this will install flowplayer inside previous A- tag. -->
 		<script>
 			flowplayer("player", "../flowplayer-3.0.3.swf");
 		</script>
-	
-		
-		
-		<!-- 
-			after this line is purely informational stuff. 
-			does not affect on Flowplayer functionality 
+
+
+
+		<!--
+			after this line is purely informational stuff.
+			does not affect on Flowplayer functionality
 		-->
 
-		<p>		
-			If you are running these examples <strong>locally</strong> and not on some webserver you must edit your 
+		<p>
+			If you are running these examples <strong>locally</strong> and not on some webserver you must edit your
 			<a href="http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html">
-				Flash security settings</a>. 
+				Flash security settings</a>.
 		</p>
-		
+
 		<p class="less">
 			Select "Edit locations" &gt; "Add location" &gt; "Browse for files" and select
 			flowplayer-x.x.x.swf you just downloaded.
 		</p>
-		
-		
+
+
 		<h2>Documentation</h2>
-		
+
 		<p>
 			<a href="http://beta.flowplayer.org/documentation/installation.html">Flowplayer installation</a>
 		</p>
@@ -65,10 +65,10 @@ <h2>Documentation</h2>
 		</p>
 
 		<p>
-			See this identical page on <a href="http://beta.flowplayer.org/demos/example/index.htm">Flowplayer website</a> 
+			See this identical page on <a href="http://beta.flowplayer.org/demos/example/index.htm">Flowplayer website</a>
 		</p>
-		
+
 	</div>
-	
-	
+
+
 </body></html>
\ No newline at end of file
diff --git a/public/javascripts/flowplayer.js b/public/javascripts/flowplayer.js
index 7f851db..ae527b6 100644
--- a/public/javascripts/flowplayer.js
+++ b/public/javascripts/flowplayer.js
@@ -1,23 +1,23 @@
-/** 
+/**
  * flowplayer.js 3.0.3. The Flowplayer API
- * 
+ *
  * Copyright 2008 Flowplayer Oy
- * 
+ *
  * This file is part of Flowplayer.
- * 
+ *
  * Flowplayer is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * Flowplayer is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with Flowplayer.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  * Version: 3.0.3 - Wed Jan 07 2009 13:22:30 GMT-0000 (GMT+00:00)
  */
 (function(){function log(args){console.log("$f.fireEvent",[].slice.call(args));}function clone(obj){if(!obj||typeof obj!='object'){return obj;}var temp=new obj.constructor();for(var key in obj){if(obj.hasOwnProperty(key)){temp[key]=clone(obj[key]);}}return temp;}function each(obj,fn){if(!obj){return;}var name,i=0,length=obj.length;if(length===undefined){for(name in obj){if(fn.call(obj[name],name,obj[name])===false){break;}}}else{for(var value=obj[0];i<length&&fn.call(value,i,value)!==false;value=obj[++i]){}}return obj;}function el(id){return document.getElementById(id);}function extend(to,from,skipFuncs){if(to&&from){each(from,function(name,value){if(!skipFuncs||typeof value!='function'){to[name]=value;}});}}function select(query){var index=query.indexOf(".");if(index!=-1){var tag=query.substring(0,index)||"*";var klass=query.substring(index+1,query.length);var els=[];each(document.getElementsByTagName(tag),function(){if(this.className&&this.className.indexOf(klass)!=-1){els.push(this);}});return els;}}function stopEvent(e){e=e||window.event;if(e.preventDefault){e.stopPropagation();e.preventDefault();}else{e.returnValue=false;e.cancelBubble=true;}return false;}function bind(to,evt,fn){to[evt]=to[evt]||[];to[evt].push(fn);}function makeId(){return"_"+(""+Math.random()).substring(2,10);}var Clip=function(json,index,player){var self=this;var cuepoints={};var listeners={};self.index=index;if(typeof json=='string'){json={url:json};}extend(this,json,true);each(("Begin*,Start,Pause*,Resume*,Seek*,Stop*,Finish*,LastSecond,Update,BufferFull,BufferEmpty,BufferStop").split(","),function(){var evt="on"+this;if(evt.indexOf("*")!=-1){evt=evt.substring(0,evt.length-1);var before="onBefore"+evt.substring(2);self[before]=function(fn){bind(listeners,before,fn);return self;};}self[evt]=function(fn){bind(listeners,evt,fn);return self;};if(index==-1){if(self[before]){player[before]=self[before];}if(self[evt]){player[evt]=self[evt];}}});extend(this,{onCuepoint:function(points,fn){if(arguments.length==1){cuepoints.embedded=[null,points];return self;}if(typeof points=='number'){points=[points];}var fnId=makeId();cuepoints[fnId]=[points,fn];if(player.isLoaded()){player._api().fp_addCuepoints(points,index,fnId);}return self;},update:function(json){extend(self,json);if(player.isLoaded()){player._api().fp_updateClip(json,index);}var conf=player.getConfig();var clip=(index==-1)?conf.clip:conf.playlist[index];extend(clip,json,true);},_fireEvent:function(evt,arg1,arg2,target){if(evt=='onLoad'){each(cuepoints,function(key,val){if(val[0]){player._api().fp_addCuepoints(val[0],index,key);}});return false;}if(index!=-1){target=self;}if(evt=='onCuepoint'){var fn=cuepoints[arg1];if(fn){return fn[1].call(player,target,arg2);}}if(evt=='onStart'||evt=='onUpdate'){extend(target,arg1);if(!target.duration){target.duration=arg1.metaData.duration;}else{target.fullDuration=arg1.metaData.duration;}}var ret=true;each(listeners[evt],function(){ret=this.call(player,target,arg1,arg2);});return ret;}});if(json.onCuepoint){var arg=json.onCuepoint;self.onCuepoint.apply(self,typeof arg=='function'?[arg]:arg);delete json.onCuepoint;}each(json,function(key,val){if(typeof val=='function'){bind(listeners,key,val);delete json[key];}});if(index==-1){player.onCuepoint=this.onCuepoint;}};var Plugin=function(name,json,player,fn){var listeners={};var self=this;var hasMethods=false;if(fn){extend(listeners,fn);}each(json,function(key,val){if(typeof val=='function'){listeners[key]=val;delete json[key];}});extend(this,{animate:function(props,speed,fn){if(!props){return self;}if(typeof speed=='function'){fn=speed;speed=500;}if(typeof props=='string'){var key=props;props={};props[key]=speed;speed=500;}if(fn){var fnId=makeId();listeners[fnId]=fn;}if(speed===undefined){speed=500;}json=player._api().fp_animate(name,props,speed,fnId);return self;},css:function(props,val){if(val!==undefined){var css={};css[props]=val;props=css;}json=player._api().fp_css(name,props);extend(self,json);return self;},show:function(){this.display='block';player._api().fp_showPlugin(name);return self;},hide:function(){this.display='none';player._api().fp_hidePlugin(name);return self;},toggle:function(){this.display=player._api().fp_togglePlugin(name);return self;},fadeTo:function(o,speed,fn){if(typeof speed=='function'){fn=speed;speed=500;}if(fn){var fnId=makeId();listeners[fnId]=fn;}this.display=player._api().fp_fadeTo(name,o,speed,fnId);this.opacity=o;return self;},fadeIn:function(speed,fn){return self.fadeTo(1,speed,fn);},fadeOut:function(speed,fn){return self.fadeTo(0,speed,fn);},getName:function(){return name;},_fireEvent:function(evt,arg){if(evt=='onUpdate'){var json=player._api().fp_getPlugin(name);if(!json){return;}extend(self,json);delete self.methods;if(!hasMethods){each(json.methods,function(){var method=""+this;self[method]=function(){var a=[].slice.call(arguments);var ret=player._api().fp_invoke(name,method,a);return ret=='undefined'?self:ret;};});hasMethods=true;}}var fn=listeners[evt];if(fn){fn.call(self,arg);if(evt.substring(0,1)=="_"){delete listeners[evt];}}}});};function Player(wrapper,params,conf){var
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 21349c2..b578f13 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -5,9 +5,9 @@ html
 	padding: 0;
 }
 
-body 
+body
 {
-	background: #fefefe none repeat scroll 0 0;	
+	background: #fefefe none repeat scroll 0 0;
 	font-family: arial, helvetica, sans-serif;
 	margin: 0;
 	padding: 0;
@@ -29,8 +29,8 @@ body
 h1, h2 {
 	letter-spacing:-1px;
 	color:#2D5AC3;
-	font-weight:normal;		
-	
+	font-weight:normal;
+
 }
 
 h1 {
@@ -50,7 +50,7 @@ h2 {
 	height: 75px;
 	padding-bottom: 0;
 	padding-top: 8px;
-	
+
 }
 
 #logo
@@ -67,7 +67,7 @@ h2 {
 	height: 33px;
 	font-weight: bold;
 	font-size: 25px;
-	text-decoration: none;	
+	text-decoration: none;
 	background-color: #5050FF;
 	padding: 5px 10px 5px 10px;
 	border: 3px solid #5555A5;
@@ -110,9 +110,9 @@ h2 {
 
 #body h2
 {
-	font-size: 23px;	
+	font-size: 23px;
 	text-align: center;
-	
+
 }
 
 #sidebar
@@ -126,7 +126,7 @@ h2 {
 	margin-left: -100%;
 	text-align: center;
 	height: 100%;
-	
+
 }
 
 #sidebar a
@@ -139,7 +139,7 @@ h2 {
 #sidebar .new
 {
 	color: red;
-	font-size: 21px;	
+	font-size: 21px;
 }
 
 #sidebar a:hover
@@ -194,7 +194,7 @@ h2 {
 }
 
 a {
-	color:#295c72;		
+	color:#295c72;
 }
 
 .video_thumb
@@ -213,10 +213,10 @@ a.video_thumb
 	border: thin solid #5555A5;
 	background-color: #ddddff;
 	text-decoration: none;
-	
+
 }
 
-a:hover.video_thumb 
+a:hover.video_thumb
 {
 	background-color: #ddffdd;
 }
@@ -243,10 +243,10 @@ a:hover.video_thumb
 .clear-right
 {
 	clear: right;
-	
+
 	margin: 5px;
 	width: 5px;
-	height: 5px;	
+	height: 5px;
 }
 
 .pagination
@@ -254,12 +254,12 @@ a:hover.video_thumb
 	text-align: center;
 	margin: auto;
 	width: 400px;
-	font-size: 80%;	
+	font-size: 80%;
 }
 
-.pagination a 
+.pagination a
 {
-	color: 
+	color:
 }
 
 .page-wide
@@ -267,11 +267,11 @@ a:hover.video_thumb
 	bottom: 0;
 	margin-top: 75px;
 	position: relative;
-	
+
 	margin: auto;
 	float: right;
 	margin-top: 75px;
-	
+
 }
 
 
@@ -287,7 +287,7 @@ a:hover.video_thumb
 	text-align: center;
 	font-weight: bold;
 	color: #c8c8c8;
-	
+
 }
 
 input
@@ -296,7 +296,7 @@ input
 	border: 3px solid gray;
 	width: 300px;
 	font-size: 120%;
-	
+
 }
 
 input.submit
@@ -360,7 +360,7 @@ label
 	border: 1px solid gray;
 	border-bottom: 2px solid black;
 	border-right: 2px solid gray;
-		
+
 }
 
 .flash_notice
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9f19269..24e9b85 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -16,7 +16,7 @@ class Test::Unit::TestCase
   # don't care one way or the other, switching from MyISAM to InnoDB tables
   # is recommended.
   #
-  # The only drawback to using transactional fixtures is when you actually 
+  # The only drawback to using transactional fixtures is when you actually
   # need to test transactions.  Since your test is bracketed by a transaction,
   # any transactions started in your code will be automatically rolled back.
   self.use_transactional_fixtures = true
diff --git a/vendor/plugins/acts_as_state_machine/lib/acts_as_state_machine.rb b/vendor/plugins/acts_as_state_machine/lib/acts_as_state_machine.rb
index 50d0439..496deb3 100644
--- a/vendor/plugins/acts_as_state_machine/lib/acts_as_state_machine.rb
+++ b/vendor/plugins/acts_as_state_machine/lib/acts_as_state_machine.rb
@@ -5,24 +5,24 @@ class InvalidState < Exception #:nodoc:
       end
       class NoInitialState < Exception #:nodoc:
       end
-      
+
       def self.included(base)        #:nodoc:
         base.extend ActMacro
       end
-      
+
       module SupportingClasses
         class State
           attr_reader :name
-        
+
           def initialize(name, opts)
             @name, @opts = name, opts
           end
-        
+
           def entering(record)
             enteract = @opts[:enter]
             record.send(:run_transition_action, enteract) if enteract
           end
-        
+
           def entered(record)
             afteractions = @opts[:after]
             return unless afteractions
@@ -30,7 +30,7 @@ def entered(record)
               record.send(:run_transition_action, afteract)
             end
           end
-        
+
           def exited(record)
             exitact  = @opts[:exit]
             record.send(:run_transition_action, exitact) if exitact
@@ -39,12 +39,12 @@ def exited(record)
 
         class StateTransition
           attr_reader :from, :to, :opts
-          
+
           def initialize(opts)
             @from, @to, @guard = opts[:from], opts[:to], opts[:guard]
             @opts = opts
           end
-          
+
           def guard(obj)
             @guard ? obj.send(:run_transition_action, @guard) : true
           end
@@ -55,21 +55,21 @@ def perform(record)
             states = record.class.read_inheritable_attribute(:states)
             next_state = states[to]
             old_state = states[record.current_state]
-          
+
             next_state.entering(record) unless loopback
-          
+
             record.update_attribute(record.class.state_column, to.to_s)
-          
+
             next_state.entered(record) unless loopback
             old_state.exited(record) unless loopback
             true
           end
-          
+
           def ==(obj)
             @from == obj.from && @to == obj.to
           end
         end
-        
+
         class Event
           attr_reader :name
           attr_reader :transitions
@@ -84,17 +84,17 @@ def initialize(name, opts, transition_table, &block)
             @transitions.freeze
             freeze
           end
-          
+
           def next_states(record)
             @transitions.select { |t| t.from == record.current_state }
           end
-          
+
           def fire(record)
             next_states(record).each do |transition|
               break true if transition.perform(record)
             end
           end
-          
+
           def transitions(trans_opts)
             Array(trans_opts[:from]).each do |s|
               @transitions << SupportingClasses::StateTransition.new(trans_opts.merge({:from => s.to_sym}))
@@ -102,7 +102,7 @@ def transitions(trans_opts)
           end
         end
       end
-      
+
       module ActMacro
         # Configuration options are
         #
@@ -111,25 +111,25 @@ module ActMacro
         def acts_as_state_machine(opts)
           self.extend(ClassMethods)
           raise NoInitialState unless opts[:initial]
-          
+
           write_inheritable_attribute :states, {}
           write_inheritable_attribute :initial_state, opts[:initial]
           write_inheritable_attribute :transition_table, {}
           write_inheritable_attribute :event_table, {}
           write_inheritable_attribute :state_column, opts[:column] || 'state'
-          
+
           class_inheritable_reader    :initial_state
           class_inheritable_reader    :state_column
           class_inheritable_reader    :transition_table
           class_inheritable_reader    :event_table
-          
+
           self.send(:include, ScottBarron::Acts::StateMachine::InstanceMethods)
 
           before_create               :set_initial_state
           after_create                :run_initial_state_actions
         end
       end
-      
+
       module InstanceMethods
         def set_initial_state #:nodoc:
           write_attribute self.class.state_column, self.class.initial_state.to_s
@@ -140,12 +140,12 @@ def run_initial_state_actions
           initial.entering(self)
           initial.entered(self)
         end
-      
+
         # Returns the current state the object is in, as a Ruby symbol.
         def current_state
           self.send(self.class.state_column).to_sym
         end
-      
+
         # Returns what the next state for a given event would be, as a Ruby symbol.
         def next_state_for_event(event)
           ns = next_states_for_event(event)
@@ -169,7 +169,7 @@ module ClassMethods
         def states
           read_inheritable_attribute(:states).keys
         end
-        
+
         # Define an event.  This takes a block which describes all valid transitions
         # for this event.
         #
@@ -195,12 +195,12 @@ def states
         # Example: <tt>order.close_order!</tt>.
         def event(event, opts={}, &block)
           tt = read_inheritable_attribute(:transition_table)
-          
+
           et = read_inheritable_attribute(:event_table)
           e = et[event.to_sym] = SupportingClasses::Event.new(event, opts, tt, &block)
           define_method("#{event.to_s}!") { e.fire(self) }
         end
-        
+
         # Define a state of the system. +state+ can take an optional Proc object
         # which will be executed every time the system transitions into that
         # state.  The proc will be passed the current object.
@@ -216,10 +216,10 @@ def event(event, opts={}, &block)
         def state(name, opts={})
           state = SupportingClasses::State.new(name.to_sym, opts)
           read_inheritable_attribute(:states)[name.to_sym] = state
-        
+
           define_method("#{state.name}?") { current_state == state.name }
         end
-        
+
         # Wraps ActiveRecord::Base.find to conveniently find all records in
         # a given state.  Options:
         #
@@ -231,7 +231,7 @@ def find_in_state(number, state, *args)
             find(number, *args)
           end
         end
-        
+
         # Wraps ActiveRecord::Base.count to conveniently count all records in
         # a given state.  Options:
         #
@@ -242,7 +242,7 @@ def count_in_state(state, *args)
             count(*args)
           end
         end
-        
+
         # Wraps ActiveRecord::Base.calculate to conveniently calculate all records in
         # a given state.  Options:
         #
@@ -253,11 +253,11 @@ def calculate_in_state(state, *args)
             calculate(*args)
           end
         end
-        
+
         protected
         def with_state_scope(state)
           raise InvalidState unless states.include?(state)
-          
+
           with_scope :find => {:conditions => ["#{table_name}.#{state_column} = ?", state.to_s]} do
             yield if block_given?
           end
diff --git a/vendor/plugins/acts_as_state_machine/test/acts_as_state_machine_test.rb b/vendor/plugins/acts_as_state_machine/test/acts_as_state_machine_test.rb
index e113515..380798b 100644
--- a/vendor/plugins/acts_as_state_machine/test/acts_as_state_machine_test.rb
+++ b/vendor/plugins/acts_as_state_machine/test/acts_as_state_machine_test.rb
@@ -4,33 +4,33 @@
 
 class ActsAsStateMachineTest < Test::Unit::TestCase
   fixtures :conversations
-  
+
   def test_no_initial_value_raises_exception
     assert_raise(NoInitialState) {
       Person.acts_as_state_machine({})
     }
   end
-  
+
   def test_initial_state_value
     assert_equal :needs_attention, Conversation.initial_state
   end
-  
+
   def test_column_was_set
     assert_equal 'state_machine', Conversation.state_column
   end
-  
+
   def test_initial_state
     c = Conversation.create
     assert_equal :needs_attention, c.current_state
     assert c.needs_attention?
   end
-  
+
   def test_states_were_set
     [:needs_attention, :read, :closed, :awaiting_response, :junk].each do |s|
       assert Conversation.states.include?(s)
     end
   end
-  
+
   def test_event_methods_created
     c = Conversation.create
     %w(new_message! view! reply! close! junk! unjunk!).each do |event|
@@ -44,10 +44,10 @@ def test_query_methods_created
       assert c.respond_to?(event)
     end
   end
-  
+
   def test_transition_table
     tt = Conversation.transition_table
-    
+
     assert tt[:new_message].include?(SupportingClasses::StateTransition.new(:from => :read, :to => :needs_attention))
     assert tt[:new_message].include?(SupportingClasses::StateTransition.new(:from => :closed, :to => :needs_attention))
     assert tt[:new_message].include?(SupportingClasses::StateTransition.new(:from => :awaiting_response, :to => :needs_attention))
@@ -57,13 +57,13 @@ def test_next_state_for_event
     c = Conversation.create
     assert_equal :read, c.next_state_for_event(:view)
   end
-  
+
   def test_change_state
     c = Conversation.create
     c.view!
     assert c.read?
   end
-  
+
   def test_can_go_from_read_to_closed_because_guard_passes
     c = Conversation.create
     c.can_close = true
@@ -72,7 +72,7 @@ def test_can_go_from_read_to_closed_because_guard_passes
     c.close!
     assert_equal :closed, c.current_state
   end
-  
+
   def test_cannot_go_from_read_to_closed_because_of_guard
     c = Conversation.create
     c.can_close = false
@@ -144,7 +144,7 @@ def test_exit_action_executed
     c.junk!
     assert c.read_exit
   end
-  
+
   def test_entry_and_exit_not_run_on_loopback_transition
     c = Conversation.create
     c.view!
@@ -160,56 +160,56 @@ def test_entry_and_after_actions_called_for_initial_state
     assert c.needs_attention_enter
     assert c.needs_attention_after
   end
-  
+
   def test_run_transition_action_is_private
     c = Conversation.create
     assert_raise(NoMethodError) { c.run_transition_action :foo }
   end
-  
+
   def test_find_all_in_state
     cs = Conversation.find_in_state(:all, :read)
-    
+
     assert_equal 2, cs.size
   end
-  
+
   def test_find_first_in_state
     c = Conversation.find_in_state(:first, :read)
-    
+
     assert_equal conversations(:first).id, c.id
   end
-  
+
   def test_find_all_in_state_with_conditions
     cs = Conversation.find_in_state(:all, :read, :conditions => ['subject = ?', conversations(:second).subject])
-    
+
     assert_equal 1, cs.size
     assert_equal conversations(:second).id, cs.first.id
   end
-  
+
   def test_find_first_in_state_with_conditions
     c = Conversation.find_in_state(:first, :read, :conditions => ['subject = ?', conversations(:second).subject])
     assert_equal conversations(:second).id, c.id
   end
-  
+
   def test_count_in_state
     cnt0 = Conversation.count(['state_machine = ?', 'read'])
     cnt  = Conversation.count_in_state(:read)
-    
+
     assert_equal cnt0, cnt
   end
-  
+
   def test_count_in_state_with_conditions
     cnt0 = Conversation.count(['state_machine = ? AND subject = ?', 'read', 'Foo'])
     cnt  = Conversation.count_in_state(:read, ['subject = ?', 'Foo'])
-    
+
     assert_equal cnt0, cnt
   end
-  
+
   def test_find_in_invalid_state_raises_exception
     assert_raise(InvalidState) {
       Conversation.find_in_state(:all, :dead)
     }
   end
-  
+
   def test_count_in_invalid_state_raises_exception
     assert_raise(InvalidState) {
       Conversation.count_in_state(:dead)
diff --git a/vendor/plugins/acts_as_state_machine/test/fixtures/conversation.rb b/vendor/plugins/acts_as_state_machine/test/fixtures/conversation.rb
index 8b41432..0f1fd60 100644
--- a/vendor/plugins/acts_as_state_machine/test/fixtures/conversation.rb
+++ b/vendor/plugins/acts_as_state_machine/test/fixtures/conversation.rb
@@ -7,7 +7,7 @@ class Conversation < ActiveRecord::Base
 
   state :needs_attention, :enter => Proc.new { |o| o.needs_attention_enter = true },
                           :after => Proc.new { |o| o.needs_attention_after = true }
-                          
+
   state :read, :enter => :read_enter_action,
                :exit  => Proc.new { |o| o.read_exit  = true },
                :after => [:read_after_first_action, :read_after_second_action]
@@ -23,7 +23,7 @@ class Conversation < ActiveRecord::Base
   event :view do
     transitions :to => :read,              :from => [:needs_attention, :read]
   end
-  
+
   event :reply do
     transitions :to => :awaiting_response, :from => [:read, :closed]
   end
diff --git a/vendor/plugins/acts_as_state_machine/test/fixtures/conversations.yml b/vendor/plugins/acts_as_state_machine/test/fixtures/conversations.yml
index 572e0ee..a689ed9 100644
--- a/vendor/plugins/acts_as_state_machine/test/fixtures/conversations.yml
+++ b/vendor/plugins/acts_as_state_machine/test/fixtures/conversations.yml
@@ -3,7 +3,7 @@ first:
   state_machine: read
   subject: This is a test
   closed: false
-  
+
 second:
   id: 2
   state_machine: read
diff --git a/vendor/plugins/acts_as_state_machine/test/schema.rb b/vendor/plugins/acts_as_state_machine/test/schema.rb
index 5012899..e4f6e9c 100644
--- a/vendor/plugins/acts_as_state_machine/test/schema.rb
+++ b/vendor/plugins/acts_as_state_machine/test/schema.rb
@@ -4,7 +4,7 @@
     t.column :subject,       :string
     t.column :closed,        :boolean
   end
-  
+
   create_table :people, :force => true do |t|
     t.column :name, :string
   end
diff --git a/vendor/plugins/acts_as_state_machine/test/test_helper.rb b/vendor/plugins/acts_as_state_machine/test/test_helper.rb
index 95331d0..4eecede 100644
--- a/vendor/plugins/acts_as_state_machine/test/test_helper.rb
+++ b/vendor/plugins/acts_as_state_machine/test/test_helper.rb
@@ -30,7 +30,7 @@ def create_fixtures(*table_names)
 
   # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
   self.use_transactional_fixtures = true
-  
+
   # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
   self.use_instantiated_fixtures  = false
 
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/lib/acts_as_taggable.rb b/vendor/plugins/acts_as_taggable_on_steroids/lib/acts_as_taggable.rb
index 14dbe12..76bb953 100644
--- a/vendor/plugins/acts_as_taggable_on_steroids/lib/acts_as_taggable.rb
+++ b/vendor/plugins/acts_as_taggable_on_steroids/lib/acts_as_taggable.rb
@@ -4,47 +4,47 @@ module Taggable #:nodoc:
       def self.included(base)
         base.extend(ClassMethods)
       end
-      
+
       module ClassMethods
         def acts_as_taggable
           has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag
           has_many :tags, :through => :taggings
-          
+
           before_save :save_cached_tag_list
           after_save :save_tags
-          
+
           include ActiveRecord::Acts::Taggable::InstanceMethods
           extend ActiveRecord::Acts::Taggable::SingletonMethods
-          
+
           alias_method_chain :reload, :tag_list
         end
-        
+
         def cached_tag_list_column_name
           "cached_tag_list"
         end
-        
+
         def set_cached_tag_list_column_name(value = nil, &block)
           define_attr_method :cached_tag_list_column_name, value, &block
         end
       end
-      
+
       module SingletonMethods
         # Returns an array of related tags.
         # Related tags are all the other tags that are found on the models tagged with the provided tags.
-        # 
+        #
         # Pass either a tag, string, or an array of strings or tags.
-        # 
+        #
         # Options:
         #   :order - SQL Order how to order the tags. Defaults to "count DESC, tags.name".
         def find_related_tags(tags, options = {})
           tags = tags.is_a?(Array) ? TagList.new(tags.map(&:to_s)) : TagList.from(tags)
-          
+
           related_models = find_tagged_with(tags)
-          
+
           return [] if related_models.blank?
-          
+
           related_ids = related_models.to_s(:db)
-          
+
           Tag.find(:all, options.merge({
             :select => "#{Tag.table_name}.*, COUNT(#{Tag.table_name}.id) AS count",
             :joins  => "JOIN #{Tagging.table_name} ON #{Tagging.table_name}.taggable_type = '#{base_class.name}'
@@ -54,9 +54,9 @@ def find_related_tags(tags, options = {})
             :group => "#{Tag.table_name}.id, #{Tag.table_name}.name HAVING #{Tag.table_name}.name NOT IN (#{tags.map { |n| quote_value(n) }.join(",")})"
           }))
         end
-        
+
         # Pass either a tag, string, or an array of strings or tags.
-        # 
+        #
         # Options:
         #   :exclude - Find models that are not tagged with the given tags
         #   :match_all - Find models that match all of the given tags, not just one
@@ -65,18 +65,18 @@ def find_tagged_with(*args)
           options = find_options_for_find_tagged_with(*args)
           options.blank? ? [] : find(:all, options)
         end
-        
+
         def find_options_for_find_tagged_with(tags, options = {})
           tags = tags.is_a?(Array) ? TagList.new(tags.map(&:to_s)) : TagList.from(tags)
           options = options.dup
-          
+
           return {} if tags.empty?
-          
+
           conditions = []
           conditions << sanitize_sql(options.delete(:conditions)) if options[:conditions]
-          
+
           taggings_alias, tags_alias = "#{table_name}_taggings", "#{table_name}_tags"
-          
+
           if options.delete(:exclude)
             conditions << <<-END
               #{table_name}.id NOT IN
@@ -97,105 +97,105 @@ def find_options_for_find_tagged_with(tags, options = {})
               conditions << tags_condition(tags, tags_alias)
             end
           end
-          
+
           { :select => "DISTINCT #{table_name}.*",
             :joins => "INNER JOIN #{Tagging.table_name} #{taggings_alias} ON #{taggings_alias}.taggable_id = #{table_name}.#{primary_key} AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name)} " +
                       "INNER JOIN #{Tag.table_name} #{tags_alias} ON #{tags_alias}.id = #{taggings_alias}.tag_id",
             :conditions => conditions.join(" AND ")
           }.reverse_merge!(options)
         end
-        
+
         # Calculate the tag counts for all tags.
-        # 
+        #
         # See Tag.counts for available options.
         def tag_counts(options = {})
           Tag.find(:all, find_options_for_tag_counts(options))
         end
-        
+
         def find_options_for_tag_counts(options = {})
           options = options.dup
           scope = scope(:find)
-          
+
           conditions = []
           conditions << send(:sanitize_conditions, options.delete(:conditions)) if options[:conditions]
           conditions << send(:sanitize_conditions, scope[:conditions]) if scope && scope[:conditions]
           conditions << "#{Tagging.table_name}.taggable_type = #{quote_value(base_class.name)}"
-          conditions << type_condition unless descends_from_active_record? 
+          conditions << type_condition unless descends_from_active_record?
           conditions.compact!
           conditions = conditions.join(" AND ")
-          
+
           joins = ["INNER JOIN #{table_name} ON #{table_name}.#{primary_key} = #{Tagging.table_name}.taggable_id"]
           joins << options.delete(:joins) if options[:joins]
           joins << scope[:joins] if scope && scope[:joins]
           joins = joins.join(" ")
-          
+
           options = { :conditions => conditions, :joins => joins }.update(options)
-          
+
           Tag.options_for_counts(options)
         end
-        
+
         def caching_tag_list?
           column_names.include?(cached_tag_list_column_name)
         end
-        
+
        private
         def tags_condition(tags, table_name = Tag.table_name)
           condition = tags.map { |t| sanitize_sql(["#{table_name}.name LIKE ?", t]) }.join(" OR ")
           "(" + condition + ")" unless condition.blank?
         end
       end
-      
+
       module InstanceMethods
         def tag_list
           return @tag_list if @tag_list
-          
+
           if self.class.caching_tag_list? and !(cached_value = send(self.class.cached_tag_list_column_name)).nil?
             @tag_list = TagList.from(cached_value)
           else
             @tag_list = TagList.new(*tags.map(&:name))
           end
         end
-        
+
         def tag_list=(value)
           @tag_list = TagList.from(value)
         end
-        
+
         def save_cached_tag_list
           if self.class.caching_tag_list?
             self[self.class.cached_tag_list_column_name] = tag_list.to_s
           end
         end
-        
+
         def save_tags
           return unless @tag_list
-          
+
           new_tag_names = @tag_list - tags.map(&:name)
           old_tags = tags.reject { |tag| @tag_list.include?(tag.name) }
-          
+
           self.class.transaction do
             if old_tags.any?
               taggings.find(:all, :conditions => ["tag_id IN (?)", old_tags.map(&:id)]).each(&:destroy)
               taggings.reset
             end
-            
+
             new_tag_names.each do |new_tag_name|
               tags << Tag.find_or_create_with_like_by_name(new_tag_name)
             end
           end
-          
+
           true
         end
-        
+
         # Calculate the tag counts for the tags used by this model.
         #
         # The possible options are the same as the tag_counts class method.
         def tag_counts(options = {})
           return [] if tag_list.blank?
-          
+
           options[:conditions] = self.class.send(:merge_conditions, options[:conditions], self.class.send(:tags_condition, tag_list))
           self.class.tag_counts(options)
         end
-        
+
         def reload_with_tag_list(*args) #:nodoc:
           @tag_list = nil
           reload_without_tag_list(*args)
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/lib/tag.rb b/vendor/plugins/acts_as_taggable_on_steroids/lib/tag.rb
index a681c19..7543d92 100644
--- a/vendor/plugins/acts_as_taggable_on_steroids/lib/tag.rb
+++ b/vendor/plugins/acts_as_taggable_on_steroids/lib/tag.rb
@@ -1,29 +1,29 @@
 class Tag < ActiveRecord::Base
   has_many :taggings, :dependent => :destroy
-  
+
   validates_presence_of :name
   validates_uniqueness_of :name
-  
+
   cattr_accessor :destroy_unused
   self.destroy_unused = false
-  
+
   # LIKE is used for cross-database case-insensitivity
   def self.find_or_create_with_like_by_name(name)
     find(:first, :conditions => ["name LIKE ?", name]) || create(:name => name)
   end
-  
+
   def ==(object)
     super || (object.is_a?(Tag) && name == object.name)
   end
-  
+
   def to_s
     name
   end
-  
+
   def count
     read_attribute(:count).to_i
   end
-  
+
   class << self
     # Calculate the tag counts for all tags.
     #  :start_at - Restrict the tags to those created after a certain time
@@ -36,32 +36,32 @@ class << self
     def counts(options = {})
       find(:all, options_for_counts(options))
     end
-    
+
     def options_for_counts(options = {})
       options.assert_valid_keys :start_at, :end_at, :conditions, :at_least, :at_most, :order, :limit, :joins
       options = options.dup
-      
+
       start_at = sanitize_sql(["#{Tagging.table_name}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
       end_at = sanitize_sql(["#{Tagging.table_name}.created_at <= ?", options.delete(:end_at)]) if options[:end_at]
-      
+
       conditions = [
         options.delete(:conditions),
         start_at,
         end_at
       ].compact
-      
+
       conditions = conditions.any? ? conditions.join(' AND ') : nil
-      
+
       joins = ["INNER JOIN #{Tagging.table_name} ON #{Tag.table_name}.id = #{Tagging.table_name}.tag_id"]
       joins << options.delete(:joins) if options[:joins]
-      
+
       at_least  = sanitize_sql(['COUNT(*) >= ?', options.delete(:at_least)]) if options[:at_least]
       at_most   = sanitize_sql(['COUNT(*) <= ?', options.delete(:at_most)]) if options[:at_most]
       having    = [at_least, at_most].compact.join(' AND ')
       group_by  = "#{Tag.table_name}.id, #{Tag.table_name}.name HAVING COUNT(*) > 0"
       group_by << " AND #{having}" unless having.blank?
-      
-      { :select     => "#{Tag.table_name}.id, #{Tag.table_name}.name, COUNT(*) AS count", 
+
+      { :select     => "#{Tag.table_name}.id, #{Tag.table_name}.name, COUNT(*) AS count",
         :joins      => joins.join(" "),
         :conditions => conditions,
         :group      => group_by
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/lib/tagging.rb b/vendor/plugins/acts_as_taggable_on_steroids/lib/tagging.rb
index 87bc44d..2036da5 100644
--- a/vendor/plugins/acts_as_taggable_on_steroids/lib/tagging.rb
+++ b/vendor/plugins/acts_as_taggable_on_steroids/lib/tagging.rb
@@ -1,7 +1,7 @@
 class Tagging < ActiveRecord::Base #:nodoc:
   belongs_to :tag
   belongs_to :taggable, :polymorphic => true
-  
+
   def after_destroy
     if Tag.destroy_unused
       if tag.taggings.count.zero?
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/abstract_unit.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/abstract_unit.rb
index 42e277a..1e9724c 100644
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/abstract_unit.rb
+++ b/vendor/plugins/acts_as_taggable_on_steroids/test/abstract_unit.rb
@@ -31,7 +31,7 @@
 class Test::Unit::TestCase #:nodoc:
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false
-  
+
   def assert_equivalent(expected, actual, message = nil)
     if expected.first.is_a?(ActiveRecord::Base)
       assert_equal expected.sort_by(&:id), actual.sort_by(&:id), message
@@ -39,26 +39,26 @@ def assert_equivalent(expected, actual, message = nil)
       assert_equal expected.sort, actual.sort, message
     end
   end
-  
+
   def assert_tag_counts(tags, expected_values)
     # Map the tag fixture names to real tag names
     expected_values = expected_values.inject({}) do |hash, (tag, count)|
       hash[tags(tag).name] = count
       hash
     end
-    
+
     tags.each do |tag|
       value = expected_values.delete(tag.name)
-      
+
       assert_not_nil value, "Expected count for #{tag.name} was not provided"
       assert_equal value, tag.count, "Expected value of #{value} for #{tag.name}, but was #{tag.count}"
     end
-    
+
     unless expected_values.empty?
       assert false, "The following tag counts were not present: #{expected_values.inspect}"
     end
   end
-  
+
   def assert_queries(num = 1)
     $query_count = 0
     yield
@@ -69,29 +69,29 @@ def assert_queries(num = 1)
   def assert_no_queries(&block)
     assert_queries(0, &block)
   end
-  
+
   # From Rails trunk
   def assert_difference(expressions, difference = 1, message = nil, &block)
-    expression_evaluations = [expressions].flatten.collect{|expression| lambda { eval(expression, block.binding) } } 
-    
+    expression_evaluations = [expressions].flatten.collect{|expression| lambda { eval(expression, block.binding) } }
+
     original_values = expression_evaluations.inject([]) { |memo, expression| memo << expression.call }
     yield
     expression_evaluations.each_with_index do |expression, i|
       assert_equal original_values[i] + difference, expression.call, message
     end
   end
-  
+
   def assert_no_difference(expressions, message = nil, &block)
     assert_difference expressions, 0, message, &block
   end
 end
 
-ActiveRecord::Base.connection.class.class_eval do  
+ActiveRecord::Base.connection.class.class_eval do
   def execute_with_counting(sql, name = nil, &block)
     $query_count ||= 0
     $query_count += 1
     execute_without_counting(sql, name, &block)
   end
-  
+
   alias_method_chain :execute, :counting
 end
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/acts_as_taggable_test.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/acts_as_taggable_test.rb
index 751e4a5..06299d0 100644
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/acts_as_taggable_test.rb
+++ b/vendor/plugins/acts_as_taggable_on_steroids/test/acts_as_taggable_test.rb
@@ -6,269 +6,269 @@ class ActsAsTaggableOnSteroidsTest < Test::Unit::TestCase
   def test_find_related_tags_with
     assert_equivalent [tags(:good), tags(:bad), tags(:question)], Post.find_related_tags("nature")
     assert_equivalent [tags(:nature)], Post.find_related_tags([tags(:good)])
-    assert_equivalent [tags(:bad), tags(:question)], Post.find_related_tags(["Very Good", "Nature"])        
+    assert_equivalent [tags(:bad), tags(:question)], Post.find_related_tags(["Very Good", "Nature"])
     assert_equivalent [tags(:bad), tags(:question)], Post.find_related_tags([tags(:good), tags(:nature)])
   end
-  
+
   def test_find_related_tags_with_non_existent_tags
     assert_equal [], Post.find_related_tags("ABCDEFG")
     assert_equal [], Post.find_related_tags(['HIJKLM'])
   end
-  
+
   def test_find_related_tags_with_nothing
     assert_equal [], Post.find_related_tags("")
-    assert_equal [], Post.find_related_tags([])    
+    assert_equal [], Post.find_related_tags([])
   end
-    
+
   def test_find_tagged_with
     assert_equivalent [posts(:jonathan_sky), posts(:sam_flowers)], Post.find_tagged_with('"Very good"')
     assert_equal Post.find_tagged_with('"Very good"'), Post.find_tagged_with(['Very good'])
     assert_equal Post.find_tagged_with('"Very good"'), Post.find_tagged_with([tags(:good)])
-    
+
     assert_equivalent [photos(:jonathan_dog), photos(:sam_flower), photos(:sam_sky)], Photo.find_tagged_with('Nature')
     assert_equal Photo.find_tagged_with('Nature'), Photo.find_tagged_with(['Nature'])
     assert_equal Photo.find_tagged_with('Nature'), Photo.find_tagged_with([tags(:nature)])
-    
+
     assert_equivalent [photos(:jonathan_bad_cat), photos(:jonathan_dog), photos(:jonathan_questioning_dog)], Photo.find_tagged_with('"Crazy animal" Bad')
     assert_equal Photo.find_tagged_with('"Crazy animal" Bad'), Photo.find_tagged_with(['Crazy animal', 'Bad'])
     assert_equal Photo.find_tagged_with('"Crazy animal" Bad'), Photo.find_tagged_with([tags(:animal), tags(:bad)])
   end
-  
+
   def test_find_tagged_with_nothing
     assert_equal [], Post.find_tagged_with("")
     assert_equal [], Post.find_tagged_with([])
   end
-  
+
   def test_find_tagged_with_nonexistant_tags
     assert_equal [], Post.find_tagged_with('ABCDEFG')
     assert_equal [], Photo.find_tagged_with(['HIJKLM'])
     assert_equal [], Photo.find_tagged_with([Tag.new(:name => 'unsaved tag')])
   end
-  
+
   def test_find_tagged_with_match_all
     assert_equivalent [photos(:jonathan_dog)], Photo.find_tagged_with('Crazy animal, "Nature"', :match_all => true)
   end
-  
+
   def test_find_tagged_with_match_all_and_include
     assert_equivalent [posts(:jonathan_sky), posts(:sam_flowers)], Post.find_tagged_with(['Very good', 'Nature'], :match_all => true, :include => :tags)
   end
-  
+
   def test_find_tagged_with_conditions
     assert_equal [], Post.find_tagged_with('"Very good", Nature', :conditions => '1=0')
   end
-  
+
   def test_find_tagged_with_duplicates_options_hash
     options = { :conditions => '1=1' }.freeze
     assert_nothing_raised { Post.find_tagged_with("Nature", options) }
   end
-  
+
   def test_find_tagged_with_exclusions
     assert_equivalent [photos(:jonathan_questioning_dog), photos(:jonathan_bad_cat)], Photo.find_tagged_with("Nature", :exclude => true)
     assert_equivalent [posts(:jonathan_grass), posts(:jonathan_rain), posts(:jonathan_cloudy), posts(:jonathan_still_cloudy)], Post.find_tagged_with("'Very good', Bad", :exclude => true)
   end
-  
+
   def test_find_options_for_find_tagged_with_no_tags_returns_empty_hash
     assert_equal Hash.new, Post.find_options_for_find_tagged_with("")
     assert_equal Hash.new, Post.find_options_for_find_tagged_with([nil])
   end
-  
+
   def test_find_options_for_find_tagged_with_leaves_arguments_unchanged
     original_tags = photos(:jonathan_questioning_dog).tags.dup
     Photo.find_options_for_find_tagged_with(photos(:jonathan_questioning_dog).tags)
     assert_equal original_tags, photos(:jonathan_questioning_dog).tags
   end
-  
+
   def test_find_options_for_find_tagged_with_respects_custom_table_name
     Tagging.table_name = "categorisations"
     Tag.table_name = "categories"
-    
+
     options = Photo.find_options_for_find_tagged_with("Hello")
-    
+
     assert_no_match(/ taggings /, options[:joins])
     assert_no_match(/ tags /, options[:joins])
-    
+
     assert_match(/ categorisations /, options[:joins])
     assert_match(/ categories /, options[:joins])
   ensure
     Tagging.table_name = "taggings"
     Tag.table_name = "tags"
   end
-  
+
   def test_include_tags_on_find_tagged_with
     assert_nothing_raised do
       Photo.find_tagged_with('Nature', :include => :tags)
       Photo.find_tagged_with("Nature", :include => { :taggings => :tag })
     end
   end
-  
+
   def test_basic_tag_counts_on_class
     assert_tag_counts Post.tag_counts, :good => 2, :nature => 7, :question => 1, :bad => 1
     assert_tag_counts Photo.tag_counts, :good => 1, :nature => 3, :question => 1, :bad => 1, :animal => 3
   end
-  
+
   def test_tag_counts_on_class_with_date_conditions
     assert_tag_counts Post.tag_counts(:start_at => Date.new(2006, 8, 4)), :good => 1, :nature => 5, :question => 1, :bad => 1
     assert_tag_counts Post.tag_counts(:end_at => Date.new(2006, 8, 6)), :good => 1, :nature => 4, :question => 1
     assert_tag_counts Post.tag_counts(:start_at => Date.new(2006, 8, 5), :end_at => Date.new(2006, 8, 10)), :good => 1, :nature => 4, :bad => 1
-    
+
     assert_tag_counts Photo.tag_counts(:start_at => Date.new(2006, 8, 12), :end_at => Date.new(2006, 8, 19)), :good => 1, :nature => 2, :bad => 1, :question => 1, :animal => 3
   end
-  
+
   def test_tag_counts_on_class_with_frequencies
     assert_tag_counts Photo.tag_counts(:at_least => 2), :nature => 3, :animal => 3
     assert_tag_counts Photo.tag_counts(:at_most => 2), :good => 1, :question => 1, :bad => 1
   end
-  
+
   def test_tag_counts_on_class_with_frequencies_and_conditions
     assert_tag_counts Photo.tag_counts(:at_least => 2, :conditions => '1=1'), :nature => 3, :animal => 3
   end
-  
+
   def test_tag_counts_duplicates_options_hash
     options = { :at_least => 2, :conditions => '1=1' }.freeze
     assert_nothing_raised { Photo.tag_counts(options) }
   end
-  
+
   def test_tag_counts_with_limit
     assert_equal 2, Photo.tag_counts(:limit => 2).size
     assert_equal 1, Post.tag_counts(:at_least => 4, :limit => 2).size
   end
-  
+
   def test_tag_counts_with_limit_and_order
     assert_equal [tags(:nature), tags(:good)], Post.tag_counts(:order => 'count desc', :limit => 2)
   end
-  
+
   def test_tag_counts_on_association
     assert_tag_counts users(:jonathan).posts.tag_counts, :good => 1, :nature => 5, :question => 1
     assert_tag_counts users(:sam).posts.tag_counts, :good => 1, :nature => 2, :bad => 1
-    
+
     assert_tag_counts users(:jonathan).photos.tag_counts, :animal => 3, :nature => 1, :question => 1, :bad => 1
     assert_tag_counts users(:sam).photos.tag_counts, :nature => 2, :good => 1
   end
-  
+
   def test_tag_counts_on_association_with_options
     assert_equal [], users(:jonathan).posts.tag_counts(:conditions => '1=0')
     assert_tag_counts users(:jonathan).posts.tag_counts(:at_most => 2), :good => 1, :question => 1
   end
-  
+
   def test_tag_counts_on_has_many_through
     assert_tag_counts users(:jonathan).magazines.tag_counts, :good => 1
   end
-  
+
   def test_tag_counts_on_model_instance
     assert_tag_counts photos(:jonathan_dog).tag_counts, :animal => 3, :nature => 3
   end
-  
+
   def test_tag_counts_on_model_instance_merges_conditions
     assert_tag_counts photos(:jonathan_dog).tag_counts(:conditions => "tags.name = 'Crazy animal'"), :animal => 3
   end
-  
+
   def test_tag_counts_on_model_instance_with_no_tags
     photo = Photo.create!
-    
+
     assert_tag_counts photo.tag_counts, {}
   end
-  
+
   def test_tag_counts_should_sanitize_scope_conditions
     Photo.send :with_scope, :find => { :conditions => ["tags.id = ?", tags(:animal).id] } do
       assert_tag_counts Photo.tag_counts, :animal => 3
     end
   end
-  
+
   def test_tag_counts_respects_custom_table_names
     Tagging.table_name = "categorisations"
     Tag.table_name = "categories"
-    
+
     options = Photo.find_options_for_tag_counts(:start_at => 2.weeks.ago, :end_at => Date.today)
     sql = options.values.join(' ')
-    
+
     assert_no_match /taggings/, sql
     assert_no_match /tags/, sql
-    
+
     assert_match /categorisations/, sql
     assert_match /categories/, sql
   ensure
     Tagging.table_name = "taggings"
     Tag.table_name = "tags"
   end
-  
+
   def test_tag_list_reader
     assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list
     assert_equivalent ["Bad", "Crazy animal"], photos(:jonathan_bad_cat).tag_list
   end
-  
+
   def test_reassign_tag_list
     assert_equivalent ["Nature", "Question"], posts(:jonathan_rain).tag_list
     posts(:jonathan_rain).taggings.reload
-    
+
     # Only an update of the posts table should be executed
     assert_queries 1 do
       posts(:jonathan_rain).update_attributes!(:tag_list => posts(:jonathan_rain).tag_list.to_s)
     end
-    
+
     assert_equivalent ["Nature", "Question"], posts(:jonathan_rain).tag_list
   end
-  
+
   def test_new_tags
     assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list
     posts(:jonathan_sky).update_attributes!(:tag_list => "#{posts(:jonathan_sky).tag_list}, One, Two")
     assert_equivalent ["Very good", "Nature", "One", "Two"], posts(:jonathan_sky).tag_list
   end
-  
+
   def test_remove_tag
     assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list
     posts(:jonathan_sky).update_attributes!(:tag_list => "Nature")
     assert_equivalent ["Nature"], posts(:jonathan_sky).tag_list
   end
-  
+
   def test_change_case_of_tags
     original_tag_names = photos(:jonathan_questioning_dog).tag_list
     photos(:jonathan_questioning_dog).update_attributes!(:tag_list => photos(:jonathan_questioning_dog).tag_list.to_s.upcase)
-    
+
     # The new tag list is not uppercase becuase the AR finders are not case-sensitive
     # and find the old tags when re-tagging with the uppercase tags.
     assert_equivalent original_tag_names, photos(:jonathan_questioning_dog).reload.tag_list
   end
-  
+
   def test_remove_and_add_tag
     assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list
     posts(:jonathan_sky).update_attributes!(:tag_list => "Nature, Beautiful")
     assert_equivalent ["Nature", "Beautiful"], posts(:jonathan_sky).tag_list
   end
-  
+
   def test_tags_not_saved_if_validation_fails
     assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list
     assert !posts(:jonathan_sky).update_attributes(:tag_list => "One, Two", :text => "")
     assert_equivalent ["Very good", "Nature"], Post.find(posts(:jonathan_sky).id).tag_list
   end
-  
+
   def test_tag_list_accessors_on_new_record
     p = Post.new(:text => 'Test')
-    
+
     assert p.tag_list.blank?
     p.tag_list = "One, Two"
     assert_equal "One, Two", p.tag_list.to_s
   end
-  
+
   def test_clear_tag_list_with_nil
     p = photos(:jonathan_questioning_dog)
-    
+
     assert !p.tag_list.blank?
     assert p.update_attributes(:tag_list => nil)
     assert p.tag_list.blank?
-    
+
     assert p.reload.tag_list.blank?
   end
-  
+
   def test_clear_tag_list_with_string
     p = photos(:jonathan_questioning_dog)
-    
+
     assert !p.tag_list.blank?
     assert p.update_attributes(:tag_list => '  ')
     assert p.tag_list.blank?
-    
+
     assert p.reload.tag_list.blank?
   end
-  
+
   def test_tag_list_reset_on_reload
     p = photos(:jonathan_questioning_dog)
     assert !p.tag_list.blank?
@@ -276,92 +276,92 @@ def test_tag_list_reset_on_reload
     assert p.tag_list.blank?
     assert !p.reload.tag_list.blank?
   end
-  
+
   def test_instance_tag_counts
     assert_tag_counts posts(:jonathan_sky).tag_counts, :good => 2, :nature => 7
   end
-  
+
   def test_tag_list_populated_when_cache_nil
     assert_nil posts(:jonathan_sky).cached_tag_list
     posts(:jonathan_sky).save!
     assert_equal posts(:jonathan_sky).tag_list.to_s, posts(:jonathan_sky).cached_tag_list
   end
-  
+
   def test_cached_tag_list_used
     posts(:jonathan_sky).save!
     posts(:jonathan_sky).reload
-    
+
     assert_no_queries do
       assert_equivalent ["Very good", "Nature"], posts(:jonathan_sky).tag_list
     end
   end
-  
+
   def test_cached_tag_list_not_used
     # Load fixture and column information
     posts(:jonathan_sky).taggings(:reload)
-    
+
     assert_queries 1 do
       # Tags association will be loaded
       posts(:jonathan_sky).tag_list
     end
   end
-  
+
   def test_cached_tag_list_updated
     assert_nil posts(:jonathan_sky).cached_tag_list
     posts(:jonathan_sky).save!
     assert_equivalent ["Very good", "Nature"], TagList.from(posts(:jonathan_sky).cached_tag_list)
     posts(:jonathan_sky).update_attributes!(:tag_list => "None")
-    
+
     assert_equal 'None', posts(:jonathan_sky).cached_tag_list
     assert_equal 'None', posts(:jonathan_sky).reload.cached_tag_list
   end
-  
+
   def test_clearing_cached_tag_list
     # Generate the cached tag list
     posts(:jonathan_sky).save!
-    
+
     posts(:jonathan_sky).update_attributes!(:tag_list => "")
     assert_equal "", posts(:jonathan_sky).cached_tag_list
   end
 
   def test_find_tagged_with_using_sti
     special_post = SpecialPost.create!(:text => "Test", :tag_list => "Random")
-    
+
     assert_equal [special_post],  SpecialPost.find_tagged_with("Random")
     assert Post.find_tagged_with("Random").include?(special_post)
   end
-  
+
   def test_tag_counts_using_sti
     SpecialPost.create!(:text => "Test", :tag_list => "Nature")
-    
+
     assert_tag_counts SpecialPost.tag_counts, :nature => 1
   end
-  
+
   def test_case_insensitivity
     assert_difference "Tag.count", 1 do
       Post.create!(:text => "Test", :tag_list => "one")
       Post.create!(:text => "Test", :tag_list => "One")
     end
-    
+
     assert_equal Post.find_tagged_with("Nature"), Post.find_tagged_with("nature")
   end
-  
+
   def test_tag_not_destroyed_when_unused
     posts(:jonathan_sky).tag_list.add("Random")
     posts(:jonathan_sky).save!
-  
+
     assert_no_difference 'Tag.count' do
       posts(:jonathan_sky).tag_list.remove("Random")
       posts(:jonathan_sky).save!
     end
   end
-  
+
   def test_tag_destroyed_when_unused
     Tag.destroy_unused = true
-    
+
     posts(:jonathan_sky).tag_list.add("Random")
     posts(:jonathan_sky).save!
-    
+
     assert_difference 'Tag.count', -1 do
       posts(:jonathan_sky).tag_list.remove("Random")
       posts(:jonathan_sky).save!
@@ -373,9 +373,9 @@ def test_tag_destroyed_when_unused
 
 class ActsAsTaggableOnSteroidsFormTest < Test::Unit::TestCase
   fixtures :tags, :taggings, :posts, :users, :photos
-  
+
   include ActionView::Helpers::FormHelper
-  
+
   def test_tag_list_contents
     fields_for :post, posts(:jonathan_sky) do |f|
       assert_match /Very good, Nature/, f.text_field(:tag_list)
diff --git a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/user.rb b/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/user.rb
index 8c0f787..dbf71b2 100644
--- a/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/user.rb
+++ b/vendor/plugins/acts_as_taggable_on_steroids/test/fixtures/user.rb
@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
   has_many :posts
   has_many :photos
-  
+
   has_many :subscriptions
   has_many :magazines, :through => :subscriptions
 end
diff --git a/vendor/plugins/attachment_fu/CHANGELOG b/vendor/plugins/attachment_fu/CHANGELOG
index 33f5d7e..d1ce6f7 100644
--- a/vendor/plugins/attachment_fu/CHANGELOG
+++ b/vendor/plugins/attachment_fu/CHANGELOG
@@ -2,7 +2,7 @@
 * amazon_s3.yml is now passed through ERB before being passed to AWS::S3 [François Beausoleil]
 
 * Mar 22 2008 *
-* Some tweaks to support Rails 2.0 and Rails 2.1 due to ActiveSupport::Callback changes.  
+* Some tweaks to support Rails 2.0 and Rails 2.1 due to ActiveSupport::Callback changes.
   Thanks to http://blog.methodmissing.com/2008/1/19/edge-callback-refactorings-attachment_fu/
 
 * Feb. 26, 2008 *
diff --git a/vendor/plugins/attachment_fu/README b/vendor/plugins/attachment_fu/README
index 8db7ba2..cdb3f8e 100644
--- a/vendor/plugins/attachment_fu/README
+++ b/vendor/plugins/attachment_fu/README
@@ -21,7 +21,7 @@ attachment_fu models
 ====================
 
 For all three of these storage options a table of metadata is required.  This table will contain information about the file (hence the 'meta') and its location.  This table has no restrictions on naming, unlike the extra table required for database storage, which must have a table name of db_files (and by convention a model of DbFile).
-  
+
 In the model there are two methods made available by this plugins: has_attachment and validates_as_attachment.
 
 has_attachment(options = {})
@@ -42,13 +42,13 @@ has_attachment(options = {})
     :thumbnail_class  # Set which model class to use for thumbnails.
                       # This current attachment class is used by default.
     :path_prefix      # path to store the uploaded files.
-                      # Uses public/#{table_name} by default for the filesystem, and just #{table_name} for the S3 backend.  
+                      # Uses public/#{table_name} by default for the filesystem, and just #{table_name} for the S3 backend.
                       # Setting this sets the :storage to :file_system.
     :storage          # Specifies the storage system to use..
                       # Defaults to :db_file.  Options are :file_system, :db_file, and :s3.
     :processor        # Sets the image processor to use for resizing of the attached image.
                       # Options include ImageScience, Rmagick, and MiniMagick.  Default is whatever is installed.
-    
+
 
   Examples:
     has_attachment :max_size => 1.kilobyte
@@ -59,7 +59,7 @@ has_attachment(options = {})
     has_attachment :content_type => ['application/pdf', :image], :resize_to => 'x50'
     has_attachment :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }
     has_attachment :storage => :file_system, :path_prefix => 'public/files'
-    has_attachment :storage => :file_system, :path_prefix => 'public/files', 
+    has_attachment :storage => :file_system, :path_prefix => 'public/files',
                    :content_type => :image, :resize_to => [50,50]
     has_attachment :storage => :file_system, :path_prefix => 'public/files',
                    :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }
@@ -67,7 +67,7 @@ has_attachment(options = {})
 
 validates_as_attachment
   This method prevents files outside of the valid range (:min_size to :max_size, or the :size range) from being saved.  It does not however, halt the upload of such files.  They will be uploaded into memory regardless of size before validation.
-  
+
   Example:
     validates_as_attachment
 
@@ -86,12 +86,12 @@ Fields for attachment_fu metadata tables...
   that reference images that will be thumbnailed:
     parent_id,    :integer  # id of parent image (on the same table, a self-referencing foreign-key).
                             # Only populated if the current object is a thumbnail.
-    thumbnail,    :string   # the 'type' of thumbnail this attachment record describes.  
+    thumbnail,    :string   # the 'type' of thumbnail this attachment record describes.
                             # Only populated if the current object is a thumbnail.
                             # Usage:
                             # [ In Model 'Avatar' ]
-                            #   has_attachment :content_type => :image, 
-                            #                  :storage => :file_system, 
+                            #   has_attachment :content_type => :image,
+                            #                  :storage => :file_system,
                             #                  :max_size => 500.kilobytes,
                             #                  :resize_to => '320x200>',
                             #                  :thumbnails => { :small => '10x10>',
@@ -100,7 +100,7 @@ Fields for attachment_fu metadata tables...
                             # @user.avatar.thumbnails.first.thumbnail #=> 'small'
   that reference files stored in the database (:db_file):
     db_file_id,   :integer  # id of the file in the database (foreign key)
-    
+
 Field for attachment_fu db_files table:
   data, :binary # binary file data, for use in database file storage
 
@@ -114,7 +114,7 @@ There are two parts of the upload form that differ from typical usage.
   1. Include ':multipart => true' in the html options of the form_for tag.
     Example:
       <% form_for(:attachment_metadata, :url => { :action => "create" }, :html => { :multipart => true }) do |form| %>
-      
+
   2. Use the file_field helper with :uploaded_data as the field name.
     Example:
       <%= form.file_field :uploaded_data %>
@@ -142,7 +142,7 @@ Example:
   def readme
     send_file '/path/to/readme.txt', :type => 'plain/text', :disposition => 'inline'
   end
-  
+
 See the possible values for send_file for reference.
 
 
@@ -155,7 +155,7 @@ Example in controller:
     @attachable_file = AttachmentMetadataModel.new(params[:attachable])
     if @attachable_file.save
       flash[:notice] = 'Attachment was successfully created.'
-      redirect_to attachable_url(@attachable_file)     
+      redirect_to attachable_url(@attachable_file)
     else
       render :action => :new
     end
diff --git a/vendor/plugins/attachment_fu/amazon_s3.yml.tpl b/vendor/plugins/attachment_fu/amazon_s3.yml.tpl
index 81cb807..44a89ec 100644
--- a/vendor/plugins/attachment_fu/amazon_s3.yml.tpl
+++ b/vendor/plugins/attachment_fu/amazon_s3.yml.tpl
@@ -1,14 +1,14 @@
 development:
   bucket_name: appname_development
-  access_key_id: 
-  secret_access_key: 
+  access_key_id:
+  secret_access_key:
 
 test:
   bucket_name: appname_test
-  access_key_id: 
-  secret_access_key: 
+  access_key_id:
+  secret_access_key:
 
 production:
   bucket_name: appname
-  access_key_id: 
-  secret_access_key: 
+  access_key_id:
+  secret_access_key:
diff --git a/vendor/plugins/attachment_fu/lib/geometry.rb b/vendor/plugins/attachment_fu/lib/geometry.rb
index 2d6e381..45bd4b3 100644
--- a/vendor/plugins/attachment_fu/lib/geometry.rb
+++ b/vendor/plugins/attachment_fu/lib/geometry.rb
@@ -29,7 +29,7 @@ def initialize(width=nil, height=nil, x=nil, y=nil, flag=nil)
 
   def self.from_s(str)
     raise(ArgumentError, "no geometry string specified") unless str
-  
+
     if m = RE.match(str)
       new(m[1].to_i, m[2].to_i, m[3].to_i, m[4].to_i, RFLAGS[m[5]])
     else
@@ -46,7 +46,7 @@ def to_s
     str << "%+d%+d" % [@x, @y] if (@x != 0 || @y != 0)
     str << FLAGS[@flag.to_i]
   end
-  
+
   # attempts to get new dimensions for the current geometry string given these old dimensions.
   # This doesn't implement the aspect flag (!) or the area flag (@).  PDI
   def new_dimensions_for(orig_width, orig_height)
diff --git a/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb
index 23881e7..0dec0d9 100644
--- a/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb
+++ b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb
@@ -12,18 +12,18 @@ def self.included(base) #:nodoc:
         def create_temp_file
           write_to_temp_file current_data
         end
-        
+
         # Gets the current data from the database
         def current_data
           db_file.data
         end
-        
+
         protected
           # Destroys the file.  Called in the after_destroy callback
           def destroy_file
             db_file.destroy if db_file
           end
-          
+
           # Saves the data to the DbFile model
           def save_to_storage
             if save_attachment?
diff --git a/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb
index 464b9c7..0a4e257 100644
--- a/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb
+++ b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb
@@ -7,11 +7,11 @@ module FileSystemBackend
         def self.included(base) #:nodoc:
           base.before_update :rename_file
         end
-      
+
         # Gets the full path to the filename in this format:
         #
         #   # This assumes a model name like MyModel
-        #   # public/#{table_name} is the default filesystem path 
+        #   # public/#{table_name} is the default filesystem path
         #   RAILS_ROOT/public/my_models/5/blah.jpg
         #
         # Overwrite this method in your model to customize the filename.
@@ -20,29 +20,29 @@ def full_filename(thumbnail = nil)
           file_system_path = (thumbnail ? thumbnail_class : self).attachment_options[:path_prefix].to_s
           File.join(RAILS_ROOT, file_system_path, *partitioned_path(thumbnail_name_for(thumbnail)))
         end
-      
+
         # Used as the base path that #public_filename strips off full_filename to create the public path
         def base_path
           @base_path ||= File.join(RAILS_ROOT, 'public')
         end
-      
+
         # The attachment ID used in the full path of a file
         def attachment_path_id
           ((respond_to?(:parent_id) && parent_id) || id).to_i
         end
-      
-        # overrwrite this to do your own app-specific partitioning. 
+
+        # overrwrite this to do your own app-specific partitioning.
         # you can thank Jamis Buck for this: http://www.37signals.com/svn/archives2/id_partitioning.php
         def partitioned_path(*args)
           ("%08d" % attachment_path_id).scan(/..../) + args
         end
-      
+
         # Gets the public path to the file
         # The optional thumbnail argument will output the thumbnail's filename.
         def public_filename(thumbnail = nil)
           full_filename(thumbnail).gsub %r(^#{Regexp.escape(base_path)}), ''
         end
-      
+
         def filename=(value)
           @old_filename = full_filename unless filename.nil? || @old_filename
           write_attribute :filename, sanitize_filename(value)
@@ -75,7 +75,7 @@ def rename_file
             @old_filename =  nil
             true
           end
-          
+
           # Saves the file to the file system
           def save_to_storage
             if save_attachment?
@@ -87,7 +87,7 @@ def save_to_storage
             @old_filename = nil
             true
           end
-          
+
           def current_data
             File.file?(full_filename) ? File.read(full_filename) : nil
           end
diff --git a/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb
index 2c2be13..5092cb4 100644
--- a/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb
+++ b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb
@@ -18,17 +18,17 @@ module Backends
       # You can sign up for S3 and get access keys by visiting http://aws.amazon.com/s3.
       #
       # Example configuration (RAILS_ROOT/config/amazon_s3.yml)
-      # 
+      #
       #   development:
       #     bucket_name: appname_development
       #     access_key_id: <your key>
       #     secret_access_key: <your key>
-      #   
+      #
       #   test:
       #     bucket_name: appname_test
       #     access_key_id: <your key>
       #     secret_access_key: <your key>
-      #   
+      #
       #   production:
       #     bucket_name: appname
       #     access_key_id: <your key>
@@ -84,7 +84,7 @@ module Backends
       # === Permissions
       #
       # By default, files are stored on S3 with public access permissions. You can customize this using
-      # the <tt>:s3_access</tt> option to <tt>has_attachment</tt>. Available values are 
+      # the <tt>:s3_access</tt> option to <tt>has_attachment</tt>. Available values are
       # <tt>:private</tt>, <tt>:public_read_write</tt>, and <tt>:authenticated_read</tt>.
       #
       # === Other options
@@ -123,7 +123,7 @@ class ConfigFileNotFoundError < StandardError; end
 
         def self.included(base) #:nodoc:
           mattr_reader :bucket_name, :s3_config
-          
+
           begin
             require 'aws/s3'
             include AWS::S3
@@ -150,11 +150,11 @@ def self.included(base) #:nodoc:
         def self.protocol
           @protocol ||= s3_config[:use_ssl] ? 'https://' : 'http://'
         end
-        
+
         def self.hostname
           @hostname ||= s3_config[:server] || AWS::S3::DEFAULT_HOST
         end
-        
+
         def self.port_string
           @port_string ||= (s3_config[:port].nil? || s3_config[:port] == (s3_config[:use_ssl] ? 443 : 80)) ? '' : ":#{s3_config[:port]}"
         end
@@ -163,11 +163,11 @@ module ClassMethods
           def s3_protocol
             Technoweenie::AttachmentFu::Backends::S3Backend.protocol
           end
-          
+
           def s3_hostname
             Technoweenie::AttachmentFu::Backends::S3Backend.hostname
           end
-          
+
           def s3_port_string
             Technoweenie::AttachmentFu::Backends::S3Backend.port_string
           end
@@ -196,7 +196,7 @@ def full_filename(thumbnail = nil)
           File.join(base_path, thumbnail_name_for(thumbnail))
         end
 
-        # All public objects are accessible via a GET request to the S3 servers. You can generate a 
+        # All public objects are accessible via a GET request to the S3 servers. You can generate a
         # url for an object using the s3_url method.
         #
         #   @photo.s3_url
@@ -211,7 +211,7 @@ def s3_url(thumbnail = nil)
         end
         alias :public_filename :s3_url
 
-        # All private objects are accessible via an authenticated GET request to the S3 servers. You can generate an 
+        # All private objects are accessible via an authenticated GET request to the S3 servers. You can generate an
         # authenticated url for an object like this:
         #
         #   @photo.authenticated_s3_url
@@ -223,7 +223,7 @@ def s3_url(thumbnail = nil)
         #
         #   # Absolute expiration date (October 13th, 2025)
         #   @photo.authenticated_s3_url(:expires => Time.mktime(2025,10,13).to_i)
-        #   
+        #
         #   # Expiration in five hours from now
         #   @photo.authenticated_s3_url(:expires_in => 5.hours)
         #
@@ -252,11 +252,11 @@ def current_data
         def s3_protocol
           Technoweenie::AttachmentFu::Backends::S3Backend.protocol
         end
-        
+
         def s3_hostname
           Technoweenie::AttachmentFu::Backends::S3Backend.hostname
         end
-          
+
         def s3_port_string
           Technoweenie::AttachmentFu::Backends::S3Backend.port_string
         end
@@ -269,7 +269,7 @@ def destroy_file
 
           def rename_file
             return unless @old_filename && @old_filename != filename
-            
+
             old_full_filename = File.join(base_path, @old_filename)
 
             S3Object.rename(
diff --git a/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/core_image_processor.rb b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/core_image_processor.rb
index 8120b69..9bba6dc 100644
--- a/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/core_image_processor.rb
+++ b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/core_image_processor.rb
@@ -8,13 +8,13 @@ def self.included(base)
           base.send :extend, ClassMethods
           base.alias_method_chain :process_attachment, :processing
         end
-        
+
         module ClassMethods
           def with_image(file, &block)
             block.call OSX::CIImage.from(file)
           end
         end
-                
+
         protected
           def process_attachment_with_processing
             return unless process_attachment_without_processing
@@ -40,14 +40,14 @@ def resize_image(img, size)
               new_size = [img.extent.size.width, img.extent.size.height] / size.to_s
               processor.resize(new_size[0], new_size[1])
             end
-            
+
             processor.render do |result|
               self.width  = result.extent.size.width  if respond_to?(:width)
               self.height = result.extent.size.height if respond_to?(:height)
               result.save self.temp_path, OSX::NSJPEGFileType
               self.size = File.size(self.temp_path)
             end
-          end          
+          end
       end
     end
   end
diff --git a/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/gd2_processor.rb b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/gd2_processor.rb
index d120b25..8f4ecba 100644
--- a/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/gd2_processor.rb
+++ b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/gd2_processor.rb
@@ -8,7 +8,7 @@ def self.included(base)
           base.send :extend, ClassMethods
           base.alias_method_chain :process_attachment, :processing
         end
-        
+
         module ClassMethods
           # Yields a block containing a GD2 Image for the given binary data.
           def with_image(file, &block)
@@ -33,12 +33,12 @@ def resize_image(img, size)
             size = size.first if size.is_a?(Array) && size.length == 1
             if size.is_a?(Fixnum) || (size.is_a?(Array) && size.first.is_a?(Fixnum))
               if size.is_a?(Fixnum)
-                # Borrowed from image science's #thumbnail method and adapted 
+                # Borrowed from image science's #thumbnail method and adapted
                 # for this.
                 scale = size.to_f / (img.width > img.height ? img.width.to_f : img.height.to_f)
                 img.resize!((img.width * scale).round(1), (img.height * scale).round(1), false)
               else
-                img.resize!(size.first, size.last, false) 
+                img.resize!(size.first, size.last, false)
               end
             else
               w, h = [img.width, img.height] / size.to_s
diff --git a/vendor/plugins/attachment_fu/test/backends/db_file_test.rb b/vendor/plugins/attachment_fu/test/backends/db_file_test.rb
index e95bb49..a87a478 100644
--- a/vendor/plugins/attachment_fu/test/backends/db_file_test.rb
+++ b/vendor/plugins/attachment_fu/test/backends/db_file_test.rb
@@ -11,6 +11,6 @@ def test_should_call_after_attachment_saved(klass = Attachment)
     end
     assert_equal 1, attachment_model.saves
   end
-  
+
   test_against_subclass :test_should_call_after_attachment_saved, Attachment
 end
\ No newline at end of file
diff --git a/vendor/plugins/attachment_fu/test/backends/file_system_test.rb b/vendor/plugins/attachment_fu/test/backends/file_system_test.rb
index d3250c1..20e794f 100644
--- a/vendor/plugins/attachment_fu/test/backends/file_system_test.rb
+++ b/vendor/plugins/attachment_fu/test/backends/file_system_test.rb
@@ -11,7 +11,7 @@ def test_filesystem_size_for_file_attachment(klass = FileAttachment)
       assert_equal attachment.size, File.open(attachment.full_filename).stat.size
     end
   end
-  
+
   test_against_subclass :test_filesystem_size_for_file_attachment, FileAttachment
 
   def test_should_not_overwrite_file_attachment(klass = FileAttachment)
@@ -21,15 +21,15 @@ def test_should_not_overwrite_file_attachment(klass = FileAttachment)
       assert_valid real
       assert !real.new_record?, real.errors.full_messages.join("\n")
       assert !real.size.zero?
-      
+
       fake = upload_file :filename => '/files/fake/rails.png'
       assert_valid fake
       assert !fake.size.zero?
-      
+
       assert_not_equal File.open(real.full_filename).stat.size, File.open(fake.full_filename).stat.size
     end
   end
-  
+
   test_against_subclass :test_should_not_overwrite_file_attachment, FileAttachment
 
   def test_should_store_file_attachment_in_filesystem(klass = FileAttachment)
@@ -38,13 +38,13 @@ def test_should_store_file_attachment_in_filesystem(klass = FileAttachment)
     assert_created do
       attachment = upload_file :filename => '/files/rails.png'
       assert_valid attachment
-      assert File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"    
+      assert File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"
     end
     attachment
   end
-  
+
   test_against_subclass :test_should_store_file_attachment_in_filesystem, FileAttachment
-  
+
   def test_should_delete_old_file_when_updating(klass = FileAttachment)
     attachment_model klass
     attachment   = upload_file :filename => '/files/rails.png'
@@ -54,14 +54,14 @@ def test_should_delete_old_file_when_updating(klass = FileAttachment)
         attachment.filename        = 'rails2.png'
         attachment.temp_path = File.join(fixture_path, file)
         attachment.save!
-        assert  File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"    
+        assert  File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"
         assert !File.exists?(old_filename),             "#{old_filename} still exists"
       end
     end
   end
-  
+
   test_against_subclass :test_should_delete_old_file_when_updating, FileAttachment
-  
+
   def test_should_delete_old_file_when_renaming(klass = FileAttachment)
     attachment_model klass
     attachment   = upload_file :filename => '/files/rails.png'
@@ -69,12 +69,12 @@ def test_should_delete_old_file_when_renaming(klass = FileAttachment)
     assert_not_created do
       attachment.filename        = 'rails2.png'
       attachment.save
-      assert  File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"    
+      assert  File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"
       assert !File.exists?(old_filename),             "#{old_filename} still exists"
       assert !attachment.reload.size.zero?
       assert_equal 'rails2.png', attachment.filename
     end
   end
-  
+
   test_against_subclass :test_should_delete_old_file_when_renaming, FileAttachment
 end
\ No newline at end of file
diff --git a/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb b/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb
index bc27720..647f1df 100644
--- a/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb
+++ b/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb
@@ -5,7 +5,7 @@ class S3Test < Test::Unit::TestCase
   def self.test_S3?
     true unless ENV["TEST_S3"] == "false"
   end
-  
+
   if test_S3? && File.exist?(File.join(File.dirname(__FILE__), '../../amazon_s3.yml'))
     include BaseAttachmentTests
     attachment_model S3Attachment
@@ -87,11 +87,11 @@ def http_response_for(url)
         url = URI.parse(url)
         Net::HTTP.start(url.host, url.port) {|http| http.request_head(url.path) }
       end
-      
+
       def s3_protocol
         Technoweenie::AttachmentFu::Backends::S3Backend.protocol
       end
-      
+
       def s3_hostname
         Technoweenie::AttachmentFu::Backends::S3Backend.hostname
       end
diff --git a/vendor/plugins/attachment_fu/test/base_attachment_tests.rb b/vendor/plugins/attachment_fu/test/base_attachment_tests.rb
index c9dbbd7..c2169a8 100644
--- a/vendor/plugins/attachment_fu/test/base_attachment_tests.rb
+++ b/vendor/plugins/attachment_fu/test/base_attachment_tests.rb
@@ -11,32 +11,32 @@ def test_should_create_file_from_uploaded_file
       assert_nil      attachment.height
     end
   end
-  
+
   def test_reassign_attribute_data
     assert_created 1 do
       attachment = upload_file :filename => '/files/rails.png'
       assert_valid attachment
       assert attachment.size > 0, "no data was set"
-      
+
       attachment.temp_data = 'wtf'
       assert attachment.save_attachment?
       attachment.save!
-      
+
       assert_equal 'wtf', attachment_model.find(attachment.id).send(:current_data)
     end
   end
-  
+
   def test_no_reassign_attribute_data_on_nil
     assert_created 1 do
       attachment = upload_file :filename => '/files/rails.png'
       assert_valid attachment
       assert attachment.size > 0, "no data was set"
-      
+
       attachment.temp_data = nil
       assert !attachment.save_attachment?
     end
   end
-  
+
   def test_should_overwrite_old_contents_when_updating
     attachment   = upload_file :filename => '/files/rails.png'
     assert_not_created do # no new db_file records
@@ -47,7 +47,7 @@ def test_should_overwrite_old_contents_when_updating
       end
     end
   end
-  
+
   def test_should_save_without_updating_file
     attachment = upload_file :filename => '/files/foo.txt'
     assert_valid attachment
diff --git a/vendor/plugins/attachment_fu/test/basic_test.rb b/vendor/plugins/attachment_fu/test/basic_test.rb
index f8f881c..4fa72f2 100644
--- a/vendor/plugins/attachment_fu/test/basic_test.rb
+++ b/vendor/plugins/attachment_fu/test/basic_test.rb
@@ -4,15 +4,15 @@ class BasicTest < Test::Unit::TestCase
   def test_should_set_default_min_size
     assert_equal 1, Attachment.attachment_options[:min_size]
   end
-  
+
   def test_should_set_default_max_size
     assert_equal 1.megabyte, Attachment.attachment_options[:max_size]
   end
-  
+
   def test_should_set_default_size
     assert_equal (1..1.megabyte), Attachment.attachment_options[:size]
   end
-  
+
   def test_should_set_default_thumbnails_option
     assert_equal Hash.new, Attachment.attachment_options[:thumbnails]
   end
@@ -20,19 +20,19 @@ def test_should_set_default_thumbnails_option
   def test_should_set_default_thumbnail_class
     assert_equal Attachment, Attachment.attachment_options[:thumbnail_class]
   end
-  
+
   def test_should_normalize_content_types_to_array
     assert_equal %w(pdf), PdfAttachment.attachment_options[:content_type]
     assert_equal %w(pdf doc txt), DocAttachment.attachment_options[:content_type]
     assert_equal ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg'], ImageAttachment.attachment_options[:content_type]
     assert_equal ['pdf', 'image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg'], ImageOrPdfAttachment.attachment_options[:content_type]
   end
-  
+
   def test_should_sanitize_content_type
     @attachment = Attachment.new :content_type => ' foo '
     assert_equal 'foo', @attachment.content_type
   end
-  
+
   def test_should_sanitize_filenames
     @attachment = Attachment.new :filename => 'blah/foo.bar'
     assert_equal 'foo.bar',    @attachment.filename
@@ -43,18 +43,18 @@ def test_should_sanitize_filenames
     @attachment.filename = 'f o!O-.bar'
     assert_equal 'f_o_O-.bar', @attachment.filename
   end
-  
+
   def test_should_convert_thumbnail_name
     @attachment = FileAttachment.new :filename => 'foo.bar'
     assert_equal 'foo.bar',           @attachment.thumbnail_name_for(nil)
     assert_equal 'foo.bar',           @attachment.thumbnail_name_for('')
     assert_equal 'foo_blah.bar',      @attachment.thumbnail_name_for(:blah)
     assert_equal 'foo_blah.blah.bar', @attachment.thumbnail_name_for('blah.blah')
-    
+
     @attachment.filename = 'foo.bar.baz'
     assert_equal 'foo.bar_blah.baz', @attachment.thumbnail_name_for(:blah)
   end
-  
+
   def test_should_require_valid_thumbnails_option
     klass = Class.new(ActiveRecord::Base)
     assert_raise ArgumentError do
diff --git a/vendor/plugins/attachment_fu/test/extra_attachment_test.rb b/vendor/plugins/attachment_fu/test/extra_attachment_test.rb
index 15b1852..269c109 100644
--- a/vendor/plugins/attachment_fu/test/extra_attachment_test.rb
+++ b/vendor/plugins/attachment_fu/test/extra_attachment_test.rb
@@ -3,7 +3,7 @@
 class OrphanAttachmentTest < Test::Unit::TestCase
   include BaseAttachmentTests
   attachment_model OrphanAttachment
-  
+
   def test_should_create_image_from_uploaded_file
     assert_created do
       attachment = upload_file :filename => '/files/rails.png'
@@ -13,7 +13,7 @@ def test_should_create_image_from_uploaded_file
       assert !attachment.size.zero?
     end
   end
-  
+
   def test_should_create_file_from_uploaded_file
     assert_created do
       attachment = upload_file :filename => '/files/foo.txt'
@@ -23,7 +23,7 @@ def test_should_create_file_from_uploaded_file
       assert !attachment.size.zero?
     end
   end
-  
+
   def test_should_create_image_from_uploaded_file_with_custom_content_type
     assert_created do
       attachment = upload_file :content_type => 'foo/bar', :filename => '/files/rails.png'
@@ -34,18 +34,18 @@ def test_should_create_image_from_uploaded_file_with_custom_content_type
       #assert_equal 1784, attachment.size
     end
   end
-  
+
   def test_should_create_thumbnail
     attachment = upload_file :filename => '/files/rails.png'
-    
+
     assert_raise Technoweenie::AttachmentFu::ThumbnailError do
       attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 50, 50)
     end
   end
-  
+
   def test_should_create_thumbnail_with_geometry_string
    attachment = upload_file :filename => '/files/rails.png'
-    
+
     assert_raise Technoweenie::AttachmentFu::ThumbnailError do
       attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 'x50')
     end
diff --git a/vendor/plugins/attachment_fu/test/fixtures/attachment.rb b/vendor/plugins/attachment_fu/test/fixtures/attachment.rb
index 7476d7d..a5d110d 100644
--- a/vendor/plugins/attachment_fu/test/fixtures/attachment.rb
+++ b/vendor/plugins/attachment_fu/test/fixtures/attachment.rb
@@ -78,7 +78,7 @@ class OrphanAttachment < ActiveRecord::Base
 class MinimalAttachment < ActiveRecord::Base
   has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick
   validates_as_attachment
-  
+
   def filename
     "#{id}.file"
   end
diff --git a/vendor/plugins/attachment_fu/test/geometry_test.rb b/vendor/plugins/attachment_fu/test/geometry_test.rb
index ade4f48..39d6957 100644
--- a/vendor/plugins/attachment_fu/test/geometry_test.rb
+++ b/vendor/plugins/attachment_fu/test/geometry_test.rb
@@ -8,42 +8,42 @@ def test_should_resize
       "60x60"   => [47, 60],
       "100x100" => [78, 100]
   end
-  
+
   def test_should_resize_no_width
     assert_geometry 50, 64,
       "x50"  => [39, 50],
       "x60"  => [47, 60],
       "x100" => [78, 100]
   end
-  
+
   def test_should_resize_no_height
     assert_geometry 50, 64,
       "50"  => [50, 64],
       "60"  => [60, 77],
       "100" => [100, 128]
   end
-  
+
   def test_should_resize_with_percent
     assert_geometry 50, 64,
       "50x50%"   => [25, 32],
       "60x60%"   => [30, 38],
       "120x112%" => [60, 72]
   end
-  
+
   def test_should_resize_with_percent_and_no_width
     assert_geometry 50, 64,
       "x50%"  => [50, 32],
       "x60%"  => [50, 38],
       "x112%" => [50, 72]
   end
-  
+
   def test_should_resize_with_percent_and_no_height
     assert_geometry 50, 64,
       "50%"  => [25, 32],
       "60%"  => [30, 38],
       "120%" => [60, 77]
   end
-  
+
   def test_should_resize_with_less
     assert_geometry 50, 64,
       "50x50<"   => [50, 64],
@@ -52,14 +52,14 @@ def test_should_resize_with_less
       "100x112<" => [88, 112],
       "40x70<"   => [50, 64]
   end
-  
+
   def test_should_resize_with_less_and_no_width
     assert_geometry 50, 64,
       "x50<"  => [50, 64],
       "x60<"  => [50, 64],
       "x100<" => [78, 100]
   end
-  
+
   def test_should_resize_with_less_and_no_height
     assert_geometry 50, 64,
       "50<"  => [50, 64],
@@ -75,14 +75,14 @@ def test_should_resize_with_greater
       "100x112>" => [50, 64],
       "40x70>"   => [40, 51]
   end
-  
+
   def test_should_resize_with_greater_and_no_width
     assert_geometry 50, 64,
       "x40>"  => [31, 40],
       "x60>"  => [47, 60],
       "x100>" => [50, 64]
   end
-  
+
   def test_should_resize_with_greater_and_no_height
     assert_geometry 50, 64,
       "40>"  => [40, 51],
diff --git a/vendor/plugins/attachment_fu/test/processors/core_image_test.rb b/vendor/plugins/attachment_fu/test/processors/core_image_test.rb
index 09a9bbd..4c0a424 100644
--- a/vendor/plugins/attachment_fu/test/processors/core_image_test.rb
+++ b/vendor/plugins/attachment_fu/test/processors/core_image_test.rb
@@ -11,14 +11,14 @@ def test_should_resize_image
       # test core image thumbnail
       assert_equal 42, attachment.width
       assert_equal 55, attachment.height
-      
+
       thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
       geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
-      
+
       # test exact resize dimensions
       assert_equal 50, thumb.width
       assert_equal 51, thumb.height
-      
+
       # test geometry string
       assert_equal 31, geo.width
       assert_equal 41, geo.height
diff --git a/vendor/plugins/attachment_fu/test/processors/gd2_test.rb b/vendor/plugins/attachment_fu/test/processors/gd2_test.rb
index 298853b..4a27c05 100644
--- a/vendor/plugins/attachment_fu/test/processors/gd2_test.rb
+++ b/vendor/plugins/attachment_fu/test/processors/gd2_test.rb
@@ -11,14 +11,14 @@ def test_should_resize_image
       # test gd2 thumbnail
       assert_equal 43, attachment.width
       assert_equal 55, attachment.height
-      
+
       thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
       geo   = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
-      
+
       # test exact resize dimensions
       assert_equal 50, thumb.width
       assert_equal 51, thumb.height
-      
+
       # test geometry string
       assert_equal 31, geo.width
       assert_equal 40, geo.height
diff --git a/vendor/plugins/attachment_fu/test/processors/image_science_test.rb b/vendor/plugins/attachment_fu/test/processors/image_science_test.rb
index 636918d..d613ae9 100644
--- a/vendor/plugins/attachment_fu/test/processors/image_science_test.rb
+++ b/vendor/plugins/attachment_fu/test/processors/image_science_test.rb
@@ -11,14 +11,14 @@ def test_should_resize_image
       # test image science thumbnail
       assert_equal 42, attachment.width
       assert_equal 55, attachment.height
-      
+
       thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
       geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
-      
+
       # test exact resize dimensions
       assert_equal 50, thumb.width
       assert_equal 51, thumb.height
-      
+
       # test geometry string
       assert_equal 31, geo.width
       assert_equal 41, geo.height
diff --git a/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb b/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb
index 244a4a2..60581d3 100644
--- a/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb
+++ b/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb
@@ -11,14 +11,14 @@ def test_should_resize_image
       # test MiniMagick thumbnail
       assert_equal 43, attachment.width
       assert_equal 55, attachment.height
-      
+
       thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
       geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
-      
+
       # test exact resize dimensions
       assert_equal 50, thumb.width
       assert_equal 51, thumb.height
-      
+
       # test geometry string
       assert_equal 31, geo.width
       assert_equal 40, geo.height
diff --git a/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb b/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb
index 98b67dd..ff56a3d 100644
--- a/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb
+++ b/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb
@@ -17,7 +17,7 @@ def test_should_create_image_from_uploaded_file
         assert_equal '50x64', attachment.image_size
       end
     end
-    
+
     def test_should_create_image_from_uploaded_file_with_custom_content_type
       assert_created do
         attachment = upload_file :content_type => 'foo/bar', :filename => '/files/rails.png'
@@ -31,10 +31,10 @@ def test_should_create_image_from_uploaded_file_with_custom_content_type
         assert_equal [], attachment.thumbnails
       end
     end
-    
+
     def test_should_create_thumbnail
       attachment = upload_file :filename => '/files/rails.png'
-      
+
       assert_created do
         basename, ext = attachment.filename.split '.'
         thumbnail = attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 50, 50)
@@ -48,10 +48,10 @@ def test_should_create_thumbnail
         assert_equal "#{basename}_thumb.#{ext}", thumbnail.filename
       end
     end
-    
+
     def test_should_create_thumbnail_with_geometry_string
       attachment = upload_file :filename => '/files/rails.png'
-      
+
       assert_created do
         basename, ext = attachment.filename.split '.'
         thumbnail = attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 'x50')
@@ -65,7 +65,7 @@ def test_should_create_thumbnail_with_geometry_string
         assert_equal "#{basename}_thumb.#{ext}", thumbnail.filename
       end
     end
-    
+
     def test_should_resize_image(klass = ImageAttachment)
       attachment_model klass
       assert_equal [50, 50], attachment_model.attachment_options[:resize_to]
@@ -78,9 +78,9 @@ def test_should_resize_image(klass = ImageAttachment)
       assert_equal 50, attachment.width
       assert_equal 50, attachment.height
     end
-    
+
     test_against_subclass :test_should_resize_image, ImageAttachment
-    
+
     def test_should_resize_image_with_geometry(klass = ImageOrPdfAttachment)
       attachment_model klass
       assert_equal 'x50', attachment_model.attachment_options[:resize_to]
@@ -93,26 +93,26 @@ def test_should_resize_image_with_geometry(klass = ImageOrPdfAttachment)
       assert_equal 39,   attachment.width
       assert_equal 50,   attachment.height
     end
-    
+
     test_against_subclass :test_should_resize_image_with_geometry, ImageOrPdfAttachment
-    
+
     def test_should_give_correct_thumbnail_filenames(klass = ImageWithThumbsFileAttachment)
       attachment_model klass
       assert_created 3 do
         attachment = upload_file :filename => '/files/rails.png'
         thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
         geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
-        
+
         [attachment, thumb, geo].each { |record| assert_valid record }
-    
+
         assert_match /rails\.png$/,          attachment.full_filename
         assert_match /rails_geometry\.png$/, attachment.full_filename(:geometry)
         assert_match /rails_thumb\.png$/,    attachment.full_filename(:thumb)
       end
     end
-    
+
     test_against_subclass :test_should_give_correct_thumbnail_filenames, ImageWithThumbsFileAttachment
-    
+
     def test_should_automatically_create_thumbnails(klass = ImageWithThumbsAttachment)
       attachment_model klass
       assert_created 3 do
@@ -124,7 +124,7 @@ def test_should_automatically_create_thumbnails(klass = ImageWithThumbsAttachmen
         assert_equal 55,   attachment.height
         assert_equal 2,    attachment.thumbnails.length
         assert_equal 1.0,  attachment.aspect_ratio
-        
+
         thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
         assert !thumb.new_record?, thumb.errors.full_messages.join("\n")
         assert !thumb.size.zero?
@@ -132,7 +132,7 @@ def test_should_automatically_create_thumbnails(klass = ImageWithThumbsAttachmen
         assert_equal 50,   thumb.width
         assert_equal 50,   thumb.height
         assert_equal 1.0,  thumb.aspect_ratio
-        
+
         geo   = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
         assert !geo.new_record?, geo.errors.full_messages.join("\n")
         assert !geo.size.zero?
@@ -142,13 +142,13 @@ def test_should_automatically_create_thumbnails(klass = ImageWithThumbsAttachmen
         assert_equal 1.0,  geo.aspect_ratio
       end
     end
-    
+
     test_against_subclass :test_should_automatically_create_thumbnails, ImageWithThumbsAttachment
-    
+
     # same as above method, but test it on a file model
     test_against_class :test_should_automatically_create_thumbnails, ImageWithThumbsFileAttachment
     test_against_subclass :test_should_automatically_create_thumbnails_on_class, ImageWithThumbsFileAttachment
-    
+
     def test_should_use_thumbnail_subclass(klass = ImageWithThumbsClassFileAttachment)
       attachment_model klass
       attachment = nil
@@ -166,18 +166,18 @@ def test_should_use_thumbnail_subclass(klass = ImageWithThumbsClassFileAttachmen
         "#full_filename does not use thumbnail class' path."
       assert_equal attachment.destroy, attachment
     end
-    
+
     test_against_subclass :test_should_use_thumbnail_subclass, ImageWithThumbsClassFileAttachment
-    
+
     def test_should_remove_old_thumbnail_files_when_updating(klass = ImageWithThumbsFileAttachment)
       attachment_model klass
       attachment = nil
       assert_created 3 do
         attachment = upload_file :filename => '/files/rails.png'
       end
-    
+
       old_filenames = [attachment.full_filename] + attachment.thumbnails.collect(&:full_filename)
-    
+
       assert_not_created do
         use_temp_file "files/rails.png" do |file|
           attachment.filename        = 'rails2.png'
@@ -189,9 +189,9 @@ def test_should_remove_old_thumbnail_files_when_updating(klass = ImageWithThumbs
         end
       end
     end
-    
+
     test_against_subclass :test_should_remove_old_thumbnail_files_when_updating, ImageWithThumbsFileAttachment
-    
+
     def test_should_delete_file_when_in_file_system_when_attachment_record_destroyed(klass = ImageWithThumbsFileAttachment)
       attachment_model klass
       attachment = upload_file :filename => '/files/rails.png'
@@ -200,17 +200,17 @@ def test_should_delete_file_when_in_file_system_when_attachment_record_destroyed
       attachment.destroy
       filenames.each { |f| assert !File.exists?(f),  "#{f} still exists" }
     end
-    
+
     test_against_subclass :test_should_delete_file_when_in_file_system_when_attachment_record_destroyed, ImageWithThumbsFileAttachment
-    
+
     def test_should_have_full_filename_method(klass = FileAttachment)
       attachment_model klass
       attachment = upload_file :filename => '/files/rails.png'
       assert_respond_to attachment, :full_filename
     end
-    
+
     test_against_subclass :test_should_have_full_filename_method, FileAttachment
-    
+
     def test_should_overwrite_old_thumbnail_records_when_updating(klass = ImageWithThumbsAttachment)
       attachment_model klass
       attachment = nil
@@ -220,7 +220,7 @@ def test_should_overwrite_old_thumbnail_records_when_updating(klass = ImageWithT
       assert_not_created do # no new db_file records
         use_temp_file "files/rails.png" do |file|
           attachment.filename             = 'rails2.png'
-          # The above test (#test_should_have_full_filename_method) to pass before be can set the temp_path below -- 
+          # The above test (#test_should_have_full_filename_method) to pass before be can set the temp_path below --
           # #temp_path calls #full_filename, which is not getting mixed into the attachment.  Maybe we don't need to
           # set temp_path at all?
           #
@@ -229,9 +229,9 @@ def test_should_overwrite_old_thumbnail_records_when_updating(klass = ImageWithT
         end
       end
     end
-    
+
     test_against_subclass :test_should_overwrite_old_thumbnail_records_when_updating, ImageWithThumbsAttachment
-    
+
     def test_should_overwrite_old_thumbnail_records_when_renaming(klass = ImageWithThumbsAttachment)
       attachment_model klass
       attachment = nil
@@ -245,7 +245,7 @@ def test_should_overwrite_old_thumbnail_records_when_renaming(klass = ImageWithT
         assert_equal 'rails2.png', attachment.filename
       end
     end
-    
+
     test_against_subclass :test_should_overwrite_old_thumbnail_records_when_renaming, ImageWithThumbsAttachment
   else
     def test_flunk
diff --git a/vendor/plugins/attachment_fu/test/schema.rb b/vendor/plugins/attachment_fu/test/schema.rb
index e46ce24..194cc19 100644
--- a/vendor/plugins/attachment_fu/test/schema.rb
+++ b/vendor/plugins/attachment_fu/test/schema.rb
@@ -13,7 +13,7 @@
 
   create_table :file_attachments, :force => true do |t|
     t.column :parent_id,       :integer
-    t.column :thumbnail,       :string 
+    t.column :thumbnail,       :string
     t.column :filename,        :string, :limit => 255
     t.column :content_type,    :string, :limit => 255
     t.column :size,            :integer
@@ -25,7 +25,7 @@
 
   create_table :gd2_attachments, :force => true do |t|
     t.column :parent_id,       :integer
-    t.column :thumbnail,       :string 
+    t.column :thumbnail,       :string
     t.column :filename,        :string, :limit => 255
     t.column :content_type,    :string, :limit => 255
     t.column :size,            :integer
@@ -36,7 +36,7 @@
 
   create_table :image_science_attachments, :force => true do |t|
     t.column :parent_id,       :integer
-    t.column :thumbnail,       :string 
+    t.column :thumbnail,       :string
     t.column :filename,        :string, :limit => 255
     t.column :content_type,    :string, :limit => 255
     t.column :size,            :integer
@@ -47,7 +47,7 @@
 
   create_table :core_image_attachments, :force => true do |t|
     t.column :parent_id,       :integer
-    t.column :thumbnail,       :string 
+    t.column :thumbnail,       :string
     t.column :filename,        :string, :limit => 255
     t.column :content_type,    :string, :limit => 255
     t.column :size,            :integer
@@ -55,10 +55,10 @@
     t.column :height,          :integer
     t.column :type,            :string
   end
-  
+
   create_table :mini_magick_attachments, :force => true do |t|
     t.column :parent_id,       :integer
-    t.column :thumbnail,       :string 
+    t.column :thumbnail,       :string
     t.column :filename,        :string, :limit => 255
     t.column :content_type,    :string, :limit => 255
     t.column :size,            :integer
@@ -69,7 +69,7 @@
 
   create_table :mini_magick_attachments, :force => true do |t|
     t.column :parent_id,       :integer
-    t.column :thumbnail,       :string 
+    t.column :thumbnail,       :string
     t.column :filename,        :string, :limit => 255
     t.column :content_type,    :string, :limit => 255
     t.column :size,            :integer
@@ -84,7 +84,7 @@
     t.column :content_type,    :string, :limit => 255
     t.column :size,            :integer
   end
-  
+
   create_table :minimal_attachments, :force => true do |t|
     t.column :size,            :integer
     t.column :content_type,    :string, :limit => 255
@@ -96,7 +96,7 @@
 
   create_table :s3_attachments, :force => true do |t|
     t.column :parent_id,       :integer
-    t.column :thumbnail,       :string 
+    t.column :thumbnail,       :string
     t.column :filename,        :string, :limit => 255
     t.column :content_type,    :string, :limit => 255
     t.column :size,            :integer
diff --git a/vendor/plugins/attachment_fu/test/test_helper.rb b/vendor/plugins/attachment_fu/test/test_helper.rb
index ccd53e5..ae0c57b 100644
--- a/vendor/plugins/attachment_fu/test/test_helper.rb
+++ b/vendor/plugins/attachment_fu/test/test_helper.rb
@@ -14,7 +14,7 @@
 db_adapter = ENV['DB']
 
 # no db passed, try one of these fine config-free DBs before bombing.
-db_adapter ||= 
+db_adapter ||=
   begin
     require 'rubygems'
     require 'sqlite'
@@ -53,7 +53,7 @@ def setup
     DbFile.transaction { [Attachment, FileAttachment, OrphanAttachment, MinimalAttachment, DbFile].each { |klass| klass.delete_all } }
     attachment_model self.class.attachment_model
   end
-  
+
   def teardown
     FileUtils.rm_rf File.join(File.dirname(__FILE__), 'files')
   end
@@ -62,7 +62,7 @@ def teardown
   self.use_instantiated_fixtures  = false
 
   def self.attachment_model(klass = nil)
-    @attachment_model = klass if klass 
+    @attachment_model = klass if klass
     @attachment_model
   end
 
@@ -107,11 +107,11 @@ def assert_created(num = 1)
         end
       end
     end
-    
+
     def assert_not_created
       assert_created(0) { yield }
     end
-    
+
     def should_reject_by_size_with(klass)
       attachment_model klass
       assert_not_created do
@@ -121,19 +121,19 @@ def should_reject_by_size_with(klass)
         assert_nil attachment.db_file if attachment.respond_to?(:db_file)
       end
     end
-    
+
     def assert_difference(object, method = nil, difference = 1)
       initial_value = object.send(method)
       yield
       assert_equal initial_value + difference, object.send(method)
     end
-    
+
     def assert_no_difference(object, method, &block)
       assert_difference object, method, 0, &block
     end
-    
+
     def attachment_model(klass = nil)
-      @attachment_model = klass if klass 
+      @attachment_model = klass if klass
       @attachment_model
     end
 end
diff --git a/vendor/plugins/attachment_fu/test/validation_test.rb b/vendor/plugins/attachment_fu/test/validation_test.rb
index a14cf99..3bb056e 100644
--- a/vendor/plugins/attachment_fu/test/validation_test.rb
+++ b/vendor/plugins/attachment_fu/test/validation_test.rb
@@ -5,11 +5,11 @@ def test_should_invalidate_big_files
     @attachment = SmallAttachment.new
     assert !@attachment.valid?
     assert @attachment.errors.on(:size)
-    
+
     @attachment.size = 2000
     assert !@attachment.valid?
     assert @attachment.errors.on(:size), @attachment.errors.full_messages.to_sentence
-    
+
     @attachment.size = 1000
     assert !@attachment.valid?
     assert_nil @attachment.errors.on(:size)
@@ -19,16 +19,16 @@ def test_should_invalidate_small_files
     @attachment = BigAttachment.new
     assert !@attachment.valid?
     assert @attachment.errors.on(:size)
-    
+
     @attachment.size = 2000
     assert !@attachment.valid?
     assert @attachment.errors.on(:size), @attachment.errors.full_messages.to_sentence
-    
+
     @attachment.size = 1.megabyte
     assert !@attachment.valid?
     assert_nil @attachment.errors.on(:size)
   end
-  
+
   def test_should_validate_content_type
     @attachment = PdfAttachment.new
     assert !@attachment.valid?
@@ -47,7 +47,7 @@ def test_should_require_filename
     @attachment = Attachment.new
     assert !@attachment.valid?
     assert @attachment.errors.on(:filename)
-    
+
     @attachment.filename = 'foo'
     assert !@attachment.valid?
     assert_nil @attachment.errors.on(:filename)
diff --git a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/color.rb b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/color.rb
index f593b90..cf06338 100644
--- a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/color.rb
+++ b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/color.rb
@@ -2,25 +2,25 @@ module RedArtisan
   module CoreImage
     module Filters
       module Color
-        
+
         def greyscale(color = nil, intensity = 1.00)
           create_core_image_context(@original.extent.size.width, @original.extent.size.height)
-          
+
           color = OSX::CIColor.colorWithString("1.0 1.0 1.0 1.0") unless color
-          
+
           @original.color_monochrome :inputColor => color, :inputIntensity => intensity do |greyscale|
             @target = greyscale
           end
         end
-        
+
         def sepia(intensity = 1.00)
           create_core_image_context(@original.extent.size.width, @original.extent.size.height)
-          
+
           @original.sepia_tone :inputIntensity => intensity do |sepia|
             @target = sepia
           end
         end
-        
+
       end
     end
   end
diff --git a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/effects.rb b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/effects.rb
index 2e0f244..9998407 100644
--- a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/effects.rb
+++ b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/effects.rb
@@ -2,26 +2,26 @@ module RedArtisan
   module CoreImage
     module Filters
       module Effects
-        
+
         def spotlight(position, points_at, brightness, concentration, color)
           create_core_image_context(@original.extent.size.width, @original.extent.size.height)
-          
-          @original.spot_light :inputLightPosition => vector3(*position), :inputLightPointsAt => vector3(*points_at), 
+
+          @original.spot_light :inputLightPosition => vector3(*position), :inputLightPointsAt => vector3(*points_at),
                                :inputBrightness => brightness, :inputConcentration => concentration, :inputColor => color do |spot|
             @target = spot
           end
         end
-        
+
         def edges(intensity = 1.00)
           create_core_image_context(@original.extent.size.width, @original.extent.size.height)
-          
+
           @original.edges :inputIntensity => intensity do |edged|
             @target = edged
           end
         end
-        
+
         private
-        
+
           def vector3(x, y, w)
             OSX::CIVector.vectorWithX_Y_Z(x, y, w)
           end
diff --git a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/perspective.rb b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/perspective.rb
index 6160dd8..8f44eb7 100644
--- a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/perspective.rb
+++ b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/perspective.rb
@@ -2,10 +2,10 @@ module RedArtisan
   module CoreImage
     module Filters
       module Perspective
-        
+
         def perspective(top_left, top_right, bottom_left, bottom_right)
           create_core_image_context(@original.extent.size.width, @original.extent.size.height)
-          
+
           @original.perspective_transform :inputTopLeft => top_left, :inputTopRight => top_right, :inputBottomLeft => bottom_left, :inputBottomRight => bottom_right do |transformed|
             @target = transformed
           end
@@ -13,12 +13,12 @@ def perspective(top_left, top_right, bottom_left, bottom_right)
 
         def perspective_tiled(top_left, top_right, bottom_left, bottom_right)
           create_core_image_context(@original.extent.size.width, @original.extent.size.height)
-          
+
           @original.perspective_tile :inputTopLeft => top_left, :inputTopRight => top_right, :inputBottomLeft => bottom_left, :inputBottomRight => bottom_right do |tiled|
             @target = tiled
           end
         end
-        
+
       end
     end
   end
diff --git a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/quality.rb b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/quality.rb
index 018690f..ef9c651 100644
--- a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/quality.rb
+++ b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/quality.rb
@@ -2,23 +2,23 @@ module RedArtisan
   module CoreImage
     module Filters
       module Quality
-        
+
         def reduce_noise(level = 0.02, sharpness = 0.4)
           create_core_image_context(@original.extent.size.width, @original.extent.size.height)
-          
+
           @original.noise_reduction :inputNoiseLevel => level, :inputSharpness => sharpness do |noise_reduced|
             @target = noise_reduced
           end
         end
-        
+
         def adjust_exposure(input_ev = 0.5)
           create_core_image_context(@original.extent.size.width, @original.extent.size.height)
-          
+
           @original.exposure_adjust :inputEV => input_ev do |adjusted|
             @target = adjusted
-          end          
+          end
         end
-        
+
       end
     end
   end
diff --git a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/scale.rb b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/scale.rb
index f729b59..b52e718 100644
--- a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/scale.rb
+++ b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/scale.rb
@@ -2,7 +2,7 @@ module RedArtisan
   module CoreImage
     module Filters
       module Scale
-        
+
         def resize(width, height)
           create_core_image_context(width, height)
 
@@ -33,14 +33,14 @@ def fit(size)
           scale = size.to_f / (original_size.width > original_size.height ? original_size.width : original_size.height)
           resize (original_size.width * scale).to_i, (original_size.height * scale).to_i
         end
-        
+
         private
-        
+
           def scale(width, height)
             original_size = @original.extent.size
             return width.to_f / original_size.width.to_f, height.to_f / original_size.height.to_f
           end
-          
+
       end
     end
   end
diff --git a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/watermark.rb b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/watermark.rb
index 3c3a1ad..76b96b7 100644
--- a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/watermark.rb
+++ b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/watermark.rb
@@ -2,25 +2,25 @@ module RedArtisan
   module CoreImage
     module Filters
       module Watermark
-        
+
         def watermark(watermark_image, tile = false, strength = 0.1)
           create_core_image_context(@original.extent.size.width, @original.extent.size.height)
-          
+
           if watermark_image.respond_to? :to_str
             watermark_image = OSX::CIImage.from(watermark_image.to_str)
           end
-          
+
           if tile
             tile_transform = OSX::NSAffineTransform.transform
             tile_transform.scaleXBy_yBy 1.0, 1.0
-            
+
             watermark_image.affine_tile :inputTransform => tile_transform do |tiled|
               tiled.crop :inputRectangle => vector(0, 0, @original.extent.size.width, @original.extent.size.height) do |tiled_watermark|
                 watermark_image = tiled_watermark
               end
             end
           end
-          
+
           @original.dissolve_transition :inputTargetImage => watermark_image, :inputTime => strength do |watermarked|
             @target = watermarked
           end
diff --git a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/processor.rb b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/processor.rb
index 965e70c..027c5ef 100644
--- a/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/processor.rb
+++ b/vendor/plugins/attachment_fu/vendor/red_artisan/core_image/processor.rb
@@ -58,7 +58,7 @@
 module RedArtisan
   module CoreImage
     class Processor
-  
+
       def initialize(original)
         if original.respond_to? :to_str
           @original = OSX::CIImage.from(original.to_str)
@@ -66,23 +66,23 @@ def initialize(original)
           @original = original
         end
       end
-  
+
       def render(&block)
         raise "unprocessed image: #{@original}" unless @target
         block.call @target
       end
-      
+
       include Filters::Scale, Filters::Color, Filters::Watermark, Filters::Quality, Filters::Perspective, Filters::Effects
-  
+
       private
-  
+
         def create_core_image_context(width, height)
       		output = OSX::NSBitmapImageRep.alloc.initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel(nil, width, height, 8, 4, true, false, OSX::NSDeviceRGBColorSpace, 0, 0)
       		context = OSX::NSGraphicsContext.graphicsContextWithBitmapImageRep(output)
       		OSX::NSGraphicsContext.setCurrentContext(context)
       		@ci_context = context.CIContext
         end
-        
+
         def vector(x, y, w, h)
           OSX::CIVector.vectorWithX_Y_Z_W(x, y, w, h)
         end
@@ -93,27 +93,27 @@ def vector(x, y, w, h)
 module OSX
   class CIImage
     include OCObjWrapper
-  
+
     def method_missing_with_filter_processing(sym, *args, &block)
       f = OSX::CIFilter.filterWithName("CI#{sym.to_s.camelize}")
       return method_missing_without_filter_processing(sym, *args, &block) unless f
-    
+
       f.setDefaults if f.respond_to? :setDefaults
       f.setValue_forKey(self, 'inputImage')
       options = args.last.is_a?(Hash) ? args.last : {}
       options.each { |k, v| f.setValue_forKey(v, k.to_s) }
-    
+
       block.call f.valueForKey('outputImage')
     end
-  
+
     alias_method_chain :method_missing, :filter_processing
-      
+
     def save(target, format = OSX::NSJPEGFileType, properties = nil)
       bitmapRep = OSX::NSBitmapImageRep.alloc.initWithCIImage(self)
       blob = bitmapRep.representationUsingType_properties(format, properties)
       blob.writeToFile_atomically(target, false)
     end
-  
+
     def self.from(filepath)
       raise Errno::ENOENT, "No such file or directory - #{filepath}" unless File.exists?(filepath)
       OSX::CIImage.imageWithContentsOfURL(OSX::NSURL.fileURLWithPath(filepath))
diff --git a/vendor/plugins/authlogic/README.rdoc b/vendor/plugins/authlogic/README.rdoc
index d07c51d..07d6936 100644
--- a/vendor/plugins/authlogic/README.rdoc
+++ b/vendor/plugins/authlogic/README.rdoc
@@ -101,7 +101,7 @@ What if your user sessions controller could look just like your other controller
     def new
       @user_session = UserSession.new
     end
-    
+
     def create
       @user_session = UserSession.new(params[:user_session])
       if @user_session.save
@@ -110,7 +110,7 @@ What if your user sessions controller could look just like your other controller
         render :action => :new
       end
     end
-    
+
     def destroy
       current_user_session.destroy
       redirect_to new_user_session_url
@@ -134,13 +134,13 @@ Or how about persisting the session...
 
   class ApplicationController
     helper_method :current_user_session, :current_user
-    
+
     private
       def current_user_session
         return @current_user_session if defined?(@current_user_session)
         @current_user_session = UserSession.find
       end
-      
+
       def current_user
         return @current_user if defined?(@current_user)
         @current_user = current_user_session && current_user_session.user
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/base.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/base.rb
index 248c9d9..986ff48 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/base.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/base.rb
@@ -7,7 +7,7 @@ def self.included(klass)
           extend Config
         end
       end
-      
+
       module Config
         # This includes a lot of helpful methods for authenticating records which The Authlogic::Session module relies on.
         # To use it just do:
@@ -30,11 +30,11 @@ def acts_as_authentic(&block)
           rescue Exception
             return
           end
-          
+
           yield self if block_given?
           acts_as_authentic_modules.each { |mod| include mod }
         end
-        
+
         # Since this part of Authlogic deals with another class, ActiveRecord, we can't just start including things
         # in ActiveRecord itself. A lot of these module includes need to be triggered by the acts_as_authentic method
         # call. For example, you don't want to start adding in email validations and what not into a model that has
@@ -47,19 +47,19 @@ def add_acts_as_authentic_module(mod)
           modules.uniq!
           write_inheritable_attribute(:acts_as_authentic_modules, modules)
         end
-        
+
         # This is the same as add_acts_as_authentic_module, except that it removes the module from the list.
         def remove_acts_as_authentic_module(mod)
           acts_as_authentic_modules.delete(mod)
           acts_as_authentic_modules
         end
-      
+
         private
           def acts_as_authentic_modules
             key = :acts_as_authentic_modules
             inheritable_attributes.include?(key) ? read_inheritable_attribute(key) : []
           end
-        
+
           def config(key, value, default_value = nil, read_value = nil)
             if value == read_value
               return read_inheritable_attribute(key) if inheritable_attributes.include?(key)
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/email.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/email.rb
index 95d69c7..e7096a1 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/email.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/email.rb
@@ -11,7 +11,7 @@ def self.included(klass)
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # Configuration to modify how Authlogic handles the email field.
       module Config
         # The name of the field that stores email addresses.
@@ -22,7 +22,7 @@ def email_field(value = nil)
           config(:email_field, value, first_column_to_exist(nil, :email))
         end
         alias_method :email_field=, :email_field
-        
+
         # Toggles validating the email field or not.
         #
         # * <tt>Default:</tt> true
@@ -31,7 +31,7 @@ def validate_email_field(value = nil)
           config(:validate_email_field, value, true)
         end
         alias_method :validate_email_field=, :validate_email_field
-        
+
         # A hash of options for the validates_length_of call for the email field. Allows you to change this however you want.
         #
         # * <tt>Default:</tt> {:within => 6..100}
@@ -40,7 +40,7 @@ def validates_length_of_email_field_options(value = nil)
           config(:validates_length_of_email_field_options, value, {:within => 6..100})
         end
         alias_method :validates_length_of_email_field_options=, :validates_length_of_email_field_options
-        
+
         # A hash of options for the validates_format_of call for the email field. Allows you to change this however you want.
         #
         # * <tt>Default:</tt> {:with => email_regex, :message => I18n.t('error_messages.email_invalid', :default => "should look like an email address.")}
@@ -49,7 +49,7 @@ def validates_format_of_email_field_options(value = nil)
           config(:validates_format_of_email_field_options, value, {:with => email_regex, :message => I18n.t('error_messages.email_invalid', :default => "should look like an email address.")})
         end
         alias_method :validates_format_of_email_field_options=, :validates_format_of_email_field_options
-        
+
         # A hash of options for the validates_uniqueness_of call for the email field. Allows you to change this however you want.
         #
         # * <tt>Default:</tt> {:scope => validations_scope, :if => "#{email_field}_changed?".to_sym}
@@ -58,7 +58,7 @@ def validates_uniqueness_of_email_field_options(value = nil)
           config(:validates_uniqueness_of_email_field_options, value, {:scope => validations_scope, :if => "#{email_field}_changed?".to_sym})
         end
         alias_method :validates_uniqueness_of_email_field_options=, :validates_uniqueness_of_email_field_options
-        
+
         private
           def email_regex
             return @email_regex if @email_regex
@@ -68,7 +68,7 @@ def email_regex
             @email_regex = /\A#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}\z/i
           end
       end
-      
+
       # All methods relating to the email field
       module Methods
         def self.included(klass)
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/logged_in_status.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/logged_in_status.rb
index a6b0d58..05029e7 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/logged_in_status.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/logged_in_status.rb
@@ -11,7 +11,7 @@ def self.included(klass)
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # All configuration for the logged in status feature set.
       module Config
         # The timeout to determine when a user is logged in or not.
@@ -23,7 +23,7 @@ def logged_in_timeout(value = nil)
         end
         alias_method :logged_in_timeout=, :logged_in_timeout
       end
-      
+
       # All methods for the logged in status feature seat.
       module Methods
         def self.included(klass)
@@ -32,18 +32,18 @@ def self.included(klass)
             named_scope :logged_out, lambda { {:conditions => ["last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago]} }
           end
         end
-        
+
         # Returns true if the last_request_at > logged_in_timeout.
         def logged_in?
           raise "Can not determine the records login state because there is no last_request_at column" if !respond_to?(:last_request_at)
           !last_request_at.nil? && last_request_at > logged_in_timeout.seconds.ago
         end
-        
+
         # Opposite of logged_in?
         def logged_out?
           !logged_in?
         end
-        
+
         private
           def logged_in_timeout
             self.class.logged_in_timeout
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/login.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/login.rb
index 91fdf64..63b8d75 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/login.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/login.rb
@@ -8,7 +8,7 @@ def self.included(klass)
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # Confguration for the login field.
       module Config
         # The name of the login field in the database.
@@ -19,7 +19,7 @@ def login_field(value = nil)
           config(:login_field, value, first_column_to_exist(nil, :login, :username))
         end
         alias_method :login_field=, :login_field
-        
+
         # Whether or not the validate the login field
         #
         # * <tt>Default:</tt> true
@@ -28,7 +28,7 @@ def validate_login_field(value = nil)
           config(:validate_login_field, value, true)
         end
         alias_method :validate_login_field=, :validate_login_field
-        
+
         # A hash of options for the validates_length_of call for the login field. Allows you to change this however you want.
         #
         # * <tt>Default:</tt> {:within => 6..100}
@@ -37,7 +37,7 @@ def validates_length_of_login_field_options(value = nil)
           config(:validates_length_of_login_field_options, value, {:within => 3..100})
         end
         alias_method :validates_length_of_login_field_options=, :validates_length_of_login_field_options
-        
+
         # A hash of options for the validates_format_of call for the login field. Allows you to change this however you want.
         #
         # * <tt>Default:</tt> {:with => /\A\w[\w\.\-_@ ]+\z/, :message => I18n.t('error_messages.login_invalid', :default => "should use only letters, numbers, spaces, and .-_@ please.")}
@@ -46,7 +46,7 @@ def validates_format_of_login_field_options(value = nil)
           config(:validates_format_of_login_field_options, value, {:with => /\A\w[\w\.\-_@ ]+\z/, :message => I18n.t('error_messages.login_invalid', :default => "should use only letters, numbers, spaces, and .-_@ please.")})
         end
         alias_method :validates_format_of_login_field_options=, :validates_format_of_login_field_options
-        
+
         # A hash of options for the validates_uniqueness_of call for the login field. Allows you to change this however you want.
         #
         # * <tt>Default:</tt> {:scope => validations_scope, :if => "#{login_field}_changed?".to_sym}
@@ -56,7 +56,7 @@ def validates_uniqueness_of_login_field_options(value = nil)
         end
         alias_method :validates_uniqueness_of_login_field_options=, :validates_uniqueness_of_login_field_options
       end
-      
+
       # All methods relating to the login field
       module Methods
         def self.included(klass)
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/magic_columns.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/magic_columns.rb
index 4be1f8e..160f695 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/magic_columns.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/magic_columns.rb
@@ -9,7 +9,7 @@ def self.included(klass)
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # Methods relating to the magic columns
       module Methods
         def self.included(klass)
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/password.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/password.rb
index 020e55c..d240532 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/password.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/password.rb
@@ -10,7 +10,7 @@ def self.included(klass)
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # All configuration for the password aspect of acts_as_authentic.
       module Config
         # The name of the crypted_password field in the database.
@@ -21,7 +21,7 @@ def crypted_password_field(value = nil)
           config(:crypted_password_field, value, first_column_to_exist(:crypted_password, :encrypted_password, :password_hash, :pw_hash))
         end
         alias_method :crypted_password_field=, :crypted_password_field
-        
+
         # The name of the password_salt field in the database.
         #
         # * <tt>Default:</tt> :password_salt, :pw_salt, :salt, nil if none exist
@@ -30,7 +30,7 @@ def password_salt_field(value = nil)
           config(:password_salt_field, value, first_column_to_exist(nil, :password_salt, :pw_salt, :salt))
         end
         alias_method :password_salt_field=, :password_salt_field
-        
+
         # Whether or not to validate the password field.
         #
         # * <tt>Default:</tt> true
@@ -39,7 +39,7 @@ def validate_password_field(value = nil)
           config(:validate_password_field, value, true)
         end
         alias_method :validate_password_field=, :validate_password_field
-        
+
         # A hash of options for the validates_length_of call for the password field. Allows you to change this however you want.
         #
         # * <tt>Default:</tt> {:minimum => 4, :if => :require_password?}
@@ -48,7 +48,7 @@ def validates_length_of_password_field_options(value = nil)
           config(:validates_length_of_password_field_options, value, {:minimum => 4, :if => :require_password?})
         end
         alias_method :validates_length_of_password_field_options=, :validates_length_of_password_field_options
-        
+
         # A hash of options for the validates_confirmation_of call for the password field. Allows you to change this however you want.
         #
         # * <tt>Default:</tt> {:minimum => 4, :if => "#{password_salt_field}_changed?".to_sym}
@@ -57,7 +57,7 @@ def validates_confirmation_of_password_field_options(value = nil)
           config(:validates_confirmation_of_password_field_options, value, {:minimum => 4, :if => (password_salt_field ? "#{password_salt_field}_changed?".to_sym : nil)})
         end
         alias_method :validates_confirmation_of_password_field_options=, :validates_confirmation_of_password_field_options
-        
+
         # A hash of options for the validates_length_of call for the password_confirmation field. Allows you to change this however you want.
         #
         # * <tt>Default:</tt> {:minimum => 4, :if => :require_password_?}
@@ -66,7 +66,7 @@ def validates_length_of_password_confirmation_field_options(value = nil)
           config(:validates_length_of_password_confirmation_field_options, value, {:minimum => 4, :if => :require_password?})
         end
         alias_method :validates_length_of_password_confirmation_field_options=, :validates_length_of_password_confirmation_field_options
-        
+
         # The class you want to use to encrypt and verify your encrypted passwords. See the Authlogic::CryptoProviders module for more info
         # on the available methods and how to create your own.
         #
@@ -76,7 +76,7 @@ def crypto_provider(value = nil)
           config(:crypto_provider, value, CryptoProviders::Sha512)
         end
         alias_method :crypto_provider=, :crypto_provider
-        
+
         # Let's say you originally encrypted your passwords with Sha1. Sha1 is starting to join the party with MD5 and you want to switch
         # to something stronger. No problem, just specify your new and improved algorithm with the crypt_provider option and then let
         # Authlogic know you are transitioning from Sha1 using this option. Authlogic will take care of everything, including transitioning
@@ -93,18 +93,18 @@ def transition_from_crypto_providers(value = nil)
         end
         alias_method :transition_from_crypto_providers=, :transition_from_crypto_providers
       end
-      
+
       # Callbacks / hooks to allow other modules to modify the behavior of this module.
       module Callbacks
         METHODS = [
           "before_password_set", "after_password_set",
           "before_password_verification", "after_password_verification"
         ]
-        
+
         def self.included(klass)
           klass.define_callbacks *METHODS
         end
-        
+
         private
           METHODS.each do |method|
             class_eval <<-"end_eval", __FILE__, __LINE__
@@ -114,7 +114,7 @@ def #{method}
             end_eval
           end
       end
-      
+
       # The methods related to the password field.
       module Methods
         def self.included(klass)
@@ -126,12 +126,12 @@ def self.included(klass)
             end
           end
         end
-        
+
         # The password
         def password
           @password
         end
-        
+
         # This is a virtual method. Once a password is passed to it, it will create new password salt as well as encrypt
         # the password.
         def password=(pass)
@@ -142,20 +142,20 @@ def password=(pass)
           send("#{crypted_password_field}=", crypto_provider.encrypt(*encrypt_arguments(@password, act_like_restful_authentication? ? :restful_authentication : nil)))
           after_password_set
         end
-        
+
         # Accepts a raw password to determine if it is the correct password or not.
         def valid_password?(attempted_password)
           return false if attempted_password.blank? || send(crypted_password_field).blank?
-          
+
           before_password_verification
-          
+
           crypto_providers = [crypto_provider] + transition_from_crypto_providers
           crypto_providers.each_with_index do |encryptor, index|
             # The arguments_type of for the transitioning from restful_authentication
             arguments_type = (act_like_restful_authentication? && index == 0) ||
               (transition_from_restful_authentication? && index > 0 && encryptor == Authlogic::CryptoProviders::Sha1) ?
               :restful_authentication : nil
-            
+
             if encryptor.matches?(send(crypted_password_field), *encrypt_arguments(attempted_password, arguments_type))
               # If we are transitioning from an older encryption algorithm and the password is still using the old algorithm
               # then let's reset the password using the new algorithm. If the algorithm has a cost (BCrypt) and the cost has changed, update the password with
@@ -164,16 +164,16 @@ def valid_password?(attempted_password)
                 self.password = attempted_password
                 save(false)
               end
-              
+
               after_password_verification
-              
+
               return true
             end
           end
-          
+
           false
         end
-        
+
         # Resets the password to a random friendly token.
         def reset_password
           friendly_token = Authlogic::Random.friendly_token
@@ -181,14 +181,14 @@ def reset_password
           self.password_confirmation = friendly_token
         end
         alias_method :randomize_password, :reset_password
-        
+
         # Resets the password to a random friendly token and then saves the record.
         def reset_password!
           reset_password
           save_without_session_maintenance(false)
         end
         alias_method :randomize_password!, :reset_password!
-        
+
         private
           def encrypt_arguments(raw_password, arguments_type = nil)
             salt = password_salt_field ? send(password_salt_field) : nil
@@ -199,23 +199,23 @@ def encrypt_arguments(raw_password, arguments_type = nil)
               [raw_password, salt].compact
             end
           end
-          
+
           def require_password?
             new_record? || (password_salt_field && send("#{password_salt_field}_changed?")) || send(crypted_password_field).blank?
           end
-          
+
           def crypted_password_field
             self.class.crypted_password_field
           end
-          
+
           def password_salt_field
             self.class.password_salt_field
           end
-          
+
           def crypto_provider
             self.class.crypto_provider
           end
-          
+
           def transition_from_crypto_providers
             self.class.transition_from_crypto_providers
           end
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/perishable_token.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/perishable_token.rb
index 5deac78..ec0f522 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/perishable_token.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/perishable_token.rb
@@ -11,7 +11,7 @@ def self.included(klass)
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # Change how the perishable token works.
       module Config
         # When using the find_using_perishable_token method the token can expire. If the token is expired, no
@@ -23,7 +23,7 @@ def perishable_token_valid_for(value = nil)
           config(:perishable_token_valid_for, (!value.nil? && value.to_i) || value, 10.minutes.to_i)
         end
         alias_method :perishable_token_valid_for=, :perishable_token_valid_for
-        
+
         # Authlogic tries to expire and change the perishable token as much as possible, without comprising
         # it's purpose. This is for security reasons. If you want to manage it yourself, you can stop
         # Authlogic from getting your in way by setting this to true.
@@ -35,21 +35,21 @@ def disable_perishable_token_maintenance(value = nil)
         end
         alias_method :disable_perishable_token_maintenance=, :disable_perishable_token_maintenance
       end
-      
+
       # All methods relating to the perishable token.
       module Methods
         def self.included(klass)
           return if !klass.column_names.include?("perishable_token")
-          
+
           klass.class_eval do
             extend ClassMethods
             include InstanceMethods
-            
+
             validates_uniqueness_of :perishable_token, :if => :perishable_token_changed?
             before_save :reset_perishable_token, :unless => :disable_perishable_token_maintenance?
           end
         end
-        
+
         # Class level methods for the perishable token
         module ClassMethods
           # Use this methdo to find a record with a perishable token. This method does 2 things for you:
@@ -63,32 +63,32 @@ module ClassMethods
           def find_using_perishable_token(token, age = perishable_token_valid_for)
             return if token.blank?
             age = age.to_i
-            
+
             conditions_sql = "perishable_token = ?"
             conditions_subs = [token]
-            
+
             if column_names.include?("updated_at") && age > 0
               conditions_sql += " and updated_at > ?"
               conditions_subs << age.seconds.ago
             end
-            
+
             find(:first, :conditions => [conditions_sql, *conditions_subs])
           end
         end
-        
+
         # Instance level methods for the perishable token.
         module InstanceMethods
           # Resets the perishable token to a random friendly token.
           def reset_perishable_token
             self.perishable_token = Random.friendly_token
           end
-          
+
           # Same as reset_perishable_token, but then saves the record afterwards.
           def reset_perishable_token!
             reset_perishable_token
             save_without_session_maintenance(false)
           end
-          
+
           # A convenience method based on the disable_perishable_token_maintenance configuration option.
           def disable_perishable_token_maintenance?
             self.class.disable_perishable_token_maintenance == true
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/persistence_token.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/persistence_token.rb
index 0b5ed42..bc1ab77 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/persistence_token.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/persistence_token.rb
@@ -8,24 +8,24 @@ def self.included(klass)
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # Methods for the persistence token.
       module Methods
         def self.included(klass)
           klass.class_eval do
             extend ClassMethods
             include InstanceMethods
-            
+
             after_password_set :reset_persistence_token
             after_password_verification :reset_persistence_token!, :if => :reset_persistence_token?
-            
+
             validates_presence_of :persistence_token
             validates_uniqueness_of :persistence_token, :if => :persistence_token_changed?
-            
+
             before_validation :reset_persistence_token, :if => :reset_persistence_token?
           end
         end
-        
+
         # Class level methods for the persistence token.
         module ClassMethods
           # Resets ALL persistence tokens in the database, which will require all users to reauthenticate.
@@ -40,21 +40,21 @@ def forget_all
             end while !records.blank?
           end
         end
-        
+
         # Instance level methods for the persistence token.
         module InstanceMethods
           # Resets the persistence_token field to a random hex value.
           def reset_persistence_token
             self.persistence_token = Authlogic::Random.hex_token
           end
-          
+
           # Same as reset_persistence_token, but then saves the record.
           def reset_persistence_token!
             reset_persistence_token
             save_without_session_maintenance(false)
           end
           alias_method :forget!, :reset_persistence_token!
-          
+
           private
             def reset_persistence_token?
               persistence_token.blank?
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/restful_authentication.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/restful_authentication.rb
index 6db468a..96ef2f4 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/restful_authentication.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/restful_authentication.rb
@@ -8,7 +8,7 @@ def self.included(klass)
           include InstanceMethods
         end
       end
-      
+
       module Config
         # Switching an existing app to Authlogic from restful_authentication? No problem, just set this true and your users won't know
         # anything changed. From your database perspective nothing will change at all. Authlogic will continue to encrypt passwords
@@ -23,7 +23,7 @@ def act_like_restful_authentication(value = nil)
           r
         end
         alias_method :act_like_restful_authentication=, :act_like_restful_authentication
-        
+
         # This works just like act_like_restful_authentication except that it will start transitioning your users to the algorithm you
         # specify with the crypto provider option. The next time they log in it will resave their password with the new algorithm
         # and any new record will use the new algorithm as well.
@@ -33,7 +33,7 @@ def transition_from_restful_authentication(value = nil)
           r
         end
         alias_method :transition_from_restful_authentication=, :transition_from_restful_authentication
-        
+
         private
           def set_restful_authentication_config
             crypto_provider_key = act_like_restful_authentication ? :crypto_provider : :transition_from_crypto_providers
@@ -44,13 +44,13 @@ def set_restful_authentication_config
             end
           end
       end
-      
+
       module InstanceMethods
         private
           def act_like_restful_authentication?
             self.class.act_like_restful_authentication == true
           end
-          
+
           def transition_from_restful_authentication?
             self.class.transition_from_restful_authentication == true
           end
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/session_maintenance.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/session_maintenance.rb
index 97d78c6..f1130ec 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/session_maintenance.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/session_maintenance.rb
@@ -24,7 +24,7 @@ def self.included(klass)
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       module Config
         # As you may know, authlogic sessions can be separate by id (See Authlogic::Session::Base#id). You can
         # specify here what session ids you want auto maintained. By default it is the main session, which has
@@ -36,7 +36,7 @@ def session_ids(value = nil)
           config(:session_ids, value, [nil])
         end
         alias_method :session_ids=, :session_ids
-        
+
         # The name of the associated session class. This is inferred by the name of the model.
         #
         # * <tt>Default:</tt> "#{klass.name}Session".constantize
@@ -47,7 +47,7 @@ def session_class(value = nil)
         end
         alias_method :session_class=, :session_class
       end
-      
+
       module Methods
         def self.included(klass)
           klass.class_eval do
@@ -55,7 +55,7 @@ def self.included(klass)
             before_save :maintain_sessions, :if => :update_sessions?
           end
         end
-        
+
         # Save the record and skip session maintenance all together.
         def save_without_session_maintenance(*args)
           self.skip_session_maintenance = true
@@ -63,30 +63,30 @@ def save_without_session_maintenance(*args)
           self.skip_session_maintenance = false
           result
         end
-        
+
         private
           def skip_session_maintenance=(value)
             @skip_session_maintenance = value
           end
-          
+
           def skip_session_maintenance
             @skip_session_maintenance ||= false
           end
-          
+
           def update_sessions?
             !skip_session_maintenance && session_class && session_class.activated? && !session_ids.blank? && persistence_token_changed?
           end
-          
+
           def get_session_information
             # Need to determine if we are completely logged out, or logged in as another user
             @_sessions = []
-            
+
             session_ids.each do |session_id|
               session = session_class.find(session_id, self)
               @_sessions << session if session && session.record
             end
           end
-          
+
           def maintain_sessions
             if @_sessions.empty?
               create_session
@@ -94,7 +94,7 @@ def maintain_sessions
               update_sessions
             end
           end
-          
+
           def create_session
             # We only want to automatically login into the first session, since this is the main session. The other sessions are sessions
             # that need to be created after logging into the main session.
@@ -103,7 +103,7 @@ def create_session
 
             return true
           end
-          
+
           def update_sessions
             # We found sessions above, let's update them with the new info
             @_sessions.each do |stale_session|
@@ -114,11 +114,11 @@ def update_sessions
 
             return true
           end
-          
+
           def session_ids
             self.class.session_ids
           end
-          
+
           def session_class
             self.class.session_class
           end
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/single_access_token.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/single_access_token.rb
index be365a4..a5a8c70 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/single_access_token.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/single_access_token.rb
@@ -9,7 +9,7 @@ def self.included(klass)
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # All configuration for the single_access token aspect of acts_as_authentic.
       module Config
         # The single access token is used for authentication via URLs, such as a private feed. That being said,
@@ -24,12 +24,12 @@ def change_single_access_token_with_password(value = nil)
         end
         alias_method :change_single_access_token_with_password=, :change_single_access_token_with_password
       end
-      
+
       # All method, for the single_access token aspect of acts_as_authentic.
       module Methods
         def self.included(klass)
           return if !klass.column_names.include?("single_access_token")
-            
+
           klass.class_eval do
             include InstanceMethods
             validates_uniqueness_of :single_access_token, :if => :single_access_token_changed?
@@ -37,24 +37,24 @@ def self.included(klass)
             after_password_set :reset_single_access_token, :if => :change_single_access_token_with_password?
           end
         end
-        
+
         module InstanceMethods
           # Resets the single_access_token to a random friendly token.
           def reset_single_access_token
             self.single_access_token = Authlogic::Random.friendly_token
           end
-        
+
           # same as reset_single_access_token, but then saves the record.
           def reset_single_access_token!
             reset_single_access_token
             save_without_session_maintenance
           end
-      
+
           protected
             def reset_single_access_token?
               single_access_token.blank?
             end
-          
+
             def change_single_access_token_with_password?
               self.class.change_single_access_token_with_password == true
             end
diff --git a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/validations_scope.rb b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/validations_scope.rb
index 866ff11..ef0c986 100644
--- a/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/validations_scope.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/acts_as_authentic/validations_scope.rb
@@ -9,7 +9,7 @@ def self.included(klass)
           extend Config
         end
       end
-      
+
       # All configuration for the scope feature.
       module Config
         # Allows you to scope everything to specific field(s). Works just like validates_uniqueness_of.
diff --git a/vendor/plugins/authlogic/lib/authlogic/authenticates_many/association.rb b/vendor/plugins/authlogic/lib/authlogic/authenticates_many/association.rb
index 9bde243..4ad6371 100644
--- a/vendor/plugins/authlogic/lib/authlogic/authenticates_many/association.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/authenticates_many/association.rb
@@ -15,13 +15,13 @@ module AuthenticatesMany
     #   end
     class Association
       attr_accessor :klass, :find_options, :id
-      
+
       def initialize(klass, find_options, id)
         self.klass = klass
         self.find_options = find_options
         self.id = id
       end
-      
+
       [:create, :create!, :find, :new].each do |method|
         class_eval <<-"end_eval", __FILE__, __LINE__
           def #{method}(*args)
@@ -32,7 +32,7 @@ def #{method}(*args)
         end_eval
       end
       alias_method :build, :new
-    
+
       private
         def scope_options
           {:find_options => find_options, :id => id}
diff --git a/vendor/plugins/authlogic/lib/authlogic/authenticates_many/base.rb b/vendor/plugins/authlogic/lib/authlogic/authenticates_many/base.rb
index b03482d..d4615d2 100644
--- a/vendor/plugins/authlogic/lib/authlogic/authenticates_many/base.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/authenticates_many/base.rb
@@ -23,7 +23,7 @@ module Base
       #
       # * <tt>session_class:</tt> default: "#{name}Session",
       #   This is the related session class.
-      #   
+      #
       # * <tt>relationship_name:</tt> default: options[:session_class].klass_name.underscore.pluralize,
       #   This is the name of the relationship you want to use to scope everything. For example an Account has many Users. There should be a relationship
       #   called :users that you defined with a has_many. The reason we use the relationship is so you don't have to repeat yourself. The relatonship
@@ -49,7 +49,7 @@ def #{name}
         end_eval
       end
     end
-    
+
     ::ActiveRecord::Base.extend(Base) if defined?(::ActiveRecord)
   end
 end
\ No newline at end of file
diff --git a/vendor/plugins/authlogic/lib/authlogic/controller_adapters/abstract_adapter.rb b/vendor/plugins/authlogic/lib/authlogic/controller_adapters/abstract_adapter.rb
index a6036a0..ec9aaa1 100644
--- a/vendor/plugins/authlogic/lib/authlogic/controller_adapters/abstract_adapter.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/controller_adapters/abstract_adapter.rb
@@ -8,7 +8,7 @@ class AbstractAdapter
       def initialize(controller)
         self.controller = controller
       end
-      
+
       def authenticate_with_http_basic(&block)
         @auth = Rack::Auth::Basic::Request.new(controller.request.env)
         if @auth.provided? and @auth.basic?
@@ -17,11 +17,11 @@ def authenticate_with_http_basic(&block)
           false
         end
       end
-      
+
       def cookies
         controller.cookies
       end
-      
+
       def cookie_domain
         raise NotImplementedError.new("The cookie_domain method has not been implemented by the controller adapter")
       end
@@ -41,11 +41,11 @@ def request_content_type
       def session
         controller.session
       end
-      
+
       def single_access_allowed?
         controller.respond_to?(:single_access_allowed?, true) && controller.send(:single_access_allowed?)
       end
-      
+
       private
         def method_missing(id, *args, &block)
           controller.send(id, *args, &block)
diff --git a/vendor/plugins/authlogic/lib/authlogic/controller_adapters/merb_adapter.rb b/vendor/plugins/authlogic/lib/authlogic/controller_adapters/merb_adapter.rb
index e440449..58e2cf6 100644
--- a/vendor/plugins/authlogic/lib/authlogic/controller_adapters/merb_adapter.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/controller_adapters/merb_adapter.rb
@@ -8,7 +8,7 @@ module MerbImplementation
         def self.included(klass) # :nodoc:
           klass.before :activate_authlogic
         end
-        
+
         def cookie_domain
           Merb::Config[:session_cookie_domain]
         end
@@ -21,7 +21,7 @@ def activate_authlogic
     end
   end
 end
- 
+
 # make sure we're running inside Merb
 if defined?(Merb::Plugins)
   Merb::BootLoader.before_app_loads do
diff --git a/vendor/plugins/authlogic/lib/authlogic/controller_adapters/rails_adapter.rb b/vendor/plugins/authlogic/lib/authlogic/controller_adapters/rails_adapter.rb
index 5c807ba..6bea10c 100644
--- a/vendor/plugins/authlogic/lib/authlogic/controller_adapters/rails_adapter.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/controller_adapters/rails_adapter.rb
@@ -6,20 +6,20 @@ class RailsAdapter < AbstractAdapter
       def authenticate_with_http_basic(&block)
         yield [nil, nil]
       end
-      
+
       def cookies
         controller.send(:cookies)
       end
-      
+
       def cookie_domain
         @cookie_domain_key ||= (Rails::VERSION::MAJOR >= 2 && Rails::VERSION::MINOR >= 3) ? :domain : :session_domain
         controller.class.session_options[@cookie_domain_key]
       end
-      
+
       def request_content_type
         request.format.to_s
       end
-      
+
       # Lets Authlogic know about the controller object via a before filter, AKA "activates" authlogic.
       module RailsImplementation
         def self.included(klass) # :nodoc:
diff --git a/vendor/plugins/authlogic/lib/authlogic/crypto_providers/aes256.rb b/vendor/plugins/authlogic/lib/authlogic/crypto_providers/aes256.rb
index bbba138..32b4dcf 100644
--- a/vendor/plugins/authlogic/lib/authlogic/crypto_providers/aes256.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/crypto_providers/aes256.rb
@@ -17,13 +17,13 @@ module CryptoProviders
     class AES256
       class << self
         attr_writer :key
-    
+
         def encrypt(*tokens)
           aes.encrypt
           aes.key = @key
           [aes.update(tokens.join) + aes.final].pack("m").chomp
         end
-    
+
         def matches?(crypted, *tokens)
           aes.decrypt
           aes.key = @key
@@ -31,7 +31,7 @@ def matches?(crypted, *tokens)
         rescue OpenSSL::CipherError
           false
         end
-    
+
         private
           def aes
             raise ArgumentError.new("You provide a key like #{name}.key = my_key before using the #{name}") if @key.blank?
diff --git a/vendor/plugins/authlogic/lib/authlogic/crypto_providers/bcrypt.rb b/vendor/plugins/authlogic/lib/authlogic/crypto_providers/bcrypt.rb
index bf6165f..f7f70f6 100644
--- a/vendor/plugins/authlogic/lib/authlogic/crypto_providers/bcrypt.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/crypto_providers/bcrypt.rb
@@ -46,19 +46,19 @@ def cost
           @cost ||= 10
         end
         attr_writer :cost
-        
+
         # Creates a BCrypt hash for the password passed.
         def encrypt(*tokens)
           ::BCrypt::Password.create(join_tokens(tokens), :cost => cost)
         end
-        
+
         # Does the hash match the tokens? Uses the same tokens that were used to encrypt.
         def matches?(hash, *tokens)
           hash = new_from_hash(hash)
           return false if hash.blank?
           hash == join_tokens(tokens)
         end
-        
+
         # This method is used as a flag to tell Authlogic to "resave" the password upon a successful login, using the new cost
         def cost_matches?(hash)
           hash = new_from_hash(hash)
@@ -68,12 +68,12 @@ def cost_matches?(hash)
             hash.cost == cost
           end
         end
-        
+
         private
           def join_tokens(tokens)
             tokens.flatten.join
           end
-          
+
           def new_from_hash(hash)
             begin
               ::BCrypt::Password.new(hash)
diff --git a/vendor/plugins/authlogic/lib/authlogic/crypto_providers/md5.rb b/vendor/plugins/authlogic/lib/authlogic/crypto_providers/md5.rb
index c3d227c..4233960 100644
--- a/vendor/plugins/authlogic/lib/authlogic/crypto_providers/md5.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/crypto_providers/md5.rb
@@ -1,29 +1,29 @@
 require "digest/md5"
- 
+
 module Authlogic
   module CryptoProviders
-    # This class was made for the users transitioning from md5 based systems. 
-    # I highly discourage using this crypto provider as it superbly inferior 
+    # This class was made for the users transitioning from md5 based systems.
+    # I highly discourage using this crypto provider as it superbly inferior
     # to your other options.
     #
     # Please use any other provider offered by Authlogic.
     class MD5
       class << self
         attr_accessor :join_token
-        
+
         # The number of times to loop through the encryption.
         def stretches
           @stretches ||= 1
         end
         attr_writer :stretches
-        
+
         # Turns your raw password into a MD5 hash.
         def encrypt(*tokens)
           digest = tokens.flatten.join(join_token)
           stretches.times { digest = Digest::MD5.hexdigest(digest) }
           digest
         end
-        
+
         # Does the crypted password match the tokens? Uses the same tokens that were used to encrypt.
         def matches?(crypted, *tokens)
           encrypt(*tokens) == crypted
diff --git a/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha1.rb b/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha1.rb
index d4ee102..dd30e58 100644
--- a/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha1.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha1.rb
@@ -10,13 +10,13 @@ def join_token
           @join_token ||= "--"
         end
         attr_writer :join_token
-        
+
         # The number of times to loop through the encryption. This is ten because that is what restful_authentication defaults to.
         def stretches
           @stretches ||= 10
         end
         attr_writer :stretches
-        
+
         # Turns your raw password into a Sha1 hash.
         def encrypt(*tokens)
           tokens = tokens.flatten
@@ -24,7 +24,7 @@ def encrypt(*tokens)
           stretches.times { digest = Digest::SHA1.hexdigest([digest, *tokens].join(join_token)) }
           digest
         end
-        
+
         # Does the crypted password match the tokens? Uses the same tokens that were used to encrypt.
         def matches?(crypted, *tokens)
           encrypt(*tokens) == crypted
diff --git a/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha512.rb b/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha512.rb
index 324bd15..19cb409 100644
--- a/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha512.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/crypto_providers/sha512.rb
@@ -26,20 +26,20 @@ module CryptoProviders
     class Sha512
       class << self
         attr_accessor :join_token
-        
+
         # The number of times to loop through the encryption. This is ten because that is what restful_authentication defaults to.
         def stretches
           @stretches ||= 20
         end
         attr_writer :stretches
-        
+
         # Turns your raw password into a Sha512 hash.
         def encrypt(*tokens)
           digest = tokens.flatten.join(join_token)
           stretches.times { digest = Digest::SHA512.hexdigest(digest) }
           digest
         end
-        
+
         # Does the crypted password match the tokens? Uses the same tokens that were used to encrypt.
         def matches?(crypted, *tokens)
           encrypt(*tokens) == crypted
diff --git a/vendor/plugins/authlogic/lib/authlogic/i18n.rb b/vendor/plugins/authlogic/lib/authlogic/i18n.rb
index 2c14947..a479067 100644
--- a/vendor/plugins/authlogic/lib/authlogic/i18n.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/i18n.rb
@@ -21,7 +21,7 @@ module Authlogic
   #       # do whatever you want here with the arguments passed to you.
   #     end
   #   end
-  #   
+  #
   #   Authlogic::I18n.extend MyAuthlogicI18nAdapter
   #
   # That it's! Here is a complete list of the keys that are passed. Just define these however you wish:
diff --git a/vendor/plugins/authlogic/lib/authlogic/random.rb b/vendor/plugins/authlogic/lib/authlogic/random.rb
index c0e2854..4256250 100644
--- a/vendor/plugins/authlogic/lib/authlogic/random.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/random.rb
@@ -3,14 +3,14 @@ module Authlogic
   # So if you are using this in a rails app you should have this library.
   module Random
     extend self
-    
+
     SecureRandom = (defined?(::SecureRandom) && ::SecureRandom) || (defined?(::ActiveSupport::SecureRandom) && ::ActiveSupport::SecureRandom)
-    
+
     if SecureRandom
       def hex_token
         SecureRandom.hex(64)
       end
-      
+
       def friendly_token
         # use base64url as defined by RFC4648
         SecureRandom.base64(15).tr('+/=', '-_ ').strip.delete("\n")
@@ -19,15 +19,15 @@ def friendly_token
       def hex_token
         Authlogic::CryptoProviders::Sha512.encrypt(Time.now.to_s + (1..10).collect{ rand.to_s }.join)
       end
-      
+
       FRIENDLY_CHARS = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
-      
+
       def friendly_token
         newpass = ""
         1.upto(20) { |i| newpass << FRIENDLY_CHARS[rand(FRIENDLY_CHARS.size-1)] }
         newpass
       end
     end
-    
+
   end
 end
\ No newline at end of file
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/activation.rb b/vendor/plugins/authlogic/lib/authlogic/session/activation.rb
index 0e550de..7052910 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/activation.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/activation.rb
@@ -9,14 +9,14 @@ def initialize(session)
           super("You must activate the Authlogic::Session::Base.controller with a controller object before creating objects")
         end
       end
-      
+
       def self.included(klass)
         klass.class_eval do
           extend ClassMethods
           include InstanceMethods
         end
       end
-      
+
       module ClassMethods
         # Returns true if a controller has been set and can be used properly. This MUST be set before anything can be done.
         # Similar to how ActiveRecord won't allow you to do anything without establishing a DB connection. In your framework
@@ -25,7 +25,7 @@ module ClassMethods
         def activated?
           !controller.nil?
         end
-        
+
         # This accepts a controller object wrapped with the Authlogic controller adapter. The controller adapters close the gap
         # between the different controllers in each framework. That being said, Authlogic is expecting your object's class to
         # extend Authlogic::ControllerAdapters::AbstractAdapter. See Authlogic::ControllerAdapters for more info.
@@ -34,20 +34,20 @@ def activated?
         def controller=(value)
           Thread.current[:authlogic_controller] = value
         end
-        
+
         # The current controller object
         def controller
           Thread.current[:authlogic_controller]
         end
       end
-      
+
       module InstanceMethods
         # Making sure we are activated before we start creating objects
         def initialize(*args)
           raise NotActivatedError.new(self) unless self.class.activated?
           super
         end
-        
+
         private
           def controller
             self.class.controller
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/active_record_trickery.rb b/vendor/plugins/authlogic/lib/authlogic/session/active_record_trickery.rb
index 414940b..c53f74f 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/active_record_trickery.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/active_record_trickery.rb
@@ -9,7 +9,7 @@ def self.included(klass)
         klass.extend ClassMethods
         klass.send(:include, InstanceMethods)
       end
-      
+
       module ClassMethods
         # How to name the attributes of Authlogic, works JUST LIKE ActiveRecord, but instead it uses the following
         # namespace:
@@ -20,25 +20,25 @@ def human_attribute_name(attribute_key_name, options = {})
           options[:default] ||= attribute_key_name.humanize
           I18n.t("attributes.#{name.underscore}.#{attribute_key_name}", options)
         end
-        
+
         # How to name the class, works JUST LIKE ActiveRecord, except it uses the following namespace:
         #
         #   authlogic.models.user_session
         def human_name(*args)
           I18n.t("models.#{name.underscore}", {:count => 1, :default => name.humanize})
         end
-        
+
         # For rails < 2.3, mispelled
         def self_and_descendents_from_active_record
           [self]
         end
-        
+
         # For Rails >2.3, fix mispelling
         def self_and_descendants_from_active_record
           [self]
         end
       end
-      
+
       module InstanceMethods
         # Don't use this yourself, this is to just trick some of the helpers since this is the method it calls.
         def new_record?
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/base.rb b/vendor/plugins/authlogic/lib/authlogic/session/base.rb
index 10f82b7..1daded6 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/base.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/base.rb
@@ -5,21 +5,21 @@ module Session # :nodoc:
     class Base
       include Foundation
       include Callbacks
-      
+
       # Included first so that the session resets itself to nil
       include Timeout
-      
+
       # Included in a specific order so they are tried in this order when persisting
       include Params
       include Cookies
       include Session
       include HttpAuth
-      
+
       # Included in a specific order so magic states gets ran after a record is found
       include Password
       include UnauthorizedRecord
       include MagicStates
-      
+
       include Activation
       include ActiveRecordTrickery
       include BruteForceProtection
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/brute_force_protection.rb b/vendor/plugins/authlogic/lib/authlogic/session/brute_force_protection.rb
index 4275ae9..70efd05 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/brute_force_protection.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/brute_force_protection.rb
@@ -23,7 +23,7 @@ def self.included(klass)
           validate :validate_failed_logins, :if => :being_brute_force_protected?
         end
       end
-      
+
       # Configuration for the brute force protection feature.
       module Config
         # To help protect from brute force attacks you can set a limit on the allowed number of consecutive failed logins. By default this is 50, this is a very liberal
@@ -40,7 +40,7 @@ def consecutive_failed_logins_limit(value = nil)
           config(:consecutive_failed_logins_limit, value, 50)
         end
         alias_method :consecutive_failed_logins_limit=, :consecutive_failed_logins_limit
-        
+
         # Once the failed logins limit has been exceed, how long do you want to ban the user? This can be a temporary or permanent ban.
         #
         # * <tt>Default:</tt> 2.hours
@@ -50,7 +50,7 @@ def failed_login_ban_for(value = nil)
         end
         alias_method :failed_login_ban_for=, :failed_login_ban_for
       end
-      
+
       # The methods available for an Authlogic::Session::Base object that make up the brute force protection feature.
       module InstanceMethods
         private
@@ -58,28 +58,28 @@ def exceeded_failed_logins_limit?
             !attempted_record.nil? && attempted_record.respond_to?(:failed_login_count) && consecutive_failed_logins_limit > 0 &&
               attempted_record.failed_login_count && attempted_record.failed_login_count >= consecutive_failed_logins_limit
           end
-          
+
           def being_brute_force_protected?
             exceeded_failed_logins_limit? && (failed_login_ban_for <= 0 || (attempted_record.respond_to?(:updated_at) && attempted_record.updated_at >= failed_login_ban_for.seconds.ago))
           end
-          
+
           def reset_failed_login_count?
             exceeded_failed_logins_limit? && !being_brute_force_protected?
           end
-          
+
           def reset_failed_login_count
             attempted_record.failed_login_count = 0
           end
-        
+
           def validate_failed_logins
             errors.clear # Clear all other error messages, as they are irrelevant at this point and can only provide additional information that is not needed
             errors.add_to_base(I18n.t('error_messages.consecutive_failed_logins_limit_exceeded', :default => "Consecutive failed logins limit exceeded, account is disabled."))
           end
-          
+
           def consecutive_failed_logins_limit
             self.class.consecutive_failed_logins_limit
           end
-          
+
           def failed_login_ban_for
             self.class.failed_login_ban_for
           end
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/callbacks.rb b/vendor/plugins/authlogic/lib/authlogic/session/callbacks.rb
index a31ec20..d0e6ae9 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/callbacks.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/callbacks.rb
@@ -15,7 +15,7 @@ module Session
     #   persist
     #   after_persisting
     #   [save record if record.changed?]
-    #   
+    #
     #   before_validation
     #   before_validation_on_create
     #   before_validation_on_update
@@ -24,7 +24,7 @@ module Session
     #   after_validation_on_create
     #   after_validation
     #   [save record if record.changed?]
-    #   
+    #
     #   before_save
     #   before_create
     #   before_update
@@ -32,7 +32,7 @@ module Session
     #   after_create
     #   after_save
     #   [save record if record.changed?]
-    #   
+    #
     #   before_destroy
     #   [save record if record.changed?]
     #   destroy
@@ -59,12 +59,12 @@ module Callbacks
         "before_save", "before_create", "before_update", "after_update", "after_create", "after_save",
         "before_destroy", "after_destroy"
       ]
-      
+
       def self.included(base) #:nodoc:
         base.send :include, ActiveSupport::Callbacks
         base.define_callbacks *METHODS
       end
-      
+
       private
         METHODS.each do |method|
           class_eval <<-"end_eval", __FILE__, __LINE__
@@ -73,11 +73,11 @@ def #{method}
             end
           end_eval
         end
-      
+
         def persist
           run_callbacks(:persist) { |result, object| result == true }
         end
-        
+
         def save_record(alternate_record = nil)
           r = alternate_record || record
           r.save_without_session_maintenance(false) if r && r.changed?
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/cookies.rb b/vendor/plugins/authlogic/lib/authlogic/session/cookies.rb
index ffe60e8..db3045e 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/cookies.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/cookies.rb
@@ -11,7 +11,7 @@ def self.included(klass)
           after_destroy :destroy_cookie
         end
       end
-      
+
       # Configuration for the cookie feature set.
       module Config
         # The name of the cookie or the key in the cookies hash. Be sure and use a unique name. If you have multiple sessions and they use the same cookie it will cause problems.
@@ -19,7 +19,7 @@ module Config
         #
         #   session = UserSession.new
         #   session.cookie_key => "user_credentials"
-        #   
+        #
         #   session = UserSession.new(:super_high_secret)
         #   session.cookie_key => "super_high_secret_user_credentials"
         #
@@ -29,7 +29,7 @@ def cookie_key(value = nil)
           config(:cookie_key, value, "#{klass_name.underscore}_credentials")
         end
         alias_method :cookie_key=, :cookie_key
-        
+
         # If sessions should be remembered by default or not.
         #
         # * <tt>Default:</tt> false
@@ -38,7 +38,7 @@ def remember_me(value = nil)
           config(:remember_me, value, false)
         end
         alias_method :remember_me=, :remember_me
-        
+
         # The length of time until the cookie expires.
         #
         # * <tt>Default:</tt> 3.months
@@ -48,7 +48,7 @@ def remember_me_for(value = :_read)
         end
         alias_method :remember_me_for=, :remember_me_for
       end
-      
+
       # The methods available for an Authlogic::Session::Base object that make up the cookie feature set.
       module InstanceMethods
         # Allows you to set the remember_me option when passing credentials.
@@ -63,44 +63,44 @@ def credentials=(value)
             self.remember_me = r if !r.nil?
           end
         end
-        
+
         # Is the cookie going to expire after the session is over, or will it stick around?
         def remember_me
           return @remember_me if defined?(@remember_me)
           @remember_me = self.class.remember_me
         end
-      
+
         # Accepts a boolean as a flag to remember the session or not. Basically to expire the cookie at the end of the session or keep it for "remember_me_until".
         def remember_me=(value)
           @remember_me = value
         end
-      
+
         # See remember_me
         def remember_me?
           remember_me == true || remember_me == "true" || remember_me == "1"
         end
-        
+
         # How long to remember the user if remember_me is true. This is based on the class level configuration: remember_me_for
         def remember_me_for
           return unless remember_me?
           self.class.remember_me_for
         end
-      
+
         # When to expire the cookie. See remember_me_for configuration option to change this.
         def remember_me_until
           return unless remember_me?
           remember_me_for.from_now
         end
-        
+
         private
           def cookie_key
             build_key(self.class.cookie_key)
           end
-          
+
           def cookie_credentials
             controller.cookies[cookie_key]
           end
-          
+
           # Tries to validate the session from information in the cookie
           def persist_by_cookie
             if cookie_credentials
@@ -110,7 +110,7 @@ def persist_by_cookie
               false
             end
           end
-        
+
           def save_cookie
             controller.cookies[cookie_key] = {
               :value => record.persistence_token,
@@ -118,7 +118,7 @@ def save_cookie
               :domain => controller.cookie_domain
             }
           end
-        
+
           def destroy_cookie
             controller.cookies.delete cookie_key, :domain => controller.cookie_domain
           end
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/existence.rb b/vendor/plugins/authlogic/lib/authlogic/session/existence.rb
index 7769307..4cc87c0 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/existence.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/existence.rb
@@ -7,7 +7,7 @@ def initialize(session)
           super("Your session is invalid and has the following errors: #{session.errors.full_messages.to_sentence}")
         end
       end
-      
+
       def self.included(klass)
         klass.class_eval do
           extend ClassMethods
@@ -15,7 +15,7 @@ def self.included(klass)
           attr_accessor :new_session, :record
         end
       end
-      
+
       module ClassMethods
         # A convenince method. The same as:
         #
@@ -29,14 +29,14 @@ def create(*args, &block)
           session = new(*args)
           session.save(&block)
         end
-        
+
         # Same as create but calls create!, which raises an exception when validation fails.
         def create!(*args)
           session = new(*args)
           session.save!
         end
       end
-      
+
       module InstanceMethods
         # Clears all errors and the associated record, you should call this terminate a session, thus requring
         # the user to authenticate again if it is needed.
@@ -48,13 +48,13 @@ def destroy
           after_destroy
           true
         end
-        
+
         # Returns true if the session is new, meaning no action has been taken on it and a successful save
         # has not taken place.
         def new_session?
           new_session != false
         end
-        
+
         # After you have specified all of the details for your session you can try to save it. This will
         # run validation checks and find the associated record, if all validation passes. If validation
         # does not pass, the save will fail and the erorrs will be stored in the errors object.
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/foundation.rb b/vendor/plugins/authlogic/lib/authlogic/session/foundation.rb
index 68b20a9..c8d67a2 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/foundation.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/foundation.rb
@@ -10,7 +10,7 @@ def self.included(klass)
           include InstanceMethods
         end
       end
-      
+
       module ClassMethods
         private
           def config(key, value, default_value = nil, read_value = nil)
@@ -22,12 +22,12 @@ def config(key, value, default_value = nil, read_value = nil)
             end
           end
       end
-      
+
       module InstanceMethods
         def initialize(*args)
           self.credentials = args
         end
-        
+
         # The credentials you passed to create your session. See credentials= for more info.
         def credentials
           []
@@ -48,11 +48,11 @@ def credentials
         #   session.credentials = [my_user_object, true, :my_id]
         def credentials=(values)
         end
-        
+
         def inspect
           "#<#{self.class.name}: #{credentials.blank? ? "no credentials provided" : credentials.inspect}>"
         end
-        
+
         private
           def build_key(last_part)
             last_part
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/http_auth.rb b/vendor/plugins/authlogic/lib/authlogic/session/http_auth.rb
index 90a2933..e854fbd 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/http_auth.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/http_auth.rb
@@ -5,7 +5,7 @@ module HttpAuth
       def self.included(klass)
         klass.persist :persist_by_http_auth
       end
-      
+
       private
         def persist_by_http_auth
           controller.authenticate_with_http_basic do |login, password|
@@ -15,7 +15,7 @@ def persist_by_http_auth
               return valid?
             end
           end
-        
+
           false
         end
     end
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/id.rb b/vendor/plugins/authlogic/lib/authlogic/session/id.rb
index b127bc9..a62e9c1 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/id.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/id.rb
@@ -7,14 +7,14 @@ def self.included(klass)
           attr_writer :id
         end
       end
-      
+
       # Setting the id if it is passed in the credentials.
       def credentials=(value)
         super
         values = value.is_a?(Array) ? value : [value]
         self.id = values.last if values.last.is_a?(Symbol)
       end
-      
+
       # Allows you to set a unique identifier for your session, so that you can have more than 1 session at a time.
       # A good example when this might be needed is when you want to have a normal user session and a "secure" user session.
       # The secure user session would be created only when they want to modify their billing information, or other sensitive
@@ -30,7 +30,7 @@ def credentials=(value)
       def id
         @id
       end
-      
+
       private
         # Used for things like cookie_key, session_key, etc.
         def build_key(last_part)
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/klass.rb b/vendor/plugins/authlogic/lib/authlogic/session/klass.rb
index 50248b5..6fb1ef0 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/klass.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/klass.rb
@@ -6,13 +6,13 @@ def self.included(klass)
         klass.class_eval do
           extend Config
           include InstanceMethods
-          
+
           class << self
             attr_accessor :configured_klass_methods
           end
         end
       end
-      
+
       module Config
         # Lets you change which model to use for authentication.
         #
@@ -23,7 +23,7 @@ def authenticate_with(klass)
           @klass = klass
         end
         alias_method :authenticate_with=, :authenticate_with
-        
+
         # The name of the class that this session is authenticating with. For example, the UserSession class will
         # authenticate with the User class unless you specify otherwise in your configuration. See authenticate_with
         # for information on how to change this value.
@@ -35,16 +35,16 @@ def klass
               nil
             end
         end
-        
+
         # Same as klass, just returns a string instead of the actual constant.
         def klass_name
-          @klass_name ||= 
+          @klass_name ||=
             if guessed_name = name.scan(/(.*)Session/)[0]
               @klass_name = guessed_name[0]
             end
         end
       end
-      
+
       module InstanceMethods
         # Creating an alias method for the "record" method based on the klass name, so that we can do:
         #
@@ -60,7 +60,7 @@ def initialize(*args)
           end
           super
         end
-        
+
         private
           def klass
             self.class.klass
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/magic_columns.rb b/vendor/plugins/authlogic/lib/authlogic/session/magic_columns.rb
index 0514b75..dd6752c 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/magic_columns.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/magic_columns.rb
@@ -21,7 +21,7 @@ def self.included(klass)
           before_save :set_last_request_at, :if => :set_last_request_at?
         end
       end
-      
+
       # Configuration for the magic columns feature.
       module Config
         # Every time a session is found the last_request_at field for that record is updatd with the current time, if that field exists. If you want to limit how frequent that field is updated specify the threshold
@@ -35,7 +35,7 @@ def last_request_at_threshold(value = nil)
         end
         alias_method :last_request_at_threshold=, :last_request_at_threshold
       end
-      
+
       # The methods available for an Authlogic::Session::Base object that make up the magic columns feature.
       module InstanceMethods
         private
@@ -45,30 +45,30 @@ def increase_failed_login_count
               attempted_record.failed_login_count += 1
             end
           end
-        
+
           def update_info
             record.login_count = (record.login_count.blank? ? 1 : record.login_count + 1) if record.respond_to?(:login_count)
             record.failed_login_count = 0 if record.respond_to?(:failed_login_count)
-          
+
             if record.respond_to?(:current_login_at)
               record.last_login_at = record.current_login_at if record.respond_to?(:last_login_at)
               record.current_login_at = klass.default_timezone == :utc ? Time.now.utc : Time.now
             end
-          
+
             if record.respond_to?(:current_login_ip)
               record.last_login_ip = record.current_login_ip if record.respond_to?(:last_login_ip)
               record.current_login_ip = controller.request.remote_ip
             end
           end
-          
+
           def set_last_request_at?
             record && record.class.column_names.include?("last_request_at") && (record.last_request_at.blank? || last_request_at_threshold.to_i.seconds.ago >= record.last_request_at)
           end
-        
+
           def set_last_request_at
             record.last_request_at = klass.default_timezone == :utc ? Time.now.utc : Time.now
           end
-          
+
           def last_request_at_threshold
             self.class.last_request_at_threshold
           end
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/magic_states.rb b/vendor/plugins/authlogic/lib/authlogic/session/magic_states.rb
index 41c2737..0cb4fb1 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/magic_states.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/magic_states.rb
@@ -20,7 +20,7 @@ def self.included(klass)
           validate :validate_magic_states, :unless => :disable_magic_states?
         end
       end
-      
+
       # Configuration for the magic states feature.
       module Config
         # Set this to true if you want to disable the checking of active?, approved?, and confirmed? on your record. This is more or less of a
@@ -34,14 +34,14 @@ def disable_magic_states(value = nil)
         end
         alias_method :disable_magic_states=, :disable_magic_states
       end
-      
+
       # The methods available for an Authlogic::Session::Base object that make up the magic states feature.
       module InstanceMethods
         private
           def disable_magic_states?
             self.class.disable_magic_states == true
           end
-        
+
           def validate_magic_states
             return true if attempted_record.nil?
             [:active, :approved, :confirmed].each do |required_status|
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/params.rb b/vendor/plugins/authlogic/lib/authlogic/session/params.rb
index e18e292..6e64baf 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/params.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/params.rb
@@ -30,7 +30,7 @@ def self.included(klass)
           persist :persist_by_params
         end
       end
-      
+
       # Configuration for the params / single access feature.
       module Config
         # Works exactly like cookie_key, but for params. So a user can login via params just like a cookie or a session. Your URL would look like:
@@ -46,7 +46,7 @@ def params_key(value = nil)
           config(:params_key, value, cookie_key)
         end
         alias_method :params_key=, :params_key
-        
+
         # Authentication is allowed via a single access token, but maybe this is something you don't want for your application as a whole. Maybe this is something you only want for specific request types.
         # Specify a list of allowed request types and single access authentication will only be allowed for the ones you specify. Checkout the "Single Access / Private Feeds Access" section in the README.
         #
@@ -57,7 +57,7 @@ def single_access_allowed_request_types(value = nil)
         end
         alias_method :single_access_allowed_request_types=, :single_access_allowed_request_types
       end
-      
+
       # The methods available for an Authlogic::Session::Base object that make up the params / single access feature.
       module InstanceMethods
         private
@@ -66,26 +66,26 @@ def persist_by_params
             self.unauthorized_record = search_for_record("find_by_single_access_token", params_credentials)
             self.single_access = valid?
           end
-          
+
           def params_enabled?
             params_credentials && klass.column_names.include?("single_access_token") &&
               (single_access_allowed_request_types.include?(controller.request_content_type) ||
                 single_access_allowed_request_types.include?(:all) ||
                   controller.single_access_allowed?)
           end
-          
+
           def params_key
             build_key(self.class.params_key)
           end
-          
+
           def single_access?
             single_access == true
           end
-          
+
           def single_access_allowed_request_types
             self.class.single_access_allowed_request_types
           end
-          
+
           def params_credentials
             controller.params[params_key]
           end
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/password.rb b/vendor/plugins/authlogic/lib/authlogic/session/password.rb
index 39d387c..c11544a 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/password.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/password.rb
@@ -7,13 +7,13 @@ def self.included(klass)
           extend Config
           include InstanceMethods
           validate :validate_by_password, :if => :authenticating_with_password?
-          
+
           class << self
             attr_accessor :configured_password_methods
           end
         end
       end
-      
+
       # Password configuration
       module Config
         # Authlogic tries to validate the credentials passed to it. One part of validation is actually finding the user and making sure it exists. What method it uses the do this is up to you.
@@ -35,7 +35,7 @@ def find_by_login_method(value = nil)
           config(:find_by_login_method, value, "find_by_#{login_field}")
         end
         alias_method :find_by_login_method=, :find_by_login_method
-        
+
         # The name of the method you want Authlogic to create for storing the login / username. Keep in mind this is just for your
         # Authlogic::Session, if you want it can be something completely different than the field in your model. So if you wanted people to
         # login with a field called "login" and then find users by email this is compeltely doable. See the find_by_login_method configuration
@@ -47,7 +47,7 @@ def login_field(value = nil)
           config(:login_field, value, klass.login_field || klass.email_field)
         end
         alias_method :login_field=, :login_field
-        
+
         # Works exactly like login_field, but for the password instead.
         #
         # * <tt>Default:</tt> :password
@@ -56,7 +56,7 @@ def password_field(value = nil)
           config(:password_field, value, :password)
         end
         alias_method :password_field=, :password_field
-        
+
         # The name of the method in your model used to verify the password. This should be an instance method. It should also be prepared to accept a raw password and a crytped password.
         #
         # * <tt>Default:</tt> "valid_#{password_field}?"
@@ -66,7 +66,7 @@ def verify_password_method(value = nil)
         end
         alias_method :verify_password_method=, :verify_password_method
       end
-      
+
       # Password related instance methods
       module InstanceMethods
         def initialize(*args)
@@ -86,10 +86,10 @@ def protected_#{password_field}
 
             self.class.configured_password_methods = true
           end
-          
+
           super
         end
-        
+
         def credentials
           if authenticating_with_password?
             details = {}
@@ -100,7 +100,7 @@ def credentials
             super
           end
         end
-        
+
         def credentials=(value)
           super
           values = value.is_a?(Array) ? value : [value]
@@ -111,12 +111,12 @@ def credentials=(value)
             end
           end
         end
-        
+
         private
           def authenticating_with_password?
             !send(login_field).nil? || !send("protected_#{password_field}").nil?
           end
-          
+
           def validate_by_password
             errors.add(login_field, I18n.t('error_messages.login_blank', :default => "can not be blank")) if send(login_field).blank?
             errors.add(password_field, I18n.t('error_messages.password_blank', :default => "can not be blank")) if send("protected_#{password_field}").blank?
@@ -134,19 +134,19 @@ def validate_by_password
               return
             end
           end
-          
+
           def find_by_login_method
             self.class.find_by_login_method
           end
-          
+
           def login_field
             self.class.login_field
           end
-          
+
           def password_field
             self.class.password_field
           end
-          
+
           def verify_password_method
             self.class.verify_password_method
           end
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/perishable_token.rb b/vendor/plugins/authlogic/lib/authlogic/session/perishable_token.rb
index 8f9b079..10c239c 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/perishable_token.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/perishable_token.rb
@@ -8,7 +8,7 @@ module PerishableToken
       def self.included(klass)
         klass.after_save :reset_perishable_token!
       end
-      
+
       private
         def reset_perishable_token!
           record.reset_perishable_token if record.respond_to?(:reset_perishable_token) && !record.disable_perishable_token_maintenance?
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/persistence.rb b/vendor/plugins/authlogic/lib/authlogic/session/persistence.rb
index e1eff4a..3641ddb 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/persistence.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/persistence.rb
@@ -8,7 +8,7 @@ def self.included(klass)
           include InstanceMethods
         end
       end
-      
+
       module ClassMethods
         # This is how you persist a session. This finds the record for the current session using
         # a variety of methods. It basically tries to "log in" the user without the user having
@@ -43,7 +43,7 @@ def find(id = nil, priority_record = nil)
           end
         end
       end
-      
+
       module InstanceMethods
         # Let's you know if the session is being persisted or not, meaning the user does not have to explicitly log in
         # in order to be logged in. If the session has no associated record, it will try to find a record and persis
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/priority_record.rb b/vendor/plugins/authlogic/lib/authlogic/session/priority_record.rb
index 33c099d..abef5b5 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/priority_record.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/priority_record.rb
@@ -9,7 +9,7 @@ def self.included(klass)
           attr_accessor :priority_record
         end
       end
-      
+
       # Setting priority record if it is passed. The only way it can be passed is through an array:
       #
       #   session.credentials = [real_user_object, priority_user_object]
@@ -18,13 +18,13 @@ def credentials=(value)
         values = value.is_a?(Array) ? value : [value]
         self.priority_record = values.second if values.second.class < ::ActiveRecord::Base
       end
-      
+
       private
         def attempted_record=(value)
           value = priority_record if value == priority_record
           super
         end
-        
+
         def save_record(alternate_record = nil)
           r = alternate_record || record
           super if r != priority_record
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/scopes.rb b/vendor/plugins/authlogic/lib/authlogic/session/scopes.rb
index 70ca366..a6af011 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/scopes.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/scopes.rb
@@ -12,14 +12,14 @@ def self.included(klass)
           attr_writer :scope
         end
       end
-      
+
       # = Scopes
       module ClassMethods
         # The current scope set, should be used in the block passed to with_scope.
         def scope
           Thread.current[:authlogic_scope]
         end
-        
+
         # What with_scopes focuses on is scoping the query when finding the object and the name of the cookie / session. It works very similar to
         # ActiveRecord::Base#with_scopes. It accepts a hash with any of the following options:
         #
@@ -65,31 +65,31 @@ def with_scope(options = {}, &block)
           self.scope = nil
           result
         end
-        
+
         private
           def scope=(value)
             Thread.current[:authlogic_scope] = value
           end
       end
-      
+
       module InstanceMethods
         # Setting the scope if it exists upon instantiation.
         def initialize(*args)
           self.scope = self.class.scope
           super
         end
-        
+
         # The scope of the current object
         def scope
           @scope ||= {}
         end
-        
+
         private
           # Used for things like cookie_key, session_key, etc.
           def build_key(last_part)
             [scope[:id], super].compact.join("_")
           end
-          
+
           def search_for_record(*args)
             klass.send(:with_scope, :find => (scope[:find_options] || {})) do
               klass.send(*args)
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/session.rb b/vendor/plugins/authlogic/lib/authlogic/session/session.rb
index 2a94d9d..ebeef10 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/session.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/session.rb
@@ -12,7 +12,7 @@ def self.included(klass)
           after_persisting :update_session, :unless => :single_access?
         end
       end
-      
+
       # Configuration for the session feature.
       module Config
         # Works exactly like cookie_key, but for sessions. See cookie_key for more info.
@@ -24,7 +24,7 @@ def session_key(value = nil)
         end
         alias_method :session_key=, :session_key
       end
-      
+
       # Instance methods for the session feature.
       module InstanceMethods
         private
@@ -41,15 +41,15 @@ def persist_by_session
               false
             end
           end
-          
+
           def session_credentials
             [controller.session[session_key], controller.session["#{session_key}_#{klass.primary_key}"]].compact
           end
-          
+
           def session_key
             build_key(self.class.session_key)
           end
-        
+
           def update_session
             controller.session[session_key] = record && record.persistence_token
             controller.session["#{session_key}_#{klass.primary_key}"] = record && record.send(record.class.primary_key)
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/timeout.rb b/vendor/plugins/authlogic/lib/authlogic/session/timeout.rb
index 6278f8f..c407b1d 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/timeout.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/timeout.rb
@@ -28,7 +28,7 @@ def self.included(klass)
           attr_accessor :stale_record
         end
       end
-      
+
       # Configuration for the timeout feature.
       module Config
         # With acts_as_authentic you get a :logged_in_timeout configuration option. If this is set, after this amount of time has passed the user
@@ -52,7 +52,7 @@ def logout_on_timeout(value = nil)
         end
         alias_method :logout_on_timeout=, :logout_on_timeout
       end
-      
+
       # Instance methods for the timeout feature.
       module InstanceMethods
         # Tells you if the record is stale or not. Meaning the record has timed out. This will only return true if you set logout_on_timeout to true in your configuration.
@@ -60,19 +60,19 @@ module InstanceMethods
         def stale?
           !stale_record.nil? || (logout_on_timeout? && record && record.logged_out?)
         end
-    
+
         private
           def reset_stale_state
             self.stale_record = nil
           end
-          
+
           def enforce_timeout
             if stale?
               self.stale_record = record
               self.record = nil
             end
           end
-          
+
           def logout_on_timeout?
             self.class.logout_on_timeout == true
           end
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/unauthorized_record.rb b/vendor/plugins/authlogic/lib/authlogic/session/unauthorized_record.rb
index 8c648bc..d497d1e 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/unauthorized_record.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/unauthorized_record.rb
@@ -18,7 +18,7 @@ def self.included(klass)
           validate :validate_by_unauthorized_record, :if => :authenticating_with_unauthorized_record?
         end
       end
-      
+
       # Returning meaningful credentials
       def credentials
         if authenticating_with_unauthorized_record?
@@ -29,19 +29,19 @@ def credentials
           super
         end
       end
-      
+
       # Setting the unauthorized record if it exists in the credentials passed.
       def credentials=(value)
         super
         values = value.is_a?(Array) ? value : [value]
         self.unauthorized_record = values.first if values.first.class < ::ActiveRecord::Base
       end
-      
+
       private
         def authenticating_with_unauthorized_record?
           !unauthorized_record.nil?
         end
-        
+
         def validate_by_unauthorized_record
           self.attempted_record = unauthorized_record
         end
diff --git a/vendor/plugins/authlogic/lib/authlogic/session/validation.rb b/vendor/plugins/authlogic/lib/authlogic/session/validation.rb
index 7c2ec85..e70230c 100644
--- a/vendor/plugins/authlogic/lib/authlogic/session/validation.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/session/validation.rb
@@ -15,19 +15,19 @@ module Validation
       #   end
       class Errors < ::ActiveRecord::Errors
       end
-      
+
       # You should use this as a place holder for any records that you find during validation. The main reason for this is to
       # allow other modules to use it if needed. Take the failed_login_count feature, it needs this in order to increase
       # the failed login count.
       def attempted_record
         @attempted_record
       end
-      
+
       # See attempted_record
       def attempted_record=(value)
         @attempted_record = value
       end
-      
+
       # The errors in Authlogic work JUST LIKE ActiveRecord. In fact, it uses the exact same ActiveRecord errors class.
       # Use it the same way:
       #
@@ -45,28 +45,28 @@ def attempted_record=(value)
       def errors
         @errors ||= Errors.new(self)
       end
-      
+
       # Determines if the information you provided for authentication is valid or not. If there is
       # a problem with the information provided errors will be added to the errors object and this
       # method will return false.
       def valid?
         errors.clear
         self.attempted_record = nil
-        
+
         before_validation
         new_session? ? before_validation_on_create : before_validation_on_update
         validate
         ensure_authentication_attempted
-                
+
         if errors.empty?
           new_session? ? after_validation_on_create : after_validation_on_update
           after_validation
         end
-        
+
         save_record(attempted_record)
         errors.empty?
       end
-      
+
       private
         def ensure_authentication_attempted
           errors.add_to_base(I18n.t('error_messages.no_authentication_details', :default => "You did not provide any details for authentication.")) if errors.empty? && attempted_record.nil?
diff --git a/vendor/plugins/authlogic/lib/authlogic/test_case.rb b/vendor/plugins/authlogic/lib/authlogic/test_case.rb
index 69887b2..0057220 100644
--- a/vendor/plugins/authlogic/lib/authlogic/test_case.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/test_case.rb
@@ -65,13 +65,13 @@ module TestCase
     def activate_authlogic
       Authlogic::Session::Base.controller = (@request && Authlogic::TestCase::ControllerAdapter.new(@request)) || controller
     end
-    
+
     # The Authlogic::TestCase::MockController object passed to Authlogic to activate it. You can access this in your test.
     # See the module description for an example.
     def controller
       @controller ||= Authlogic::TestCase::MockController.new
     end
   end
-  
+
   ::Test::Unit::TestCase.send(:include, TestCase)
 end
\ No newline at end of file
diff --git a/vendor/plugins/authlogic/lib/authlogic/test_case/controller_adapter.rb b/vendor/plugins/authlogic/lib/authlogic/test_case/controller_adapter.rb
index 0f16d6c..5f49d36 100644
--- a/vendor/plugins/authlogic/lib/authlogic/test_case/controller_adapter.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/test_case/controller_adapter.rb
@@ -6,7 +6,7 @@ class ControllerAdapter < ControllerAdapters::AbstractAdapter
       def authenticate_with_http_basic(&block)
         controller.authenticate_with_http_basic(&block)
       end
-      
+
       def cookies
         new_cookies = {}
         super.each do |key, value|
@@ -14,15 +14,15 @@ def cookies
         end
         new_cookies
       end
-      
+
       def cookie_domain
         nil
       end
-      
+
       def request
         @request ||= MockRequest.new
       end
-      
+
       def request_content_type
         request.format.to_s
       end
diff --git a/vendor/plugins/authlogic/lib/authlogic/test_case/mock_controller.rb b/vendor/plugins/authlogic/lib/authlogic/test_case/mock_controller.rb
index b1b5028..88ff4a3 100644
--- a/vendor/plugins/authlogic/lib/authlogic/test_case/mock_controller.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/test_case/mock_controller.rb
@@ -5,34 +5,34 @@ module TestCase
     class MockController < ControllerAdapters::AbstractAdapter
       attr_accessor :http_user, :http_password
       attr_writer :request_content_type
-  
+
       def initialize
       end
-  
+
       def authenticate_with_http_basic(&block)
         yield http_user, http_password
       end
-  
+
       def cookies
         @cookies ||= MockCookieJar.new
       end
-  
+
       def cookie_domain
         nil
       end
-  
+
       def params
         @params ||= {}
       end
-  
+
       def request
         @request ||= MockRequest.new
       end
-  
+
       def request_content_type
         @request_content_type ||= "text/html"
       end
-  
+
       def session
         @session ||= {}
       end
diff --git a/vendor/plugins/authlogic/lib/authlogic/test_case/mock_cookie_jar.rb b/vendor/plugins/authlogic/lib/authlogic/test_case/mock_cookie_jar.rb
index 99c38e9..86c9198 100644
--- a/vendor/plugins/authlogic/lib/authlogic/test_case/mock_cookie_jar.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/test_case/mock_cookie_jar.rb
@@ -5,7 +5,7 @@ def [](key)
         hash = super
         hash && hash[:value]
       end
-  
+
       def delete(key, options = {})
         super(key)
       end
diff --git a/vendor/plugins/authlogic/lib/authlogic/version.rb b/vendor/plugins/authlogic/lib/authlogic/version.rb
index 1d536c3..1df8ef3 100644
--- a/vendor/plugins/authlogic/lib/authlogic/version.rb
+++ b/vendor/plugins/authlogic/lib/authlogic/version.rb
@@ -4,7 +4,7 @@ module Authlogic # :nodoc:
   # +tiny+ (or +patch+) number.
   class Version
     include Comparable
-  
+
     # A convenience method for instantiating a new Version instance with the
     # given +major+, +minor+, and +tiny+ components.
     def self.[](major, minor, tiny)
@@ -34,7 +34,7 @@ def to_s
     def to_i
       @to_i ||= @major * 1_000_000 + @minor * 1_000 + @tiny
     end
-    
+
     def to_a
       [@major, @minor, @tiny]
     end
diff --git a/vendor/plugins/authlogic/test/acts_as_authentic_test/email_test.rb b/vendor/plugins/authlogic/test/acts_as_authentic_test/email_test.rb
index f34512b..6681cf5 100644
--- a/vendor/plugins/authlogic/test/acts_as_authentic_test/email_test.rb
+++ b/vendor/plugins/authlogic/test/acts_as_authentic_test/email_test.rb
@@ -5,82 +5,82 @@ class EmailTest < ActiveSupport::TestCase
     def test_email_field_config
       assert_equal :email, User.email_field
       assert_equal :email, Employee.email_field
-      
+
       User.email_field = :nope
       assert_equal :nope, User.email_field
       User.email_field :email
       assert_equal :email, User.email_field
     end
-    
+
     def test_validate_email_field_config
       assert User.validate_email_field
       assert Employee.validate_email_field
-      
+
       User.validate_email_field = false
       assert !User.validate_email_field
       User.validate_email_field true
       assert User.validate_email_field
     end
-    
+
     def test_validates_length_of_email_field_options_config
       assert_equal({:within => 6..100}, User.validates_length_of_email_field_options)
       assert_equal({:within => 6..100}, Employee.validates_length_of_email_field_options)
-      
+
       User.validates_length_of_email_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_length_of_email_field_options)
       User.validates_length_of_email_field_options({:within => 6..100})
       assert_equal({:within => 6..100}, User.validates_length_of_email_field_options)
     end
-    
+
     def test_validates_format_of_email_field_options_config
       default = {:with => User.send(:email_regex), :message => I18n.t('error_messages.email_invalid', :default => "should look like an email address.")}
       assert_equal default, User.validates_format_of_email_field_options
       assert_equal default, Employee.validates_format_of_email_field_options
-      
+
       User.validates_format_of_email_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_format_of_email_field_options)
       User.validates_format_of_email_field_options default
       assert_equal default, User.validates_format_of_email_field_options
     end
-    
+
     def test_validates_uniqueness_of_email_field_options_config
       default = {:scope => Employee.validations_scope, :if => "#{Employee.email_field}_changed?".to_sym}
       assert_equal default, Employee.validates_uniqueness_of_email_field_options
-      
+
       Employee.validates_uniqueness_of_email_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, Employee.validates_uniqueness_of_email_field_options)
       Employee.validates_uniqueness_of_email_field_options default
       assert_equal default, Employee.validates_uniqueness_of_email_field_options
     end
-    
+
     def test_validates_length_of_email_field
       u = User.new
       u.email = "a@a.a"
       assert !u.valid?
       assert u.errors.on(:email)
-      
+
       u.email = "a@a.com"
       assert !u.valid?
       assert !u.errors.on(:email)
     end
-    
+
     def test_validates_format_of_email_field
       u = User.new
       u.email = "aaaaaaaaaaaaa"
       assert !u.valid?
       assert u.errors.on(:email)
-      
+
       u.email = "a@a.com"
       assert !u.valid?
       assert !u.errors.on(:email)
     end
-    
+
     def test_validates_uniqueness_of_email_field
       u = User.new
       u.email = "bjohnson@binarylogic.com"
       assert !u.valid?
       assert u.errors.on(:email)
-      
+
       u.email = "a@a.com"
       assert !u.valid?
       assert !u.errors.on(:email)
diff --git a/vendor/plugins/authlogic/test/acts_as_authentic_test/logged_in_status_test.rb b/vendor/plugins/authlogic/test/acts_as_authentic_test/logged_in_status_test.rb
index 4a48651..fd3d681 100644
--- a/vendor/plugins/authlogic/test/acts_as_authentic_test/logged_in_status_test.rb
+++ b/vendor/plugins/authlogic/test/acts_as_authentic_test/logged_in_status_test.rb
@@ -5,25 +5,25 @@ class LoggedInStatusTest < ActiveSupport::TestCase
     def test_logged_in_timeout_config
       assert_equal 10.minutes.to_i, User.logged_in_timeout
       assert_equal 10.minutes.to_i, Employee.logged_in_timeout
-      
+
       User.logged_in_timeout = 1.hour
       assert_equal 1.hour.to_i, User.logged_in_timeout
       User.logged_in_timeout 10.minutes
       assert_equal 10.minutes.to_i, User.logged_in_timeout
     end
-    
+
     def test_named_scope_logged_in
       assert_equal 0, User.logged_in.count
       User.first.update_attribute(:last_request_at, Time.now)
       assert_equal 1, User.logged_in.count
     end
-    
+
     def test_named_scope_logged_out
       assert_equal 2, User.logged_out.count
       User.first.update_attribute(:last_request_at, Time.now)
       assert_equal 1, User.logged_out.count
     end
-    
+
     def test_logged_in_logged_out
       u = User.first
       assert !u.logged_in?
diff --git a/vendor/plugins/authlogic/test/acts_as_authentic_test/login_test.rb b/vendor/plugins/authlogic/test/acts_as_authentic_test/login_test.rb
index 30b7fc8..7d777fd 100644
--- a/vendor/plugins/authlogic/test/acts_as_authentic_test/login_test.rb
+++ b/vendor/plugins/authlogic/test/acts_as_authentic_test/login_test.rb
@@ -5,82 +5,82 @@ class LoginTest < ActiveSupport::TestCase
     def test_login_field_config
       assert_equal :login, User.login_field
       assert_nil Employee.login_field
-      
+
       User.login_field = :nope
       assert_equal :nope, User.login_field
       User.login_field :login
       assert_equal :login, User.login_field
     end
-    
+
     def test_validate_login_field_config
       assert User.validate_login_field
       assert Employee.validate_login_field
-      
+
       User.validate_login_field = false
       assert !User.validate_login_field
       User.validate_login_field true
       assert User.validate_login_field
     end
-    
+
     def test_validates_length_of_login_field_options_config
       assert_equal({:within => 3..100}, User.validates_length_of_login_field_options)
       assert_equal({:within => 3..100}, Employee.validates_length_of_login_field_options)
-      
+
       User.validates_length_of_login_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_length_of_login_field_options)
       User.validates_length_of_login_field_options({:within => 3..100})
       assert_equal({:within => 3..100}, User.validates_length_of_login_field_options)
     end
-    
+
     def test_validates_format_of_login_field_options_config
       default = {:with => /\A\w[\w\.\-_@ ]+\z/, :message => I18n.t('error_messages.login_invalid', :default => "should use only letters, numbers, spaces, and .-_@ please.")}
       assert_equal default, User.validates_format_of_login_field_options
       assert_equal default, Employee.validates_format_of_login_field_options
-      
+
       User.validates_format_of_login_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_format_of_login_field_options)
       User.validates_format_of_login_field_options default
       assert_equal default, User.validates_format_of_login_field_options
     end
-    
+
     def test_validates_uniqueness_of_login_field_options_config
       default = {:scope => User.validations_scope, :if => "#{User.login_field}_changed?".to_sym}
       assert_equal default, User.validates_uniqueness_of_login_field_options
-      
+
       User.validates_uniqueness_of_login_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_uniqueness_of_login_field_options)
       User.validates_uniqueness_of_login_field_options default
       assert_equal default, User.validates_uniqueness_of_login_field_options
     end
-    
+
     def test_validates_length_of_login_field
       u = User.new
       u.login = "a"
       assert !u.valid?
       assert u.errors.on(:login)
-      
+
       u.login = "aaaaaaaaaa"
       assert !u.valid?
       assert !u.errors.on(:login)
     end
-    
+
     def test_validates_format_of_login_field
       u = User.new
       u.login = "fdsf@^&*"
       assert !u.valid?
       assert u.errors.on(:login)
-      
+
       u.login = "fdsfdsfdsfdsfs"
       assert !u.valid?
       assert !u.errors.on(:login)
     end
-    
+
     def test_validates_uniqueness_of_login_field
       u = User.new
       u.login = "bjohnson"
       assert !u.valid?
       assert u.errors.on(:login)
-      
+
       u.login = "fdsfdsf"
       assert !u.valid?
       assert !u.errors.on(:login)
diff --git a/vendor/plugins/authlogic/test/acts_as_authentic_test/magic_columns_test.rb b/vendor/plugins/authlogic/test/acts_as_authentic_test/magic_columns_test.rb
index 0b1890f..77e717f 100644
--- a/vendor/plugins/authlogic/test/acts_as_authentic_test/magic_columns_test.rb
+++ b/vendor/plugins/authlogic/test/acts_as_authentic_test/magic_columns_test.rb
@@ -7,18 +7,18 @@ def test_validates_numericality_of_login_count
       u.login_count = -1
       assert !u.valid?
       assert u.errors.on(:login_count)
-      
+
       u.login_count = 0
       assert !u.valid?
       assert !u.errors.on(:login_count)
     end
-    
+
     def test_validates_numericality_of_failed_login_count
       u = User.new
       u.failed_login_count = -1
       assert !u.valid?
       assert u.errors.on(:failed_login_count)
-      
+
       u.failed_login_count = 0
       assert !u.valid?
       assert !u.errors.on(:failed_login_count)
diff --git a/vendor/plugins/authlogic/test/acts_as_authentic_test/password_test.rb b/vendor/plugins/authlogic/test/acts_as_authentic_test/password_test.rb
index fcf3472..cfd92de 100644
--- a/vendor/plugins/authlogic/test/acts_as_authentic_test/password_test.rb
+++ b/vendor/plugins/authlogic/test/acts_as_authentic_test/password_test.rb
@@ -5,135 +5,135 @@ class PasswordTest < ActiveSupport::TestCase
     def test_crypted_password_field_config
       assert_equal :crypted_password, User.crypted_password_field
       assert_equal :crypted_password, Employee.crypted_password_field
-      
+
       User.crypted_password_field = :nope
       assert_equal :nope, User.crypted_password_field
       User.crypted_password_field :crypted_password
       assert_equal :crypted_password, User.crypted_password_field
     end
-    
+
     def test_password_salt_field_config
       assert_equal :password_salt, User.password_salt_field
       assert_equal :password_salt, Employee.password_salt_field
-      
+
       User.password_salt_field = :nope
       assert_equal :nope, User.password_salt_field
       User.password_salt_field :password_salt
       assert_equal :password_salt, User.password_salt_field
     end
-    
+
     def test_validate_password_field_config
       assert User.validate_password_field
       assert Employee.validate_password_field
-      
+
       User.validate_password_field = false
       assert !User.validate_password_field
       User.validate_password_field true
       assert User.validate_password_field
     end
-    
+
     def test_validates_length_of_password_field_options_config
       default = {:minimum => 4, :if => :require_password?}
       assert_equal default, User.validates_length_of_password_field_options
       assert_equal default, Employee.validates_length_of_password_field_options
-      
+
       User.validates_length_of_password_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_length_of_password_field_options)
       User.validates_length_of_password_field_options default
       assert_equal default, User.validates_length_of_password_field_options
     end
-    
+
     def test_validates_confirmation_of_password_field_options_config
       default = {:minimum => 4, :if => "#{User.password_salt_field}_changed?".to_sym}
       assert_equal default, User.validates_confirmation_of_password_field_options
       assert_equal default, Employee.validates_confirmation_of_password_field_options
-      
+
       User.validates_confirmation_of_password_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_confirmation_of_password_field_options)
       User.validates_confirmation_of_password_field_options default
       assert_equal default, User.validates_confirmation_of_password_field_options
     end
-    
+
     def test_validates_length_of_password_confirmation_field_options_config
       default = {:minimum => 4, :if => :require_password?}
       assert_equal default, User.validates_length_of_password_confirmation_field_options
       assert_equal default, Employee.validates_length_of_password_confirmation_field_options
-      
+
       User.validates_length_of_password_confirmation_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_length_of_password_confirmation_field_options)
       User.validates_length_of_password_confirmation_field_options default
       assert_equal default, User.validates_length_of_password_confirmation_field_options
     end
-    
+
     def test_crypto_provider_config
       assert_equal Authlogic::CryptoProviders::Sha512, User.crypto_provider
       assert_equal Authlogic::CryptoProviders::AES256, Employee.crypto_provider
-      
+
       User.crypto_provider = Authlogic::CryptoProviders::BCrypt
       assert_equal Authlogic::CryptoProviders::BCrypt, User.crypto_provider
       User.crypto_provider Authlogic::CryptoProviders::Sha512
       assert_equal Authlogic::CryptoProviders::Sha512, User.crypto_provider
     end
-    
+
     def test_transition_from_crypto_providers_config
       assert_equal [], User.transition_from_crypto_providers
       assert_equal [], Employee.transition_from_crypto_providers
-      
+
       User.transition_from_crypto_providers = [Authlogic::CryptoProviders::BCrypt]
       assert_equal [Authlogic::CryptoProviders::BCrypt], User.transition_from_crypto_providers
       User.transition_from_crypto_providers []
       assert_equal [], User.transition_from_crypto_providers
     end
-    
+
     def test_validates_length_of_password
       u = User.new
       u.password_confirmation = "test2"
       assert !u.valid?
       assert u.errors.on(:password)
-      
+
       u.password = "test"
       assert !u.valid?
       assert !u.errors.on(:password_confirmation)
     end
-    
+
     def test_validates_confirmation_of_password
       u = User.new
       u.password = "test"
       u.password_confirmation = "test2"
       assert !u.valid?
       assert u.errors.on(:password)
-      
+
       u.password_confirmation = "test"
       assert !u.valid?
       assert !u.errors.on(:password)
     end
-    
+
     def test_validates_length_of_password_confirmation
       u = User.new
-      
+
       assert !u.valid?
       assert u.errors.on(:password_confirmation)
-      
+
       u.password = "test"
       u.password_confirmation = ""
       assert !u.valid?
       assert u.errors.on(:password_confirmation)
-      
+
       u.password_confirmation = "test"
       assert !u.valid?
       assert !u.errors.on(:password_confirmation)
-      
+
       ben = users(:ben)
       assert ben.valid?
-      
+
       ben.password = "newpass"
       assert !ben.valid?
       assert ben.errors.on(:password_confirmation)
-      
+
       ben.password_confirmation = "newpass"
       assert ben.valid?
     end
-    
+
     def test_password
       u = User.new
       old_password_salt = u.password_salt
@@ -142,40 +142,40 @@ def test_password
       assert_not_equal old_password_salt, u.password_salt
       assert_not_equal old_crypted_password, u.crypted_password
     end
-    
+
     def test_transitioning_password
       ben = users(:ben)
       transition_password_to(Authlogic::CryptoProviders::BCrypt, ben)
       transition_password_to(Authlogic::CryptoProviders::Sha1, ben, [Authlogic::CryptoProviders::Sha512, Authlogic::CryptoProviders::BCrypt])
       transition_password_to(Authlogic::CryptoProviders::Sha512, ben, [Authlogic::CryptoProviders::Sha1, Authlogic::CryptoProviders::BCrypt])
     end
-    
+
     def test_reset_password
       ben = users(:ben)
       old_crypted_password = ben.crypted_password
       old_password_salt = ben.password_salt
-      
+
       # soft reset
       ben.reset_password
       assert_not_equal old_crypted_password, ben.crypted_password
       assert_not_equal old_password_salt, ben.password_salt
-      
+
       # make sure it didn't go into the db
       ben.reload
       assert_equal old_crypted_password, ben.crypted_password
       assert_equal old_password_salt, ben.password_salt
-      
+
       # hard reset
       assert ben.reset_password!
       assert_not_equal old_crypted_password, ben.crypted_password
       assert_not_equal old_password_salt, ben.password_salt
-      
+
       # make sure it did go into the db
       ben.reload
       assert_not_equal old_crypted_password, ben.crypted_password
       assert_not_equal old_password_salt, ben.password_salt
     end
-    
+
     private
       def transition_password_to(crypto_provider, records, from_crypto_providers = Authlogic::CryptoProviders::Sha512)
         records = [records] unless records.is_a?(Array)
@@ -189,7 +189,7 @@ def transition_password_to(crypto_provider, records, from_crypto_providers = Aut
           assert record.valid_password?(password_for(record))
           assert_not_equal old_hash.to_s, record.crypted_password.to_s
           assert_not_equal old_persistence_token.to_s, record.persistence_token.to_s
-          
+
           old_hash = record.crypted_password
           old_persistence_token = record.persistence_token
           assert record.valid_password?(password_for(record))
diff --git a/vendor/plugins/authlogic/test/acts_as_authentic_test/perishable_token_test.rb b/vendor/plugins/authlogic/test/acts_as_authentic_test/perishable_token_test.rb
index 79eb09e..3ff443a 100644
--- a/vendor/plugins/authlogic/test/acts_as_authentic_test/perishable_token_test.rb
+++ b/vendor/plugins/authlogic/test/acts_as_authentic_test/perishable_token_test.rb
@@ -5,50 +5,50 @@ class PerishableTokenTest < ActiveSupport::TestCase
     def test_perishable_token_valid_for_config
       assert_equal 10.minutes.to_i, User.perishable_token_valid_for
       assert_equal 10.minutes.to_i, Employee.perishable_token_valid_for
-      
+
       User.perishable_token_valid_for = 1.hour
       assert_equal 1.hour.to_i, User.perishable_token_valid_for
       User.perishable_token_valid_for 10.minutes
       assert_equal 10.minutes.to_i, User.perishable_token_valid_for
     end
-    
+
     def test_disable_perishable_token_maintenance_config
       assert !User.disable_perishable_token_maintenance
       assert !Employee.disable_perishable_token_maintenance
-      
+
       User.disable_perishable_token_maintenance = true
       assert User.disable_perishable_token_maintenance
       User.disable_perishable_token_maintenance false
       assert !User.disable_perishable_token_maintenance
     end
-    
+
     def test_validates_uniqueness_of_perishable_token
       u = User.new
       u.perishable_token = users(:ben).perishable_token
       assert !u.valid?
       assert u.errors.on(:perishable_token)
     end
-    
+
     def test_before_save_reset_perishable_token
       ben = users(:ben)
       old_perishable_token = ben.perishable_token
       assert ben.save
       assert_not_equal old_perishable_token, ben.perishable_token
     end
-    
+
     def test_reset_perishable_token
       ben = users(:ben)
       old_perishable_token = ben.perishable_token
-      
+
       assert ben.reset_perishable_token
       assert_not_equal old_perishable_token, ben.perishable_token
-      
+
       ben.reload
       assert_equal old_perishable_token, ben.perishable_token
-      
+
       assert ben.reset_perishable_token!
       assert_not_equal old_perishable_token, ben.perishable_token
-      
+
       ben.reload
       assert_not_equal old_perishable_token, ben.perishable_token
     end
diff --git a/vendor/plugins/authlogic/test/acts_as_authentic_test/persistence_token_test.rb b/vendor/plugins/authlogic/test/acts_as_authentic_test/persistence_token_test.rb
index 8db7a79..586fb04 100644
--- a/vendor/plugins/authlogic/test/acts_as_authentic_test/persistence_token_test.rb
+++ b/vendor/plugins/authlogic/test/acts_as_authentic_test/persistence_token_test.rb
@@ -8,25 +8,25 @@ def test_after_password_set_reset_persistence_token
       ben.password = "newpass"
       assert_not_equal old_persistence_token, ben.persistence_token
     end
-    
+
     def test_after_password_verification_reset_persistence_token
       ben = users(:ben)
       old_persistence_token = ben.persistence_token
       assert ben.valid_password?(password_for(ben))
       assert_equal old_persistence_token, ben.persistence_token
-      
+
       # only update it if it is nil
       assert ben.update_attribute(:persistence_token, nil)
       assert ben.valid_password?(password_for(ben))
       assert_not_equal old_persistence_token, ben.persistence_token
     end
-    
+
     def test_before_validate_reset_persistence_token
       u = User.new
       assert !u.valid?
       assert_not_nil u.persistence_token
     end
-    
+
     def test_forget_all
       http_basic_auth_for(users(:ben)) { UserSession.find }
       http_basic_auth_for(users(:zack)) { UserSession.find(:ziggity_zack) }
@@ -36,7 +36,7 @@ def test_forget_all
       assert !UserSession.find
       assert !UserSession.find(:ziggity_zack)
     end
-    
+
     def test_forget
       ben = users(:ben)
       zack = users(:zack)
diff --git a/vendor/plugins/authlogic/test/acts_as_authentic_test/restful_authentication_test.rb b/vendor/plugins/authlogic/test/acts_as_authentic_test/restful_authentication_test.rb
index 2acfd87..7020d42 100644
--- a/vendor/plugins/authlogic/test/acts_as_authentic_test/restful_authentication_test.rb
+++ b/vendor/plugins/authlogic/test/acts_as_authentic_test/restful_authentication_test.rb
@@ -5,7 +5,7 @@ class RestfulAuthenticationTest < ActiveSupport::TestCase
     def test_act_like_restful_authentication_config
       assert !User.act_like_restful_authentication
       assert !Employee.act_like_restful_authentication
-  
+
       User.act_like_restful_authentication = true
       assert User.act_like_restful_authentication
       assert_equal Authlogic::CryptoProviders::Sha1, User.crypto_provider
@@ -15,7 +15,7 @@ def test_act_like_restful_authentication_config
 
       User.act_like_restful_authentication false
       assert !User.act_like_restful_authentication
-  
+
       User.crypto_provider = Authlogic::CryptoProviders::Sha512
       User.transition_from_crypto_providers = []
     end
@@ -23,16 +23,16 @@ def test_act_like_restful_authentication_config
     def test_transition_from_restful_authentication_config
       assert !User.transition_from_restful_authentication
       assert !Employee.transition_from_restful_authentication
-      
+
       User.transition_from_restful_authentication = true
       assert User.transition_from_restful_authentication
       assert defined?(::REST_AUTH_SITE_KEY)
       assert_equal '', ::REST_AUTH_SITE_KEY
       assert_equal 1, Authlogic::CryptoProviders::Sha1.stretches
-  
+
       User.transition_from_restful_authentication false
       assert !User.transition_from_restful_authentication
-  
+
       User.crypto_provider = Authlogic::CryptoProviders::Sha512
       User.transition_from_crypto_providers = []
     end
diff --git a/vendor/plugins/authlogic/test/acts_as_authentic_test/session_maintenance_test.rb b/vendor/plugins/authlogic/test/acts_as_authentic_test/session_maintenance_test.rb
index a10c02d..ac2fa82 100644
--- a/vendor/plugins/authlogic/test/acts_as_authentic_test/session_maintenance_test.rb
+++ b/vendor/plugins/authlogic/test/acts_as_authentic_test/session_maintenance_test.rb
@@ -6,7 +6,7 @@ def test_login_after_create
       assert User.create(:login => "awesome", :password => "saweet", :password_confirmation => "saweet", :email => "awesome@awesome.com")
       assert UserSession.find
     end
-    
+
     def test_updating_session_with_failed_magic_state
       ben = users(:ben)
       ben.confirmed = false
@@ -39,7 +39,7 @@ def test_no_session_update_after_modify
       assert_equal controller.session["user_credentials"], old_session_key
       assert_equal controller.cookies["user_credentials"], old_cookie_key
     end
-    
+
     def test_creating_other_user
       ben = users(:ben)
       UserSession.create(ben)
diff --git a/vendor/plugins/authlogic/test/acts_as_authentic_test/single_access_test.rb b/vendor/plugins/authlogic/test/acts_as_authentic_test/single_access_test.rb
index 7b12c79..beeb6c1 100644
--- a/vendor/plugins/authlogic/test/acts_as_authentic_test/single_access_test.rb
+++ b/vendor/plugins/authlogic/test/acts_as_authentic_test/single_access_test.rb
@@ -5,34 +5,34 @@ class SingleAccessTest < ActiveSupport::TestCase
     def test_change_single_access_token_with_password_config
       assert !User.change_single_access_token_with_password
       assert !Employee.change_single_access_token_with_password
-      
+
       User.change_single_access_token_with_password = true
       assert User.change_single_access_token_with_password
       User.change_single_access_token_with_password false
       assert !User.change_single_access_token_with_password
     end
-    
+
     def test_validates_uniqueness_of_single_access_token
       u = User.new
       u.single_access_token = users(:ben).single_access_token
       assert !u.valid?
       assert u.errors.on(:single_access_token)
     end
-    
+
     def test_before_validation_reset_single_access_token
       u = User.new
       assert !u.valid?
       assert_not_nil u.single_access_token
     end
-    
+
     def test_after_password_set_reset_single_access_token
       User.change_single_access_token_with_password = true
-      
+
       ben = users(:ben)
       old_single_access_token = ben.single_access_token
       ben.password = "new_pass"
       assert_not_equal old_single_access_token, ben.single_access_token
-      
+
       User.change_single_access_token_with_password = false
     end
   end
diff --git a/vendor/plugins/authlogic/test/authenticates_many_test.rb b/vendor/plugins/authlogic/test/authenticates_many_test.rb
index f57aba9..c1fac32 100644
--- a/vendor/plugins/authlogic/test/authenticates_many_test.rb
+++ b/vendor/plugins/authlogic/test/authenticates_many_test.rb
@@ -6,11 +6,11 @@ def test_scoping
     ben = users(:ben)
     binary_logic = companies(:binary_logic)
     set_session_for(zack)
-    
+
     assert !binary_logic.user_sessions.find
-    
+
     set_session_for(ben)
-    
+
     assert binary_logic.user_sessions.find
   end
 end
\ No newline at end of file
diff --git a/vendor/plugins/authlogic/test/crypto_provider_test/aes256_test.rb b/vendor/plugins/authlogic/test/crypto_provider_test/aes256_test.rb
index 63d0903..d83ed9f 100644
--- a/vendor/plugins/authlogic/test/crypto_provider_test/aes256_test.rb
+++ b/vendor/plugins/authlogic/test/crypto_provider_test/aes256_test.rb
@@ -5,7 +5,7 @@ class AES256Test < ActiveSupport::TestCase
     def test_encrypt
       assert Authlogic::CryptoProviders::AES256.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::AES256.encrypt("mypass")
       assert Authlogic::CryptoProviders::AES256.matches?(hash, "mypass")
diff --git a/vendor/plugins/authlogic/test/crypto_provider_test/bcrypt_test.rb b/vendor/plugins/authlogic/test/crypto_provider_test/bcrypt_test.rb
index 8adca35..506aac1 100644
--- a/vendor/plugins/authlogic/test/crypto_provider_test/bcrypt_test.rb
+++ b/vendor/plugins/authlogic/test/crypto_provider_test/bcrypt_test.rb
@@ -5,7 +5,7 @@ class BCrpytTest < ActiveSupport::TestCase
     def test_encrypt
       assert Authlogic::CryptoProviders::BCrypt.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::BCrypt.encrypt("mypass")
       assert Authlogic::CryptoProviders::BCrypt.matches?(hash, "mypass")
diff --git a/vendor/plugins/authlogic/test/crypto_provider_test/sha1_test.rb b/vendor/plugins/authlogic/test/crypto_provider_test/sha1_test.rb
index ec1f65d..ccf4305 100644
--- a/vendor/plugins/authlogic/test/crypto_provider_test/sha1_test.rb
+++ b/vendor/plugins/authlogic/test/crypto_provider_test/sha1_test.rb
@@ -5,12 +5,12 @@ class Sha1Test < ActiveSupport::TestCase
     def test_encrypt
       assert Authlogic::CryptoProviders::Sha1.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::Sha1.encrypt("mypass")
       assert Authlogic::CryptoProviders::Sha1.matches?(hash, "mypass")
     end
-    
+
     def test_old_restful_authentication_passwords
       password = "test"
       salt = "7e3041ebc2fc05a40c60028e2c4901a81035d3cd"
diff --git a/vendor/plugins/authlogic/test/crypto_provider_test/sha512_test.rb b/vendor/plugins/authlogic/test/crypto_provider_test/sha512_test.rb
index 7d313e9..ed2b818 100644
--- a/vendor/plugins/authlogic/test/crypto_provider_test/sha512_test.rb
+++ b/vendor/plugins/authlogic/test/crypto_provider_test/sha512_test.rb
@@ -5,7 +5,7 @@ class Sha512Test < ActiveSupport::TestCase
     def test_encrypt
       assert Authlogic::CryptoProviders::Sha512.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::Sha512.encrypt("mypass")
       assert Authlogic::CryptoProviders::Sha512.matches?(hash, "mypass")
diff --git a/vendor/plugins/authlogic/test/fixtures/companies.yml b/vendor/plugins/authlogic/test/fixtures/companies.yml
index b62165b..4e51414 100644
--- a/vendor/plugins/authlogic/test/fixtures/companies.yml
+++ b/vendor/plugins/authlogic/test/fixtures/companies.yml
@@ -1,5 +1,5 @@
 binary_logic:
   name: Binary Logic
-  
+
 logic_over_data:
   name: Logic Over Data
\ No newline at end of file
diff --git a/vendor/plugins/authlogic/test/fixtures/employees.yml b/vendor/plugins/authlogic/test/fixtures/employees.yml
index c30e931..93519cd 100644
--- a/vendor/plugins/authlogic/test/fixtures/employees.yml
+++ b/vendor/plugins/authlogic/test/fixtures/employees.yml
@@ -6,7 +6,7 @@ drew:
   persistence_token: 5273d85ed156e9dbd6a7c1438d319ef8c8d41dd24368db6c222de11346c7b11e53ee08d45ecf619b1c1dc91233d22b372482b751b066d0a6f6f9bac42eacaabf
   first_name: Drew
   last_name: Gainor
-  
+
 jennifer:
   company: logic_over_data
   email: jjohnson@logicoverdata.com
diff --git a/vendor/plugins/authlogic/test/fixtures/users.yml b/vendor/plugins/authlogic/test/fixtures/users.yml
index 196444a..e554f67 100644
--- a/vendor/plugins/authlogic/test/fixtures/users.yml
+++ b/vendor/plugins/authlogic/test/fixtures/users.yml
@@ -10,7 +10,7 @@ ben:
   email: bjohnson@binarylogic.com
   first_name: Ben
   last_name: Johnson
-  
+
 zack:
   company: logic_over_data
   projects: web_services
diff --git a/vendor/plugins/authlogic/test/libs/employee.rb b/vendor/plugins/authlogic/test/libs/employee.rb
index 6703eba..3a2fb4a 100644
--- a/vendor/plugins/authlogic/test/libs/employee.rb
+++ b/vendor/plugins/authlogic/test/libs/employee.rb
@@ -2,6 +2,6 @@ class Employee < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypto_provider Authlogic::CryptoProviders::AES256
   end
-  
+
   belongs_to :company
 end
\ No newline at end of file
diff --git a/vendor/plugins/authlogic/test/random_test.rb b/vendor/plugins/authlogic/test/random_test.rb
index 1dc669d..75830b2 100644
--- a/vendor/plugins/authlogic/test/random_test.rb
+++ b/vendor/plugins/authlogic/test/random_test.rb
@@ -7,7 +7,7 @@ def test_random_tokens_have_consisten_length
       assert_equal 20,  Authlogic::Random.friendly_token.length
     end
   end
-  
+
   def test_random_tokens_are_indeed_random
     # this might fail if you are *really* unlucky :)
     with_any_random do
@@ -24,10 +24,10 @@ def with_any_random(&block)
     def with_secure_random_enabled(enabled = true)
       # can't really test SecureRandom if we don't have an implementation
       return if enabled && !Authlogic::Random::SecureRandom
-    
+
       current_sec_rand = Authlogic::Random::SecureRandom
       reload_authlogic_with_sec_random!(current_sec_rand, enabled)
-  
+
       yield
     ensure
       reload_authlogic_with_sec_random!(current_sec_rand)
diff --git a/vendor/plugins/authlogic/test/session_test/activation_test.rb b/vendor/plugins/authlogic/test/session_test/activation_test.rb
index aee40a7..117ea57 100644
--- a/vendor/plugins/authlogic/test/session_test/activation_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/activation_test.rb
@@ -8,7 +8,7 @@ def test_activated
         Authlogic::Session::Base.controller = nil
         assert !UserSession.activated?
       end
-    
+
       def test_controller
         Authlogic::Session::Base.controller = nil
         assert_nil Authlogic::Session::Base.controller
@@ -20,18 +20,18 @@ def test_controller
         thread1.join
 
         assert_nil Authlogic::Session::Base.controller
-      
+
         thread2 = Thread.new do
           controller = MockController.new
           Authlogic::Session::Base.controller = controller
           assert_equal controller, Authlogic::Session::Base.controller
         end
         thread2.join
-      
+
         assert_nil Authlogic::Session::Base.controller
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_init
         UserSession.controller = nil
diff --git a/vendor/plugins/authlogic/test/session_test/active_record_trickery_test.rb b/vendor/plugins/authlogic/test/session_test/active_record_trickery_test.rb
index bd7ffec..cceb251 100644
--- a/vendor/plugins/authlogic/test/session_test/active_record_trickery_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/active_record_trickery_test.rb
@@ -6,16 +6,16 @@ class ClassMethodsTest < ActiveSupport::TestCase
       def test_human_attribute_name
         assert_equal "Some attribute", UserSession.human_attribute_name("some_attribute")
       end
-    
+
       def test_human_name
         assert_equal "Usersession", UserSession.human_name
       end
-    
+
       def test_self_and_descendents_from_active_record
         assert_equal [UserSession], UserSession.self_and_descendents_from_active_record
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_new_record
         session = UserSession.new
diff --git a/vendor/plugins/authlogic/test/session_test/brute_force_protection_test.rb b/vendor/plugins/authlogic/test/session_test/brute_force_protection_test.rb
index 1cf3858..bb70a3a 100644
--- a/vendor/plugins/authlogic/test/session_test/brute_force_protection_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/brute_force_protection_test.rb
@@ -6,20 +6,20 @@ class ConfigTest < ActiveSupport::TestCase
       def test_consecutive_failed_logins_limit
         UserSession.consecutive_failed_logins_limit = 10
         assert_equal 10, UserSession.consecutive_failed_logins_limit
-    
+
         UserSession.consecutive_failed_logins_limit 50
         assert_equal 50, UserSession.consecutive_failed_logins_limit
       end
-      
+
       def test_failed_login_ban_for
         UserSession.failed_login_ban_for = 10
         assert_equal 10, UserSession.failed_login_ban_for
-    
+
         UserSession.failed_login_ban_for 2.hours
         assert_equal 2.hours.to_i, UserSession.failed_login_ban_for
       end
     end
-    
+
     class InstaceMethodsTest < ActiveSupport::TestCase
       def test_under_limit
         ben = users(:ben)
@@ -37,61 +37,61 @@ def test_exceeded_limit
         ben.updated_at = (UserSession.failed_login_ban_for + 2.hours.to_i).seconds.ago
         assert UserSession.create(ben)
       end
-    
+
       def test_exceeding_failed_logins_limit
         UserSession.consecutive_failed_logins_limit = 2
         ben = users(:ben)
-      
+
         2.times do |i|
           session = UserSession.new(:login => ben.login, :password => "badpassword1")
           assert !session.save
           assert session.errors.on(:password)
           assert_equal i + 1, ben.reload.failed_login_count
         end
-      
+
         session = UserSession.new(:login => ben.login, :password => "badpassword2")
         assert !session.save
         assert !session.errors.on(:password)
         assert_equal 2, ben.reload.failed_login_count
-      
+
         UserSession.consecutive_failed_logins_limit = 50
       end
-      
+
       def test_exceeded_ban_for
         UserSession.consecutive_failed_logins_limit = 2
         ben = users(:ben)
-      
+
         2.times do |i|
           session = UserSession.new(:login => ben.login, :password => "badpassword1")
           assert !session.save
           assert session.errors.on(:password)
           assert_equal i + 1, ben.reload.failed_login_count
         end
-        
+
         ActiveRecord::Base.connection.execute("update users set updated_at = '#{1.day.ago.to_s(:db)}' where login = '#{ben.login}'")
         session = UserSession.new(:login => ben.login, :password => "benrocks")
         assert session.save
         assert_equal 0, ben.reload.failed_login_count
-      
+
         UserSession.consecutive_failed_logins_limit = 50
       end
 
       def test_exceeded_ban_and_failed_doesnt_ban_again
         UserSession.consecutive_failed_logins_limit = 2
         ben = users(:ben)
-      
+
         2.times do |i|
           session = UserSession.new(:login => ben.login, :password => "badpassword1")
           assert !session.save
           assert session.errors.on(:password)
           assert_equal i + 1, ben.reload.failed_login_count
         end
-        
+
         ActiveRecord::Base.connection.execute("update users set updated_at = '#{1.day.ago.to_s(:db)}' where login = '#{ben.login}'")
         session = UserSession.new(:login => ben.login, :password => "badpassword1")
         assert !session.save
         assert_equal 1, ben.reload.failed_login_count
-      
+
         UserSession.consecutive_failed_logins_limit = 50
       end
     end
diff --git a/vendor/plugins/authlogic/test/session_test/cookies_test.rb b/vendor/plugins/authlogic/test/session_test/cookies_test.rb
index e4e0058..4288ff4 100644
--- a/vendor/plugins/authlogic/test/session_test/cookies_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/cookies_test.rb
@@ -6,30 +6,30 @@ class ConfiTest < ActiveSupport::TestCase
       def test_cookie_key
         UserSession.cookie_key = "my_cookie_key"
         assert_equal "my_cookie_key", UserSession.cookie_key
-    
+
         UserSession.cookie_key "user_credentials"
         assert_equal "user_credentials", UserSession.cookie_key
       end
-    
+
       def test_remember_me
         UserSession.remember_me = true
         assert_equal true, UserSession.remember_me
         session = UserSession.new
         assert_equal true, session.remember_me
-    
+
         UserSession.remember_me false
         assert_equal false, UserSession.remember_me
         session = UserSession.new
         assert_equal false, session.remember_me
       end
-  
+
       def test_remember_me_for
         UserSession.remember_me_for = 3.years
         assert_equal 3.years, UserSession.remember_me_for
         session = UserSession.new
         session.remember_me = true
         assert_equal 3.years, session.remember_me_for
-    
+
         UserSession.remember_me_for 3.months
         assert_equal 3.months, UserSession.remember_me_for
         session = UserSession.new
@@ -37,48 +37,48 @@ def test_remember_me_for
         assert_equal 3.months, session.remember_me_for
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_credentials
         session = UserSession.new
         session.credentials = {:remember_me => true}
         assert_equal true, session.remember_me
       end
-    
+
       def test_remember_me
         session = UserSession.new
         assert_equal false, session.remember_me
         assert !session.remember_me?
-      
+
         session.remember_me = false
         assert_equal false, session.remember_me
         assert !session.remember_me?
-      
+
         session.remember_me = true
         assert_equal true, session.remember_me
         assert session.remember_me?
-      
+
         session.remember_me = nil
         assert_nil session.remember_me
         assert !session.remember_me?
-      
+
         session.remember_me = "1"
         assert_equal "1", session.remember_me
         assert session.remember_me?
-      
+
         session.remember_me = "true"
         assert_equal "true", session.remember_me
         assert session.remember_me?
       end
-    
+
       def test_remember_me_until
         session = UserSession.new
         assert_nil session.remember_me_until
-      
+
         session.remember_me = true
         assert 3.months.from_now <= session.remember_me_until
       end
-    
+
       def test_persist_persist_by_cookie
         ben = users(:ben)
         assert !UserSession.find
@@ -86,14 +86,14 @@ def test_persist_persist_by_cookie
         assert session = UserSession.find
         assert_equal ben, session.record
       end
-    
+
       def test_after_save_save_cookie
         ben = users(:ben)
         session = UserSession.new(ben)
         assert session.save
         assert_equal ben.persistence_token, controller.cookies["user_credentials"]
       end
-    
+
       def test_after_destroy_destroy_cookie
         ben = users(:ben)
         set_cookie_for(ben)
diff --git a/vendor/plugins/authlogic/test/session_test/existence_test.rb b/vendor/plugins/authlogic/test/session_test/existence_test.rb
index df7dd99..c58e9a8 100644
--- a/vendor/plugins/authlogic/test/session_test/existence_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/existence_test.rb
@@ -11,23 +11,23 @@ def test_create
         assert UserSession.create!(:login => ben.login, :password => "benrocks")
       end
     end
-    
+
     class IsntaceMethodsTest < ActiveSupport::TestCase
       def test_new_session
         session = UserSession.new
         assert session.new_session?
-      
+
         set_session_for(users(:ben))
         session = UserSession.find
         assert !session.new_session?
       end
-    
+
       def test_save_with_nothing
         session = UserSession.new
         assert !session.save
         assert session.new_session?
       end
-    
+
       def test_save_with_block
         ben = users(:ben)
         session = UserSession.new
@@ -37,15 +37,15 @@ def test_save_with_block
         assert !block_result
         assert session.new_session?
       end
-    
+
       def test_save_with_bang
         session = UserSession.new
         assert_raise(Authlogic::Session::Existence::SessionInvalidError) { session.save! }
-      
+
         session.unauthorized_record = users(:ben)
         assert_nothing_raised { session.save! }
       end
-    
+
       def test_destroy
         ben = users(:ben)
         session = UserSession.new
diff --git a/vendor/plugins/authlogic/test/session_test/id_test.rb b/vendor/plugins/authlogic/test/session_test/id_test.rb
index 3e7105d..5fe9f64 100644
--- a/vendor/plugins/authlogic/test/session_test/id_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/id_test.rb
@@ -7,7 +7,7 @@ def test_credentials
       session.credentials = [:my_id]
       assert_equal :my_id, session.id
     end
-      
+
     def test_id
       session = UserSession.new
       session.id = :my_id
diff --git a/vendor/plugins/authlogic/test/session_test/klass_test.rb b/vendor/plugins/authlogic/test/session_test/klass_test.rb
index eaacac1..24ea878 100644
--- a/vendor/plugins/authlogic/test/session_test/klass_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/klass_test.rb
@@ -7,12 +7,12 @@ def test_authenticate_with
         UserSession.authenticate_with = Employee
         assert_equal "Employee", UserSession.klass_name
         assert_equal Employee, UserSession.klass
-    
+
         UserSession.authenticate_with User
         assert_equal "User", UserSession.klass_name
         assert_equal User, UserSession.klass
       end
-    
+
       def test_klass
         assert_equal User, UserSession.klass
       end
@@ -21,7 +21,7 @@ def test_klass_name
         assert_equal "User", UserSession.klass_name
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_record_method
         ben = users(:ben)
diff --git a/vendor/plugins/authlogic/test/session_test/magic_columns_test.rb b/vendor/plugins/authlogic/test/session_test/magic_columns_test.rb
index 43c84fe..6a2135a 100644
--- a/vendor/plugins/authlogic/test/session_test/magic_columns_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/magic_columns_test.rb
@@ -6,24 +6,24 @@ class ConfigTest < ActiveSupport::TestCase
       def test_last_request_at_threshold_config
         UserSession.last_request_at_threshold = 2.minutes
         assert_equal 2.minutes, UserSession.last_request_at_threshold
-    
+
         UserSession.last_request_at_threshold 0
         assert_equal 0, UserSession.last_request_at_threshold
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_after_persisting_set_last_request_at
         ben = users(:ben)
         assert UserSession.create(ben)
-        
+
         set_cookie_for(ben)
         old_last_request_at = ben.last_request_at
         assert UserSession.find
         ben.reload
         assert ben.last_request_at != old_last_request_at
       end
-    
+
       def test_valid_increase_failed_login_count
         ben = users(:ben)
         old_failed_login_count = ben.failed_login_count
@@ -31,14 +31,14 @@ def test_valid_increase_failed_login_count
         ben.reload
         assert_equal old_failed_login_count + 1, ben.failed_login_count
       end
-    
+
       def test_before_save_update_info
         ben = users(:ben)
-      
+
         # increase failed login count
         assert !UserSession.create(:login => ben.login, :password => "wrong")
         ben.reload
-      
+
         # grab old values
         old_login_count = ben.login_count
         old_failed_login_count = ben.failed_login_count
@@ -46,9 +46,9 @@ def test_before_save_update_info
         old_current_login_at = ben.current_login_at
         old_last_login_ip = ben.last_login_ip
         old_current_login_ip = ben.current_login_ip
-      
+
         assert UserSession.create(:login => ben.login, :password => "benrocks")
-        
+
         ben.reload
         assert_equal old_login_count + 1, ben.login_count
         assert_equal 0, ben.failed_login_count
diff --git a/vendor/plugins/authlogic/test/session_test/magic_states_test.rb b/vendor/plugins/authlogic/test/session_test/magic_states_test.rb
index b4badd6..4e5ad06 100644
--- a/vendor/plugins/authlogic/test/session_test/magic_states_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/magic_states_test.rb
@@ -6,51 +6,51 @@ class ConfigTest < ActiveSupport::TestCase
       def test_disable_magic_states_config
         UserSession.disable_magic_states = true
         assert_equal true, UserSession.disable_magic_states
-    
+
         UserSession.disable_magic_states false
         assert_equal false, UserSession.disable_magic_states
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_disabling_magic_states
         UserSession.disable_magic_states = true
-      
+
         ben = users(:ben)
         ben.update_attribute(:active, false)
         assert UserSession.create(ben)
-      
+
         UserSession.disable_magic_states = false
       end
-    
+
       def test_validate_validate_magic_states_active
         session = UserSession.new
         ben = users(:ben)
         session.unauthorized_record = ben
         assert session.valid?
-      
+
         ben.update_attribute(:active, false)
         assert !session.valid?
         assert session.errors.on_base.size > 0
       end
-    
+
       def test_validate_validate_magic_states_approved
         session = UserSession.new
         ben = users(:ben)
         session.unauthorized_record = ben
         assert session.valid?
-      
+
         ben.update_attribute(:approved, false)
         assert !session.valid?
         assert session.errors.on_base.size > 0
       end
-    
+
       def test_validate_validate_magic_states_confirmed
         session = UserSession.new
         ben = users(:ben)
         session.unauthorized_record = ben
         assert session.valid?
-      
+
         ben.update_attribute(:confirmed, false)
         assert !session.valid?
         assert session.errors.on_base.size > 0
diff --git a/vendor/plugins/authlogic/test/session_test/params_test.rb b/vendor/plugins/authlogic/test/session_test/params_test.rb
index 3a03f8a..ff25295 100644
--- a/vendor/plugins/authlogic/test/session_test/params_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/params_test.rb
@@ -6,43 +6,43 @@ class ConfigTest < ActiveSupport::TestCase
       def test_params_key
         UserSession.params_key = "my_params_key"
         assert_equal "my_params_key", UserSession.params_key
-    
+
         UserSession.params_key "user_credentials"
         assert_equal "user_credentials", UserSession.params_key
       end
-    
+
       def test_single_access_allowed_request_types
         UserSession.single_access_allowed_request_types = ["my request type"]
         assert_equal ["my request type"], UserSession.single_access_allowed_request_types
-    
+
         UserSession.single_access_allowed_request_types ["application/rss+xml", "application/atom+xml"]
         assert_equal ["application/rss+xml", "application/atom+xml"], UserSession.single_access_allowed_request_types
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_persist_persist_by_params
         ben = users(:ben)
         session = UserSession.new
-    
+
         assert !session.persisting?
         set_params_for(ben)
-      
+
         assert !session.persisting?
         assert !session.unauthorized_record
         assert !session.record
         assert_nil controller.session["user_credentials"]
-      
+
         set_request_content_type("text/plain")
         assert !session.persisting?
         assert !session.unauthorized_record
         assert_nil controller.session["user_credentials"]
-      
+
         set_request_content_type("application/atom+xml")
         assert session.persisting?
         assert_equal ben, session.record
         assert_nil controller.session["user_credentials"] # should not persist since this is single access
-      
+
         set_request_content_type("application/rss+xml")
         assert session.persisting?
         assert_equal ben, session.unauthorized_record
diff --git a/vendor/plugins/authlogic/test/session_test/password_test.rb b/vendor/plugins/authlogic/test/session_test/password_test.rb
index aea5a26..aca9f9f 100644
--- a/vendor/plugins/authlogic/test/session_test/password_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/password_test.rb
@@ -6,46 +6,46 @@ class ConfigTest < ActiveSupport::TestCase
       def test_find_by_login_method
         UserSession.find_by_login_method = "my_login_method"
         assert_equal "my_login_method", UserSession.find_by_login_method
-    
+
         UserSession.find_by_login_method "find_by_login"
         assert_equal "find_by_login", UserSession.find_by_login_method
       end
-    
+
       def test_verify_password_method
         UserSession.verify_password_method = "my_login_method"
         assert_equal "my_login_method", UserSession.verify_password_method
-    
+
         UserSession.verify_password_method "valid_password?"
         assert_equal "valid_password?", UserSession.verify_password_method
       end
-    
+
       def test_login_field
         UserSession.configured_password_methods = false
         UserSession.login_field = :saweet
         assert_equal :saweet, UserSession.login_field
         session = UserSession.new
         assert session.respond_to?(:saweet)
-    
+
         UserSession.login_field :login
         assert_equal :login, UserSession.login_field
         session = UserSession.new
         assert session.respond_to?(:login)
       end
-    
+
       def test_password_field
         UserSession.configured_password_methods = false
         UserSession.password_field = :saweet
         assert_equal :saweet, UserSession.password_field
         session = UserSession.new
         assert session.respond_to?(:saweet)
-    
+
         UserSession.password_field :password
         assert_equal :password, UserSession.password_field
         session = UserSession.new
         assert session.respond_to?(:password)
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_init
         session = UserSession.new
@@ -55,7 +55,7 @@ def test_init
         assert session.respond_to?(:password=)
         assert session.respond_to?(:protected_password, true)
       end
-    
+
       def test_credentials
         session = UserSession.new
         session.credentials = {:login => "login", :password => "pass"}
@@ -64,12 +64,12 @@ def test_credentials
         assert_equal "pass", session.send(:protected_password)
         assert_equal({:password => "<protected>", :login => "login"}, session.credentials)
       end
-    
+
       def test_credentials_are_params_safe
         session = UserSession.new
         assert_nothing_raised { session.credentials = {:hacker_method => "error!"} }
       end
-    
+
       def test_save_with_credentials
         ben = users(:ben)
         session = UserSession.new(:login => ben.login, :password => "benrocks")
diff --git a/vendor/plugins/authlogic/test/session_test/perishability_test.rb b/vendor/plugins/authlogic/test/session_test/perishability_test.rb
index 45ae4da..ca273c8 100644
--- a/vendor/plugins/authlogic/test/session_test/perishability_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/perishability_test.rb
@@ -7,7 +7,7 @@ def test_after_save
       old_perishable_token = ben.perishable_token
       session = UserSession.create(ben)
       assert_not_equal old_perishable_token, ben.perishable_token
-      
+
       drew = employees(:drew)
       assert UserSession.create(drew)
     end
diff --git a/vendor/plugins/authlogic/test/session_test/persistence_test.rb b/vendor/plugins/authlogic/test/session_test/persistence_test.rb
index 2fbad1b..d949012 100644
--- a/vendor/plugins/authlogic/test/session_test/persistence_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/persistence_test.rb
@@ -13,7 +13,7 @@ def test_find
       session = UserSession.find
       assert session
     end
-    
+
     def test_persisting
       # tested thoroughly in test_find
     end
diff --git a/vendor/plugins/authlogic/test/session_test/scopes_test.rb b/vendor/plugins/authlogic/test/session_test/scopes_test.rb
index edc3c9d..2575904 100644
--- a/vendor/plugins/authlogic/test/session_test/scopes_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/scopes_test.rb
@@ -4,16 +4,16 @@ module SessionTest
   class ScopesTest < ActiveSupport::TestCase
     def test_scope_method
       assert_nil Authlogic::Session::Base.scope
-      
+
       thread1 = Thread.new do
         scope = {:id => :scope1}
         Authlogic::Session::Base.send(:scope=, scope)
         assert_equal scope, Authlogic::Session::Base.scope
       end
       thread1.join
-      
+
       assert_nil Authlogic::Session::Base.scope
-      
+
       thread2 = Thread.new do
         scope = {:id => :scope2}
         Authlogic::Session::Base.send(:scope=, scope)
@@ -23,17 +23,17 @@ def test_scope_method
 
       assert_nil Authlogic::Session::Base.scope
     end
-  
+
     def test_with_scope_method
       assert_raise(ArgumentError) { UserSession.with_scope }
-      
+
       UserSession.with_scope(:find_options => {:conditions => "awesome = 1"}, :id => "some_id") do
         assert_equal({:find_options => {:conditions => "awesome = 1"}, :id => "some_id"}, UserSession.scope)
       end
-      
+
       assert_nil UserSession.scope
     end
-  
+
     def test_initialize
       UserSession.with_scope(:find_options => {:conditions => "awesome = 1"}, :id => "some_id") do
         session = UserSession.new
@@ -42,18 +42,18 @@ def test_initialize
         assert_equal "another_id_some_id_test", session.send(:build_key, "test")
       end
     end
-    
+
     def test_search_for_record_with_scopes
       binary_logic = companies(:binary_logic)
       ben = users(:ben)
       zack = users(:zack)
-      
+
       session = UserSession.new
       assert_equal zack, session.send(:search_for_record, "find_by_login", zack.login)
-      
+
       session.scope = {:find_options => {:conditions => ["company_id = ?", binary_logic.id]}}
       assert_nil session.send(:search_for_record, "find_by_login", zack.login)
-      
+
       assert_equal ben, session.send(:search_for_record, "find_by_login", ben.login)
     end
   end
diff --git a/vendor/plugins/authlogic/test/session_test/session_test.rb b/vendor/plugins/authlogic/test/session_test/session_test.rb
index 242b0be..c26e0cd 100644
--- a/vendor/plugins/authlogic/test/session_test/session_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/session_test.rb
@@ -6,12 +6,12 @@ class ConfigTest < ActiveSupport::TestCase
       def test_session_key
         UserSession.session_key = "my_session_key"
         assert_equal "my_session_key", UserSession.session_key
-    
+
         UserSession.session_key "user_credentials"
         assert_equal "user_credentials", UserSession.session_key
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_persist_persist_by_session
         ben = users(:ben)
@@ -20,7 +20,7 @@ def test_persist_persist_by_session
         assert_equal ben, session.record
         assert_equal ben.persistence_token, controller.session["user_credentials"]
       end
-      
+
       def test_persist_persist_by_session_with_token_only
         ben = users(:ben)
         set_session_for(ben)
@@ -29,7 +29,7 @@ def test_persist_persist_by_session_with_token_only
         assert_equal ben, session.record
         assert_equal ben.persistence_token, controller.session["user_credentials"]
       end
-    
+
       def test_after_save_update_session
         ben = users(:ben)
         session = UserSession.new(ben)
@@ -37,7 +37,7 @@ def test_after_save_update_session
         assert session.save
         assert_equal ben.persistence_token, controller.session["user_credentials"]
       end
-    
+
       def test_after_destroy_update_session
         ben = users(:ben)
         set_session_for(ben)
@@ -46,7 +46,7 @@ def test_after_destroy_update_session
         assert session.destroy
         assert controller.session["user_credentials"].blank?
       end
-    
+
       def test_after_persisting_update_session
         ben = users(:ben)
         set_cookie_for(ben)
diff --git a/vendor/plugins/authlogic/test/session_test/timeout_test.rb b/vendor/plugins/authlogic/test/session_test/timeout_test.rb
index 83a0e4a..ca8300e 100644
--- a/vendor/plugins/authlogic/test/session_test/timeout_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/timeout_test.rb
@@ -6,12 +6,12 @@ class ConfigTest < ActiveSupport::TestCase
       def test_logout_on_timeout
         UserSession.logout_on_timeout = true
         assert UserSession.logout_on_timeout
-    
+
         UserSession.logout_on_timeout false
         assert !UserSession.logout_on_timeout
       end
     end
-    
+
     class InstanceMethods < ActiveSupport::TestCase
       def test_stale_state
         UserSession.logout_on_timeout = true
@@ -19,26 +19,26 @@ def test_stale_state
         ben.last_request_at = 3.years.ago
         ben.save
         set_session_for(ben)
-      
+
         session = UserSession.new
         assert session.persisting?
         assert session.stale?
         assert_equal ben, session.stale_record
         assert_nil session.record
         assert_nil controller.session["user_credentials_id"]
-      
+
         set_session_for(ben)
-      
+
         ben.last_request_at = Time.now
         ben.save
-      
+
         assert session.persisting?
         assert !session.stale?
         assert_nil session.stale_record
-      
+
         UserSession.logout_on_timeout = false
       end
-      
+
       def test_successful_login
         UserSession.logout_on_timeout = true
         ben = users(:ben)
diff --git a/vendor/plugins/authlogic/test/session_test/validation_test.rb b/vendor/plugins/authlogic/test/session_test/validation_test.rb
index 0d17202..9cc10fa 100644
--- a/vendor/plugins/authlogic/test/session_test/validation_test.rb
+++ b/vendor/plugins/authlogic/test/session_test/validation_test.rb
@@ -6,13 +6,13 @@ def test_errors
       session = UserSession.new
       assert session.errors.is_a?(Authlogic::Session::Validation::Errors)
     end
-    
+
     def test_valid
       session = UserSession.new
       assert !session.valid?
       assert_nil session.record
       assert session.errors.count > 0
-      
+
       ben = users(:ben)
       session.unauthorized_record = ben
       assert session.valid?
diff --git a/vendor/plugins/authlogic/test/test_helper.rb b/vendor/plugins/authlogic/test/test_helper.rb
index fea3f9c..a278919 100644
--- a/vendor/plugins/authlogic/test/test_helper.rb
+++ b/vendor/plugins/authlogic/test/test_helper.rb
@@ -9,25 +9,25 @@
 ActiveRecord::Base.configurations = true
 ActiveRecord::Schema.define(:version => 1) do
   create_table :companies do |t|
-    t.datetime  :created_at    
+    t.datetime  :created_at
     t.datetime  :updated_at
     t.string    :name
     t.boolean   :active
   end
 
   create_table :projects do |t|
-    t.datetime  :created_at      
+    t.datetime  :created_at
     t.datetime  :updated_at
     t.string    :name
   end
-  
+
   create_table :projects_users, :id => false do |t|
     t.integer :project_id
     t.integer :user_id
   end
-  
+
   create_table :users do |t|
-    t.datetime  :created_at      
+    t.datetime  :created_at
     t.datetime  :updated_at
     t.integer   :lock_version, :default => 0
     t.integer   :company_id
@@ -51,9 +51,9 @@
     t.boolean   :approved, :default => true
     t.boolean   :confirmed, :default => true
   end
-  
+
   create_table :employees do |t|
-    t.datetime  :created_at      
+    t.datetime  :created_at
     t.datetime  :updated_at
     t.integer   :company_id
     t.string    :email
@@ -90,7 +90,7 @@ class ActiveSupport::TestCase
   self.pre_loaded_fixtures = false
   fixtures :all
   setup :activate_authlogic
-  
+
   private
     def password_for(user)
       case user
@@ -100,7 +100,7 @@ def password_for(user)
         "zackrocks"
       end
     end
-    
+
     def http_basic_auth_for(user = nil, &block)
       unless user.blank?
         controller.http_user = user.login
@@ -109,36 +109,36 @@ def http_basic_auth_for(user = nil, &block)
       yield
       controller.http_user = controller.http_password = nil
     end
-    
+
     def set_cookie_for(user, id = nil)
       controller.cookies["user_credentials"] = {:value => user.persistence_token, :expires => nil}
     end
-    
+
     def unset_cookie
       controller.cookies["user_credentials"] = nil
     end
-    
+
     def set_params_for(user, id = nil)
       controller.params["user_credentials"] = user.single_access_token
     end
-    
+
     def unset_params
       controller.params["user_credentials"] = nil
     end
-    
+
     def set_request_content_type(type)
       controller.request_content_type = type
     end
-    
+
     def unset_request_content_type
       controller.request_content_type = nil
     end
-    
+
     def set_session_for(user, id = nil)
       controller.session["user_credentials"] = user.persistence_token
       controller.session["user_credentials_id"] = user.id
     end
-    
+
     def unset_session
       controller.session["user_credentials"] = controller.session["user_credentials_id"] = nil
     end
diff --git a/vendor/plugins/spawn/README b/vendor/plugins/spawn/README
index ff46adb..120149a 100644
--- a/vendor/plugins/spawn/README
+++ b/vendor/plugins/spawn/README
@@ -6,7 +6,7 @@ code so that your application can return results to your users more quickly.
 This plugin works by creating new database connections in ActiveRecord::Base for the
 spawned block.
 
-The plugin also patches ActiveRecord::Base to handle some known bugs when using 
+The plugin also patches ActiveRecord::Base to handle some known bugs when using
 threads (see lib/patches.rb).
 
 Usage
@@ -51,10 +51,10 @@ For example, this is how you can tell spawn to use threading on the call,
   spawn(:method => :thread) do
     something
   end
-  
+
 When using the :thread setting, spawn will check to make sure that you have set
 allow_concurrency=true in your configuration.   If you want this setting then
-put this line in one of your environment config files: 
+put this line in one of your environment config files:
 
   config.active_record.allow_concurrency = true
 
@@ -94,7 +94,7 @@ Forking advantages:
     mode (config.cache_classes = false).
 
 Threading advantages:
-  - less filling - threads take less resources... how much less?  it depends.   Some 
+  - less filling - threads take less resources... how much less?  it depends.   Some
     flavors of Unix are pretty efficient at forking so the threading advantage may not
     be as big as you think... but then again, maybe it's more than you think.  ;-)
   - debugging - you can set breakpoints in your threads
@@ -109,7 +109,7 @@ in rails for background processing.
 Further inspiration for the threading implementation came from Jonathon Rochkind's
 blog post on threading in rails.
     http://bibwild.wordpress.com/2007/08/28/threading-in-rails/
-    
+
 Also thanks to all who have helped debug problems and suggest improvements including:
   Ahmed Adam, Tristan Schneiter, Scott Haug, Andrew Garfield, Eugene Otto, Dan Sharp,
   Olivier Ruffin
diff --git a/vendor/plugins/spawn/lib/spawn.rb b/vendor/plugins/spawn/lib/spawn.rb
index 025d31d..1740115 100644
--- a/vendor/plugins/spawn/lib/spawn.rb
+++ b/vendor/plugins/spawn/lib/spawn.rb
@@ -55,7 +55,7 @@ def spawn(options = {})
       fork_it(options) { yield }
     end
   end
-  
+
   def wait(sids = [])
     # wait for all threads and/or forks (if a single sid passed in, convert to array first)
     Array(sids).each do |sid|
@@ -72,7 +72,7 @@ def wait(sids = [])
     # clean up connections from expired threads
     ActiveRecord::Base.verify_active_connections!()
   end
-  
+
   class SpawnId
     attr_accessor :type
     attr_accessor :handle