fixes

Author: jacook

main.py

@@ -166,19 +166,27 @@ def __init__(self, value, *args):
 
 
 class LimitExcept(Container):
-	name = 'limit_except'
+	def __init__(self, value, *args):
+		super(LimitExcept, self).__init__(value, *args)
+		self.name = 'limit_except'
 
 
 class Types(Container):
-	name = 'types'
+	def __init__(self, value, *args):
+		super(Types, self).__init__(value, *args)
+		self.name = 'types'
 
 
 class If(Container):
-	name = 'if'
+	def __init__(self, value, *args):
+		super(If, self).__init__(value, *args)
+		self.name = 'if'
 
 
 class Upstream(Container):
-	name = 'upstream'
+	def __init__(self, value, *args):
+		super(Upstream, self).__init__(value, *args)
+		self.name = 'upstream'
 
 
 class Key(object):
@@ -201,11 +209,15 @@ def loads(data):
 			s = Server()
 			lopen.insert(0, s)
 		if re.match('\s*location.*{', line):
-			lpath = re.match('\s*location\s*(.*)\s*{', line).group(1)
+			lpath = re.match('\s*location\s*(.*\S+)\s*{', line).group(1)
 			l = Location(lpath)
 			lopen.insert(0, l)
+		if re.match('\s*upstream.*{', line):
+			ups = re.match('\s*upstream\s*(.*\S+)\s*{', line).group(1)
+			u = Upstream(ups)
+			lopen.insert(0, u)
 		if re.match('.*;', line):
-			kname, kval = re.match('.*(?:^|{\s*)(\S+)\s(.+);', line).group(1, 2)
+			kname, kval = re.match('.*(?:^|^\s*|{\s*)(\S+)\s(.+);', line).group(1, 2)
 			k = Key(kname, kval)
 			lopen[0].add(k)
 		if re.match('.*}', line):
@@ -214,10 +226,13 @@ def loads(data):
 				if isinstance(lopen[0], Server):
 					f.add(lopen[0])
 					lopen.pop(0)
-				elif isinstance(lopen[0], Location):
-					l = lopen[0]
+				elif isinstance(lopen[0], Container):
+					c = lopen[0]
 					lopen.pop(0)
-					lopen[0].add(l)
+					if lopen:
+						lopen[0].add(c)
+					else:
+						f.add(c)
 				closenum = closenum - 1
 		if re.match('\s*#\s*', line):
 			c = Comment(re.match('\s*#\s*(.*)$', line).group(1))

test.py

@@ -7,6 +7,7 @@ def test():
 def messy():
 	return nginx.loads("""
 		# This is an example of a messy config
+		upstream php { server unix:/tmp/php-cgi.socket; }
 		server { server_name localhost; #this is the server server_name
 		location /{ test_key test_value; }}
 		""")