From 0315ca27011c27de9e499401a128a14e171806b7 Mon Sep 17 00:00:00 2001
From: Michael Reinsch <michael@mobalean.com>
Date: Fri, 17 Feb 2012 19:14:42 +0900
Subject: [PATCH] fix for :host getting overwritten in scope[:options] and thus
 not generating URLs with correct hostnames

---
 lib/devise/rails/routes.rb      | 3 ++-
 test/rails_app/config/routes.rb | 4 ++++
 test/routes_test.rb             | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/devise/rails/routes.rb b/lib/devise/rails/routes.rb
index 503d43a1..9aa967d7 100644
--- a/lib/devise/rails/routes.rb
+++ b/lib/devise/rails/routes.rb
@@ -196,7 +196,8 @@ module ActionDispatch::Routing
       options[:path_names]    = (@scope[:path_names] || {}).merge(options[:path_names] || {})
       options[:constraints]   = (@scope[:constraints] || {}).merge(options[:constraints] || {})
       options[:defaults]      = (@scope[:defaults] || {}).merge(options[:defaults] || {})
-      options[:options]       = (@scope[:options] || {}).merge({:format => false}) if options[:format] == false
+      options[:options]       = @scope[:options] || {}
+      options[:options][:format] = false if options[:format] == false
 
       resources.map!(&:to_sym)
 
diff --git a/test/rails_app/config/routes.rb b/test/rails_app/config/routes.rb
index b54cd60e..052de586 100644
--- a/test/rails_app/config/routes.rb
+++ b/test/rails_app/config/routes.rb
@@ -58,6 +58,10 @@ Rails.application.routes.draw do
   # Other routes for routing_test.rb
   devise_for :reader, :class_name => "User", :only => :passwords
 
+  scope :host => "sub.example.com" do
+    devise_for :sub_admin, :class_name => "Admin"
+  end
+
   namespace :publisher, :path_names => { :sign_in => "i_dont_care", :sign_out => "get_out" } do
     devise_for :accounts, :class_name => "Admin", :path_names => { :sign_in => "get_in" }
   end
diff --git a/test/routes_test.rb b/test/routes_test.rb
index d3f0ceff..25d0cc77 100644
--- a/test/routes_test.rb
+++ b/test/routes_test.rb
@@ -128,6 +128,10 @@ class CustomizedRoutingTest < ActionController::TestCase
     end
   end
 
+  test 'subdomain admin' do
+    assert_recognizes({"host"=>"sub.example.com", :controller => 'devise/sessions', :action => 'new'}, {:host => "sub.example.com", :path => '/sub_admin/sign_in', :method => :get})
+  end
+
   test 'does only map reader password' do
     assert_raise ActionController::RoutingError do
       assert_recognizes({:controller => 'devise/sessions', :action => 'new'}, 'reader/sessions/new')