Add support for nginx

examples/nested-jsbeautifyrc/nginx/expected/nginx.conf

@@ -0,0 +1,203 @@
+
+#user html;
+worker_processes 1;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+error_log logs/error.log info;
+
+#pid        logs/nginx.pid;
+
+events
+{
+	worker_connections 1024;
+}
+
+
+http
+{
+	include mime.types;
+	default_type application/octet-stream;
+
+	#log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+	#                  '$status $body_bytes_sent "$http_referer" '
+	#                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+	#access_log  logs/access.log  main;
+	sendfile on;
+	#tcp_nopush     on;
+
+	#keepalive_timeout  0;
+	keepalive_timeout 65;
+
+	#gzip  on;
+
+	server
+	{
+		listen 80;
+		server_name localhost;
+
+		#charset koi8-r;
+
+		#access_log  logs/host.access.log  main;
+		location /
+		{
+			root /usr/share/nginx/html;
+			index index.html index.htm;
+		}
+
+		#error_page  404              /404.html;
+
+		# redirect server error pages to the static page /50x.html
+		#
+		error_page 500 502 503 504 /50x.html;
+		location = /50x.html
+		{
+			root /usr/share/nginx/html;
+		}
+
+		# proxy the PHP scripts to Apache listening on 127.0.0.1:80
+		#
+		#location ~ \.php$ {
+		#    proxy_pass   http://127.0.0.1;
+		#}
+
+		# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+		#
+		#location ~ \.php$ {
+		#    root           html;
+		#    fastcgi_pass   127.0.0.1:9000;
+		#    fastcgi_index  index.php;
+		#    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+		#    include        fastcgi_params;
+		#}
+		# deny access to .htaccess files, if Apache's document root
+		# concurs with nginx's one
+		#
+		#location ~ /\.ht {
+		#    deny  all;
+		#}
+	}
+
+
+	server
+	{
+		listen 80;
+		include mime.types;
+		server_name dv;
+		location /nginxstatic/
+		{
+			alias /srv/http/dv/;
+			limit_rate 250k;
+		}
+
+		location /
+		{
+			#root /srv/http/dv/;
+			#index index.html;
+			limit_rate 1M;
+			#limit_conn addr 1;
+			proxy_pass http://localhost:3000/;
+		}
+	}
+
+	server
+	{
+		listen 80;
+		server_name ip.dv;
+		root /home/http/ip/;
+		include mime.types;
+		location /
+		{
+			try_files $uri $uri/ /index.php;
+		}
+		location ~ .php$
+		{
+			try_files $uri =404;
+			fastcgi_pass unix:/var/run/php5-fpm/socket_name.socket;
+			fastcgi_split_path_info ^(.+\.php)(/.+)$;
+			fastcgi_index index.php;
+			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+			include fastcgi_params;
+		}
+	}
+
+	server
+	{
+		listen 80;
+		server_name pma.dv;
+		location /
+		{
+			root /home/http/pma/;
+			index index.php;
+		}
+
+		location ~ \.php$
+		{
+			fastcgi_pass unix:/run/php-fpm/php-fpm.sock;
+			fastcgi_index index.php;
+			fastcgi_param SCRIPT_FILENAME /home/http/pma/$fastcgi_script_name;
+			include fastcgi_params;
+		}
+	}
+	server
+	{
+		listen 80;
+		server_name swissecurity.coelis;
+		location /
+		{
+			root /srv/http/swissecurity-fm/;
+			index index.html;
+		}
+	}
+
+	server
+	{
+		listen 80;
+		server_name p1.dv;
+		location /
+		{
+			proxy_pass http://127.0.0.1:1337/;
+		}
+	}
+
+
+	server
+	{
+		listen 80;
+		server_name s.dev;
+		location /
+		{
+			proxy_pass http://127.0.0.1:1337/;
+		}
+	}
+
+
+	# another virtual host using mix of IP-, name-, and port-based configuration
+	#
+	#server {
+	#    listen       8000;
+	#    listen       somename:8080;
+	#    server_name  somename  alias  another.alias;
+	#    location / {
+	#        root   html;
+	#        index  index.html index.htm;
+	#    }
+	#}
+	# HTTPS server
+	#
+	#server {
+	#    listen       443 ssl;
+	#    server_name  localhost;
+	#    ssl_certificate      cert.pem;
+	#    ssl_certificate_key  cert.key;
+	#    ssl_session_cache    shared:SSL:1m;
+	#    ssl_session_timeout  5m;
+	#    ssl_ciphers  HIGH:!aNULL:!MD5;
+	#    ssl_prefer_server_ciphers  on;
+	#    location / {
+	#        root   html;
+	#        index  index.html index.htm;
+	#    }
+	#}
+}

examples/nested-jsbeautifyrc/nginx/original/nginx.conf

@@ -0,0 +1,194 @@
+
+#user html;
+worker_processes  1;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+error_log  logs/error.log  info;
+
+#pid        logs/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        #charset koi8-r;
+
+        #access_log  logs/host.access.log  main;
+
+        location / {
+            root   /usr/share/nginx/html;
+            index  index.html index.htm;
+        }
+
+        #error_page  404              /404.html;
+
+        # redirect server error pages to the static page /50x.html
+        #
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   /usr/share/nginx/html;
+        }
+
+        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+        #
+        #location ~ \.php$ {
+        #    proxy_pass   http://127.0.0.1;
+        #}
+
+        # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+        #
+        #location ~ \.php$ {
+        #    root           html;
+        #    fastcgi_pass   127.0.0.1:9000;
+        #    fastcgi_index  index.php;
+        #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+        #    include        fastcgi_params;
+        #}
+
+        # deny access to .htaccess files, if Apache's document root
+        # concurs with nginx's one
+        #
+        #location ~ /\.ht {
+        #    deny  all;
+        #}
+    }
+
+
+    server {
+	listen 80;
+	include mime.types;
+	server_name dv;
+	location /nginxstatic/ {
+	 alias /srv/http/dv/;
+	 limit_rate 250k;
+	}
+
+	location / {
+	  #root /srv/http/dv/;
+	  #index index.html;
+	  limit_rate 1M;
+	  #limit_conn addr 1;
+	  proxy_pass http://localhost:3000/;
+	}
+    }
+
+    server {
+	listen 80;
+	server_name ip.dv;
+	root /home/http/ip/;
+	include mime.types;
+    	location / {
+	    try_files $uri $uri/ /index.php;
+			    }
+	 location ~ .php$ {
+		        try_files $uri =404;
+			       fastcgi_pass unix:/var/run/php5-fpm/socket_name.socket;
+			              fastcgi_split_path_info ^(.+\.php)(/.+)$;
+				             fastcgi_index index.php;
+					            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+						           include fastcgi_params;
+							   }
+    }
+
+    server {
+        listen 80;
+	server_name pma.dv;
+	location / {
+         root /home/http/pma/;
+	 index index.php;
+	}
+
+	location ~ \.php$ {
+         fastcgi_pass   unix:/run/php-fpm/php-fpm.sock;
+         fastcgi_index  index.php;
+         fastcgi_param  SCRIPT_FILENAME  /home/http/pma/$fastcgi_script_name;
+         include        fastcgi_params;
+	}
+    }
+    server {
+        listen 80;
+	server_name swissecurity.coelis;
+	location / {
+         root /srv/http/swissecurity-fm/;
+	 index index.html;
+	}
+    }
+
+    server {
+        listen 80;
+	server_name p1.dv;
+	location / {
+	 proxy_pass http://127.0.0.1:1337/;
+	}
+    }
+
+
+    server { listen 80;
+	server_name s.dev;
+	location / {
+	 proxy_pass http://127.0.0.1:1337/;
+	}
+    }
+
+
+    # another virtual host using mix of IP-, name-, and port-based configuration
+    #
+    #server {
+    #    listen       8000;
+    #    listen       somename:8080;
+    #    server_name  somename  alias  another.alias;
+
+    #    location / {
+    #        root   html;
+    #        index  index.html index.htm;
+    #    }
+    #}
+
+
+    # HTTPS server
+    #
+    #server {
+    #    listen       443 ssl;
+    #    server_name  localhost;
+
+    #    ssl_certificate      cert.pem;
+    #    ssl_certificate_key  cert.key;
+
+    #    ssl_session_cache    shared:SSL:1m;
+    #    ssl_session_timeout  5m;
+
+    #    ssl_ciphers  HIGH:!aNULL:!MD5;
+    #    ssl_prefer_server_ciphers  on;
+
+    #    location / {
+    #        root   html;
+    #        index  index.html index.htm;
+    #    }
+    #}
+
+}

package.json

@@ -140,6 +140,7 @@
     "lodash": "^4.14.2",
     "loophole": "^1.0.0",
     "marko-prettyprint": "^1.2.0",
+    "nginxbeautify": "^2.0.0",
     "node-dir": "^0.1.16",
     "node-cljfmt": "^0.5.3-1",
     "node-uuid": "^1.4.3",
@@ -305,4 +306,4 @@
     "lint": "coffeelint src/ spec/",
     "code-docs": "codo && open docs/code/index.html"
   }
-}
+}

script/build-options.js

@@ -215,7 +215,7 @@ buildOptionsForBeautifiers = function(beautifiers, allLanguages) {
     if (_.isArray(objValue)) {
       return _.uniq(objValue.concat(srcValue));
     }
-  } 
+  }
   for (j = 0, len1 = allLanguages.length; j < len1; j++) {
     lang = allLanguages[j];
     namespaceDest = lang.namespace;

src/beautifiers/index.coffee

@@ -53,6 +53,7 @@ module.exports = class Beautifiers extends EventEmitter
     'js-beautify'
     'jscs'
     'lua-beautifier'
+    'nginx-beautify'
     'ocp-indent'
     'perltidy'
     'php-cs-fixer'

src/beautifiers/nginx-beautify.coffee

@@ -0,0 +1,22 @@
+"use strict"
+Beautifier = require('./beautifier')
+
+module.exports = class NginxBeautify extends Beautifier
+  name: "Nginx Beautify"
+  link: "https://github.com/denysvitali/nginxbeautify"
+
+  options: {
+    Nginx: true
+  }
+
+  beautify: (text, language, options) ->
+
+    return new @Promise((resolve, reject) ->
+      Beautify = require("nginxbeautify")
+      instance = new Beautify(options);
+      try
+        resolve(instance.parse(text))
+      catch error
+        # Error occurred
+        reject(error)
+    )

src/languages/index.coffee

@@ -47,6 +47,7 @@ module.exports = class Languages
     "markdown"
     'marko'
     "mustache"
+    "nginx"
     "nunjucks"
     "objective-c"
     "ocaml"

src/languages/nginx.coffee

@@ -0,0 +1,38 @@
+module.exports = {
+
+  name: "Nginx"
+  namespace: "nginx"
+
+  ###
+  Supported Grammars
+  ###
+  grammars: [
+    "nginx"
+  ]
+
+  ###
+  Supported extensions
+  ###
+  extensions: [
+    "conf"
+  ]
+
+  defaultBeautifier: "Nginx Beautify"
+
+  options:
+    spaces:
+      title: "Spaces"
+      type: "number"
+      default: 0
+      description: "Indent with spaces"
+    tabs:
+      title: "Tabs"
+      type: "number"
+      default: 1
+      description: "Indent with tabs"
+    dontJoinCurlyBracet:
+      title: "Don't join curly brackets"
+      type: "boolean"
+      default: true
+      descriotion: ""
+}