Changeset 1201 for lang/lua

Timestamp:

11/07/07 04:36:41 (6 years ago)

Author:

cho45

Message:

lang/lua/bluasxom/bluasxom.lua,
lang/lua/bluasxom/template.html:

いろいろシンプルになるように修正。
ねよう

Location:

lang/lua/bluasxom

Files:

• bluasxom.lua (modified) (4 diffs)
• template.html (modified) (1 diff)

lang/lua/bluasxom/bluasxom.lua

@@ -2 +2 @@
 -- vim:ft=lua:
 -- POSIX かつ ruby がインストールされている前提
+-- Lua 5.1
 
 package.path = "./lib/?.lua"
@@ -27 +28 @@
 }
 
-function get_entries(dir, ext)
-        local ret = List.new()
-        local tf = os.tmpname()
-        os.execute('ruby -rpathname -e "Pathname.glob(%|'..dir..'/**/*'..ext..'|){|f|puts %|#{f.mtime.to_i} #{f}|}" > ' .. tf)
-        for line in io.lines(tf) do
-                local time, filename = string.match(line, "(%d+) (.+)")
-                local e = Entry.new(filename, tonumber(time, 10))
-                e.name = string.gsub(string.gsub(filename, "%.%w+$", ""), "^"..dir, "")
-                ret:push(e)
-        end
-        return ret
-end
-
-
 ELua = Class { super = nil,
         initialize = function (self, template)
@@ -56 +43 @@
                         ret = ret .. pre
                         if     string.match(code, "^==") then
-                                ret = ret .. "]===] .. " .. string.sub(code, 3) .. " .. [===["
+                                ret = ret .. "]===] .. tostring(" .. string.sub(code, 3) .. ") .. [===["
                         elseif string.match(code, "^=") then
-                                ret = ret .. "]===] .. " .. string.sub(code, 2) .. " .. [===["
+                                ret = ret .. "]===] .. htmlescape(" .. string.sub(code, 2) .. ") .. [===["
                         else
                                 ret = ret .. "]===]\n" .. code .. "\nret = ret .. [===["
@@ -68 +55 @@
         end,
 
+        htmlescape = function (str)
+                local m = {["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;"}
+                return string.gsub(tostring(str), "[<>&]", function (s)
+                        return m[s]
+                end)
+        end,
+
         result = function (self, context)
                 local f = loadstring(self.src, "ELua")
-                -- グローバル環境を context のコピー
+                -- グローバル環境を context にコピー
                 -- うわがきされる。
                 for k, v in pairs(_G) do
                         context[k] = v
                 end
+                context.htmlescape = self.htmlescape
                 setfenv(f, context)
                 return f()
         end,
+
+        run = function (filename, context)
+                local f = io.open(filename)
+                local tmpl = f:read("*a")
+                f:close()
+                print(ELua.new(tmpl):result(context))
+        end,
 }
 
-local f = io.open("template.html")
-tmpl = f:read("*a")
-f:close()
 
-local entries = get_entries("data", ".txt")
+function get_entries(dir, ext)
+        local ret = List.new()
+        local tf = os.tmpname()
+        -- ruby++
+        os.execute('ruby -rpathname -e "Pathname.glob(%|'..dir..'/**/*'..ext..'|){|f|puts %|#{f.mtime.to_i} #{f}|}" > ' .. tf)
+        for line in io.lines(tf) do
+                local time, filename = string.match(line, "(%d+) (.+)")
+                local e = Entry.new(filename, tonumber(time, 10))
+                e.name = string.gsub(string.gsub(filename, "%.%w+$", ""), "^"..dir, "")
+                ret:push(e)
+        end
+        return ret
+end
 
-entries = entries:sort(function (a, b)
-        return a.time > b.time
-end)
-
-local result = ELua.new(tmpl):result({
-        title = "test",
-        home  = "test",
-        entries = entries,
+ELua.run("template.html", {
+        title    = "test",
+        home     = os.getenv("SCRIPT_NAME"),
+        server   = "http://" .. tostring(os.getenv("SERVER_NAME")),
+        entries  =
+                get_entries("data", ".txt"):sort(function (a, b)
+                        return a.time > b.time
+                end),
         debugObj = "aaa",
-        version = _VERSION,
 })
 
-print(result)

lang/lua/bluasxom/template.html

@@ -99 +99 @@
 
                         <div id="footer">
-                                <p>Powered by Lua (+ruby) <%= version %></p>
+                                <p>Powered by Lua (+ruby) <%= _VERSION %></p>
                         </div>
                 </div>