Mercurial Hosting > luan

annotate http/src/luan/modules/http/run.luan @ 560:2f39468680be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove SimplyHTML from shell
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 23 Jun 2015 07:57:10 -0600
parents bfb2c30324c0
children 1e69d9c21461
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
321
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 294
diff changeset
1 local Luan = require "luan:Luan"
558
6e3f063b71b5 remove SimplyHTML from run.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 505
diff changeset
2 local error = Luan.error
6e3f063b71b5 remove SimplyHTML from run.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 505
diff changeset
3 local load = Luan.load or error()
6e3f063b71b5 remove SimplyHTML from run.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 505
diff changeset
4 local try = Luan.try or error()
321
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 294
diff changeset
5 local Io = require "luan:Io"
558
6e3f063b71b5 remove SimplyHTML from run.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 505
diff changeset
6 local print = Io.print or error()
494
2b9bc97f0439 change luan:web to luan:http
Franklin Schmidt <fschmidt@gmail.com>
parents: 493
diff changeset
7 local Http = require "luan:http/Http"
138
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
8
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 498
diff changeset
9
138
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
10 local function lines(s)
271
82a3ebcfbafa add internal tests
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 226
diff changeset
11 local matcher = s.gmatch "([^\n]*)\n|([^\n])+$"
138
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
12 return function()
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
13 local m1, m2 = matcher()
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
14 return m1 or m2
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
15 end
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
16 end
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
17
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
18 local function print_with_line_numbers(s)
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 498
diff changeset
19 local i = 1
138
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
20 for line in lines(s) do
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
21 print(i,line)
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
22 i = i + 1
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
23 end
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
24 end
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
25
391
2f5cc9c2cbf0 replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents: 347
diff changeset
26 local function form() %>
2f5cc9c2cbf0 replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents: 347
diff changeset
27 <html>
2f5cc9c2cbf0 replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents: 347
diff changeset
28 <head>
2f5cc9c2cbf0 replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents: 347
diff changeset
29 <title>Run Luan Code</title>
558
6e3f063b71b5 remove SimplyHTML from run.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 505
diff changeset
30 <style>
560
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
31 body {
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
32 font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
33 text-align: center;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
34 margin-top: 1em;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
35 }
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
36 h2 {
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
37 margin-bottom: .3em;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
38 font-weight: normal;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
39 }
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
40 textarea {
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
41 font: inherit;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
42 border-radius: 4px;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
43 padding: .5em .8em;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
44 }
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
45 input[type="submit"] {
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
46 margin-top: .3em;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
47 color: white;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
48 background: #337ab7;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
49 border-color: #337ab7;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
50 font: inherit;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
51 padding: .5em;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
52 border-radius: 4px;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
53 }
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
54 input[type="submit"]:hover {
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
55 background: #236aa7 !important;
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
56 }
558
6e3f063b71b5 remove SimplyHTML from run.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 505
diff changeset
57 </style>
391
2f5cc9c2cbf0 replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents: 347
diff changeset
58 </head>
560
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
59 <body>
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
60 <h2>Run Luan Code</h2>
391
2f5cc9c2cbf0 replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents: 347
diff changeset
61 <form name="form0" method="post">
2f5cc9c2cbf0 replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents: 347
diff changeset
62 <input type="hidden" name="content_type" value="text/plain" />
558
6e3f063b71b5 remove SimplyHTML from run.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 505
diff changeset
63 <div>
560
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
64 <textarea name="code" rows="20" cols="90" wrap="off" autofocus></textarea>
558
6e3f063b71b5 remove SimplyHTML from run.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 505
diff changeset
65 </div>
6e3f063b71b5 remove SimplyHTML from run.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 505
diff changeset
66 <div>
560
2f39468680be remove SimplyHTML from shell
Franklin Schmidt <fschmidt@gmail.com>
parents: 559
diff changeset
67 <input type="submit" value="Execute Luan Code"/>
558
6e3f063b71b5 remove SimplyHTML from run.luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 505
diff changeset
68 </div>
391
2f5cc9c2cbf0 replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents: 347
diff changeset
69 </form>
2f5cc9c2cbf0 replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents: 347
diff changeset
70 </body>
2f5cc9c2cbf0 replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents: 347
diff changeset
71 </html>
2f5cc9c2cbf0 replace Html.simply_html_page with simply_html_head and simply_html_body_bottom
Franklin Schmidt <fschmidt@gmail.com>
parents: 347
diff changeset
72 <% end
283
b669cdaf54b7 add URL post;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 271
diff changeset
73
505
7bc63886d4f2 web page modules now return a function
Franklin Schmidt <fschmidt@gmail.com>
parents: 503
diff changeset
74 return function()
283
b669cdaf54b7 add URL post;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 271
diff changeset
75 Io.stdout = Http.response.text_writer()
497
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 495
diff changeset
76 local code = Http.request.parameter.code
283
b669cdaf54b7 add URL post;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 271
diff changeset
77 if code == nil then
b669cdaf54b7 add URL post;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 271
diff changeset
78 form()
b669cdaf54b7 add URL post;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 271
diff changeset
79 return
b669cdaf54b7 add URL post;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 271
diff changeset
80 end
497
55f9f74f1e55 Http.request is now pure luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 495
diff changeset
81 local content_type = Http.request.parameter.content_type
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 156
diff changeset
82 if content_type ~= nil then
498
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
83 Http.response.header.content_type = content_type
157
1de3e4a6e82d remove LuanJavaFunction.RTN_NUMBER_ARRAY;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 156
diff changeset
84 end
156
925ba2d59b9d fix String java calls;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 139
diff changeset
85 local env = {
925ba2d59b9d fix String java calls;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 139
diff changeset
86 request = Http.request;
925ba2d59b9d fix String java calls;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 139
diff changeset
87 response = Http.response;
925ba2d59b9d fix String java calls;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 139
diff changeset
88 }
326
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
89 try {
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
90 function()
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
91 local run = load(code,"<web_run>",env)
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
92 run()
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
93 end;
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
94 catch = function(e)
498
ee55be414a34 Http.response is now mostly luan
Franklin Schmidt <fschmidt@gmail.com>
parents: 497
diff changeset
95 Http.response.header.content_type = "text/plain"
326
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
96 print(e)
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
97 print()
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
98 print()
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
99 print_with_line_numbers(code)
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
100 end;
db37d6aee4db remove try-catch statement;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 325
diff changeset
101 }
138
06159094b802 replace WebRun.java with web_run.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
102 end