devise 0.8.1 → 0.8.2

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+== 0.8.2
+
+* enhancements
+  * Allow Devise.mailer_sender to be a proc (by github/grimen)
+
+* bug fix
+  * Fix bug with passenger, update is required to anyone deploying on passenger (by github/dvdpalm)
+
+== 0.8.1
+
 * enhancements
   * Move salt to encryptors
 

data/app/models/devise_mailer.rb

@@ -19,7 +19,7 @@ class DeviseMailer < ::ActionMailer::Base
       raise "Invalid devise resource #{record}" unless mapping
 
       subject      translate(mapping, key)
-      from         Devise.mailer_sender
+      from         mailer_sender(mapping)
       recipients   record.email
       sent_on      Time.now
       content_type 'text/html'
@@ -38,6 +38,14 @@ class DeviseMailer < ::ActionMailer::Base
       end
     end
 
+    def mailer_sender(mapping)
+      if Devise.mailer_sender.is_a?(Proc)
+        Devise.mailer_sender.call(mapping.name)
+      else
+        Devise.mailer_sender
+      end
+    end
+
     # Setup subject namespaced by model. It means you're able to setup your
     # messages using specific resource scope, or provide a default one.
     # Example (i18n locale file):

data/lib/devise/hooks/trackable.rb

@@ -1,5 +1,5 @@
 # After each sign in, update sign in time, sign in count and sign in IP.
-Warden::Manager.after_set_user :event => [:authentication, :set_user] do |record, warden, options|
+Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
   scope = options[:scope]
   if Devise.mappings[scope].try(:trackable?) && warden.authenticated?(scope)
     old_current, new_current  = record.current_sign_in_at, Time.now

data/lib/devise/mapping.rb

@@ -92,9 +92,9 @@ module Devise
       self.path_prefix.count("/")
     end
 
-    # Returns the raw path using path_prefix and as.
+    # Returns the raw path using the current relative_url_root, path_prefix and as.
     def raw_path
-      path_prefix + as.to_s
+      ActionController::Base.relative_url_root.to_s + path_prefix + as.to_s
     end
 
     # Returns the parsed path. If you need meta information in your path_prefix,

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "0.8.1".freeze
+  VERSION = "0.8.2".freeze
 end

data/test/mailers/confirmation_instructions_test.rb

@@ -62,4 +62,10 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
       assert_equal user.email, mail.body
     end
   end
+
+  test 'mailer sender accepts a proc' do
+    swap Devise, :mailer_sender => lambda { "another@example.com" } do
+      assert_equal ['another@example.com'], mail.from
+    end
+  end
 end

data/test/mailers/reset_password_instructions_test.rb

@@ -59,4 +59,10 @@ class ResetPasswordInstructionsTest < ActionMailer::TestCase
     reset_url_regexp = %r{<a href=\"http://#{host}/users/password/edit\?reset_password_token=#{user.reset_password_token}">}
     assert_match reset_url_regexp, mail.body
   end
+
+  test 'mailer sender accepts a proc' do
+    swap Devise, :mailer_sender => lambda { "another@example.com" } do
+      assert_equal ['another@example.com'], mail.from
+    end
+  end
 end

data/test/mapping_test.rb

@@ -86,7 +86,7 @@ class MappingTest < ActiveSupport::TestCase
     mapping = Devise.mappings[:manager]
     assert_equal '/:locale/', mapping.path_prefix
   end
-
+  
   test 'retrieve as from the proper position' do
     assert_equal 1, Devise.mappings[:user].as_position
     assert_equal 2, Devise.mappings[:manager].as_position
@@ -96,6 +96,18 @@ class MappingTest < ActiveSupport::TestCase
     assert_equal '/users', Devise.mappings[:user].raw_path
     assert_equal '/:locale/accounts', Devise.mappings[:manager].raw_path
   end
+  
+  test 'raw path adds in the relative_url_root' do
+    swap ActionController::Base, :relative_url_root => '/abc' do
+      assert_equal '/abc/users', Devise.mappings[:user].raw_path
+    end
+  end
+
+  test 'raw path deals with a nil relative_url_root' do
+    swap ActionController::Base, :relative_url_root => nil do
+      assert_equal '/users', Devise.mappings[:user].raw_path
+    end
+  end
 
   test 'parsed path is returned' do
     begin
@@ -106,7 +118,13 @@ class MappingTest < ActiveSupport::TestCase
       Devise.default_url_options {{ }}
     end
   end
-
+  
+  test 'parsed path deals with non-standard relative_url_roots' do
+    swap ActionController::Base, :relative_url_root => "/abc" do
+      assert_equal '/abc/users', Devise.mappings[:user].parsed_path
+    end
+  end
+  
   test 'should have default route options' do
     assert_equal({}, Devise.mappings[:user].route_options)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 +01:00
+date: 2010-01-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency