Condensed some more code

danopia · Jan 17, 2010 · 7235cdf · 7235cdf
1 parent cb818af
commit 7235cdf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/provider.rb b/lib/provider.rb
@@ -8,16 +8,12 @@ class Provider
 
 	# Create a new provider.
 	def initialize(domain, subdomain='wave', sock=nil)
-		subdomain = "#{subdomain}." if subdomain
-
 		@domain = domain
-		@name = "#{subdomain}#{domain}"
-		@servers = ServerList.new
+		@name = [subdomain, domain] * '.'
+		@servers = ServerList.new self
 		@sock = sock
 		@packet_ids = {}
 		@ready = false
-
-		@servers.provider = self
 
 		@local = Server.new self, @domain, @name, false
 		@local.state = :local

diff --git a/lib/server_list.rb b/lib/server_list.rb
@@ -5,6 +5,11 @@ module Sails
 class ServerList < Hash
 	attr_accessor :provider
 
+	def initialize provider=nil
+		super()
+		@provider = provider
+	end
+
 	def [](server)
 		return nil unless server
 		super server.downcase