Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lenses/nginx.aug: Allow types block to be defined #844

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

lenses/nginx.aug: Allow types block to be defined #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lenses/nginx.aug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,14 @@ autoload xfm

(* Variable: word *)
let word = /[A-Za-z0-9_.:-]+/
(* Variable: sub_type_word
According to https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
*)
let sub_type_work = /[A-Za-z.-]+[0-9_]*/

(* Variable: block_re
The keywords reserved for block entries *)
let block_re = "http" | "events" | "server" | "mail" | "stream"
let block_re = "http" | "events" | "server" | "mail" | "stream" | "types"

(* All block keywords, including the ones we treat specially *)
let block_re_all = block_re | "if" | "location" | "geo" | "map"
Expand All @@ -47,9 +51,10 @@ let block_re_all = block_re | "if" | "location" | "geo" | "map"
let simple =
let kw = word - block_re_all
in let mask = [ label "mask" . Util.del_str "/" . store Rx.integer ]
in let sub_type = [ label "sub_type" . Util.del_str "/" . store sub_type_word ]
in let sto = store /[^ \t\n;#]([^";#]|"[^"]*\")*/
in [ Util.indent .
key kw . mask? .
key kw . (sub_type | mask)? .
(Sep.space . sto)? . Sep.semicolon .
(Util.eol|Util.comment_eol) ]

Expand Down
12 changes: 12 additions & 0 deletions lenses/tests/test_nginx.aug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,3 +297,15 @@ test lns get "upstream php-handler {
{ "@server"
{ "@address" = "unix:/var/run/php/php7.3-fpm.sock" } } }

test lns get "types {
text/html html;
application/x-bzip2 bz2;
application/vnd.ms-powerpoint ppt;
}\n" =
{ "types"
{ "text" = "html"
{ "sub_type" = "html" } }
{ "application" = "bz2"
{ "sub_type" = "x-bzip2" } }
{ "application" = "ppt"
{ "sub_type" = "vnd.ms-powerpoint" } } }