clearance 0.16.3 → 1.0.0.rc1

data/app/controllers/clearance/passwords_controller.rb

@@ -1,17 +1,12 @@
 class Clearance::PasswordsController < ApplicationController
   unloadable
 
-  skip_before_filter :authorize,           :only => [:new, :create, :edit, :update]
-  before_filter :forbid_missing_token,     :only => [:edit, :update]
+  skip_before_filter :authorize, :only => [:create, :edit, :new, :update]
+  before_filter :forbid_missing_token, :only => [:edit, :update]
   before_filter :forbid_non_existent_user, :only => [:edit, :update]
 
-  def new
-    render :template => 'passwords/new'
-  end
-
   def create
-    if user = Clearance.configuration.user_model.find_by_email(
-                   params[:password][:email])
+    if user = find_user_for_create
       user.forgot_password!
       ::ClearanceMailer.change_password(user).deliver
       render :template => 'passwords/create'
@@ -22,18 +17,20 @@ class Clearance::PasswordsController < ApplicationController
   end
 
   def edit
-    @user = Clearance.configuration.user_model.find_by_id_and_confirmation_token(
-                   params[:user_id], params[:token].to_s)
+    @user = find_user_for_edit
     render :template => 'passwords/edit'
   end
 
+  def new
+    render :template => 'passwords/new'
+  end
+
   def update
-    @user = Clearance.configuration.user_model.find_by_id_and_confirmation_token(
-                   params[:user_id], params[:token].to_s)
+    @user = find_user_for_update
 
-    if @user.update_password(params[:user][:password])
-      sign_in(@user)
-      redirect_to(url_after_update)
+    if @user.update_password params[:user][:password]
+      sign_in @user
+      redirect_to url_after_update
     else
       flash_failure_after_update
       render :template => 'passwords/edit'
@@ -42,39 +39,55 @@ class Clearance::PasswordsController < ApplicationController
 
   private
 
-  def forbid_missing_token
-    if params[:token].to_s.blank?
-      flash_failure_when_forbidden
-      render :template => 'passwords/new'
-    end
+  def find_user_by_id_and_confirmation_token
+    Clearance.configuration.user_model.
+      find_by_id_and_confirmation_token params[:user_id], params[:token].to_s
   end
 
-  def forbid_non_existent_user
-    unless Clearance.configuration.user_model.find_by_id_and_confirmation_token(
-                  params[:user_id], params[:token].to_s)
-      flash_failure_when_forbidden
-      render :template => 'passwords/new'
-    end
+  def find_user_for_create
+    Clearance.configuration.user_model.find_by_email params[:password][:email]
+  end
+
+  def find_user_for_edit
+    find_user_by_id_and_confirmation_token
+  end
+
+  def find_user_for_update
+    find_user_by_id_and_confirmation_token
   end
 
   def flash_failure_when_forbidden
     flash.now[:notice] = translate(:forbidden,
-      :scope   => [:clearance, :controllers, :passwords],
-      :default => "Please double check the URL or try submitting the form again.")
+      :scope => [:clearance, :controllers, :passwords],
+      :default => 'Please double check the URL or try submitting the form again.')
   end
 
   def flash_failure_after_create
     flash.now[:notice] = translate(:unknown_email,
-      :scope   => [:clearance, :controllers, :passwords],
-      :default => "Unknown email.")
+      :scope => [:clearance, :controllers, :passwords],
+      :default => 'Unknown email.')
   end
 
   def flash_failure_after_update
     flash.now[:notice] = translate(:blank_password,
-      :scope   => [:clearance, :controllers, :passwords],
+      :scope => [:clearance, :controllers, :passwords],
       :default => "Password can't be blank.")
   end
 
+  def forbid_missing_token
+    if params[:token].to_s.blank?
+      flash_failure_when_forbidden
+      render :template => 'passwords/new'
+    end
+  end
+
+  def forbid_non_existent_user
+    unless find_user_by_id_and_confirmation_token
+      flash_failure_when_forbidden
+      render :template => 'passwords/new'
+    end
+  end
+
   def url_after_create
     sign_in_url
   end

data/app/controllers/clearance/sessions_controller.rb

@@ -1,35 +1,36 @@
 class Clearance::SessionsController < ApplicationController
   unloadable
 
-  skip_before_filter :authorize, :only => [:new, :create, :destroy]
+  skip_before_filter :authorize, :only => [:create, :new, :destroy]
   protect_from_forgery :except => :create
 
-  def new
-    render :template => 'sessions/new'
-  end
-
   def create
     @user = authenticate(params)
+
     if @user.nil?
       flash_failure_after_create
       render :template => 'sessions/new', :status => :unauthorized
     else
-      sign_in(@user)
-      redirect_back_or(url_after_create)
+      sign_in @user
+      redirect_back_or url_after_create
     end
   end
 
   def destroy
     sign_out
-    redirect_to(url_after_destroy)
+    redirect_to url_after_destroy
+  end
+
+  def new
+    render :template => 'sessions/new'
   end
 
   private
 
   def flash_failure_after_create
     flash.now[:notice] = translate(:bad_email_or_password,
-      :scope   => [:clearance, :controllers, :sessions],
-      :default => "Bad email or password.")
+      :scope => [:clearance, :controllers, :sessions],
+      :default => %{Bad email or password. Are you trying to register a new account? <a href="#{sign_up_path}">Sign up</a>.}.html_safe)
   end
 
   def url_after_create

data/app/controllers/clearance/users_controller.rb

@@ -1,8 +1,8 @@
 class Clearance::UsersController < ApplicationController
   unloadable
 
-  skip_before_filter :authorize,   :only => [:new, :create]
-  before_filter :redirect_to_root, :only => [:new, :create], :if => :signed_in?
+  skip_before_filter :authorize, :only => [:create, :new]
+  before_filter :redirect_to_root, :only => [:create, :new], :if => :signed_in?
 
   def new
     @user = user_from_params
@@ -11,30 +11,26 @@ class Clearance::UsersController < ApplicationController
 
   def create
     @user = user_from_params
+
     if @user.save
-      sign_in(@user)
-      redirect_back_or(url_after_create)
+      sign_in @user
+      redirect_back_or url_after_create
     else
-      flash_failure_after_create
       render :template => 'users/new'
     end
   end
 
   private
 
-  def flash_failure_after_create
-    flash.now[:notice] = translate(:bad_email_or_password,
-      :scope   => [:clearance, :controllers, :passwords],
-      :default => "Must be a valid email address. Password can't be blank.")
-  end
-
   def url_after_create
     '/'
   end
 
   def user_from_params
     user_params = params[:user] || Hash.new
-    email, password = user_params.delete(:email), user_params.delete(:password)
+    email = user_params.delete(:email)
+    password = user_params.delete(:password)
+
     Clearance.configuration.user_model.new(user_params).tap do |user|
       user.email = email
       user.password = password

data/app/mailers/clearance_mailer.rb

@@ -1,10 +1,9 @@
 class ClearanceMailer < ActionMailer::Base
   def change_password(user)
     @user = user
-    mail :from    => Clearance.configuration.mailer_sender,
-         :to      => @user.email,
-         :subject => I18n.t(:change_password,
-                           :scope   => [:clearance, :models, :clearance_mailer],
-                           :default => "Change your password")
+    mail :from => Clearance.configuration.mailer_sender, :to => @user.email,
+      :subject => I18n.t(:change_password,
+         :scope => [:clearance, :models, :clearance_mailer],
+         :default => 'Change your password')
   end
 end

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

@@ -1,7 +1,5 @@
-Someone, hopefully you, has requested that we send you a link to change your password.
-
-Here's the link:
+Someone, hopefully you, requested we send you a link to change your password:
 
 <%= edit_user_password_url(@user, :token => @user.confirmation_token.html_safe) %>
 
-If you didn't request this, ignore this email. Don't worry. Your password hasn't been changed.
+If you didn't request this, ignore this email. Your password hasn't been changed.

data/app/views/layouts/application.html.erb

@@ -5,18 +5,20 @@
   <%= csrf_meta_tag %>
 </head>
 <body>
-  <div id="header">
+  <div id='header'>
     <% if signed_in? -%>
-      <%= link_to "Sign out", sign_out_path, :method => :delete %>
+      <%= link_to 'Sign out', sign_out_path, :method => :delete %>
     <% else -%>
-      <%= link_to "Sign in", sign_in_path %>
+      <%= link_to 'Sign in', sign_in_path %>
     <% end -%>
   </div>
-  <div id="flash">
+
+  <div id='flash'>
     <% flash.each do |key, value| -%>
-      <div id="flash_<%= key %>"><%=h value %></div>
+      <div id='flash_<%= key %>'><%=h value %></div>
     <% end %>
   </div>
+
   <%= yield %>
 </body>
 </html>

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

@@ -4,14 +4,15 @@
   Your password has been reset. Choose a new password below.
 </p>
 
-<%= form_for(:user,
-             :url  => user_password_path(@user, :token => @user.confirmation_token),
-             :html => { :method => :put }) do |form| %>
-  <div class="password_field">
-    <%= form.label :password, "Choose password" %>
+<%= form_for :user,
+      :url => user_password_path(@user, :token => @user.confirmation_token),
+      :html => { :method => :put } do |form| %>
+  <div class='password_field'>
+    <%= form.label :password, 'Choose password' %>
     <%= form.password_field :password %>
   </div>
-  <div class="submit_field">
-    <%= form.submit "Save this password" %>
+
+  <div class='submit_field'>
+    <%= form.submit 'Save this password' %>
   </div>
 <% end %>

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

@@ -5,11 +5,12 @@
 </p>
 
 <%= form_for :password, :url => passwords_path do |form| %>
-  <div class="text_field">
-    <%= form.label :email, "Email address" %>
-    <%= form.text_field :email, :type => "email" %>
+  <div class='text_field'>
+    <%= form.label :email, 'Email address' %>
+    <%= form.text_field :email, :type => 'email' %>
   </div>
-  <div class="submit_field">
-    <%= form.submit "Reset password" %>
+
+  <div class='submit_field'>
+    <%= form.submit 'Reset password' %>
   </div>
 <% end %>

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

@@ -1,13 +1,15 @@
 <%= form_for :session, :url => session_path do |form| %>
-  <div class="text_field">
+  <div class='text_field'>
     <%= form.label :email %>
-    <%= form.text_field :email, :type => "email" %>
+    <%= form.text_field :email, :type => 'email' %>
   </div>
-  <div class="text_field">
+
+  <div class='text_field'>
     <%= form.label :password %>
     <%= form.password_field :password %>
   </div>
-  <div class="submit_field">
-    <%= form.submit "Sign in" %>
+
+  <div class='submit_field'>
+    <%= form.submit 'Sign in' %>
   </div>
 <% end %>

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

@@ -4,9 +4,10 @@
 
 <ul>
   <li>
-    <%= link_to "Sign up", sign_up_path %>
+    <%= link_to 'Sign up', sign_up_path %>
   </li>
+
   <li>
-    <%= link_to "Forgot password?", new_password_path %>
+    <%= link_to 'Forgot password?', new_password_path %>
   </li>
 </ul>

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

@@ -1,8 +1,9 @@
-<div class="text_field">
+<div class='text_field'>
   <%= form.label :email %>
-  <%= form.text_field :email, :type => "email" %>
+  <%= form.text_field :email, :type => 'email' %>
 </div>
-<div class="password_field">
+
+<div class='password_field'>
   <%= form.label :password %>
   <%= form.password_field :password %>
 </div>

data/clearance.gemspec

@@ -3,36 +3,38 @@ require 'clearance/version'
 require 'date'
 
 Gem::Specification.new do |s|
-  s.name     = %q{clearance}
-  s.version  = Clearance::VERSION
-  s.email    = %q{support@thoughtbot.com}
+  s.name = %q{clearance}
+  s.version = Clearance::VERSION
+  s.authors = [
+    'Dan Croak', 'Mike Burns', 'Jason Morrison', 'Joe Ferris', 'Eugene Bolshakov',
+    'Nick Quaranto', 'Josh Nichols', 'Mike Breen', 'Jon Yurek', 'Chad Pytel'
+  ]
+  s.email = %q{support@thoughtbot.com}
   s.homepage = %q{http://github.com/thoughtbot/clearance}
-
-  s.authors = ["Dan Croak", "Mike Burns", "Jason Morrison", "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto", "Josh Nichols", "Mike Breen", "Jon Yurek", "Chad Pytel"]
-  s.date        = Date.today.to_s
-  s.summary     = %q{Rails authentication & authorization with email & password.}
+  s.summary = %q{Rails authentication & authorization with email & password.}
   s.description = %q{Rails authentication & authorization with email & password.}
-  s.extra_rdoc_files = %w(LICENSE README.md)
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,features}/*`.split("\n")
 
-  s.rdoc_options     = ["--charset=UTF-8"]
-  s.require_paths    = ["lib"]
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {features,spec}/*`.split("\n")
+  s.extra_rdoc_files = %w(LICENSE README.md)
+  s.rdoc_options = ['--charset=UTF-8']
+  s.require_paths = ['lib']
 
-  s.add_dependency('rails',  '>= 3.0')
-  s.add_dependency('diesel', '~> 0.1.5')
+  s.required_ruby_version = Gem::Requirement.new('>= 1.9.2')
 
-  s.add_development_dependency('bundler',        '~> 1.1.0')
-  s.add_development_dependency('appraisal',      '~> 0.4.1')
-  s.add_development_dependency('cucumber-rails', '~> 1.1.1')
-  s.add_development_dependency('rspec-rails',    '~> 2.9.0')
-  s.add_development_dependency('sqlite3')
-  s.add_development_dependency('bourne', '~> 1.1.2')
-  s.add_development_dependency('timecop')
-  s.add_development_dependency('capybara', '~> 1.1.2')
-  s.add_development_dependency('factory_girl_rails', '~> 3.1.0')
-  s.add_development_dependency('shoulda-matchers', '~> 1.1.0')
-  s.add_development_dependency('database_cleaner')
-  s.add_development_dependency('launchy')
-  s.add_development_dependency('aruba', '~> 0.4.11')
+  s.add_dependency 'bcrypt-ruby'
+  s.add_dependency 'diesel', '0.1.5'
+  s.add_dependency 'rails', '>= 3.0'
+  s.add_development_dependency 'appraisal', '0.4.1'
+  s.add_development_dependency 'aruba', '0.4.11'
+  s.add_development_dependency 'bourne', '1.1.2'
+  s.add_development_dependency 'bundler', '1.1.3'
+  s.add_development_dependency 'capybara', '1.1.2'
+  s.add_development_dependency 'cucumber-rails', '1.1.1'
+  s.add_development_dependency 'database_cleaner', '0.8.0'
+  s.add_development_dependency 'factory_girl_rails', '3.5.0'
+  s.add_development_dependency 'rspec-rails', '2.11.0'
+  s.add_development_dependency 'shoulda-matchers', '1.2.0'
+  s.add_development_dependency 'sqlite3', '1.3.6'
+  s.add_development_dependency 'timecop', '0.3.5'
 end

data/config/routes.rb

@@ -1,19 +1,16 @@
 Rails.application.routes.draw do
-  resources :passwords,
-    :controller => 'clearance/passwords',
-    :only       => [:new, :create]
+  resources :passwords, :controller => 'clearance/passwords',
+    :only => [:create, :new]
 
-  resource  :session,
-    :controller => 'clearance/sessions',
-    :only       => [:new, :create, :destroy]
+  resource  :session, :controller => 'clearance/sessions',
+    :only => [:create, :new, :destroy]
 
-  resources :users, :controller => 'clearance/users', :only => [:new, :create] do
-    resource :password,
-      :controller => 'clearance/passwords',
-      :only       => [:create, :edit, :update]
+  resources :users, :controller => 'clearance/users', :only => [:create, :new] do
+    resource :password, :controller => 'clearance/passwords',
+      :only => [:create, :edit, :update]
   end
 
-  match 'sign_up'  => 'clearance/users#new', :as => 'sign_up'
-  match 'sign_in'  => 'clearance/sessions#new', :as => 'sign_in'
-  match 'sign_out' => 'clearance/sessions#destroy', :via => :delete, :as => 'sign_out'
+  match 'sign_in' => 'clearance/sessions#new', :as => 'sign_in'
+  match 'sign_out' => 'clearance/sessions#destroy', :as => 'sign_out', :via => :delete
+  match 'sign_up' => 'clearance/users#new', :as => 'sign_up'
 end