Permalink
Browse files

Should accept path prefixes not starting with slash.

  • Loading branch information...
1 parent ef25da9 commit 04ce9d1e6f3dc794577cb90b675c7513ba126c4b @josevalim josevalim committed Jan 16, 2010
Showing with 6 additions and 4 deletions.
  1. +3 −0 CHANGELOG.rdoc
  2. +2 −3 lib/devise/mapping.rb
  3. +1 −1 test/rails_app/config/routes.rb
View
@@ -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
View
@@ -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
@@ -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'

0 comments on commit 04ce9d1

Please sign in to comment.