Changeset 1817

Timestamp:

07/12/05 16:16:13 (3 years ago)

Author:

minam

Message:

Make Request#subdomains handle "foo.foo.com" correctly

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/request.rb (modified) (1 diff)
• trunk/actionpack/test/controller/request_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ +1 @@
+*SVN*
+
+* Fixed Request#subdomains to handle "foo.foo.com" correctly
+
-*1.9.1* (11 July, 2005)
-

trunk/actionpack/lib/action_controller/request.rb

@@ -117 +117 @@
-    def subdomains(tld_length = 1)
-      parts = host.split('.')
- - parts.last(1 + tld_length)
+[0..-(tld_length+2)]
-    end
-

trunk/actionpack/test/controller/request_test.rb

@@ -56 +56 @@
-    @request.host = "dev.www.rubyonrails.co.uk"
-    assert_equal %w( dev www ), @request.subdomains(2)
+
+    @request.host = "foobar.foobar.com"
+    assert_equal %w( foobar ), @request.subdomains
-  end
-