thoughtbot-clearance 0.1.10 → 0.2.0

data/clearance.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "clearance"
-  s.version = "0.1.10"
+  s.version = "0.2.0"
   s.date = "2008-10-11"
   s.summary = "Simple, complete Rails authentication."
   s.email = "dcroak@thoughtbot.com"
@@ -9,17 +9,42 @@ Gem::Specification.new do |s|
   s.authors = ["thoughtbot, inc.", "Dan Croak", "Josh Nichols", "Mike Breen", "Mike Burns", "Jason Morrison"]
   s.files = ["README.textile",
     "clearance.gemspec",
+    "generators/clearance/clearance_generator.rb",
+    "generators/clearance/templates/app/.rb",
+    "generators/clearance/templates/app/controllers/confirmations_controller.rb",
+    "generators/clearance/templates/app/controllers/passwords_controller.rb",
+    "generators/clearance/templates/app/controllers/sessions_controller.rb",
+    "generators/clearance/templates/app/controllers/users_controller.rb",
+    "generators/clearance/templates/app/models/user.rb",
+    "generators/clearance/templates/app/models/user_mailer.rb",
+    "generators/clearance/templates/app/views/confirmations/new.html.erb",
+    "generators/clearance/templates/app/views/passwords/edit.html.erb",
+    "generators/clearance/templates/app/views/passwords/new.html.erb",
+    "generators/clearance/templates/app/views/sessions/new.htmlerb",
+    "generators/clearance/templates/app/views/user_mailer/change_password.htmlerb",
+    "generators/clearance/templates/app/views/user_mailer/confirmation.htmlerb",
+    "generators/clearance/templates/app/views/users/_form.htmlerb",
+    "generators/clearance/templates/app/views/users/edit.htmlerb",
+    "generators/clearance/templates/app/views/users/new.htmlerb",
+    "generators/clearance/templates/test/functional/confirmations_controller.rb",
+    "generators/clearance/templates/test/functional/passwords_controller.rb",
+    "generators/clearance/templates/test/functional/sessions_controller.rb",
+    "generators/clearance/templates/test/functional/users_controller_test.rb",
+    "generators/clearance/templates/test/unit/user_mailer_test.rb",
+    "generators/clearance/templates/test/unit/user_test.rb",
+    "generators/clearance/USAGE",
     "lib/clearance.rb",
     "lib/clearance/app/controllers/application_controller.rb",
+    "lib/clearance/app/controllers/confirmations_controller.rb",
+    "lib/clearance/app/controllers/passwords_controller.rb",
+    "lib/clearance/app/controllers/sessions_controller.rb",
+    "lib/clearance/app/controllers/users_controller.rb",
     "lib/clearance/app/models/user.rb",
     "lib/clearance/app/models/user_mailer.rb",
-    "lib/clearance/app/controllers/sessions_controller.rb",
+    "lib/clearance/test/functionals/confirmations_controller_test.rb",
+    "lib/clearance/test/functionals/passwords_controller_test.rb",
     "lib/clearance/test/functionals/sessions_controller_test.rb",
     "lib/clearance/test/test_helper.rb",
     "lib/clearance/test/units/user_test.rb",
-    "lib/clearance/test/units/user_mailer_test.rb",
-    "lib/clearance/app/controllers/users_controller.rb",
-    "lib/clearance/test/functionals/users_controller_test.rb",
-    "lib/clearance/app/controllers/passwords_controller.rb",
-    "lib/clearance/test/functionals/passwords_controller_test.rb"]
+    "lib/clearance/test/units/user_mailer_test.rb"]
 end

data/generators/clearance/USAGE

@@ -0,0 +1 @@
+script/generate clearance

data/generators/clearance/clearance_generator.rb

@@ -0,0 +1,65 @@
+class ClearanceGenerator < Rails::Generator::Base
+  
+  def manifest
+    record do |m|
+      system `mkdir app/controllers`
+      ["app/controllers/confirmations_controller.rb",
+       "app/controllers/passwords_controller.rb", 
+       "app/controllers/sessions_controller.rb", 
+       "app/controllers/users_controller.rb"].each do |file|
+        m.file file, file
+      end
+      
+      system `mkdir app/models`
+      ["app/models/user.rb",
+       "app/models/user_mailer.rb"].each do |file|
+        m.file file, file
+      end
+      
+      system `mkdir app/views`
+      system `mkdir app/views/confirmations`
+      ["app/views/confirmations/new.html.erb"].each do |file|
+        m.file file, file
+      end
+      
+      system `mkdir app/views/passwords`
+      ["app/views/passwords/new.html.erb",
+       "app/views/passwords/edit.html.erb"].each do |file|
+        m.file file, file
+      end
+      
+      system `mkdir app/views/sessions`
+      ["app/views/sessions/new.html.erb"].each do |file|
+        m.file file, file
+      end
+      
+      system `mkdir app/views/user_mailer`
+      ["app/views/user_mailer/change_password.html.erb",
+       "app/views/user_mailer/confirmation.html.erb"].each do |file|
+        m.file file, file
+      end
+      
+      system `mkdir app/views/users`
+      ["app/views/users/_form.html.erb",
+       "app/views/users/edit.html.erb",
+       "app/views/users/new.html.erb"].each do |file|
+        m.file file, file
+      end
+      
+      system `mkdir test/functional`
+      ["test/functional/confirmations_controller_test.rb",
+       "test/functional/passwords_controller_test.rb",
+       "test/functional/sessions_controller_test.rb",
+       "test/functional/users_controller_test.rb"].each do |file|
+        m.file file, file
+      end
+      
+      system `mkdir test/unit`
+      ["test/unit/user_mailer_test.rb",
+       "test/unit/user_test.rb"].each do |file|
+        m.file file, file
+      end
+    end
+  end
+  
+end

data/generators/clearance/templates/app/controllers/confirmations_controller.rb

@@ -0,0 +1,3 @@
+class ConfirmationsController < ApplicationController
+  include Clearance::ConfirmationsController
+end

data/generators/clearance/templates/app/controllers/passwords_controller.rb

@@ -0,0 +1,3 @@
+class PasswordsController < ApplicationController
+  include Clearance::PasswordsController
+end

data/generators/clearance/templates/app/controllers/sessions_controller.rb

@@ -0,0 +1,3 @@
+class SessionsController < ApplicationController
+  include Clearance::SessionsController
+end

data/generators/clearance/templates/app/controllers/users_controller.rb

@@ -0,0 +1,3 @@
+class UsersController < ApplicationController
+  include Clearance::UsersController
+end

data/generators/clearance/templates/app/models/user.rb

@@ -0,0 +1,3 @@
+class User < ActiveRecord::Base
+  include Clearance::Models::User
+end

data/generators/clearance/templates/app/models/user_mailer.rb

@@ -0,0 +1,7 @@
+class UserMailer < ActionMailer::Base
+  
+  default_url_options[:host] = HOST
+  
+  include Clearance::Mailers::User
+
+end

data/generators/clearance/templates/app/views/confirmations/new.html.erb

@@ -0,0 +1,4 @@
+<% form_for :user, :url => user_confirmation_path(:user_id => @user,
+                                                  :salt => @user.salt) do |form| %>
+  <%= form.submit 'Confirm' %>
+<% end %>

data/generators/clearance/templates/app/views/passwords/edit.html.erb

@@ -0,0 +1,28 @@
+<div class="page">
+  <div class="plain">
+    <div class="page-header">
+      <h2 class="instructions">
+        Your password has been reset.  Choose a new password below.
+      </h2>
+    </div>
+    <%= error_messages_for :user %>
+    <% form_for(:user,
+                :url => user_password_path(
+                  @user,
+                  :email => @user.email,
+                  :password => @user.crypted_password),
+                :html => { :method => :put }) do |form| %>
+      <div class="text">
+        <%= form.label :password, 'Choose password' %>
+        <%= form.password_field :password %>
+      </div>
+      <div class="text">
+        <%= form.label :password_confirmation, 'Verify password' %>
+        <%= form.password_field :password_confirmation %>
+      </div>
+      <div class="buttons" id="password-submit">
+        <%= form.submit 'Save this password' %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/generators/clearance/templates/app/views/passwords/new.html.erb

@@ -0,0 +1,13 @@
+<h2>Change your password</h2>
+
+<p class="help">We'll email you a link to change your password.</p>
+
+<% form_for :password, :url => passwords_path do |form| %>
+  <div class="text">
+    <%= form.label :email, 'Email address' %>
+    <%= form.text_field :email %>
+  </div>
+  <div class="buttons" id="password-submit">
+    <%= form.submit 'Reset password' %>
+  </div>
+<% end %>

data/generators/clearance/templates/test/functional/users_controller_test.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class UsersControllerTest < ActionController::TestCase
+  include Clearance::UsersControllerTest
+end

data/generators/clearance/templates/test/unit/user_mailer_test.rb

@@ -0,0 +1,6 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class UserMailerTest < ActionMailer::TestCase
+  tests UserMailer
+  include Clearance::UserMailerTest
+end

data/lib/clearance/app/controllers/confirmations_controller.rb

@@ -0,0 +1,38 @@
+module Clearance
+  module ConfirmationsController
+    
+    def self.included(base)
+      base.class_eval do
+        before_filter :existing_user?, :only => [:new, :create]
+        
+        include InstanceMethods
+        
+      private
+        include PrivateInstanceMethods
+      end
+    end
+    
+    module InstanceMethods
+      def new
+        @user = User.find_by_id_and_salt(params[:user_id], params[:salt])
+      end
+
+      def create
+        @user = User.find_by_id_and_salt(params[:user_id], params[:salt])
+        @user.confirm!
+        session[:user_id] = @user.id
+        redirect_to user_path(@user)
+      end
+    end
+    
+    module PrivateInstanceMethods
+      def existing_user?
+        user = User.find_by_id_and_salt(params[:user_id], params[:salt])
+        if user.nil?
+          render :nothing => true, :status => :not_found
+        end
+      end
+    end
+    
+  end
+end

data/lib/clearance/test/functionals/confirmations_controller_test.rb

@@ -0,0 +1,81 @@
+module Clearance
+  module ConfirmationsControllerTest
+
+    def self.included(base)
+      base.class_eval do
+
+        context 'A GET to #new' do
+          context "with the User with the given id's salt" do
+            setup do
+              @user = Factory :user
+              get :new, :user_id => @user.id, :salt => @user.salt
+            end
+
+            should 'find the User record with the given id and salt' do
+              assert_equal @user, assigns(:user)
+            end
+
+            should_respond_with :success
+            should_render_template :new
+          end
+
+          context "without the User with the given id's salt" do
+            setup do
+              user = Factory :user
+              salt = ''
+              assert_not_equal salt, user.salt
+
+              get :new, :user_id => user.id, :salt => ''
+            end
+
+            should_respond_with :not_found
+
+            should 'render nothing' do
+              assert @response.body.blank?
+            end
+          end
+        end
+
+        context 'A POST to #create' do
+          context "with the User with the given id's salt" do
+            setup do
+              @user = Factory :user
+              assert ! @user.confirmed?
+
+              post :create, :user_id => @user, :salt => @user.salt
+              @user.reload
+            end
+
+            should 'confirm the User record with the given id' do
+              assert @user.confirmed?
+            end
+
+            should 'log the User in' do
+              assert_equal @user.id, session[:user_id]
+            end
+
+            should_redirect_to "user_path(@user)"
+          end
+
+          context "without the User with the given id's salt" do
+            setup do
+              user = Factory :user
+              salt = ''
+              assert_not_equal salt, user.salt
+
+              post :create, :user_id => user.id, :salt => salt
+            end
+
+            should_respond_with :not_found
+
+            should 'render nothing' do
+              assert @response.body.blank?
+            end
+          end
+        end
+
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -29,19 +29,44 @@ extra_rdoc_files: []
 files: 
 - README.textile
 - clearance.gemspec
+- generators/clearance/clearance_generator.rb
+- generators/clearance/templates/app/.rb
+- generators/clearance/templates/app/controllers/confirmations_controller.rb
+- generators/clearance/templates/app/controllers/passwords_controller.rb
+- generators/clearance/templates/app/controllers/sessions_controller.rb
+- generators/clearance/templates/app/controllers/users_controller.rb
+- generators/clearance/templates/app/models/user.rb
+- generators/clearance/templates/app/models/user_mailer.rb
+- generators/clearance/templates/app/views/confirmations/new.html.erb
+- generators/clearance/templates/app/views/passwords/edit.html.erb
+- generators/clearance/templates/app/views/passwords/new.html.erb
+- generators/clearance/templates/app/views/sessions/new.htmlerb
+- generators/clearance/templates/app/views/user_mailer/change_password.htmlerb
+- generators/clearance/templates/app/views/user_mailer/confirmation.htmlerb
+- generators/clearance/templates/app/views/users/_form.htmlerb
+- generators/clearance/templates/app/views/users/edit.htmlerb
+- generators/clearance/templates/app/views/users/new.htmlerb
+- generators/clearance/templates/test/functional/confirmations_controller.rb
+- generators/clearance/templates/test/functional/passwords_controller.rb
+- generators/clearance/templates/test/functional/sessions_controller.rb
+- generators/clearance/templates/test/functional/users_controller_test.rb
+- generators/clearance/templates/test/unit/user_mailer_test.rb
+- generators/clearance/templates/test/unit/user_test.rb
+- generators/clearance/USAGE
 - lib/clearance.rb
 - lib/clearance/app/controllers/application_controller.rb
+- lib/clearance/app/controllers/confirmations_controller.rb
+- lib/clearance/app/controllers/passwords_controller.rb
+- lib/clearance/app/controllers/sessions_controller.rb
+- lib/clearance/app/controllers/users_controller.rb
 - lib/clearance/app/models/user.rb
 - lib/clearance/app/models/user_mailer.rb
-- lib/clearance/app/controllers/sessions_controller.rb
+- lib/clearance/test/functionals/confirmations_controller_test.rb
+- lib/clearance/test/functionals/passwords_controller_test.rb
 - lib/clearance/test/functionals/sessions_controller_test.rb
 - lib/clearance/test/test_helper.rb
 - lib/clearance/test/units/user_test.rb
 - lib/clearance/test/units/user_mailer_test.rb
-- lib/clearance/app/controllers/users_controller.rb
-- lib/clearance/test/functionals/users_controller_test.rb
-- lib/clearance/app/controllers/passwords_controller.rb
-- lib/clearance/test/functionals/passwords_controller_test.rb
 has_rdoc: false
 homepage: http://github.com/thoughtbot/clearance
 post_install_message: 

data/lib/clearance/test/functionals/users_controller_test.rb

@@ -1,60 +0,0 @@
-module Clearance
-  module UsersControllerTest
-
-    def self.included(base)
-      base.class_eval do
-        public_context do
-
-          context "on GET to /users/new" do
-            setup { get :new }
-            should_respond_with :success
-            should_render_template :new
-            should_not_set_the_flash
-            should_have_form :action => "users_path",
-              :method => :post,
-              :fields => { :email => :text,
-                :password => :password,
-                :password_confirmation => :password }
-
-            context "with params" do
-              setup do
-                @email = 'a@example.com'
-                get :new, :user => {:email => @email}
-              end
-
-              should_assign_to :user
-              should "set the @user's params" do
-                assert_equal @email, assigns(:user).email
-              end
-            end
-          end
-
-          context "on POST to /users" do
-            setup do
-              post :create, :user => {
-                :email => Factory.next(:email),
-                :password => 'skerit',
-                :password_confirmation => 'skerit'
-              }
-            end
-            
-            should_set_the_flash_to /created/i
-            should_redirect_to "@controller.send(:url_after_create)"
-            should_assign_to :user
-            should_change 'User.count', :by => 1
-          end
-
-        end
-
-        logged_in_user_context do
-
-          should_deny_access_on "get :new"
-          should_deny_access_on "post :create, :user => {}" 
-          should_filter_params :password
-
-        end
-      end
-    end
-
-  end
-end