thoughtbot-clearance 0.6.9 → 0.7.0

data/CHANGELOG.textile

@@ -1,3 +1,12 @@
+h2. 0.7.0 (08/04/2009)
+
+* Redirect signed in user who clicks confirmation link again. (Dan Croak)
+* Redirect signed out user who clicks confirmation link again. (Dan Croak)
+* Added signed_out? convenience method for controllers, helpers, views. (Dan
+Croak)
+* Added clearance_views generator. By default, creates formtastic views which
+pass all tests and features. (Dan Croak)
+
 h2. 0.6.9 (07/04/2009)
 
 * Added timestamps to create users migration. (Dan Croak)

data/README.textile

@@ -18,7 +18,7 @@ In config/environment.rb:
 config.gem "thoughtbot-clearance", 
   :lib     => 'clearance', 
   :source  => 'http://gems.github.com', 
-  :version => '0.6.6'
+  :version => '0.6.9'
 </pre>
 
 Vendor the gem:

data/Rakefile

@@ -5,8 +5,16 @@ require 'rake/testtask'
 require 'cucumber/rake/task'
 
 namespace :test do
-  Rake::TestTask.new(:all => ["generator:cleanup",
-                              "generator:generate"]) do |task|
+  Rake::TestTask.new(:basic => ["generator:cleanup",
+                                "generator:clearance",
+                                "generator:clearance_features"]) do |task|
+    task.libs << "lib"
+    task.libs << "test"
+    task.pattern = "test/**/*_test.rb"
+    task.verbose = false
+  end
+
+  Rake::TestTask.new(:views => ["generator:clearance_views"]) do |task|
     task.libs << "lib"
     task.libs << "test"
     task.pattern = "test/**/*_test.rb"
@@ -17,9 +25,14 @@ namespace :test do
     t.cucumber_opts   = "--format progress"
     t.feature_pattern = "test/rails_root/features/*.feature"
   end
+
+  Cucumber::Rake::Task.new(:features_for_views) do |t|
+    t.cucumber_opts   = "--format progress"
+    t.feature_pattern = "test/rails_root/features/*.feature"
+  end
 end
 
-generators = %w(clearance clearance_features)
+generators = %w(clearance clearance_features clearance_views)
 
 namespace :generator do
   desc "Cleans up the test app before running the generator"
@@ -34,26 +47,40 @@ namespace :generator do
     FileList["test/rails_root/db/**/*"].each do |each| 
       FileUtils.rm_rf(each)
     end
+
     FileUtils.rm_rf("test/rails_root/vendor/plugins/clearance")
     FileUtils.mkdir_p("test/rails_root/vendor/plugins")
     clearance_root = File.expand_path(File.dirname(__FILE__))
     system("ln -s #{clearance_root} test/rails_root/vendor/plugins/clearance")
+
+    FileUtils.rm_rf("test/rails_root/app/views/passwords")
+    FileUtils.rm_rf("test/rails_root/app/views/sessions")
+    FileUtils.rm_rf("test/rails_root/app/views/users")
   end
 
-  desc "Run the generator on the tests"
-  task :generate do
-    generators.each do |generator|
-      system "cd test/rails_root && ./script/generate #{generator} && rake db:migrate db:test:prepare"
-    end
+  desc "Run the clearance generator"
+  task :clearance do
+    system "cd test/rails_root && ./script/generate clearance && rake db:migrate db:test:prepare"
+  end
+
+  desc "Run the clearance features generator"
+  task :clearance_features do
+    system "cd test/rails_root && ./script/generate clearance_features"
+  end
+
+  desc "Run the clearance views generator"
+  task :clearance_views do
+    system "cd test/rails_root && ./script/generate clearance_views"
   end
 end
 
 desc "Run the test suite"
-task :default => ['test:all', 'test:features']
+task :default => ['test:basic', 'test:features',
+                  'test:views', 'test:features_for_views']
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name        = "clearance"
-  gem_spec.version     = "0.6.9"
+  gem_spec.version     = "0.7.0"
   gem_spec.summary     = "Rails authentication with email & password."
   gem_spec.email       = "support@thoughtbot.com"
   gem_spec.homepage    = "http://github.com/thoughtbot/clearance"

data/app/controllers/clearance/confirmations_controller.rb

@@ -1,9 +1,11 @@
 class Clearance::ConfirmationsController < ApplicationController
   unloadable
 
-  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]
+  before_filter :redirect_signed_in_confirmed_user,  :only => [:new, :create]
+  before_filter :redirect_signed_out_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
@@ -21,10 +23,19 @@ class Clearance::ConfirmationsController < ApplicationController
 
   private
 
-  def forbid_confirmed_user
+  def redirect_signed_in_confirmed_user
+    user = ::User.find_by_id(params[:user_id])
+    if user && user.email_confirmed? && current_user == user
+      flash_success_after_create
+      redirect_to(url_after_create)
+    end
+  end
+
+  def redirect_signed_out_confirmed_user
     user = ::User.find_by_id(params[:user_id])
-    if user && user.email_confirmed?
-      raise ActionController::Forbidden, "confirmed user"
+    if user && user.email_confirmed? && signed_out?
+      flash_already_confirmed
+      redirect_to(url_already_confirmed)
     end
   end
 
@@ -46,7 +57,17 @@ class Clearance::ConfirmationsController < ApplicationController
       :default => "Confirmed email and signed in.")
   end
 
+  def flash_already_confirmed
+    flash[:success] = translate(:already_confirmed_email,
+      :scope   => [:clearance, :controllers, :confirmations],
+      :default => "Already confirmed email. Please sign in.")
+  end
+
   def url_after_create
     root_url
   end
+
+  def url_already_confirmed
+    sign_in_url
+  end
 end

data/generators/clearance_features/clearance_features_generator.rb

@@ -1,10 +1,10 @@
 class ClearanceFeaturesGenerator < Rails::Generator::Base
-  
+
   def manifest
     record do |m|
       m.directory File.join("features", "step_definitions")
       m.directory File.join("features", "support")
-      
+
       ["features/step_definitions/clearance_steps.rb",
        "features/step_definitions/factory_girl_steps.rb",
        "features/support/paths.rb",
@@ -16,5 +16,5 @@ class ClearanceFeaturesGenerator < Rails::Generator::Base
        end
     end
   end
-  
+
 end

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

@@ -26,3 +26,20 @@ Feature: Sign up
       Then I should see "Confirmed email and signed in"
       And I should be signed in
 
+    Scenario: Signed in user clicks confirmation link again
+      Given I signed up with "email@person.com/password"
+      When I follow the confirmation link sent to "email@person.com"
+      Then I should be signed in
+      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
+
+    Scenario: Signed out user clicks confirmation link again
+      Given I signed up with "email@person.com/password"
+      When I follow the confirmation link sent to "email@person.com"
+      Then I should be signed in
+      When I sign out
+      And I follow the confirmation link sent to "email@person.com"
+      Then I should see "Already confirmed email. Please sign in."
+      And I should be signed out
+

data/generators/clearance_views/clearance_views_generator.rb

@@ -0,0 +1,27 @@
+class ClearanceViewsGenerator < Rails::Generator::Base
+
+  def manifest
+    record do |m|
+      strategy          = "formtastic"
+      template_strategy = "erb"
+
+      m.directory File.join("app", "views", "users")
+      m.file "#{strategy}/users/new.html.#{template_strategy}",
+        "app/views/users/new.html.#{template_strategy}"
+      m.file "#{strategy}/users/_inputs.html.#{template_strategy}",
+        "app/views/users/_inputs.html.#{template_strategy}"
+
+      m.directory File.join("app", "views", "sessions")
+      m.file "#{strategy}/sessions/new.html.#{template_strategy}",
+        "app/views/sessions/new.html.#{template_strategy}"
+
+      m.directory File.join("app", "views", "passwords")
+      m.file "#{strategy}/passwords/new.html.#{template_strategy}",
+        "app/views/passwords/new.html.#{template_strategy}"
+      m.file "#{strategy}/passwords/edit.html.#{template_strategy}",
+        "app/views/passwords/edit.html.#{template_strategy}"
+    end
+  end
+
+end
+

data/generators/clearance_views/templates/formtastic/passwords/edit.html.erb

@@ -0,0 +1,21 @@
+<h2>Change your password</h2>
+
+<p>
+  Your password has been reset. Choose a new password below.
+</p>
+
+<% semantic_form_for(:user,
+            :url  => user_password_path(@user, :token => @user.token),
+            :html => { :method => :put }) do |form| %>
+  <%= form.error_messages %>
+  <% form.inputs do -%>
+    <%= form.input :password, :as => :password,
+                   :label => "Choose password" %>
+    <%= form.input :password_confirmation, :as => :password,
+                   :label => "Confirm password" %>
+  <% end -%>
+  <% form.buttons do -%>
+    <%= form.commit_button "Save this password" %>
+  <% end -%>
+<% end %>
+

data/generators/clearance_views/templates/formtastic/passwords/new.html.erb

@@ -0,0 +1,15 @@
+<h2>Reset your password</h2>
+
+<p>
+  We will email you a link to reset your password.
+</p>
+
+<% semantic_form_for :password, :url => passwords_path do |form| -%>
+  <% form.inputs do -%>
+    <%= form.input :email, :label => "Email address" %>
+  <% end -%>
+  <% form.buttons do -%>
+    <%= form.commit_button "Reset password" %>
+  <% end -%>
+<% end -%>
+

data/generators/clearance_views/templates/formtastic/sessions/new.html.erb

@@ -0,0 +1,22 @@
+<h2>Sign in</h2>
+
+<% semantic_form_for :session, :url => session_path do |form| %>
+  <% form.inputs do %>
+    <%= form.input :email %>
+    <%= form.input :password, :as => :password %>
+    <%= form.input :remember_me, :as => :boolean, :required => false %>
+  <% end %>
+  <% form.buttons do %>
+    <%= form.commit_button "Sign in" %>
+  <% end %>
+<% end %>
+
+<ul>
+  <li>
+    <%= link_to "Sign up", new_user_path %>
+  </li>
+  <li>
+    <%= link_to "Forgot password?", new_password_path %>
+  </li>
+</ul>
+

data/generators/clearance_views/templates/formtastic/users/_inputs.html.erb

@@ -0,0 +1,6 @@
+<% form.inputs do %>
+  <%= form.input :email %>
+  <%= form.input :password %>
+  <%= form.input :password_confirmation, :label => "Confirm password" %>
+<% end %>
+

data/generators/clearance_views/templates/formtastic/users/new.html.erb

@@ -0,0 +1,10 @@
+<h2>Sign up</h2>
+
+<% semantic_form_for @user do |form| %>
+  <%= form.error_messages %>
+  <%= render :partial => "/users/inputs", :locals => { :form => form } %>
+  <% form.buttons do %>
+    <%= form.commit_button "Sign up" %>
+  <% end %>
+<% end %>
+

data/lib/clearance/authentication.rb

@@ -5,10 +5,8 @@ module Clearance
       controller.send(:include, InstanceMethods)
 
       controller.class_eval do
-        helper_method :current_user
-        helper_method :signed_in?
-
-        hide_action :current_user, :signed_in?
+        helper_method :current_user, :signed_in?, :signed_out?
+        hide_action   :current_user, :signed_in?, :signed_out?
       end
     end
 
@@ -21,6 +19,10 @@ module Clearance
         ! current_user.nil?
       end
 
+      def signed_out?
+        current_user.nil?
+      end
+
       protected
 
       def authenticate

data/shoulda_macros/clearance.rb

@@ -132,6 +132,12 @@ module Clearance
       end
     end
 
+    def should_redirect_to_url_already_confirmed
+      should_redirect_to("the already confirmed url") do
+        @controller.send(:url_already_confirmed)
+      end
+    end
+
     # VALIDATIONS
 
     def should_validate_confirmation_of(attribute, opts = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors: 
 - Dan Croak
@@ -24,7 +24,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-03 21:00:00 -07:00
+date: 2009-08-03 21:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -90,6 +90,19 @@ files:
 - generators/clearance_features/templates/features/support
 - generators/clearance_features/templates/features/support/paths.rb
 - generators/clearance_features/USAGE
+- generators/clearance_views
+- generators/clearance_views/clearance_views_generator.rb
+- generators/clearance_views/templates
+- generators/clearance_views/templates/formtastic
+- generators/clearance_views/templates/formtastic/passwords
+- generators/clearance_views/templates/formtastic/passwords/edit.html.erb
+- generators/clearance_views/templates/formtastic/passwords/new.html.erb
+- generators/clearance_views/templates/formtastic/sessions
+- generators/clearance_views/templates/formtastic/sessions/new.html.erb
+- generators/clearance_views/templates/formtastic/users
+- generators/clearance_views/templates/formtastic/users/_inputs.html.erb
+- generators/clearance_views/templates/formtastic/users/new.html.erb
+- generators/clearance_views/USAGE
 - lib/clearance
 - lib/clearance/authentication.rb
 - lib/clearance/extensions
@@ -102,6 +115,8 @@ files:
 - rails/init.rb
 has_rdoc: true
 homepage: http://github.com/thoughtbot/clearance
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -122,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Rails authentication with email & password.