clearance 0.11.0 → 0.11.1

data/.bundle/config

@@ -1,2 +1,2 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"
+--- {}
+

data/CHANGELOG.md

@@ -1,10 +1,19 @@
+0.11.1
+-------------------
+
+* [#146] Redirect to home page after sign up. (Dan Croak)
+* [#145] Remove dependency on dynamic_form. Replaced with flashes due to limited number of failure cases. (Dan Croak)
+* Moving ClearanceMailer to app/mailers. Moving spec to spec/mailers. (Dan Croak)
+* [#148] Removing :case_sensitive option from validates_uniqueness_of. It was unnecessary and causes a small performance problem on some apps. (Dan Croak)
+* Only development dependency in gemspec should be bundler. All others are derived by bundling. (Dan Croak)
+
 0.11.0
 -------------------
 
-* Removing password confirmation.
-* Use ActiveSupport::Concern and ActiveSupport::SecureRandom to clean up code.
-* New controller#authenticate(params) method. Redefine username & password or other styles of authentication.
-* before_filter :authenticate API replaced with more aptly-named before_filter :authorize.
+* [#141] Removing password confirmation. (Dan Croak)
+* [#143] Use ActiveSupport::Concern and ActiveSupport::SecureRandom to clean up code. (Dan Croak)
+* New controller#authenticate(params) method. Redefine username & password or other styles of authentication. (Dan Croak)
+* before_filter :authenticate API replaced with more aptly-named before_filter :authorize. (Dan Croak)
 
 0.10.5
 -------------------
@@ -14,11 +23,11 @@
 0.10.4
 ------------------
 
-* Formtastic views generator removed.
+* Formtastic views generator removed. (Dan Croak)
 * Emails forced to be downcased (particularly for iPhone user case). (Adam Conrad)
 * Suite converted from test/unit to RSpec. (Joe Ferris)
-* Password reset requires a password. (Joel Meador)
-* Use HTML5 email fields.
+* [#135] Password reset requires a password. (Joel Meador)
+* [#138] Use HTML5 email fields. (Dan Croak)
 
 0.10.3.2
 ------------------
@@ -41,14 +50,14 @@
 * Replaced test/rails_root & general testing strategy with Diesel. (Joe Ferris)
 * Conveniences in factories for password/confirmation.
 * New generator command: rails generate clearance:install.
-* Step definitions are now prefixed with visitor_ to use thoughtbot convention.
+* Step definitions are now prefixed with visitor_ to use thoughtbot convention. (Dan Croak)
 * When Clearance installed in an app that already has users, allow old users to sign in by resetting their password.
 
 0.10.1
 ------------------
 
-* replaced ActionController::Forbidden with a user-friendly flash message.
-* improved language of Cucumber steps by allowing a little more flexibility.
+* replaced ActionController::Forbidden with a user-friendly flash message. (Dan Croak)
+* improved language of Cucumber steps by allowing a little more flexibility. (Dan Croak)
 
 0.10.0
 ------------------
@@ -62,7 +71,7 @@
   https://github.com/rails/jquery-ujs/issues#issue/30
   http://bugs.jquery.com/ticket/7061
 
-0.9.x
+0.9.1
 ------------------
 
 Forgot to update the changelog in a while, this is going to be brief:

data/Gemfile

@@ -1,17 +1,15 @@
 source "http://rubygems.org"
-gem "cucumber"
 gem "aruba", "~> 0.2.7"
 gem "rake"
-gem "rails", ">= 3.0.6"
+gem "rails", ">= 3.0.7"
 gem "thin"
 gem "shoulda"
 gem "sqlite3"
 gem "factory_girl"
 gem "diesel"
-gem "cucumber-rails"
+gem "cucumber-rails", '0.3.2'
 gem "capybara"
 gem "factory_girl_rails"
 gem "rspec-rails"
-gem "dynamic_form"
 gem "launchy"
 gem "mocha"

data/Gemfile.lock

@@ -2,39 +2,39 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.6)
-      actionpack (= 3.0.6)
-      mail (~> 2.2.9)
-    actionpack (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.6)
-      activesupport (= 3.0.6)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
-    activesupport (3.0.6)
-    arel (2.0.6)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.9)
     aruba (0.2.8)
       childprocess (~> 0.1.6)
       cucumber (~> 0.10.0)
       rspec (~> 2.3.0)
     builder (2.1.2)
-    capybara (0.4.0)
+    capybara (0.4.1.2)
       celerity (>= 0.7.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
@@ -42,25 +42,24 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.2)
-    celerity (0.8.7)
-    childprocess (0.1.6)
-      ffi (~> 0.6.3)
+      xpath (~> 0.1.3)
+    celerity (0.8.9)
+    childprocess (0.1.8)
+      ffi (~> 1.0.6)
     configuration (1.2.0)
-    cucumber (0.10.0)
+    cucumber (0.10.2)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 2.3.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
-    culerity (0.2.14)
-    daemons (1.1.0)
+    culerity (0.2.15)
+    daemons (1.1.3)
     diesel (0.1.4)
-      railties (~> 3.0.6)
+      railties (~> 3.0.3)
     diff-lcs (1.1.2)
-    dynamic_form (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
@@ -68,42 +67,41 @@ GEM
     factory_girl_rails (1.0.1)
       factory_girl (~> 1.3)
       railties (>= 3.0.0)
-    ffi (0.6.3)
+    ffi (1.0.7)
       rake (>= 0.8.7)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
+    gherkin (2.3.6)
+      json (>= 1.4.6)
     i18n (0.5.0)
-    json (1.4.6)
-    json_pure (1.4.6)
-    launchy (0.3.7)
+    json (1.5.1)
+    json_pure (1.5.1)
+    launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    mail (2.2.14)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mocha (0.9.10)
-      rake
+    mocha (0.9.12)
     nokogiri (1.4.4)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.6)
-      actionmailer (= 3.0.6)
-      actionpack (= 3.0.6)
-      activerecord (= 3.0.6)
-      activeresource (= 3.0.6)
-      activesupport (= 3.0.6)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.6)
-    railties (3.0.6)
-      actionpack (= 3.0.6)
-      activesupport (= 3.0.6)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
@@ -121,23 +119,23 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.3.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.2)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
+    selenium-webdriver (0.2.0)
+      childprocess (>= 0.1.7)
+      ffi (>= 1.0.7)
       json_pure
       rubyzip
     shoulda (2.11.3)
     sqlite3 (1.3.3)
     term-ansicolor (1.0.5)
-    thin (1.2.7)
+    thin (1.2.11)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-    xpath (0.1.3)
+    tzinfo (0.3.27)
+    xpath (0.1.4)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -146,15 +144,13 @@ PLATFORMS
 DEPENDENCIES
   aruba (~> 0.2.7)
   capybara
-  cucumber
-  cucumber-rails
+  cucumber-rails (= 0.3.2)
   diesel
-  dynamic_form
   factory_girl
   factory_girl_rails
   launchy
   mocha
-  rails (>= 3.0.6)
+  rails (>= 3.0.7)
   rake
   rspec-rails
   shoulda

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.11.1

data/app/controllers/clearance/passwords_controller.rb

@@ -36,6 +36,7 @@ class Clearance::PasswordsController < ApplicationController
       flash_success_after_update
       redirect_to(url_after_update)
     else
+      flash_failure_after_update
       render :template => 'passwords/edit'
     end
   end
@@ -80,6 +81,12 @@ class Clearance::PasswordsController < ApplicationController
     flash[:success] = translate(:signed_in, :default => "Signed in.")
   end
 
+  def flash_failure_after_update
+    flash.now[:failure] = translate(:blank_password,
+      :scope   => [:clearance, :controllers, :passwords],
+      :default => "Password can't be blank.")
+  end
+
   def url_after_create
     sign_in_url
   end

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 => [:new, :create]
+  before_filter :redirect_to_root, :only => [:new, :create], :if => :signed_in?
 
   def new
     @user = ::User.new(params[:user])
@@ -12,10 +12,11 @@ class Clearance::UsersController < ApplicationController
   def create
     @user = ::User.new(params[:user])
     if @user.save
-      flash_notice_after_create
       sign_in(@user)
+      flash_notice_after_create
       redirect_to(url_after_create)
     else
+      flash_failure_after_create
       render :template => 'users/new'
     end
   end
@@ -28,7 +29,13 @@ class Clearance::UsersController < ApplicationController
       :default => "You are now signed up.")
   end
 
+  def flash_failure_after_create
+    flash.now[:failure] = 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
-    sign_in_url
+    '/'
   end
 end

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

@@ -7,7 +7,6 @@
 <%= form_for(:user,
              :url  => user_password_path(@user, :token => @user.confirmation_token),
              :html => { :method => :put }) do |form| %>
-  <%= form.error_messages %>
   <div class="password_field">
     <%= form.label :password, "Choose password" %>
     <%= form.password_field :password %>

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

@@ -1,4 +1,3 @@
-<%= form.error_messages %>
 <div class="text_field">
   <%= form.label :email %>
   <%= form.text_field :email, :type => "email" %>

data/clearance.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/thoughtbot/clearance}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dan Croak", "Mike Burns", "Jason Morrison", "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto", "Josh Nichols", "Mike Breen", "Marcel G\303\266rner", "Bence Nagy", "Ben Mabey", "Eloy Duran", "Tim Pope", "Mihai Anca", "Mark Cornick", "Shay Arnett", "Jon Yurek", "Chad Pytel"]
+  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.description = %q{Rails authentication & authorization with email & password.}
@@ -25,8 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rails',  '~> 3.0.0')
   s.add_dependency('diesel', '~> 0.1.4')
 
-  s.add_development_dependency('rspec',    '~> 1.3.0')
-  s.add_development_dependency('cucumber', '~> 0.10.0')
+  s.add_development_dependency('bundler', '~> 1.0.0')
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/features/engine/visitor_resets_password.feature

@@ -23,7 +23,7 @@ Feature: Password reset
     And I press "Reset password"
     When I follow the password reset link sent to "email@example.com"
     And I update my password with ""
-    Then I should see an error message
+    Then I should see "Password can't be blank."
     And I should be signed out
 
   Scenario: User is signed up and updates his password

data/features/engine/visitor_signs_up.feature

@@ -1,6 +1,6 @@
 Feature: Sign up
 
-  In order to get access to protected sections of the site
+  In order to access protected sections of the site
   As a visitor
   I want to sign up
 
@@ -12,7 +12,7 @@ Feature: Sign up
     When I fill in "Email" with "invalidemail"
     And I fill in "Password" with "password"
     And I press "Sign up"
-    Then I should see "Email is invalid"
+    Then I should see "Must be a valid email address"
 
   Scenario: Visitor signs up with blank password
     When I fill in "Email" with "email@example.com"
@@ -25,3 +25,4 @@ Feature: Sign up
     And I fill in "Password" with "password"
     And I press "Sign up"
     Then I should see "signed up"
+    And I should be on the home page

data/lib/clearance/user.rb

@@ -45,7 +45,7 @@ module Clearance
       # :password must be present, confirmed
       included do
         validates_presence_of     :email, :unless => :email_optional?
-        validates_uniqueness_of   :email, :case_sensitive => false, :allow_blank => true
+        validates_uniqueness_of   :email, :allow_blank => true
         validates_format_of       :email, :with => %r{^[a-z0-9!#\$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#\$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$}i, :allow_blank => true
 
         validates_presence_of     :password, :unless => :password_optional?

data/spec/controllers/passwords_controller_spec.rb

@@ -154,7 +154,7 @@ describe Clearance::PasswordsController do
         cookies[:remember_token].should be_nil
       end
 
-      it { should_not set_the_flash }
+      it { should set_the_flash.to(/password can't be blank/i) }
       it { should respond_with(:success) }
       it { should render_template(:edit) }
     end

data/spec/models/user_spec.rb

@@ -1,14 +1,9 @@
 require 'spec_helper'
 
 describe User do
-
-  # db
-
   it { should have_db_index(:email) }
   it { should have_db_index(:remember_token) }
 
-  # signing up
-
   describe "When signing up" do
     it { should validate_presence_of(:email) }
     it { should validate_presence_of(:password) }
@@ -52,8 +47,6 @@ describe User do
     it { should validate_uniqueness_of(:email) }
   end
 
-  # authenticating
-
   describe "A user" do
     before do
       @user     = Factory(:user)
@@ -76,8 +69,6 @@ describe User do
     end
   end
 
-  # resetting remember token
-
   describe "When resetting authentication with reset_remember_token!" do
     before do
       @user  = Factory(:user)
@@ -90,8 +81,6 @@ describe User do
     end
   end
 
-  # updating password
-
   describe "An email confirmed user" do
     before do
       @user = Factory(:user)
@@ -118,8 +107,6 @@ describe User do
     second_user.remember_token.should_not == first_user.remember_token
   end
 
-  # recovering forgotten password
-
   describe "An user" do
     before do
       @user = Factory(:user)
@@ -166,10 +153,8 @@ describe User do
         end
       end
     end
-
   end
 
-  # optional email/password fields
   describe "a user with an optional email" do
     before do
       @user = User.new

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: clearance
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 11
-  - 0
-  version: 0.11.0
+  prerelease: 
+  version: 0.11.1
 platform: ruby
 authors: 
 - Dan Croak
@@ -17,22 +13,13 @@ authors:
 - Nick Quaranto
 - Josh Nichols
 - Mike Breen
-- "Marcel G\xC3\xB6rner"
-- Bence Nagy
-- Ben Mabey
-- Eloy Duran
-- Tim Pope
-- Mihai Anca
-- Mark Cornick
-- Shay Arnett
 - Jon Yurek
 - Chad Pytel
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 -04:00
-default_executable: 
+date: 2011-04-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -42,10 +29,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -57,43 +40,20 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 4
         version: 0.1.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: bundler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+        version: 1.0.0
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 0
-        version: 0.10.0
-  type: :development
-  version_requirements: *id004
 description: Rails authentication & authorization with email & password.
 email: support@thoughtbot.com
 executables: []
@@ -117,7 +77,7 @@ files:
 - app/controllers/clearance/passwords_controller.rb
 - app/controllers/clearance/sessions_controller.rb
 - app/controllers/clearance/users_controller.rb
-- app/models/clearance_mailer.rb
+- app/mailers/clearance_mailer.rb
 - app/views/clearance_mailer/change_password.html.erb
 - app/views/layouts/application.html.erb
 - app/views/passwords/edit.html.erb
@@ -159,13 +119,12 @@ files:
 - spec/controllers/sessions_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/factories.rb
-- spec/models/clearance_mailer_spec.rb
+- spec/mailers/clearance_mailer_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
 - spec/support/authorization.rb
 - spec/support/clearance_redirects.rb
 - spec/support/cookies.rb
-has_rdoc: true
 homepage: http://github.com/thoughtbot/clearance
 licenses: []
 
@@ -179,21 +138,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Rails authentication & authorization with email & password.