lib/devise/controllers/url_helpers.rb in devise-0.8.2 vs lib/devise/controllers/url_helpers.rb in devise-0.9.0
- old
+ new
@@ -17,27 +17,19 @@
# confirmation_path(:user) => user_confirmation_path
#
# Those helpers are added to your ApplicationController.
module UrlHelpers
- [:session, :password, :confirmation].each do |module_name|
+ [:session, :password, :confirmation, :unlock].each do |module_name|
[:path, :url].each do |path_or_url|
actions = [ nil, :new_ ]
actions << :edit_ if module_name == :password
actions << :destroy_ if module_name == :session
actions.each do |action|
class_eval <<-URL_HELPERS
def #{action}#{module_name}_#{path_or_url}(resource, *args)
- resource = case resource
- when Symbol, String
- resource
- when Class
- resource.name.underscore
- else
- resource.class.name.underscore
- end
-
+ resource = Devise::Mapping.find_scope!(resource)
send("#{action}\#{resource}_#{module_name}_#{path_or_url}", *args)
end
URL_HELPERS
end
end