clearance 1.0.0.rc4 → 1.0.0.rc6

data/Rakefile

@@ -9,6 +9,9 @@ require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 require 'appraisal'
 
+require 'clearance/testing/application'
+Clearance::Testing::Application.load_tasks
+
 task :default do
   if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
     exec 'rake spec cucumber'

data/app/controllers/clearance/passwords_controller.rb

@@ -10,7 +10,7 @@ class Clearance::PasswordsController < ApplicationController
   def create
     if user = find_user_for_create
       user.forgot_password!
-      ::ClearanceMailer.change_password(user).deliver
+      deliver_email(user)
     end
     render :template => 'passwords/create'
   end
@@ -38,6 +38,10 @@ class Clearance::PasswordsController < ApplicationController
 
   private
 
+  def deliver_email(user)
+    ::ClearanceMailer.change_password(user).deliver
+  end
+
   def password_reset_params
     if params.has_key? :user
       ActiveSupport::Deprecation.warn %{Since locales functionality was added, accessing params[:user] is no longer supported.}
@@ -53,7 +57,7 @@ class Clearance::PasswordsController < ApplicationController
   end
 
   def find_user_for_create
-    Clearance.configuration.user_model.find_by_email params[:password][:email]
+    Clearance.configuration.user_model.find_by_normalized_email params[:password][:email]
   end
 
   def find_user_for_edit

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

@@ -1,5 +1,5 @@
-<%= t('.introduction_paragraph') %>
+<%= t('.opening') %>
 
 <%= edit_user_password_url(@user, :token => @user.confirmation_token.html_safe) %>
 
-<%= t('.ending_paragraph') %>
+<%= t('.closing') %>

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

@@ -1 +1,3 @@
-<p><%= t '.description' %></p>
+<div id="clearance" class="password-reset">
+  <p><%= t '.description' %></p>
+</div>

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

@@ -1,16 +1,18 @@
-<h2><%= t '.title' %></h2>
+<div id='clearance' class='password-reset'>
+  <h2><%= t '.title' %></h2>
 
-<p><%= t '.description' %></p>
+  <p><%= t '.description' %></p>
 
-<%= form_for :password_reset,
-      :url => user_password_path(@user, :token => @user.confirmation_token),
-      :html => { :method => :put } do |form| %>
-  <div class='password_field'>
-    <%= form.label :password %>
-    <%= form.password_field :password %>
-  </div>
+  <%= form_for :password_reset,
+        :url => user_password_path(@user, :token => @user.confirmation_token),
+        :html => { :method => :put } do |form| %>
+    <div class='password-field'>
+      <%= form.label :password %>
+      <%= form.password_field :password %>
+    </div>
 
-  <div class='submit_field'>
-    <%= form.submit %>
-  </div>
-<% end %>
+    <div class='submit-field'>
+      <%= form.submit %>
+    </div>
+  <% end %>
+</div>

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

@@ -1,14 +1,16 @@
-<h2><%= t '.title' %></h2>
+<div id='clearance' class='password-reset'>
+  <h2><%= t '.title' %></h2>
 
-<p><%= t '.description' %></p>
+  <p><%= t '.description' %></p>
 
-<%= form_for :password, :url => passwords_path do |form| %>
-  <div class='text_field'>
-    <%= form.label :email %>
-    <%= form.text_field :email, :type => 'email' %>
-  </div>
+  <%= form_for :password, :url => passwords_path do |form| %>
+    <div class='text-field'>
+      <%= form.label :email %>
+      <%= form.text_field :email, :type => 'email' %>
+    </div>
 
-  <div class='submit_field'>
-    <%= form.submit %>
-  </div>
-<% end %>
+    <div class='submit-field'>
+      <%= form.submit %>
+    </div>
+  <% end %>
+</div>

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

@@ -1,15 +1,20 @@
 <%= 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' %>
   </div>
 
-  <div class='text_field'>
+  <div class='password-field'>
     <%= form.label :password %>
     <%= form.password_field :password %>
   </div>
 
-  <div class='submit_field'>
+  <div class='submit-field'>
     <%= form.submit %>
   </div>
+
+  <div class='other-links'>
+    <%= link_to t('.sign_up'), sign_up_path %>
+    <%= link_to t('.forgot_password'), new_password_path %>
+  </div>
 <% end %>

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

@@ -1,13 +1,6 @@
-<h2><%= t '.title' %></h2>
+<div id='clearance' class='sign-in'>
+  <h2><%= t '.title' %></h2>
 
-<%= render :partial => '/sessions/form' %>
+  <%= render :partial => '/sessions/form' %>
 
-<ul>
-  <li>
-    <%= link_to t('.sign_up'), sign_up_path %>
-  </li>
-
-  <li>
-    <%= link_to t('.forgot_password'), new_password_path %>
-  </li>
-</ul>
+</div>

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

@@ -1,9 +1,9 @@
-<div class='text_field'>
+<div class='text-field'>
   <%= form.label :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/app/views/users/new.html.erb

@@ -1,6 +1,15 @@
-<h2>Sign up</h2>
+<div id='clearance' class='sign-up'>
+  <h2>Sign up</h2>
 
-<%= form_for @user do |form| %>
-  <%= render :partial => '/users/form', :object => form %>
-  <%= form.submit %>
-<% end %>
+  <%= form_for @user do |form| %>
+    <%= render :partial => '/users/form', :object => form %>
+
+    <div class='submit-field'>
+      <%= form.submit %>
+    </div>
+
+    <div class='other-links'>
+      <%= link_to t('.sign_in'), sign_in_path %>
+    </div>
+  <% end %>
+</div>

data/clearance.gemspec

@@ -23,16 +23,18 @@ Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new('>= 1.9.2')
 
   s.add_dependency 'bcrypt-ruby'
+  s.add_dependency 'email_validator'
   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.2.0'
+  s.add_development_dependency 'bourne', '1.3.0'
+  s.add_development_dependency 'bundler', '~> 1.1'
   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 'psych', '~> 1.3.4'
+  s.add_development_dependency 'rspec-rails', '2.12.2'
   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'

data/config/locales/clearance.en.yml

@@ -1,42 +1,72 @@
 en:
+  clearance_mailer:
+    change_password:
+      opening:
+        'Someone, hopefully you, requested we send you a link to change your
+         password:'
+      closing:
+        "If you didn't request this, ignore this email. Your password has not
+         been changed."
   flashes:
-    failure_when_forbidden: Please double check the URL or try submitting the form again.
-    failure_after_update: Password can't be blank.
-    failure_after_create: Bad email or password. Are you trying to register a new account? <a href="%{sign_up_path}">Sign up</a>.
+    failure_when_forbidden:
+      'Please double check the URL or try submitting the form again.'
+    failure_after_update:
+      "Password can't be blank."
+    failure_after_create:
+      'Bad email or password. Are you trying to register a new account?
+       <a href="%{sign_up_path}">Sign up</a>.'
   helpers:
     submit:
       password:
-        submit: Reset password
+        submit:
+          'Reset password'
       password_reset:
-        submit: Save this password
+        submit:
+          'Save this password'
       session:
-        submit: Sign in
+        submit:
+          'Sign in'
       user:
-        create: Sign up
+        create:
+          'Sign up'
     label:
       password:
-        email: Email address
+        email:
+          'Email address'
       password_reset:
-        password: Choose password
+        password:
+          'Choose password'
   layouts:
     application:
-      sign_in: Sign in
-      sign_out: Sign out
+      sign_in:
+        'Sign in'
+      sign_out:
+        'Sign out'
   passwords:
     create:
-      description: You will receive an email within the next few minutes. It contains instructions for changing your password.
+      description:
+        'You will receive an email within the next few minutes.
+         It contains instructions for changing your password.'
     edit:
-      title: Change your password
-      description: Your password has been reset. Choose a new password below.
+      description:
+        'Your password has been reset. Choose a new password below.'
+      title:
+        'Change your password'
     new:
-      title: Reset your password
-      description: We will email you a link to reset your password.
+      description:
+        'To be emailed a link to reset your password, please enter your email
+         address.'
+      title:
+        'Reset your password'
   sessions:
     new:
-      title: Sign in
-      sign_up: Sign up
-      forgot_password: Forgot password?
-  clearance_mailer:
-    change_password:
-      beginning_paragraph: 'Someone, hopefully you, requested we send you a link to change your password:'
-      ending_paragraph: If you didn't request this, ignore this email. Your password hasn't been changed.
+      forgot_password:
+        'Forgot password?'
+      sign_up:
+        'Sign up'
+      title:
+        'Sign in'
+  users:
+    new:
+      sign_in:
+        'Sign in'

data/config/routes.rb

@@ -15,7 +15,7 @@ Rails.application.routes.draw do
         :only => [:create, :edit, :update]
     end
 
-  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'
+  get '/sign_in' => 'clearance/sessions#new', :as => 'sign_in'
+  delete '/sign_out' => 'clearance/sessions#destroy', :as => 'sign_out'
+  get '/sign_up' => 'clearance/users#new', :as => 'sign_up'
 end

data/gemfiles/{3.0.17.gemfile → 3.0.20.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.0.17"
+gem "rails", "3.0.20"
 
 gemspec :path=>"../"

data/gemfiles/{3.0.17.gemfile.lock → 3.0.20.gemfile.lock}

@@ -1,20 +1,21 @@
 PATH
-  remote: /Users/harlow/Sites/clearance
+  remote: ../
   specs:
-    clearance (1.0.0.rc3)
+    clearance (1.0.0.rc5)
       bcrypt-ruby
+      email_validator
       rails (>= 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.17)
-      actionpack (= 3.0.17)
+    actionmailer (3.0.20)
+      actionpack (= 3.0.20)
       mail (~> 2.2.19)
-    actionpack (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -22,20 +23,19 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.17)
-      activesupport (= 3.0.17)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
-    activesupport (3.0.17)
-    addressable (2.3.2)
+    activeresource (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+    activesupport (3.0.20)
     appraisal (0.4.1)
       bundler
       rake
@@ -46,8 +46,8 @@ GEM
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
     bcrypt-ruby (3.0.1)
-    bourne (1.1.2)
-      mocha (= 0.10.5)
+    bourne (1.3.0)
+      mocha (= 0.13.0)
     builder (2.1.2)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -56,7 +56,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.3.5)
+    childprocess (0.3.7)
       ffi (~> 1.0, >= 1.0.6)
     cucumber (1.2.1)
       builder (>= 2.1.2)
@@ -69,6 +69,8 @@ GEM
       nokogiri (>= 1.5.0)
     database_cleaner (0.8.0)
     diff-lcs (1.1.3)
+    email_validator (1.3.0)
+      activemodel
     erubis (2.6.6)
       abstract (>= 1.0.0)
     factory_girl (3.5.0)
@@ -76,13 +78,11 @@ GEM
     factory_girl_rails (3.5.0)
       factory_girl (~> 3.5.0)
       railties (>= 3.0.0)
-    ffi (1.1.5)
-    gherkin (2.11.2)
+    ffi (1.3.1)
+    gherkin (2.11.5)
       json (>= 1.4.6)
     i18n (0.5.0)
-    json (1.7.5)
-    libwebsocket (0.1.5)
-      addressable
+    json (1.7.6)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -90,61 +90,65 @@ GEM
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     mime-types (1.19)
-    mocha (0.10.5)
+    mocha (0.13.0)
       metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
+    multi_json (1.5.0)
+    nokogiri (1.5.6)
     polyglot (0.3.3)
-    rack (1.2.5)
+    psych (1.3.4)
+    rack (1.2.7)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.17)
-      actionmailer (= 3.0.17)
-      actionpack (= 3.0.17)
-      activerecord (= 3.0.17)
-      activeresource (= 3.0.17)
-      activesupport (= 3.0.17)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
       bundler (~> 1.0)
-      railties (= 3.0.17)
-    railties (3.0.17)
-      actionpack (= 3.0.17)
-      activesupport (= 3.0.17)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    rspec-rails (2.11.0)
+    rspec-mocks (2.12.2)
+    rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.25.0)
+    selenium-webdriver (2.29.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+      websocket (~> 1.0.4)
     shoulda-matchers (1.2.0)
       activesupport (>= 3.0.0)
     sqlite3 (1.3.6)
     thor (0.14.6)
     timecop (0.3.5)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
+    websocket (1.0.7)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -154,15 +158,16 @@ PLATFORMS
 DEPENDENCIES
   appraisal (= 0.4.1)
   aruba (= 0.4.11)
-  bourne (= 1.1.2)
-  bundler (~> 1.2.0)
+  bourne (= 1.3.0)
+  bundler (~> 1.1)
   capybara (= 1.1.2)
   clearance!
   cucumber-rails (= 1.1.1)
   database_cleaner (= 0.8.0)
   factory_girl_rails (= 3.5.0)
-  rails (= 3.0.17)
-  rspec-rails (= 2.11.0)
+  psych (~> 1.3.4)
+  rails (= 3.0.20)
+  rspec-rails (= 2.12.2)
   shoulda-matchers (= 1.2.0)
   sqlite3 (= 1.3.6)
   timecop (= 0.3.5)