Skip to content

Commit

Permalink
Should accept path prefixes not starting with slash.
Browse files Browse the repository at this point in the history
  • Loading branch information
josevalim committed Jan 16, 2010
1 parent ef25da9 commit 04ce9d1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.rdoc
Expand Up @@ -6,6 +6,9 @@
* Warden 0.9.0 compatibility
* Mongomapper 0.6.10 compatibility

* bug fix
* Accept path prefix not starting with slash

== 0.8.2

* enhancements
Expand Down
5 changes: 2 additions & 3 deletions lib/devise/mapping.rb
Expand Up @@ -61,9 +61,8 @@ def initialize(name, options) #:nodoc:
@as = (options.delete(:as) || name).to_sym
@klass = (options.delete(:class_name) || name.to_s.classify).to_s
@name = (options.delete(:scope) || name.to_s.singularize).to_sym
@path_names = options.delete(:path_names) || {}
@path_prefix = options.delete(:path_prefix).to_s
@path_prefix << "/" unless @path_prefix[-1] == ?/
@path_names = options.delete(:path_names) || {}
@path_prefix = "/#{options.delete(:path_prefix)}/".squeeze("/")
@route_options = options || {}

setup_path_names
Expand Down
2 changes: 1 addition & 1 deletion test/rails_app/config/routes.rb
@@ -1,7 +1,7 @@
ActionController::Routing::Routes.draw do |map|
map.devise_for :users
map.devise_for :admin, :as => 'admin_area'
map.devise_for :accounts, :scope => 'manager', :path_prefix => '/:locale',
map.devise_for :accounts, :scope => 'manager', :path_prefix => ':locale',
:class_name => "User", :requirements => { :extra => 'value' }, :path_names => {
:sign_in => 'login', :sign_out => 'logout', :password => 'secret',
:confirmation => 'verification', :unlock => 'unblock'
Expand Down

0 comments on commit 04ce9d1

Please sign in to comment.