vita-clearance 0.6.3.1 → 0.6.9

data/CHANGELOG.textile

@@ -1,3 +1,47 @@
+h2. 0.6.9 (07/22/2009)
+
+* Added i18n support for views. (Vit Krchov)
+
+h2. 0.6.9 (07/04/2009)
+
+* Added timestamps to create users migration. (Dan Croak)
+* Ready for Ruby 1.9. (Jason Morrison, Nick Quaranto)
+
+h2. 0.6.8 (06/24/2009)
+
+* Added defined? checks for various Rails constants such as ActionController
+for easier unit testing of Clearance extensions... particularly ActiveRecord
+extensions... particularly strong_password. (Dan Croak)
+
+h2. 0.6.7 (06/13/2009)
+
+* [#30] Added sign_up, sign_in, sign_out named routes. (Dan Croak)
+* [#22] Minimizing Reek smell: Duplication in redirect_back_or. (Dan Croak)
+* Deprecated sign_user_in. Told developers to use sign_in instead. (Dan
+Croak)
+* [#16] flash_success_after_create, flash_notice_after_create, flash_failure_after_create, flash_sucess_after_update, flash_success_after_destroy, etc. (Dan Croak)
+* [#17] bug. added #create to forbidden before_filters on confirmations controller. (Dan Croak)
+* [#24] should_be_signed_in_as shouldn't look in the session. (Dan Croak)
+* README improvements. (Dan Croak)
+* Move routes loading to separate file. (Joshua Clayton)
+
+h2. 0.6.6 (05/18/2009)
+
+* [#14] replaced class_eval in Clearance::User with modules. This was needed
+in a thoughtbot client app so we could write our own validations. (Dan Croak)
+
+h2. 0.6.5 (05/17/2009)
+
+* [#6] Make Clearance i18n aware. (Timur Vafin, Marcel Goerner, Eugene Bolshakov, Dan Croak)
+
+h2. 0.6.4 (05/12/2009)
+
+* Moved issue tracking to Github from Lighthouse. (Dan Croak)
+* [#7] asking higher-level questions of controllers in webrat steps, such as signed_in? instead of what's in the session. same for accessors. (Dan Croak)
+* [#11] replacing sign_in_as & sign_out shoulda macros with a stubbing (requires no dependency) approach. this will avoid dealing with the internals of current_user, such as session & cookies. added sign_in macro which signs in an email confirmed user from clearance's factories. (Dan Croak)
+* [#13] move private methods on sessions controller into Clearance::Authentication module (Dan Croak)
+* [#9] audited flash keys. (Dan Croak)
+
 h2. 0.6.3 (04/23/2009)
 
 * Scoping ClearanceMailer properly within controllers so it works in production environments. (Nick Quaranto)

data/README.textile

@@ -1,5 +1,77 @@
-h1. Vita's Clearance 0.6.3 fork
+h1. Vita's Clearance fork
 
-Added i18n support.
+This is fork of "Clearance":http://github.com/thoughtbot/clearance/tree/master. Added i18n support for views.
 
-"Original Clearance":http://github.com/thoughtbot/clearance/tree/master
+h2. Example locals for clearance
+
+<pre>
+{
+  :'cz' => {
+      :activerecord => {
+        :models => {
+          :user => 'Uživatel'
+      },
+      :attributes => {
+        :user => {
+          :password => 'Heslo',
+          :password_confirmation => 'Potvrzení hesla'
+        }
+      }
+    }
+    :clearance => {
+      :views => {
+        :mailer => {
+          :change_password => {
+            :header => "Pod Vaším e-mailem byla zaregistrována žádost o změnu přístupového hesla pro Váš účet. Zasíláme Vám odkaz, na kterém mužete heslo změnit.",
+            :footer => "Pokud tato žádost není od Vás, tak můžete e-mail ignorovat, heslo nebude změněno."
+          }
+        },
+        :passwords => {
+          :change_password => 'Změna hesla',
+          :change_password_information => 'Vaše staré heslo bude smazáno. Zvolte si nové.',
+          :new_password_information => 'Zadejte e-mailovou adresu, na kterou Vám pošleme e-mail s odkazem na změnu hesla.'
+        },
+        :sessions => {
+          :sign_in => 'Přihlášení',
+          :sign_up => 'Zaregistrovat',
+          :forgot_password => 'Zapomenuté heslo?',
+          :remember_me => 'Zapamatovat si mě'
+        },
+        :users => {
+          :sign_up => 'Registrace'
+        },
+        :buttons => {
+          :save_this_password => 'Ulož heslo',
+          :reset_password => 'Resetovat heslo',
+          :sign_up => 'Zaregistrovat se',
+          :please_wait => 'Počkejte prosím ...'
+        }
+      },
+      :models => {
+        :clearance_mailer => {
+          :confirmation => "Ověření e-mailové adresy.",
+          :change_password => "Změna hesla"
+        }
+      },
+      :controllers => {
+        :confirmations => {
+          :confirmed_email => "Email ověřen. Byl jste úspěšně přihlášen."
+        },
+        :passwords => {
+          :deliver_change_password => "Během následujících minut Vám bude doručen e-mail s instrukcema pro změnu hesla.",
+          :unknown_email => "Neznámý e-mail."
+        },
+        :sessions => {
+          :bad_email_or_password => "Chybný e-mail nebo heslo.",
+          :signed_in => "Úspěšně přihlášen.",
+          :unconfirmed_email => "Nemáte ověřenout e-mailovou adresu. Při registraci Vám byl zaslán e-mail s instrukcema pro ověření.",
+          :signed_out => "Úspěšně odhlášen."
+        },
+        :users => {
+          :deliver_confirmation => "Během následujících minut Vám bude doručen e-mail s instrukcema pro ověření účtu."
+        }
+      }
+    }
+  }
+}
+</pre>

data/Rakefile

@@ -1,19 +1,21 @@
+# encoding: utf-8
+
 require 'rake'
 require 'rake/testtask'
 require 'cucumber/rake/task'
 
 namespace :test do
-  Rake::TestTask.new(:all => ['generator:cleanup', 
-                              'generator:generate']) do |task|
-    task.libs << 'lib'
+  Rake::TestTask.new(:all => ["generator:cleanup",
+                              "generator:generate"]) do |task|
+    task.libs << "lib"
     task.libs << "test"
-    task.pattern = 'test/**/*_test.rb'
+    task.pattern = "test/**/*_test.rb"
     task.verbose = false
   end
 
   Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = "--format progress"
-    t.feature_pattern = 'test/rails_root/features/*.feature'
+    t.cucumber_opts   = "--format progress"
+    t.feature_pattern = "test/rails_root/features/*.feature"
   end
 end
 
@@ -51,8 +53,8 @@ task :default => ['test:all', 'test:features']
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name        = "clearance"
-  gem_spec.version     = "0.6.3"
-  gem_spec.summary     = "Rails authentication with email & password."
+  gem_spec.version     = "0.6.9"
+  gem_spec.summary     = "Rails authentication with email & password. Fork with i18n support for views."
   gem_spec.email       = "support@thoughtbot.com"
   gem_spec.homepage    = "http://github.com/thoughtbot/clearance"
   gem_spec.description = "Rails authentication with email & password."
@@ -71,3 +73,4 @@ task :gemspec do
     f.write gem_spec.to_yaml
   end
 end
+

data/app/controllers/clearance/confirmations_controller.rb

@@ -1,9 +1,9 @@
 class Clearance::ConfirmationsController < ApplicationController
   unloadable
 
-  before_filter :forbid_confirmed_user,    :only => :new
-  before_filter :forbid_missing_token,     :only => :new
-  before_filter :forbid_non_existent_user, :only => :new
+  before_filter :forbid_confirmed_user,    :only => [:new, :create]
+  before_filter :forbid_missing_token,     :only => [:new, :create]
+  before_filter :forbid_non_existent_user, :only => [:new, :create]
   filter_parameter_logging :token
 
   def new
@@ -14,9 +14,9 @@ class Clearance::ConfirmationsController < ApplicationController
     @user = ::User.find_by_id_and_token(params[:user_id], params[:token])
     @user.confirm_email!
 
-    sign_user_in(@user)
-    flash[:success] = t(:confirmed, :scope => [:clearance, :controllers, :confirmations], :default => "Confirmed email and signed in.")
-    redirect_to url_after_create
+    sign_in(@user)
+    flash_success_after_create
+    redirect_to(url_after_create)
   end
 
   private
@@ -40,8 +40,13 @@ class Clearance::ConfirmationsController < ApplicationController
     end
   end
 
+  def flash_success_after_create
+    flash[:success] = translate(:confirmed_email,
+      :scope   => [:clearance, :controllers, :confirmations],
+      :default => "Confirmed email and signed in.")
+  end
+
   def url_after_create
     root_url
   end
-
 end

data/app/controllers/clearance/passwords_controller.rb

@@ -13,10 +13,10 @@ class Clearance::PasswordsController < ApplicationController
     if user = ::User.find_by_email(params[:password][:email])
       user.forgot_password!
       ::ClearanceMailer.deliver_change_password user
-      flash[:notice] = t(:deliver_change_password, :scope => [:clearance, :controllers, :passwords], :default => "You will receive an email within the next few minutes. It contains instructions for changing your password.")
-      redirect_to url_after_create
+      flash_notice_after_create
+      redirect_to(url_after_create)
     else
-      flash.now[:notice] = t(:unknown_email, :scope => [:clearance, :controllers, :passwords], :default => "Unknown email")
+      flash_failure_after_create
       render :template => 'passwords/new'
     end
   end
@@ -29,11 +29,12 @@ class Clearance::PasswordsController < ApplicationController
   def update
     @user = ::User.find_by_id_and_token(params[:user_id], params[:token])
 
-    if @user.update_password(params[:user][:password], 
+    if @user.update_password(params[:user][:password],
                              params[:user][:password_confirmation])
-      @user.confirm_email! unless @user.email_confirmed?
-      sign_user_in(@user)
-      redirect_to url_after_update
+      @user.confirm_email!
+      sign_in(@user)
+      flash_success_after_update
+      redirect_to(url_after_update)
     else
       render :template => 'passwords/edit'
     end
@@ -53,12 +54,28 @@ class Clearance::PasswordsController < ApplicationController
     end
   end
 
+  def flash_notice_after_create
+    flash[:notice] = translate(:deliver_change_password,
+      :scope   => [:clearance, :controllers, :passwords],
+      :default => "You will receive an email within the next few minutes. " <<
+                  "It contains instructions for changing your password.")
+  end
+
+  def flash_failure_after_create
+    flash.now[:failure] = translate(:unknown_email,
+      :scope   => [:clearance, :controllers, :passwords],
+      :default => "Unknown email.")
+  end
+
   def url_after_create
     new_session_url
   end
 
+  def flash_success_after_update
+    flash[:success] = translate(:signed_in, :default => "Signed in.")
+  end
+
   def url_after_update
     root_url
   end
-
 end

data/app/controllers/clearance/sessions_controller.rb

@@ -10,53 +10,58 @@ class Clearance::SessionsController < ApplicationController
 
   def create
     @user = ::User.authenticate(params[:session][:email],
-                              params[:session][:password])
+                                params[:session][:password])
     if @user.nil?
-      flash.now[:notice] = t(:unauthorized, :scope => [:clearance, :controllers, :sessions], :default => "Bad email or password.")
+      flash_failure_after_create
       render :template => 'sessions/new', :status => :unauthorized
     else
       if @user.email_confirmed?
+        sign_in(@user)
         remember(@user) if remember?
-        sign_user_in(@user)
-        flash[:notice] = t(:signed_in, :scope => [:clearance, :controllers, :sessions], :default => "Signed in successfully.")
-        redirect_back_or url_after_create
+        flash_success_after_create
+        redirect_back_or(url_after_create)
       else
         ::ClearanceMailer.deliver_confirmation(@user)
-        deny_access(t(:unconfirmed_email, :scope => [:clearance, :controllers, :sessions], :default => "User has not confirmed email. Confirmation email will be resent."))
+        flash_notice_after_create
+        redirect_to(new_session_url)
       end
     end
   end
 
   def destroy
     forget(current_user)
-    reset_session
-    flash[:notice] = t(:sign_out, :scope => [:clearance, :controllers, :sessions], :default => "You have been signed out.")
-    redirect_to url_after_destroy
+    flash_success_after_destroy
+    redirect_to(url_after_destroy)
   end
 
   private
 
-  def remember?
-    params[:session] && params[:session][:remember_me] == "1"
+  def flash_failure_after_create
+    flash.now[:failure] = translate(:bad_email_or_password,
+      :scope   => [:clearance, :controllers, :sessions],
+      :default => "Bad email or password.")
   end
 
-  def remember(user)
-    user.remember_me!
-    cookies[:remember_token] = { :value   => user.token,
-                                 :expires => user.token_expires_at }
+  def flash_success_after_create
+    flash[:success] = translate(:signed_in, :default =>  "Signed in.")
   end
 
-  def forget(user)
-    user.forget_me! if user
-    cookies.delete :remember_token
+  def flash_notice_after_create
+    flash[:notice] = translate(:unconfirmed_email,
+      :scope   => [:clearance, :controllers, :sessions],
+      :default => "User has not confirmed email. " <<
+                  "Confirmation email will be resent.")
   end
 
   def url_after_create
     root_url
   end
 
+  def flash_success_after_destroy
+    flash[:success] = translate(:signed_out, :default =>  "Signed out.")
+  end
+
   def url_after_destroy
     new_session_url
   end
-
 end

data/app/controllers/clearance/users_controller.rb

@@ -13,8 +13,8 @@ class Clearance::UsersController < ApplicationController
     @user = ::User.new params[:user]
     if @user.save
       ::ClearanceMailer.deliver_confirmation @user
-      flash[:notice] = t(:deliver_confirmation, :scope => [:clearance, :controllers, :users], :default => "You will receive an email within the next few minutes. It contains instructions for confirming your account.")
-      redirect_to url_after_create
+      flash_notice_after_create
+      redirect_to(url_after_create)
     else
       render :template => 'users/new'
     end
@@ -22,8 +22,14 @@ class Clearance::UsersController < ApplicationController
 
   private
 
+  def flash_notice_after_create
+    flash[:notice] = translate(:deliver_confirmation,
+      :scope   => [:clearance, :controllers, :users],
+      :default => "You will receive an email within the next few minutes. " <<
+                  "It contains instructions for confirming your account.")
+  end
+
   def url_after_create
     new_session_url
   end
-
 end

data/app/models/clearance_mailer.rb

@@ -5,14 +5,18 @@ class ClearanceMailer < ActionMailer::Base
   def change_password(user)
     from       DO_NOT_REPLY
     recipients user.email
-    subject    I18n.t(:change_password, :scope => [:clearance, :models, :clearance_mailer], :default => "Change your password")
+    subject    I18n.t(:change_password,
+                      :scope   => [:clearance, :models, :clearance_mailer],
+                      :default => "Change your password")
     body       :user => user
   end
 
   def confirmation(user)
     from       DO_NOT_REPLY
     recipients user.email
-    subject    I18n.t(:confirmation, :scope => [:clearance, :models, :clearance_mailer], :default => "Account confirmation")
+    subject    I18n.t(:confirmation,
+                      :scope   => [:clearance, :models, :clearance_mailer],
+                      :default => "Account confirmation")
     body      :user => user
   end
 

data/app/views/clearance_mailer/change_password.html.erb

@@ -1,7 +1,7 @@
-Someone, hopefully you, has requested that we send you a link to change your password.
-
-Here's the link:
+<%=t :header, :scope => [:clearance, :views, :mailer, :change_password],
+							:default => 'Someone, hopefully you, has requested that we send you a link to change your password.' %>
 
 <%= edit_user_password_url(@user, :token => @user.token, :escape => false) %>
 
-If you didn't request this, ignore this email. Don't worry. Your password hasn't been changed.
+<%=t :footer, :scope => [:clearance, :views, :mailer, :change_password],
+ 							:default => "If you didn't request this, ignore this email. Don't worry. Your password hasn't been changed." %>

data/app/views/passwords/edit.html.erb

@@ -1,7 +1,7 @@
-<h2>Change your password</h2>
+<h2><%= t :change_password, :scope => [:clearance, :views, :passwords], :default => 'Change your password' %></h2>
 
 <p>
-  Your password has been reset. Choose a new password below.
+  <%= t :change_password_information, :scope => [:clearance, :views, :passwords], :default => 'Your password has been reset. Choose a new password below.' %>
 </p>
 
 <%= error_messages_for :user %>
@@ -10,14 +10,15 @@
             :url => user_password_path(@user, :token    => @user.token),
             :html => { :method => :put }) do |form| %>
   <div class="password_field">
-    <%= form.label :password, "Choose password" %>
+    <%= form.label :password %>
     <%= form.password_field :password %>
   </div>
   <div class="password_field">
-    <%= form.label :password_confirmation, "Confirm password" %>
+    <%= form.label :password_confirmation %>
     <%= form.password_field :password_confirmation %>
   </div>
   <div class="submit_field">
-    <%= form.submit "Save this password", :disable_with => "Please wait..." %>
+    <%= form.submit t(:save_this_password, :scope => [:clearance, :views, :buttons], :default => "Save this password"),
+										:disable_with => t(:please_wait, :scope => [:clearance, :views, :buttons], :default => "Please wait...") %>
   </div>
 <% end %>

data/app/views/passwords/new.html.erb

@@ -1,15 +1,16 @@
-<h2>Change your password</h2>
+<h2><%= t :change_password, :scope => [:clearance, :views, :passwords], :default => 'Change your password' %></h2>
 
 <p>
-  We will email you a link to change your password.
+  <%= t :new_password_information, :scope => [:clearance, :views, :passwords], :defualt => 'We will email you a link to change your password.' %>
 </p>
 
 <% form_for :password, :url => passwords_path do |form| %>
   <div class="text_field">
-    <%= form.label :email, "Email address" %>
+    <%= form.label :email %>
     <%= form.text_field :email %>
   </div>
   <div class="submit_field">
-    <%= form.submit "Reset password", :disable_with => "Please wait..." %>
+    <%= form.submit t(:reset_password, :scope => [:clearance, :views, :buttons], :defaul => 'Reset password'),
+										:disable_with => t(:please_wait, :scope => [:clearance, :views, :buttons], :default => "Please wait...") %>
   </div>
 <% end %>

data/app/views/sessions/new.html.erb

@@ -1,4 +1,4 @@
-<h2>Sign in</h2>
+<h2><%= t :sign_in, :scope => [:clearance, :views, :sessions], :default => 'Sign in' %></h2>
 
 <% form_for :session, :url => session_path do |form| %>
   <div class="text_field">
@@ -11,18 +11,19 @@
   </div>
   <div class="text_field">
     <%= form.check_box :remember_me %>
-    <%= form.label :remember_me %>
+    <%= form.label :remember_me, t(:remember_me, :scope => [:clearance, :views, :sessions], :default => 'Remember me') %>
   </div>
   <div class="submit_field">
-    <%= form.submit "Sign in", :disable_with => "Please wait..." %>
+    <%= form.submit t(:sing_in, :scope => [:clearance, :views, :buttons], :default => 'Sign in'),
+										:disable_with => t(:please_wait, :scope => [:clearance, :views, :buttons], :default => "Please wait...") %>
   </div>
 <% end %>
 
 <ul>
   <li>
-    <%= link_to "Sign up", new_user_path %>
+    <%= link_to t(:sign_up, :scope => [:clearance, :views, :sessions], :default => 'Sign up'), new_user_path %>
   </li>
   <li>
-    <%= link_to "Forgot password?", new_password_path %>
+    <%= link_to t(:forgot_password, :scope => [:clearance, :views, :sessions], :default => 'Forgot password?'), new_password_path %>
   </li>
 </ul>

data/app/views/users/_form.html.erb

@@ -8,6 +8,6 @@
   <%= form.password_field :password %>
 </div>
 <div class="password_field">
-  <%= form.label :password_confirmation, "Confirm password" %>
+  <%= form.label :password_confirmation %>
   <%= form.password_field :password_confirmation %>
 </div>

data/app/views/users/new.html.erb

@@ -1,6 +1,7 @@
-<h2>Sign up</h2>
+<h2><%= t :sign_up, :scope => [:clearance, :views, :users], :default => 'Sign up' %></h2>
 
 <% form_for @user do |form| %>
   <%= render :partial => '/users/form', :object => form %>
-  <%= form.submit 'Sign up', :disable_with => 'Please wait...' %>
+  <%= form.submit t(:sign_up, :scope => [:clearance, :views, :buttons], :default => 'Sign up'),
+									:disable_with => t(:please_wait, :scope => [:clearance, :views, :buttons], :default => "Please wait...") %>
 <% end %>

data/config/clearance_routes.rb

@@ -1,19 +1,30 @@
 ActionController::Routing::Routes.draw do |map|
   map.resources :passwords,
     :controller => 'clearance/passwords',
-    :only => [:new, :create]
+    :only       => [:new, :create]
 
   map.resource  :session,
     :controller => 'clearance/sessions',
-    :only => [:new, :create, :destroy]
+    :only       => [:new, :create, :destroy]
 
   map.resources :users, :controller => 'clearance/users' do |users|
     users.resource :password,
       :controller => 'clearance/passwords',
-      :only => [:create, :edit, :update]
+      :only       => [:create, :edit, :update]
 
     users.resource :confirmation,
       :controller => 'clearance/confirmations',
-      :only => [:new, :create]
+      :only       => [:new, :create]
   end
+
+  map.sign_up  'sign_up',
+    :controller => 'clearance/users',
+    :action     => 'new'
+  map.sign_in  'sign_in',
+    :controller => 'clearance/sessions',
+    :action     => 'new'
+  map.sign_out 'sign_out',
+    :controller => 'clearance/sessions',
+    :action     => 'destroy',
+    :method     => :delete
 end

data/generators/clearance/lib/insert_commands.rb

@@ -7,40 +7,6 @@ Rails::Generator::Commands::Base.class_eval do
 end
 
 Rails::Generator::Commands::Create.class_eval do
-
-  def route_resources(resource_list)
-    sentinel = 'ActionController::Routing::Routes.draw do |map|'
-    
-    logger.route "map.resources #{resource_list}"
-    unless options[:pretend] || file_contains?('config/routes.rb', resource_list)
-      gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-        "#{match}\n  map.resources #{resource_list}"
-      end
-    end
-  end
-
-  def route_resource(resource_list)
-    sentinel = 'ActionController::Routing::Routes.draw do |map|'
-    
-    logger.route "map.resource #{resource_list}"
-    unless options[:pretend] || file_contains?('config/routes.rb', resource_list)
-      gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-        "#{match}\n  map.resource #{resource_list}"
-      end
-    end
-  end
-  
-  def route_name(name, path, route_options = {})
-    sentinel = 'ActionController::Routing::Routes.draw do |map|'
-    
-    logger.route "map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
-    unless options[:pretend] 
-      gsub_file_once 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-        "#{match}\n  map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
-      end
-    end
-  end
-  
   def insert_into(file, line)
     logger.insert "#{line} into #{file}"
     unless options[:pretend] || file_contains?(file, line)
@@ -52,30 +18,6 @@ Rails::Generator::Commands::Create.class_eval do
 end
 
 Rails::Generator::Commands::Destroy.class_eval do
-  def route_resource(resource_list)
-    look_for = "  map.resource #{resource_list}\n".gsub(/[\[\]]/, '\\\\\0')
-    logger.route "map.resource #{resource_list} #{look_for}"
-    unless options[:pretend]
-      gsub_file 'config/routes.rb', /(#{look_for})/mi, ''
-    end
-  end
-  
-  def route_resources(resource_list)
-    look_for = "  map.resources #{resource_list}\n".gsub(/[\[\]]/, '\\\\\0')
-    logger.route "map.resources #{resource_list} #{look_for}"
-    unless options[:pretend]
-      gsub_file 'config/routes.rb', /(#{look_for})/mi, ''
-    end
-  end  
-  
-  def route_name(name, path, route_options = {})
-    look_for =   "\n  map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
-    logger.route "map.#{name} '#{path}',     :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
-    unless options[:pretend]
-      gsub_file    'config/routes.rb', /(#{look_for})/mi, ''
-    end
-  end
-  
   def insert_into(file, line)
     logger.remove "#{line} from #{file}"
     unless options[:pretend]
@@ -85,18 +27,6 @@ Rails::Generator::Commands::Destroy.class_eval do
 end
 
 Rails::Generator::Commands::List.class_eval do
-  def route_resource(resources_list)
-    logger.route "map.resource #{resource_list}"
-  end
-  
-  def route_resources(resources_list)
-    logger.route "map.resource #{resource_list}"
-  end  
-  
-  def route_name(name, path, options = {})
-    logger.route "map.#{name} '#{path}', :controller => '{options[:controller]}', :action => '#{options[:action]}'"
-  end
-  
   def insert_into(file, line)
     logger.insert "#{line} into #{file}"
   end

data/generators/clearance/templates/migrations/create_users.rb

@@ -7,14 +7,15 @@ class ClearanceCreateUsers < ActiveRecord::Migration
       t.string   :token,              :limit => 128
       t.datetime :token_expires_at
       t.boolean  :email_confirmed, :default => false, :null => false
+      t.timestamps
     end
 
     add_index :users, [:id, :token]
     add_index :users, :email
-    add_index :users, :token    
+    add_index :users, :token
   end
-  
+
   def self.down
-    drop_table :users  
+    drop_table :users
   end
 end

data/generators/clearance_features/templates/features/password_reset.feature

@@ -2,24 +2,24 @@ Feature: Password reset
   In order to sign in even if user forgot their password
   A user
   Should be able to reset it
-  
+
     Scenario: User is not signed up
       Given no user exists with an email of "email@person.com"
       When I request password reset link to be sent to "email@person.com"
       Then I should see "Unknown email"
-  
+
     Scenario: User is signed up and requests password reset
       Given I signed up with "email@person.com/password"
       When I request password reset link to be sent to "email@person.com"
       Then I should see "instructions for changing your password"
       And a password reset message should be sent to "email@person.com"
-    
+
     Scenario: User is signed up updated his password and types wrong confirmation
       Given I signed up with "email@person.com/password"
       When I follow the password reset link sent to "email@person.com"
       And I update my password with "newpassword/wrongconfirmation"
       Then I should see error messages
-      And I should not be signed in
+      And I should be signed out
 
     Scenario: User is signed up and updates his password
       Given I signed up with "email@person.com/password"
@@ -27,5 +27,7 @@ Feature: Password reset
       And I update my password with "newpassword/newpassword"
       Then I should be signed in
       When I sign out
+      Then I should be signed out
       And I sign in as "email@person.com/newpassword"
-      Then I should be signed in
+      Then I should be signed in
+

data/generators/clearance_features/templates/features/sign_in.feature

@@ -8,34 +8,35 @@ Feature: Sign in
       When I go to the sign in page
       And I sign in as "email@person.com/password"
       Then I should see "Bad email or password"
-      And I should not be signed in      
+      And I should be signed out
 
     Scenario: User is not confirmed
       Given I signed up with "email@person.com/password"
       When I go to the sign in page
       And I sign in as "email@person.com/password"
       Then I should see "User has not confirmed email"
-      And I should not be signed in
+      And I should be signed out
 
    Scenario: User enters wrong password
       Given I am signed up and confirmed as "email@person.com/password"
       When I go to the sign in page
       And I sign in as "email@person.com/wrongpassword"
       Then I should see "Bad email or password"
-      And I should not be signed in
+      And I should be signed out
 
    Scenario: User signs in successfully
       Given I am signed up and confirmed as "email@person.com/password"
       When I go to the sign in page
       And I sign in as "email@person.com/password"
-      Then I should see "Signed in successfully"
+      Then I should see "Signed in"
       And I should be signed in
 
    Scenario: User signs in and checks "remember me"
       Given I am signed up and confirmed as "email@person.com/password"
       When I go to the sign in page
       And I sign in with "remember me" as "email@person.com/password"
-      Then I should see "Signed in successfully"
-      And I should be signed in    
+      Then I should see "Signed in"
+      And I should be signed in
       When I return next time
       Then I should be signed in
+

data/generators/clearance_features/templates/features/sign_out.feature

@@ -2,21 +2,22 @@ Feature: Sign out
   To protect my account from unauthorized access
   A signed in user
   Should be able to sign out
-  
+
     Scenario: User signs out
       Given I am signed up and confirmed as "email@person.com/password"
       When I sign in as "email@person.com/password"
       Then I should be signed in
       And I sign out
-      Then I should see "You have been signed out"     
-      And I should not be signed in
-      
+      Then I should see "Signed out"
+      And I should be signed out
+
     Scenario: User who was remembered signs out
       Given I am signed up and confirmed as "email@person.com/password"
       When I sign in with "remember me" as "email@person.com/password"
       Then I should be signed in
       And I sign out
-      Then I should see "You have been signed out"     
-      And I should not be signed in
+      Then I should see "Signed out"
+      And I should be signed out
       When I return next time
-      Then I should not be signed in  
+      Then I should be signed out
+

data/generators/clearance_features/templates/features/sign_up.feature

@@ -2,7 +2,7 @@ Feature: Sign up
   In order to get access to protected sections of the site
   A user
   Should be able to sign up
-  
+
     Scenario: User signs up with invalid data
       When I go to the sign up page
       And I fill in "Email" with "invalidemail"
@@ -10,7 +10,7 @@ Feature: Sign up
       And I fill in "Confirm password" with ""
       And I press "Sign Up"
       Then I should see error messages
-      
+
     Scenario: User signs up with valid data
       When I go to the sign up page
       And I fill in "Email" with "email@person.com"
@@ -19,12 +19,10 @@ Feature: Sign up
       And I press "Sign Up"
       Then I should see "instructions for confirming"
       And a confirmation message should be sent to "email@person.com"
-      
+
     Scenario: User confirms his account
       Given I signed up with "email@person.com/password"
       When I follow the confirmation link sent to "email@person.com"
       Then I should see "Confirmed email and signed in"
-      And I should be signed in      
-      
-      
-      
+      And I should be signed in
+

data/generators/clearance_features/templates/features/step_definitions/clearance_steps.rb

@@ -11,15 +11,15 @@ Given /^no user exists with an email of "(.*)"$/ do |email|
 end
 
 Given /^I signed up with "(.*)\/(.*)"$/ do |email, password|
-  user = Factory :user, 
-    :email                 => email, 
+  user = Factory :user,
+    :email                 => email,
     :password              => password,
     :password_confirmation => password
 end 
 
 Given /^I am signed up and confirmed as "(.*)\/(.*)"$/ do |email, password|
   user = Factory :email_confirmed_user,
-    :email                 => email, 
+    :email                 => email,
     :password              => password,
     :password_confirmation => password
 end
@@ -27,15 +27,16 @@ end
 # Session
 
 Then /^I should be signed in$/ do
-  assert_not_nil request.session[:user_id]
+  assert controller.signed_in?
 end
 
-Then /^I should not be signed in$/ do
-  assert_nil request.session[:user_id]
+Then /^I should be signed out$/ do
+  assert ! controller.signed_in?
 end
 
 When /^session is cleared$/ do
-  request.session[:user_id] = nil
+  request.reset_session
+  controller.instance_variable_set(:@_current_user, nil)
 end
 
 # Emails
@@ -77,7 +78,6 @@ Then /^I should be forbidden$/ do
   assert_response :forbidden
 end
 
-
 # Actions
 
 When /^I sign in( with "remember me")? as "(.*)\/(.*)"$/ do |remember, email, password|

data/lib/clearance.rb

@@ -1,15 +1,6 @@
 require 'clearance/extensions/errors'
 require 'clearance/extensions/rescue'
+require 'clearance/extensions/routes'
 
 require 'clearance/authentication'
 require 'clearance/user'
-
-class ActionController::Routing::RouteSet
-  def load_routes_with_clearance!
-    clearance_routes = File.join(File.dirname(__FILE__), *%w[.. config clearance_routes.rb])
-    add_configuration_file(clearance_routes) unless configuration_files.include? clearance_routes
-    load_routes_without_clearance!
-  end
-
-  alias_method_chain :load_routes!, :clearance
-end

data/lib/clearance/authentication.rb

@@ -42,6 +42,7 @@ module Clearance
       end
 
       def sign_user_in(user)
+        warn "[DEPRECATION] sign_user_in: unnecessary. use sign_in(user) instead."
         sign_in(user)
       end
 
@@ -51,18 +52,37 @@ module Clearance
         end
       end
 
+      def remember?
+        params[:session] && params[:session][:remember_me] == "1"
+      end
+
+      def remember(user)
+        user.remember_me!
+        cookies[:remember_token] = { :value   => user.token,
+                                     :expires => user.token_expires_at }
+      end
+
+      def forget(user)
+        user.forget_me! if user
+        cookies.delete(:remember_token)
+        reset_session
+      end
+
       def redirect_back_or(default)
-        session[:return_to] ||= params[:return_to]
-        if session[:return_to]
-          redirect_to(session[:return_to])
-        else
-          redirect_to(default)
-        end
+        redirect_to(return_to || default)
+        clear_return_to
+      end
+
+      def return_to
+        session[:return_to] || params[:return_to]
+      end
+
+      def clear_return_to
         session[:return_to] = nil
       end
 
       def redirect_to_root
-        redirect_to root_url
+        redirect_to(root_url)
       end
 
       def store_location
@@ -72,7 +92,7 @@ module Clearance
       def deny_access(flash_message = nil, opts = {})
         store_location
         flash[:failure] = flash_message if flash_message
-        redirect_to new_session_url
+        redirect_to(new_session_url)
       end
     end
 

data/lib/clearance/extensions/errors.rb

@@ -1,4 +1,6 @@
-module ActionController
-  class Forbidden < StandardError
+if defined?(ActionController)
+  module ActionController
+    class Forbidden < StandardError
+    end
   end
 end

data/lib/clearance/extensions/rescue.rb

@@ -1 +1,3 @@
-ActionController::Base.rescue_responses.update('ActionController::Forbidden' => :forbidden)
+if defined?(ActionController::Base)
+  ActionController::Base.rescue_responses.update('ActionController::Forbidden' => :forbidden)
+end

data/lib/clearance/extensions/routes.rb

@@ -0,0 +1,14 @@
+if defined?(ActionController::Routing::RouteSet)
+  class ActionController::Routing::RouteSet
+    def load_routes_with_clearance!
+      lib_path = File.dirname(__FILE__)
+      clearance_routes = File.join(lib_path, *%w[.. .. .. config clearance_routes.rb])
+      unless configuration_files.include?(clearance_routes)
+        add_configuration_file(clearance_routes)
+      end
+      load_routes_without_clearance!
+    end
+
+    alias_method_chain :load_routes!, :clearance
+  end
+end

data/lib/clearance/user.rb

@@ -4,20 +4,49 @@ module Clearance
   module User
 
     def self.included(model)
-      model.extend ClassMethods
+      model.extend(ClassMethods)
+
       model.send(:include, InstanceMethods)
+      model.send(:include, AttrAccessible)
+      model.send(:include, AttrAccessor)
+      model.send(:include, Validations)
+      model.send(:include, Callbacks)
+    end
+
+    module AttrAccessible
+      def self.included(model)
+        model.class_eval do
+          attr_accessible :email, :password, :password_confirmation
+        end
+      end
+    end
+
+    module AttrAccessor
+      def self.included(model)
+        model.class_eval do
+          attr_accessor :password, :password_confirmation
+        end
+      end
+    end
 
-      model.class_eval do
-        attr_accessible :email, :password, :password_confirmation
-        attr_accessor :password, :password_confirmation
+    module Validations
+      def self.included(model)
+        model.class_eval do
+          validates_presence_of     :email
+          validates_uniqueness_of   :email, :case_sensitive => false
+          validates_format_of       :email, :with => %r{.+@.+\..+}
 
-        validates_presence_of     :email
-        validates_presence_of     :password, :if => :password_required?
-        validates_confirmation_of :password, :if => :password_required?
-        validates_uniqueness_of   :email, :case_sensitive => false
-        validates_format_of       :email, :with => %r{.+@.+\..+}
+          validates_presence_of     :password, :if => :password_required?
+          validates_confirmation_of :password, :if => :password_required?
+        end
+      end
+    end
 
-        before_save :initialize_salt, :encrypt_password, :initialize_token
+    module Callbacks
+      def self.included(model)
+        model.class_eval do
+          before_save :initialize_salt, :encrypt_password, :initialize_token
+        end
       end
     end
 

data/shoulda_macros/clearance.rb

@@ -8,12 +8,14 @@ module Clearance
         user = block.bind(self).call
         assert_not_nil user,
           "please pass a User. try: should_be_signed_in_as { @user }"
-        assert_equal user.id,   session[:user_id],
-          "session[:user_id] is not set to User's id"
+        assert_equal user, @controller.send(:current_user),
+          "#{user.inspect} is not the current_user, " <<
+          "which is #{@controller.send(:current_user).inspect}"
       end
     end
 
     def should_be_signed_in_and_email_confirmed_as(&block)
+      warn "[DEPRECATION] should_be_signed_in_and_email_confirmed_as: questionable usefulness"
       should_be_signed_in_as &block
 
       should "have confirmed email" do
@@ -31,10 +33,8 @@ module Clearance
       end
     end
 
-    # Examples:
-    #   should_deny_access_on :get, :index, :flash => /not authorized/i
-    #   should_deny_access_on :get, :show, :id => '1'
     def should_deny_access_on(http_method, action, opts = {})
+      warn "[DEPRECATION] should_deny_access_on: use a setup & should_deny_access(:flash => ?)"
       flash_message = opts.delete(:flash)
       context "on #{http_method} to #{action}" do
         setup do
@@ -68,6 +68,7 @@ module Clearance
     # CONTEXTS
 
     def signed_in_user_context(&blk)
+      warn "[DEPRECATION] signed_in_user_context: creates a Mystery Guest, causes Obscure Test"
       context "A signed in user" do
         setup do
           @user = Factory(:user)
@@ -79,6 +80,7 @@ module Clearance
     end
 
     def public_context(&blk)
+      warn "[DEPRECATION] public_context: common case is no-op. call sign_out otherwise"
       context "The public" do
         setup { sign_out }
         merge_block(&blk)
@@ -88,6 +90,7 @@ module Clearance
     # CREATING USERS
 
     def should_create_user_successfully
+      warn "[DEPRECATION] should_create_user_successfully: not meant to be public, no longer used internally"
       should_assign_to :user
       should_change 'User.count', :by => 1
 
@@ -132,6 +135,7 @@ module Clearance
     # VALIDATIONS
 
     def should_validate_confirmation_of(attribute, opts = {})
+      warn "[DEPRECATION] should_validate_confirmation_of: not meant to be public, no longer used internally"
       raise ArgumentError if opts[:factory].nil?
 
       context "on save" do
@@ -141,6 +145,7 @@ module Clearance
     end
 
     def should_validate_confirmation_is_not_blank(factory, attribute, opts = {})
+      warn "[DEPRECATION] should_validate_confirmation_is_not_blank: not meant to be public, no longer used internally"
       should "validate #{attribute}_confirmation is not blank" do
         model = Factory.build(factory, blank_confirmation_options(attribute))
         model.save
@@ -150,6 +155,7 @@ module Clearance
     end
 
     def should_validate_confirmation_is_not_bad(factory, attribute, opts = {})
+      warn "[DEPRECATION] should_validate_confirmation_is_not_bad: not meant to be public, no longer used internally"
       should "validate #{attribute}_confirmation is different than #{attribute}" do
         model = Factory.build(factory, bad_confirmation_options(attribute))
         model.save
@@ -161,6 +167,7 @@ module Clearance
     # FORMS
 
     def should_display_a_password_update_form
+      warn "[DEPRECATION] should_display_a_password_update_form: not meant to be public, no longer used internally"
       should "have a form for the user's token, password, and password confirm" do
         update_path = ERB::Util.h(
           user_password_path(@user, :token => @user.token)
@@ -175,6 +182,7 @@ module Clearance
     end
 
     def should_display_a_sign_up_form
+      warn "[DEPRECATION] should_display_a_sign_up_form: not meant to be public, no longer used internally"
       should "display a form to sign up" do
         assert_select "form[action=#{users_path}][method=post]",
         true, "There must be a form to sign up" do
@@ -191,6 +199,7 @@ module Clearance
     end
 
     def should_display_a_sign_in_form
+      warn "[DEPRECATION] should_display_a_sign_in_form: not meant to be public, no longer used internally"
       should 'display a "sign in" form' do
         assert_select "form[action=#{session_path}][method=post]",
           true, "There must be a form to sign in" do
@@ -211,30 +220,35 @@ end
 module Clearance
   module Shoulda
     module Helpers
-      def sign_in_as(user = nil)
-        unless user
-          user = Factory(:user)
-          user.confirm_email!
-        end
-        @request.session[:user_id] = user.id
+      def sign_in_as(user)
+        @controller.class_eval { attr_accessor :current_user }
+        @controller.current_user = user
         return user
       end
 
+      def sign_in
+        sign_in_as Factory(:email_confirmed_user)
+      end
+
       def sign_out
-        @request.session[:user_id] = nil
+        @controller.class_eval { attr_accessor :current_user }
+        @controller.current_user = nil
       end
 
       def blank_confirmation_options(attribute)
+        warn "[DEPRECATION] blank_confirmation_options: not meant to be public, no longer used internally"
         opts = { attribute => attribute.to_s }
         opts.merge("#{attribute}_confirmation".to_sym => "")
       end
 
       def bad_confirmation_options(attribute)
+        warn "[DEPRECATION] bad_confirmation_options: not meant to be public, no longer used internally"
         opts = { attribute => attribute.to_s }
         opts.merge("#{attribute}_confirmation".to_sym => "not_#{attribute}")
       end
 
       def assert_confirmation_error(model, attribute, message = "confirmation error")
+        warn "[DEPRECATION] assert_confirmation_error: not meant to be public, no longer used internally"
         assert model.errors.on(attribute).include?("doesn't match confirmation"),
           message
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vita-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.6.3.1
+  version: 0.6.9
 platform: ruby
 authors: 
 - Dan Croak
@@ -24,11 +24,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-22 21:00:00 -07:00
+date: 2009-07-21 21:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Vita's fork Clearance 0.6.3. Added i18n support.
+description: Rails authentication with email & password.
 email: support@thoughtbot.com
 executables: []
 
@@ -95,11 +95,12 @@ files:
 - lib/clearance/extensions
 - lib/clearance/extensions/errors.rb
 - lib/clearance/extensions/rescue.rb
+- lib/clearance/extensions/routes.rb
 - lib/clearance/user.rb
 - lib/clearance.rb
 - shoulda_macros/clearance.rb
 - rails/init.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/thoughtbot/clearance
 post_install_message: 
 rdoc_options: []
@@ -123,7 +124,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
-summary: Rails authentication with email & password.
+specification_version: 3
+summary: Rails authentication with email & password. Fork with i18n support for views.
 test_files: []