@@ -1,5 +1,8 @@ module Huberry module ValidatesAsHostnameLabel + + RESERVED_HOSTNAMES = %w(www blog dev stage stats status admin ftp sftp mail pop pop3 imap smtp) + # Checks for: # # * Length between 1 and 63 characters long @@ -9,7 +12,7 @@ module Huberry # # Accepts an :allow_underscores option which defaults to false def validates_as_hostname_label(*attrs) - options = { :allow_underscores => false, :reserved => [] }.merge(attrs.last.is_a?(Hash) ? attrs.pop : {}) + options = { :allow_underscores => false, :reserved => RESERVED_HOSTNAMES }.merge(attrs.last.is_a?(Hash) ? attrs.pop : {}) format = 'a-z0-9\-' format << '_' if options.delete(:allow_underscores) lib/validates_as_hostname_label.rb @@ -11,7 +11,7 @@ class Account < ActiveRecord::Base validates_as_hostname_label :subdomain_with_underscores, :allow_underscores => true validates_as_hostname_label :subdomain_with_blank, :allow_blank => true validates_as_hostname_label :subdomain_with_nil, :allow_nil => true - validates_as_hostname_label :subdomain_with_reserved, :reserved => ['www'] + validates_as_hostname_label :subdomain_with_reserved, :reserved => ['funky'] end class ValidatesAsHostnameLabelTest < Test::Unit::TestCase @@ -100,10 +100,24 @@ class ValidatesAsHostnameLabelTest < Test::Unit::TestCase assert @account.save end - def test_should_not_save_with_a_reserved_subdomain - @account = Account.new :subdomain_with_reserved => 'www' + def test_should_not_save_with_a_reserved_subdomain_from_the_default_list + Huberry::ValidatesAsHostnameLabel::RESERVED_HOSTNAMES.each do |hostname| + @account = Account.new :subdomain => hostname + assert !@account.save + assert @account.errors.on(:subdomain) + end + end + + def test_should_not_save_with_a_reserved_subdomain_from_a_list + @account = Account.new :subdomain_with_reserved => 'funky' assert !@account.save assert @account.errors.on(:subdomain_with_reserved) end + def test_should_not_be_valid_with_a_subdomain_not_from_the_list + @account = Account.new :subdomain_with_reserved => 'qqqfds' + assert !@account.save + assert !@account.errors.on(:subdomain_with_reserved) + end + end \ No newline at end of file test/validates_as_hostname_label_test.rb 5a19ee2fb796926fd942671c81e2875a16725279 Anders Törnqvist anders@elabs.se http://github.com/shuber/validates_as_hostname_label/commit/fc2e66593e43e89ae108e4bd574d8a9689abdda5 fc2e66593e43e89ae108e4bd574d8a9689abdda5 2009-06-05T11:25:13-07:00 2009-06-02T08:14:57-07:00 Add a default for the :reserved option Signed-off-by: Sean Huber <shuber@huberry.com> 9ab525f62d75ae3edf69df6c68f938ea630ef4e4 Sean Huber shuber@huberry.com