remove hostname from site and begin refactoring

app/controllers/admin/sites_controller.rb

@@ -11,7 +11,7 @@ def new
   def switch_to
     site = Site.find(params[:id])
     if site
-      redirect_to "http://#{site.hostname}#{request.port.to_s == '80' ? '' : ":#{request.port}"}/admin"
+      redirect_to "http://#{site.hostnames.first.domain}#{request.port.to_s == '80' ? '' : ":#{request.port}"}/admin"
     else
       render :index
     end 

app/views/admin/sites/remove.html.haml

@@ -9,8 +9,8 @@
   %tbody
     %tr.node.level-1
       %td.site 
-        = image('page', :alt => "page-icon")
-        = @site.hostname
+        = @site.title
+        = %{(#{@site.hostnames.map(&:domain).join(', ')})}
 
 - form_for [:admin, @site], :html => {:method => :delete} do
   %p.buttons

db/migrate/20100718021117_remove_site_hostname_field.rb

@@ -0,0 +1,16 @@
+class RemoveSiteHostnameField < ActiveRecord::Migration
+  def self.up
+    remove_column :sites, :hostname
+  end
+
+  def self.down
+    add_column :sites, :hostname, :string
+    Site.reset_column_information
+    Site.find_in_batches do |sites|
+      sites.each do |site|
+        site.hostname = site.hostnames.first.domain
+        site.save
+      end
+    end
+  end
+end

lib/vhost/admin_users_helper_extensions.rb

@@ -2,7 +2,7 @@ module Vhost::AdminUsersHelperExtensions
   def self.included(receiver)
     receiver.send :alias_method_chain, :roles, :site_admin
     receiver.send :define_method, :sites do |user|
-      sites = user.sites.collect{|site| site.hostname}
+      sites = user.sites.collect{|site| site.title}
       sites.join("<br/>")
     end
   end

lib/vhost/application_controller_extensions.rb

@@ -9,14 +9,14 @@ def redirect_to_primary_site
         if VhostExtension.REDIRECT_TO_PRIMARY_SITE
           site = current_site
           return if site.nil? || site.hostname.include?("*")
-          primary_host = site.hostname.split(',')[0].strip
+          primary_host = site.hostnames.first.domain
           redirect_to(primary_site_url + request.request_uri) if request.host != primary_host
         end
       end
 
       def primary_site_url
           site = current_site
-          return nil if site.nil? || site.hostname.include?("*")
+          return nil if site.nil? || site.hostnames.map(&:domain).include?("*")
 
           # Rebuild the current URL. Check if it matches the URL of the
           # primary site and redirect if it does not.
@@ -25,7 +25,7 @@ def primary_site_url
           port = request.port_string
 
           # Primary site is the first site
-          primary_host = site.hostname.split(',')[0].strip
+          primary_host = site.hostnames.first.domain
 
           # Return the concatenation
           prefix+primary_host+port

lib/vhost/application_helper_extensions.rb

@@ -10,6 +10,6 @@ def self.included(receiver)
   end
 
   def subtitle_with_site_hostname
-    current_site.hostname
+    current_site.title
   end
 end

spec/controllers/admin/pages_controller_spec.rb

@@ -4,7 +4,7 @@
   dataset :sites_site_users_and_site_pages
 
   before :each do
-    VhostExtension.HOST = sites(:site_a).hostname # Pretend we're connected to site_a so the SiteScope works right
+    VhostExtension.HOST = sites(:site_a).hostnames.first.domain # Pretend we're connected to site_a so the SiteScope works right
     rescue_action_in_public!  # ActionController::TestCase no longer considers this request a local request
 
     # don't bork results with stale cache items

spec/controllers/site_controller_spec.rb

@@ -5,7 +5,7 @@
 
   before(:each) do
     logout
-    VhostExtension.HOST = sites(:site_a).hostname # Pretend we're connected to site_a so the SiteScope works right
+    VhostExtension.HOST = sites(:site_a).hostnames.first.domain # Pretend we're connected to site_a so the SiteScope works right
     rescue_action_in_public!  # ActionController::TestCase no longer considers this request a local request
 
     # don't bork results with stale cache items