use Clearance.configure block to set mailer sender instead of DO_NOT_…

…REPLY constant

CHANGELOG.textile

@@ -1,11 +1,13 @@
-h2. 0.8.5 (01/18/2010)
+h2. 0.8.5
 
-* replaced routing hack with Clearance::Routes.draw(map) to give 
+* replaced routing hack with Clearance::Routes.draw(map) to give
 more control to the application developer. (Dan Croak)
 * removed attr_accessible from Clearance::User. (Dan Croak)
 * fixed bug in password reset feature. (Dan Croak)
 * use Jeweler for gemming. (Dan Croak)
 * remove dependency on root_path, use '/' instead. (Dan Croak)
+* use Clearance.configure block to set mailer sender instead of
+DO_NOT_REPLY constant. (Dan Croak)
 
 h2. 0.8.4 (10/08/2009)
 

Rakefile

@@ -37,40 +37,29 @@ generators = %w(clearance clearance_features clearance_views)
 namespace :generator do
   desc "Cleans up the test app before running the generator"
   task :cleanup do
-    generators.each do |generator|
-      FileList["generators/#{generator}/templates/**/*.*"].each do |each|
-        file = "test/rails_root/#{each.gsub("generators/#{generator}/templates/",'')}"
-        File.delete(file) if File.exists?(file)
-      end
-    end
-
-    FileList["test/rails_root/db/**/*"].each do |each| 
+    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 clearance generator"
   task :clearance do
-    system "cd test/rails_root && ./script/generate clearance && rake db:migrate db:test:prepare"
+    system "cd test/rails_root && ./script/generate clearance -f && 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"
+    system "cd test/rails_root && ./script/generate clearance_features -f"
   end
 
   desc "Run the clearance views generator"
   task :clearance_views do
-    system "cd test/rails_root && ./script/generate clearance_views"
+    system "cd test/rails_root && ./script/generate clearance_views -f"
   end
 end
 

app/models/clearance_mailer.rb

@@ -1,9 +1,7 @@
 class ClearanceMailer < ActionMailer::Base
 
-  default_url_options[:host] = HOST
-
   def change_password(user)
-    from       DO_NOT_REPLY
+    from       Clearance.configuration.mailer_sender
     recipients user.email
     subject    I18n.t(:change_password,
                       :scope   => [:clearance, :models, :clearance_mailer],
@@ -12,7 +10,7 @@ def change_password(user)
   end
 
   def confirmation(user)
-    from       DO_NOT_REPLY
+    from       Clearance.configuration.mailer_sender
     recipients user.email
     subject    I18n.t(:confirmation,
                       :scope   => [:clearance, :models, :clearance_mailer],

generators/clearance/clearance_generator.rb

@@ -5,6 +5,9 @@ class ClearanceGenerator < Rails::Generator::Base
 
   def manifest
     record do |m|
+      m.directory File.join("config", "initializers")
+      m.file "clearance.rb", "config/initializers/clearance.rb"
+
       m.insert_into "app/controllers/application_controller.rb",
                     "include Clearance::Authentication"
 

generators/clearance/templates/clearance.rb

@@ -1,3 +1,3 @@
-# Clearance.configure do |config|
-#   config.mailer_sender 'donotreply@example.com'
-# end
+Clearance.configure do |config|
+  config.mailer_sender = 'donotreply@example.com'
+end

lib/clearance.rb

@@ -1,6 +1,7 @@
 require 'clearance/extensions/errors'
 require 'clearance/extensions/rescue'
 
+require 'clearance/configuration'
 require 'clearance/routes'
 require 'clearance/authentication'
 require 'clearance/user'

lib/clearance/configuration.rb

@@ -0,0 +1,25 @@
+module Clearance
+  class Configuration
+    attr_accessor :mailer_sender
+
+    def initialize
+      @mailer_sender = 'donotreply@example.com'
+    end
+  end
+
+  class << self
+    attr_accessor :configuration
+  end
+
+  # Configure Clearance someplace sensible,
+  # like config/initializers/clearance.rb
+  #
+  # @example
+  #   Clearance.configure do |config|
+  #     config.mailer_sender = 'donotreply@example.com'
+  #   end
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield(configuration)
+  end
+end

test/models/clearance_mailer_test.rb

@@ -9,7 +9,7 @@ class ClearanceMailerTest < ActiveSupport::TestCase
     end
 
     should "be from DO_NOT_REPLY" do
-      assert_match /#{@email.from[0]}/i, DO_NOT_REPLY
+      assert_match /#{@email.from[0]}/i, Clearance.configuration.mailer_sender
     end
 
     should "be sent to user" do
@@ -34,7 +34,7 @@ class ClearanceMailerTest < ActiveSupport::TestCase
     end
 
     should "be from DO_NOT_REPLY" do
-      assert_match /#{@email.from[0]}/i, DO_NOT_REPLY
+      assert_match /#{@email.from[0]}/i, Clearance.configuration.mailer_sender
     end
 
     should "be sent to user" do

test/rails_root/config/environment.rb

@@ -8,9 +8,10 @@
     :session_key => "_clearance_session",
     :secret      => ['clearance', 'random', 'words', 'here'].map {|k| Digest::MD5.hexdigest(k) }.join
   }
+
   config.gem "justinfrench-formtastic", 
     :lib     => 'formtastic', 
     :source  => 'http://gems.github.com'
-end
 
-DO_NOT_REPLY = "donotreply@example.com"
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+end

test/rails_root/config/environments/test.rb

@@ -21,8 +21,6 @@
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
 
-HOST = "localhost"
-
 config.gem 'shoulda',
   :source  => "http://gemcutter.org",
   :version => '>= 2.9.1'

test/rails_root/config/initializers/clearance.rb

@@ -1,8 +1,3 @@
-# This simulates loading the clearance gem, but without relying on
-# vendor/gems
-
-clearance_path = File.join(File.dirname(__FILE__), *%w(.. .. .. ..))
-clearance_lib_path = File.join(clearance_path, "lib")
-
-$LOAD_PATH.unshift(clearance_lib_path)
-load File.join(clearance_path, 'rails', 'init.rb')
+Clearance.configure do |config|
+  config.mailer_sender = 'donotreply@example.com'
+end