moved subdomain reference from name:string to account_id:integer, thi…

…s could pose a speed issue later on. Also created the necessary indexes.

app/controllers/application_controller.rb

@@ -6,16 +6,16 @@ class ApplicationController < ActionController::Base
 
 
   def current_subdomain
-      if request.subdomain.present? && request.subdomain != "www"
-        current_subdomain = request.subdomain
+      if request.subdomains.first.present? && request.subdomains.first != "www"
+        current_subdomain = Subdomain.find_by_name(request.subdomains.first)
       else 
         current_subdomain = nil
       end
       return current_subdomain
-  end
+  end      
 
   def check_my_subdomain(subdomain)
-    if subdomain != current_subdomain
+    if subdomain != current_subdomain.name
       redirect_to "/opps" , :alert => "Sorry, resource is not part of your subdomain"
     end
   end

app/controllers/home_controller.rb

@@ -1,7 +1,7 @@
 class HomeController < ApplicationController
   def index
     if current_user
-      subdomain = current_user.subdomain_name
+      subdomain = current_user.subdomain.name
       sign_out(current_user)
       redirect_to new_user_session_url( :subdomain => subdomain), :notice => "Please sign-in to your subdomain account"
     end

app/controllers/sites_controller.rb

@@ -1,11 +1,11 @@
 class SitesController < ApplicationController
 
   def index
-    @site = Site.find_by_name(current_subdomain)
+    @site = Site.find_by_name(current_subdomain.name)
   end
 
   def opps
-    @site = Site.find_by_name(current_subdomain)
+    @site = Site.find_by_name(current_subdomain.name)
   end
 
 end

app/controllers/users_controller.rb

@@ -1,13 +1,13 @@
 class UsersController < ApplicationController
 
   def index
-    @users = current_subdomain.nil? ? User.all : User.where(:subdomain_name => current_subdomain)
+    @users = current_subdomain.nil? ? User.all : current_subdomain.users
   end
 
   def show
     @user = User.find(params[:id])
     if !current_subdomain.nil?
-      check_my_subdomain(@user.subdomain_name)
+      check_my_subdomain(@user.subdomain.name)
     end
   end
 

app/helpers/application_helper.rb

@@ -1,2 +1,3 @@
 module ApplicationHelper
+
 end

app/models/subdomain.rb

@@ -1,5 +1,5 @@
 class Subdomain < ActiveRecord::Base
-  has_many :users, :primary_key => "name", :foreign_key => "subdomain_name"
+  has_many :users
   has_friendly_id :name, :use_slug => true, :strip_non_ascii => true
   validates_uniqueness_of :name, :case_sensitive => false
   validates_presence_of :name

app/models/user.rb

@@ -1,19 +1,17 @@
 class User < ActiveRecord::Base
-  belongs_to :subdomain, :primary_key => "name", :foreign_key => "subdomain_name"
+  belongs_to :subdomain
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
   validates_presence_of :name, :subdomain_name
   validates_uniqueness_of  :email, :case_sensitive => false
+  attr_accessor :subdomain_name
   attr_accessible :name, :subdomain_name, :email, :password, :password_confirmation, :remember_me
   # has_friendly_id :subdomain_name, :use_slug => true, :strip_non_ascii => true
-  after_create :create_subdomain
+  before_create :create_subdomain
 
   private
-
   def create_subdomain
-    subdomain = Subdomain.find_by_name(self.subdomain_name)
-    if !subdomain
-       Subdomain.create! :name => self.subdomain_name, :user_id => self.id
-    end
+    self.subdomain = Subdomain.find_by_name(self.subdomain_name) 
+    self.subdomain ||= Subdomain.create!(:name => self.subdomain_name, :user_id => self.id)
   end
 end

app/views/devise/registrations/edit.html.erb

@@ -3,8 +3,7 @@
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= devise_error_messages! %>
 
-  <p><%= f.label :subdomain %> :
-  <%= f.hidden_field :subdomain_name %><%= resource.subdomain_name %></p>
+  <p><%= f.hidden_field :subdomain_name, :value => resource.subdomain.name %></p>
 
   <p><%= f.label :name %><br />
   <%= f.text_field :name %></p>

app/views/devise/registrations/new.html.erb

@@ -3,11 +3,10 @@
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
 
-  <p><%= f.label :subdomain %>
     <% if current_subdomain %>
-      : <%= f.hidden_field :subdomain_name, :value => current_subdomain %> <%= current_subdomain%></p>
-
+    <%= f.hidden_field :subdomain_name, :value => current_subdomain.name %>
     <% else%>
+    <p><%= f.label :subdomain %>
       <br /><%= f.text_field :subdomain_name%></p>
     <% end %>
 

db/migrate/20100808194405_devise_create_users.rb

@@ -26,4 +26,4 @@ def self.up
   def self.down
     drop_table :users
   end
-end
+end

db/migrate/20100930104337_migrate_subdomain_to_integer.rb

@@ -0,0 +1,15 @@
+class MigrateSubdomainToInteger < ActiveRecord::Migration
+  def self.up
+    remove_column :users, :subdomain_name
+    add_column :users, :subdomain_id, :integer
+    add_index :users, :subdomain_id
+    add_index :subdomains, :name
+  end
+
+  def self.down
+    add_column :users, :subdomain_name, :limit => 40
+    remove_column :users, :subdomain_id
+    remove_index :users, :subdomain_id
+    remove_index :subdomains, :name
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100808194652) do
+ActiveRecord::Schema.define(:version => 20100930104337) do
 
   create_table "slugs", :force => true do |t|
     t.string   "name"
@@ -31,6 +31,8 @@
     t.datetime "updated_at"
   end
 
+  add_index "subdomains", ["name"], :name => "index_subdomains_on_name"
+
   create_table "users", :force => true do |t|
     t.string   "email",                               :default => "", :null => false
     t.string   "encrypted_password",   :limit => 128, :default => "", :null => false
@@ -44,14 +46,15 @@
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
     t.string   "name"
-    t.string   "subdomain_name",       :limit => 40
     t.string   "loginable_type",       :limit => 40
     t.integer  "loginable_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "subdomain_id"
   end
 
   add_index "users", ["email"], :name => "index_users_on_email", :unique => true
   add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+  add_index "users", ["subdomain_id"], :name => "index_users_on_subdomain_id"
 
 end