thoughtbot-clearance 0.3.4 → 0.3.7

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2008 thoughtbot, inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.textile

@@ -8,12 +8,17 @@ h2. Gem installation (Rails 2.1+)
 
 In config/environments/test.rb:
 
-    config.gem 'thoughtbot-shoulda', :lib => 'shoulda', :source => "http://gems.github.com"
-    config.gem 'thoughtbot-factory_girl', :lib => 'factory_girl', :source => "http://gems.github.com"
+    config.gem 'mocha'
+    config.gem 'thoughtbot-shoulda',
+      :lib    => 'shoulda',
+      :source => "http://gems.github.com"
+    config.gem 'thoughtbot-factory_girl',
+      :lib    => 'factory_girl',
+      :source => "http://gems.github.com"
 
 In config/environment.rb:
 
-    config.gem "thoughtbot-clearance", :lib => 'clearance', :source => 'http://gems.github.com/'
+    config.gem "thoughtbot-clearance", :lib => 'clearance', :source => 'http://gems.github.com'
 
 Then:
 

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'date'
-
+ 
 test_files_pattern = 'test/rails_root/test/{unit,functional,other}/**/*_test.rb'
 namespace :test do
   Rake::TestTask.new(:all => 'generator:tests') do |t|
@@ -11,24 +10,36 @@ namespace :test do
   end
 end
 
+namespace :generator do
+  desc "Run the generator on the tests"
+  task :tests do
+    FileList["generators/clearance/templates/**/*.*"].each do |f|
+      File.delete("test/rails_root/#{f.gsub("generators/clearance/templates/",'')}")
+    end
+    FileUtils.rm_r("test/rails_root/vendor/plugins/clearance")
+    system "mkdir -p test/rails_root/vendor/plugins/clearance"
+    system "cp -R generators test/rails_root/vendor/plugins/clearance"
+    system "cd test/rails_root && ./script/generate clearance"
+  end
+end
+
 desc "Run the test suite"
 task :default => 'test:all'
 
 spec = Gem::Specification.new do |s|
   s.name = "clearance"
+  s.version = '0.3.7'
   s.summary = "Simple, complete Rails authentication."
-  s.email = "dcroak@thoughtbot.com"
+  s.email = "support@thoughtbot.com"
   s.homepage = "http://github.com/thoughtbot/clearance"
   s.description = "Simple, complete Rails authentication scheme."
   s.authors = ["thoughtbot, inc.", "Josh Nichols", "Mike Breen"]
-  s.files = FileList["[A-Z]*", "{generators,lib,test}/**/*"]
+  s.files = FileList["[A-Z]*", "{generators,lib}/**/*"]
 end
 
-namespace :generator do
-  desc "Run the generator on the tests"
-  task :tests do
-    system "mkdir -p test/rails_root/vendor/plugins/clearance"
-    system "cp -R generators test/rails_root/vendor/plugins/clearance"
-    system "cd test/rails_root; ./script/generate clearance"
+desc "Generate a gemspec file"
+task :gemspec do
+  File.open("#{spec.name}.gemspec", 'w') do |f|
+    f.write spec.to_ruby
   end
 end

data/TODO.textile

@@ -2,11 +2,9 @@
 
 # activation code (like restful-auth) instead of salt?
 # remove dependency on root_url?
-# should_have_form should be pulled into shoulda
 # generator should print out instructions to include modules existing files
 # check to make sure attr_accessible doesn't override and w/ attr_protected
 # move shoulda macros in test_helper to shoulda_macros folder
-# add shoulda and factory girl dependencies to gemspec
 # refactor Mailer default_url_options[:host] to something cleaner
 # application controller uses protected, all other controllers use private
 # add information about url_after_create to README or github wikis
@@ -21,4 +19,4 @@ ideas to steal from merb-auth:
 # forgot password is a strategy
 # salted password is a strategy
 
-http://adam.speaksoutofturn.com/articles/entication_vs_orization.html
+http://adam.speaksoutofturn.com/post/57615195/entication-vs-orization

data/generators/clearance/clearance_generator.rb

@@ -3,7 +3,8 @@ class ClearanceGenerator < Rails::Generator::Base
   def manifest
     record do |m|
       m.directory File.join("app", "controllers")
-      ["app/controllers/confirmations_controller.rb",
+      ["app/controllers/application.rb",
+       "app/controllers/confirmations_controller.rb",
        "app/controllers/passwords_controller.rb", 
        "app/controllers/sessions_controller.rb", 
        "app/controllers/users_controller.rb"].each do |file|
@@ -33,7 +34,7 @@ class ClearanceGenerator < Rails::Generator::Base
         m.file file, file
       end
       
-      m.directory File.join("app", "views", "user_mailer")
+      m.directory File.join("app", "views", "clearance_mailer")
       ["app/views/clearance_mailer/change_password.html.erb",
        "app/views/clearance_mailer/confirmation.html.erb"].each do |file|
         m.file file, file

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

@@ -0,0 +1,5 @@
+class ClearanceMailer < ActionMailer::Base
+  default_url_options[:host] = HOST
+  
+  include Clearance::App::Models::ClearanceMailer
+end

data/generators/clearance/templates/app/views/clearance_mailer/change_password.html.erb

@@ -0,0 +1,6 @@
+Someone, hopefully you, has requested that we send you a link to change your password.
+
+Here's the link:
+<%= edit_user_password_url @user, :email => @user.email, :password => @user.crypted_password %>
+
+If you didn't request this, no need to freak out, your password hasn't been changed.  You can just ignore this email.

data/generators/clearance/templates/app/views/clearance_mailer/confirmation.html.erb

@@ -0,0 +1 @@
+<%= new_user_confirmation_url :user_id => @user, :salt => @user.salt %>

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

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

data/lib/clearance/app/models/clearance_mailer.rb

@@ -0,0 +1,33 @@
+module Clearance
+  module App
+    module Models
+      module ClearanceMailer
+    
+        def self.included(base)
+          base.class_eval do
+        
+            include InstanceMethods
+        
+          end
+        end
+    
+        module InstanceMethods
+          def change_password(user)
+            from       DO_NOT_REPLY
+            recipients user.email
+            subject    "[#{PROJECT_NAME.humanize}] Change your password"
+            body       :user => user
+          end
+        
+          def confirmation(user)
+            recipients user.email
+            from       DO_NOT_REPLY
+            subject   "[#{PROJECT_NAME.humanize}] Account confirmation"
+            body      :user => user
+          end
+        end
+        
+      end
+    end
+  end
+end

data/lib/clearance/app/models/user.rb

@@ -1,3 +1,5 @@
+require 'digest/sha1'
+
 module Clearance
   module App
     module Models
@@ -13,6 +15,7 @@ module Clearance
             validates_presence_of     :password, :if => :password_required?
             validates_confirmation_of :password, :if => :password_required?
             validates_uniqueness_of   :email
+            validates_format_of       :email, :with => %r{.+@.+\..+}
 
             before_save :initialize_salt, :encrypt_password
         

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

@@ -33,11 +33,9 @@ module Clearance
 
               context "on POST to /users" do
                 setup do
-                  post :create, :user => {
-                    :email => Factory.next(:email),
-                    :password => 'skerit',
-                    :password_confirmation => 'skerit'
-                  }
+                  post :create, :user => Factory.build(:user).attributes.merge(
+                                            {:password => 'skerit',
+                                              :password_confirmation => 'skerit'})
                 end
             
                 should_set_the_flash_to /confirm/i

data/lib/clearance/test/unit/clearance_mailer_test.rb

@@ -0,0 +1,63 @@
+module Clearance
+  module Test
+    module Unit
+      module ClearanceMailerTest
+  
+        def self.included(base)
+          base.class_eval do
+            context "A change password email" do
+              setup do
+                @user = Factory :user
+                @email = ClearanceMailer.create_change_password @user
+              end
+
+              should "set its from address to DO_NOT_REPLY" do
+                assert_equal DO_NOT_REPLY, @email.from[0]
+              end
+
+              should "contain a link to edit the user's password" do
+                host = ActionMailer::Base.default_url_options[:host]
+                regexp = %r{http://#{host}/users/#{@user.id}/password/edit\?email=#{@user.email.gsub("@", "%40")}&password=#{@user.crypted_password}}
+                assert_match regexp, @email.body
+              end
+
+              should "be sent to the user" do
+                assert_equal [@user.email], @email.to
+              end
+
+              should "have a subject of '[PROJECT_NAME] Change your password'" do
+                assert_equal @email.subject, "[#{PROJECT_NAME.humanize}] Change your password"
+              end
+            end
+            
+            context "A confirmation email" do
+              setup do
+                @user = Factory :user
+                @email = ClearanceMailer.create_confirmation @user
+              end
+
+              should 'set its recipient to the given user' do
+                assert_equal @user.email, @email.to[0]
+              end
+
+              should 'set its subject' do
+                assert_equal "[#{PROJECT_NAME.humanize}] Account confirmation", @email.subject
+              end
+
+              should 'set its from address to DO_NOT_REPLY' do
+                assert_equal DO_NOT_REPLY, @email.from[0]
+              end
+
+              should "contain a link to confirm the user's account" do
+                host = ActionMailer::Base.default_url_options[:host]
+                regexp = %r{http://#{host}/users/#{@user.id}/confirmation/new\?salt=#{@user.salt}}
+                assert_match regexp, @email.body
+              end
+            end
+          end
+        end
+
+      end
+    end  
+  end
+end

data/lib/clearance/test/unit/user_test.rb

@@ -6,6 +6,9 @@ module Clearance
         def self.included(base)
           base.class_eval do
             should_require_attributes :email, :password
+            should_allow_values_for :email, 'foo@example.com'
+            should_not_allow_values_for :email, 'foo'
+            should_not_allow_values_for :email, 'example.com'
 
             should "require password validation on create" do
               user = Factory.build(:user, :password => 'blah', :password_confirmation => 'boogidy')