allowing port for hostnames

gaynetdinov · Oct 28, 2012 · 486c465 · 486c465
1 parent 8279ab5
commit 486c465
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/models/cms/site.rb b/app/models/cms/site.rb
@@ -34,7 +34,7 @@ class Cms::Site < ActiveRecord::Base
   validates :hostname,
     :presence   => true,
     :uniqueness => { :scope => :path },
-    :format     => { :with => /^[\w\.\-]+$/ }
+    :format     => { :with => /^[\w\.\-]+(?:\:\d+)?$/ }
 
   # -- Scopes ---------------------------------------------------------------
   scope :mirrored, where(:is_mirrored => true)

diff --git a/test/unit/models/site_test.rb b/test/unit/models/site_test.rb
@@ -4,7 +4,7 @@ class CmsSiteTest < ActiveSupport::TestCase
 
   def test_fixtures_validity
     Cms::Site.all.each do |site|
-      assert site.valid?, site.errors.full_messages.to_s
+      assert site.valid?, site.errors.inspect
     end
   end
 
@@ -22,7 +22,10 @@ def test_validation
     assert_has_errors_on site, :identifier
 
     site = Cms::Site.new(:identifier => 'test', :hostname => 'site.host')
-    assert site.valid?, site.errors.to_yaml
+    assert site.valid?, site.errors.inspect
+
+    site = Cms::Site.new(:identifier => 'test', :hostname => 'localhost:3000')
+    assert site.valid?, site.errors.inspect
   end
 
   def test_validation_path_uniqueness