Merge pull request #11 from lelik9/feature

Fixing

Author: peakwinter

nginx.py

@@ -415,19 +415,19 @@ def loads(data, conf=True):
     lopen = []
     for line in data.split('\n'):
         line_outside_quotes = re.sub(r'"([^"]+)"|\'([^\']+)\'|\\S+', '', line)
-        if re.match(r'\s*server\s*{', line):
+        if re.match(r'\s*server\s*({.*)?$', line):
             s = Server()
             lopen.insert(0, s)
         if re.match(r'\s*location.*{', line):
             lpath = re.match(r'\s*location\s*(.*\S+)\s*{', line).group(1)
             l = Location(lpath)
             lopen.insert(0, l)
-        if re.match(r'\s*if.*{', line):
-            ifs = re.match('\s*if\s*(.*\S+)\s*{', line).group(1)
+        if re.match(r'\s*if.*({.*)?$', line):
+            ifs = re.match('\s*if\s*(.*\s+)\s*', line).group(1)
             ifs = If(ifs)
             lopen.insert(0, ifs)
-        if re.match(r'\s*upstream.*{', line):
-            ups = re.match(r'\s*upstream\s*(.*\S+)\s*{', line).group(1)
+        if re.match(r'\s*upstream.*({.*)?$', line):
+            ups = re.match(r'\s*upstream\s*(.*\S+)\s*[^{]', line).group(1)
             u = Upstream(ups)
             lopen.insert(0, u)
         if re.match(r'\s*geo\s*\$.*\s{', line):
@@ -445,7 +445,7 @@ def loads(data, conf=True):
                 if "#" not in kname:
                     k = Key(kname, kval)
                     lopen[0].add(k)
-        if re.match(r'.*}', line_outside_quotes):
+        if re.match(r'(^(?!#)([^#]*[}]{1}\s*)$)|(\s*{$)', line_outside_quotes):
             closenum = len(re.findall('}', line_outside_quotes))
             while closenum > 0:
                 if isinstance(lopen[0], Server):

tests.py

@@ -29,6 +29,41 @@
 }
 """
 
+SECONDTESTBLOCK = """
+upstream php 
+{
+    server unix:/tmp/php-fcgi.socket;
+}
+server 
+{
+listen 80;  # This comment should be present;
+    # And this one
+    server_name localhost 127.0.0.1;
+root /srv/http;  # And also this one
+    mykey "myvalue; #notme myothervalue";
+    # This one too
+    index index.php;
+if (!-e $request_filename)
+{
+    rewrite ^(.+)$ /index.php?q=$1 last;
+}
+
+if (!-e $request_filename) {
+    rewrite ^(.+)$ /index.php?q=$1 last;
+}
+    location ~ \.php(?:$|/) {
+        fastcgi_pass php;
+    }
+    
+    # location from the issue #10
+     location / {
+return 301 $scheme://$host:$server_port${request_uri}bitbucket/;
+ }
+}
+"""
+
+
+
 MESSYBLOCK = """
 # This is an example of a messy config
 upstream php { server unix:/tmp/php-cgi.socket; }
@@ -62,6 +97,16 @@ def test_key_parse(self):
         self.assertEqual(thirdKey.name, 'mykey')
         self.assertEqual(thirdKey.value, '"myvalue; #notme myothervalue"')
 
+    def test_key_parse_testblock2(self):
+        data = nginx.loads(SECONDTESTBLOCK)
+        self.assertEqual(len(data.server.keys), 5)
+        firstKey = data.server.keys[0]
+        thirdKey = data.server.keys[3]
+        self.assertEqual(firstKey.name, 'listen')
+        self.assertEqual(firstKey.value, '80')
+        self.assertEqual(thirdKey.name, 'mykey')
+        self.assertEqual(thirdKey.value, '"myvalue; #notme myothervalue"')
+
     def test_location_parse(self):
         data = nginx.loads(TESTBLOCK)
         self.assertEqual(len(data.server.locations), 1)