diff --git a/lib/devise/mapping.rb b/lib/devise/mapping.rb index 863d562c..c833a136 100644 --- a/lib/devise/mapping.rb +++ b/lib/devise/mapping.rb @@ -22,7 +22,7 @@ module Devise # # is the modules included in the class # class Mapping #:nodoc: - attr_reader :singular, :scoped_path, :path, :controllers, :path_names, :class_name, :sign_out_via + attr_reader :singular, :scoped_path, :path, :controllers, :path_names, :class_name, :sign_out_via, :format alias :name :singular # Receives an object and find a scope for it. If a scope cannot be found, @@ -67,7 +67,11 @@ module Devise @constraints = Hash.new { |h,k| h[k] = k.to_s } @constraints.merge!(options[:constraints] || {}) + @defaults = Hash.new { |h,k| h[k] = k.to_s } + @defaults.merge!(options[:defaults] || {}) + @sign_out_via = options[:sign_out_via] || Devise.sign_out_via + @format = options[:format] end # Return modules for the mapping. @@ -104,6 +108,10 @@ module Devise @constraints end + def defaults + @defaults + end + # Create magic predicates for verifying what module is activated by this map. # Example: # diff --git a/lib/devise/rails/routes.rb b/lib/devise/rails/routes.rb index a55df494..647364e3 100644 --- a/lib/devise/rails/routes.rb +++ b/lib/devise/rails/routes.rb @@ -103,6 +103,10 @@ module ActionDispatch::Routing # # devise_for :users, :only => :sessions # + # * :format => include "(.:format)" in the generated routes? true by default, set to false to disable: + # + # devise_for :users, :format => false + # # # ==== Scoping # @@ -160,6 +164,9 @@ module ActionDispatch::Routing options[:path_prefix] ||= @scope[:path] if @scope[:path].present? options[:path_names] = (@scope[:path_names] || {}).merge(options[:path_names] || {}) options[:constraints] = (@scope[:constraints] || {}).merge(options[:constraints] || {}) + options[:defaults] = (@scope[:defaults] || {}).merge(options[:defaults] || {}) + + @scope[:options] = (@scope[:options] || {}).merge({:format => false}) if options[:format] == false resources.map!(&:to_sym) @@ -186,7 +193,7 @@ module ActionDispatch::Routing devise_scope mapping.name do yield if block_given? - with_devise_exclusive_scope mapping.fullpath, mapping.name, mapping.constraints do + with_devise_exclusive_scope mapping.fullpath, mapping.name, mapping.constraints, mapping.defaults do routes.each { |mod| send("devise_#{mod}", mapping, mapping.controllers) } end end @@ -331,12 +338,12 @@ module ActionDispatch::Routing @scope[:path] = path end - def with_devise_exclusive_scope(new_path, new_as, new_constraints) #:nodoc: - old_as, old_path, old_module, old_constraints = @scope[:as], @scope[:path], @scope[:module], @scope[:constraints] - @scope[:as], @scope[:path], @scope[:module], @scope[:constraints] = new_as, new_path, nil, new_constraints + def with_devise_exclusive_scope(new_path, new_as, new_constraints, new_defaults) #:nodoc: + old_as, old_path, old_module, old_constraints, old_defaults = @scope[:as], @scope[:path], @scope[:module], @scope[:constraints], @scope[:defaults] + @scope[:as], @scope[:path], @scope[:module], @scope[:constraints], @scope[:defaults] = new_as, new_path, nil, new_constraints, new_defaults yield ensure - @scope[:as], @scope[:path], @scope[:module], @scope[:constraints] = old_as, old_path, old_module, old_constraints + @scope[:as], @scope[:path], @scope[:module], @scope[:constraints], @scope[:defaults] = old_as, old_path, old_module, old_constraints, old_defaults end def raise_no_devise_method_error!(klass) #:nodoc: diff --git a/test/rails_app/config/routes.rb b/test/rails_app/config/routes.rb index b6c73eeb..9ad431b4 100644 --- a/test/rails_app/config/routes.rb +++ b/test/rails_app/config/routes.rb @@ -47,6 +47,10 @@ Rails.application.routes.draw do devise_for :homebase_admin, :class_name => "Admin", :path => "homebase" end + # Routes for format=false testing + devise_for :htmlonly_admin, :class_name => "Admin", :skip => [:confirmations, :unlocks], :path => "htmlonly_admin", :format => false + devise_for :htmlonly_users, :class_name => "User", :only => [:confirmations, :unlocks], :path => "htmlonly_users", :format => false + # Other routes for routing_test.rb devise_for :reader, :class_name => "User", :only => :passwords @@ -73,4 +77,4 @@ Rails.application.routes.draw do match "/set", :to => "home#set" match "/unauthenticated", :to => "home#unauthenticated" root :to => "home#index" -end \ No newline at end of file +end diff --git a/test/routes_test.rb b/test/routes_test.rb index ec3d0a21..f243d84d 100644 --- a/test/routes_test.rb +++ b/test/routes_test.rb @@ -190,6 +190,41 @@ class CustomizedRoutingTest < ActionController::TestCase assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => 'http://10.0.0.100//homebase/sign_up', :method => :get}) end end + + test 'map with format false for sessions' do + assert_recognizes({:controller => 'devise/sessions', :action => 'new'}, {:path => '/htmlonly_admin/sign_in', :method => :get}) + assert_raise ActionController::RoutingError do + assert_recognizes({:controller => 'devise/sessions', :action => 'new'}, {:path => '/htmlonly_admin/sign_in.xml', :method => :get}) + end + end + + test 'map with format false for passwords' do + assert_recognizes({:controller => 'devise/passwords', :action => 'create'}, {:path => '/htmlonly_admin/password', :method => :post}) + assert_raise ActionController::RoutingError do + assert_recognizes({:controller => 'devise/passwords', :action => 'create'}, {:path => '/htmlonly_admin/password.xml', :method => :post}) + end + end + + test 'map with format false for registrations' do + assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => '/htmlonly_admin/sign_up', :method => :get}) + assert_raise ActionController::RoutingError do + assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => '/htmlonly_admin/sign_up.xml', :method => :get}) + end + end + + test 'map with format false for confirmations' do + assert_recognizes({:controller => 'devise/confirmations', :action => 'show'}, {:path => '/htmlonly_users/confirmation', :method => :get}) + assert_raise ActionController::RoutingError do + assert_recognizes({:controller => 'devise/confirmations', :action => 'show'}, {:path => '/htmlonly_users/confirmation.xml', :method => :get}) + end + end + + test 'map with format false for unlocks' do + assert_recognizes({:controller => 'devise/unlocks', :action => 'show'}, {:path => '/htmlonly_users/unlock', :method => :get}) + assert_raise ActionController::RoutingError do + assert_recognizes({:controller => 'devise/unlocks', :action => 'show'}, {:path => '/htmlonly_users/unlock.xml', :method => :get}) + end + end end class ScopedRoutingTest < ActionController::TestCase