@@ -1,3 +1,6 @@ +import Prelude hiding ((.), (-)) +import MPS.Light + nemesis = do clean @@ -10,20 +13,20 @@ nemesis = do ] desc "prepare cabal dist" - task "dist" $ do + task "dist" - do sh "cabal clean" sh "cabal configure" sh "cabal sdist" desc "put all .hs files in manifest" - task "manifest" $ do - sh "find . | grep 'hs$' > manifest" + task "manifest" - do + sh "find . | grep 'hs-' > manifest" desc "show sloc" - task "stat" $ do - sh "cloc -match-f=hs$ --quiet src --no3" + task "stat" - do + sh "cloc -match-f=hs- --quiet src --no3" ghci "template" "Network/Loli/Template" @@ -38,19 +41,19 @@ nemesis = do -- test - task "tl" $ sh "curl j:3000" - task "tp" $ sh "curl -d 'src=print' j:3000" + task "tl" - sh "curl j:3000" + task "tp" - sh "curl -d 'src=print' j:3000" -- deploy - task "deploy" $ sh "scp -C .bin/paste easymic.com:~/link/loli/.bin" + task "deploy" - sh "scp -C .bin/paste easymic.com:~/link/loli/.bin" - task "start" $ do + task "start" - do sh "echo starting.." sh ".bin/paste" where - ghci n x = task n $ sh $ "ghci -isrc src/" ++ x ++ ".hs" - bin n x = task n $ do - sh $ "ghc --make -Wall -isrc src/" ++ x ++ ".hs -o .bin/" ++ n - sh $ "echo done.." - sh $ ".bin/" ++ n + ghci n x = task n - sh - "ghci -isrc src/" ++ x ++ ".hs" + bin n x = task n - do + sh - "ghc --make -Wall -isrc src/" ++ x ++ ".hs -o .bin/" ++ n + sh - "echo done.." + sh - ".bin/" ++ n Nemesis @@ -1,3 +1,11 @@ +2009.8.16 +--------- + +### Feature + +* use hackCache for performance +* no $ noise + 2009.7.2 -------- changelog.md @@ -1,5 +1,5 @@ Name: loli -Version: 2009.7.2 +Version: 2009.8.16 Build-type: Simple Synopsis: A minimum web dev DSL in Haskell Description: loli.cabal @@ -9,11 +9,11 @@ loli is a DSL built on hack. It allows you to easily define routes, build your c import Network.Loli import Hack.Handler.Happstack - main = run . loli $ get "/" (text "loli power") + main = run . loli - get "/" (text "loli power") * route - get "/hello" $ do + get "/hello" - do text "hello" will route "/hello" to a controller that outputs hello. @@ -35,7 +35,7 @@ loli is a DSL built on hack. It allows you to easily define routes, build your c After implementing your own template engine, you can use - output $ your-engine-constructor "template-name" + output - your-engine-constructor "template-name" * demo release.md @@ -2,7 +2,7 @@ import Hack.Handler.Happstack import Data.ByteString.Lazy.Char8 import Hack -import Prelude hiding ((.), (>), (/), (^)) +import Prelude hiding ((.), (>), (/), (^), (-)) import MPS.Light import Hack.Contrib.Response import Data.Default @@ -14,6 +14,6 @@ app = \env -> do return r --- main' = run . loli $ get "/" (text "loli power") +-- main' = run . loli - get "/" (text "loli power") main = run app \ No newline at end of file src/Debug/Debug.hs @@ -5,7 +5,7 @@ import Hack.Contrib.Middleware.Config import Hack.Contrib.Middleware.ContentLength import Hack.Contrib.Middleware.ContentType import Network.Loli.Utils -import Prelude hiding ((.), (>), (^)) +import Prelude hiding ((.), (>), (^), (-)) pre_installed_middlewares :: [Middleware] src/Network/Loli/Config.hs @@ -12,7 +12,7 @@ import Network.Loli.Engine import Network.Loli.Middleware.IOConfig import Network.Loli.Type import Network.Loli.Utils -import Prelude hiding ((.), (>), (^)) +import Prelude hiding ((.), (>), (^), (-)) import qualified Control.Monad.State as State @@ -21,10 +21,10 @@ app f = ask >>= (f > io) >>= State.put layout :: String -> Unit -layout x = middleware $ config (set_namespace loli_config loli_layout x) +layout x = middleware - config (set_namespace loli_config loli_layout x) views :: String -> Unit -views x = middleware $ config (set_namespace loli_config loli_views x) +views x = middleware - config (set_namespace loli_config loli_views x) router :: Router -> Unit router = set_router > update @@ -49,7 +49,7 @@ mime :: String -> String -> Unit mime k v = add_mime k v .update public :: Maybe String -> [String] -> Unit -public r xs = middleware $ static r xs +public r xs = middleware - static r xs io :: (MonadIO m) => IO a -> m a io = liftIO src/Network/Loli/DSL.hs @@ -14,7 +14,7 @@ import Network.Loli.Middleware.LoliRouter () import Network.Loli.Middleware.UserMime import Network.Loli.Type import Network.Loli.Utils -import Prelude hiding ((.), (/), (>), (^)) +import Prelude hiding ((.), (/), (>), (^), (-)) run_app :: AppUnit -> Application run_app unit = \env -> runReaderT unit env .flip execStateT def {status = 200} @@ -41,7 +41,7 @@ add_route_config r s = let xs = s.routes in s {routes = xs.insert_last r} add_route :: RequestMethod -> String -> AppUnit -> Unit add_route r s u = do c <- get ^ current_router - update $ add_route_config RouteConfig { route_path = (r, s, u), router = c } + update - add_route_config RouteConfig { route_path = (r, s, u), router = c } set_router :: Router -> Loli -> Loli set_router r x = x { current_router = r } src/Network/Loli/Engine.hs @@ -5,7 +5,7 @@ import Hack import Hack.Contrib.Utils import Hack.Contrib.Utils hiding (get, put) import MPS -import Prelude hiding ((.), (>), (/)) +import Prelude hiding ((.), (>), (/), (-)) import Data.ByteString.UTF8 (fromString) @@ -56,12 +56,12 @@ parse_params t s = let token_length = template_tokens.length location = "/" / url_tokens.take token_length .join "/" in - Just $ (location, rs.catMaybes.catMaybes) + Just - (location, rs.catMaybes.catMaybes) else Nothing where capture x y - | x.starts_with ":" = Just $ Just (x.tail, y) + | x.starts_with ":" = Just - Just (x.tail, y) | x == y = Just Nothing | otherwise = Nothing src/Network/Loli/Middleware/LoliRouter.hs @@ -5,7 +5,7 @@ import Hack import Hack.Contrib.Response import Hack.Contrib.Utils import MPS.Light -import Prelude hiding ((.)) +import Prelude hiding ((.), (-)) user_mime :: [(String, String)] -> Middleware @@ -13,5 +13,5 @@ user_mime h app env = do r <- app env case h.only_fst.find mime >>= flip lookup h of Nothing -> return r - Just v -> return $ r.set_content_type v + Just v -> return - r.set_content_type v where mime x = env.path_info.ends_with ('.' : x) src/Network/Loli/Middleware/UserMime.hs @@ -12,20 +12,20 @@ import Network.Loli.Template.TextTemplate import Network.Loli.Type import Network.Loli.Utils import Data.Maybe -import Prelude hiding ((.), (>), (^), (/)) +import Prelude hiding ((.), (>), (^), (-), (/)) import qualified Control.Monad.State as State -- simple text :: String -> AppUnit text x = do - update $ set_content_type _TextPlain - update $ set_body (x.fromString) + update - set_content_type _TextPlain + update - set_body (x.fromString) render_layout html :: String -> AppUnit html x = do - update $ set_content_type _TextHtml - update $ set_body (x.fromString) + update - set_content_type _TextHtml + update - set_body (x.fromString) render_layout -- template @@ -55,7 +55,7 @@ render_layout = do Nothing -> return () Just layout_template -> do s <- State.get ^ body ^ toString - local (set_namespace loli_partials loli_layout_content s) $ do + local (set_namespace loli_partials loli_layout_content s) - do render (text_template layout_template) >>= fromString > set_body > update src/Network/Loli/Template.hs @@ -4,7 +4,7 @@ import Control.Arrow ((***)) import Data.ByteString.Lazy.UTF8 import MPS import Network.Loli.Type -import Prelude hiding ((.), (>), (^), (/)) +import Prelude hiding ((.), (>), (^), (-), (/)) import Text.Template hiding (Context, Template, template) import qualified Text.Template as T src/Network/Loli/Template/TextTemplate.hs @@ -3,7 +3,7 @@ module Network.Loli.Utils where import Control.Monad.State import Hack import MPS.Light -import Prelude hiding ((.), (/), (>), (^)) +import Prelude hiding ((.), (/), (>), (^), (-)) import Data.ByteString.UTF8 (fromString, toString) namespace :: String -> Env -> [(String, String)] src/Network/Loli/Utils.hs @@ -80,7 +80,7 @@ list = ls db ^ rsort >>= mapM read read :: String -> IO Paste read x = do src <- readFile (db / x) - return $ def {no, lang, user, src} + return - def {no, lang, user, src} where no = x.split sep .first .P.read :: Int lang = x.split "\\." .last @@ -109,22 +109,22 @@ link x = "/" ++ x.paste_id -- Controller main :: IO () -main = runWithConfig def {port = 5000} $ loli $ do +main = runWithConfig def {port = 5000} - loli - do public (Just "public") ["/css", "/js"] middleware lambda - middleware $ content_type _TextHtml + middleware - content_type _TextHtml views "views/loli_paste" layout "layout.html" - get "/create" $ do - bind "options" options $ do - output $ text_template "create.html" + get "/create" - do + bind "options" options - do + output - text_template "create.html" - get "/:paste" $ do + get "/:paste" - do name <- captures ^ lookup "paste" ^ fromJust ^ unescape_uri ^ b2u if ".." `isInfixOf` name then html "no permission" @@ -135,16 +135,16 @@ main = runWithConfig def {port = 5000} $ loli $ do paste <- read name .io raw <- ask ^ params ^ lookup "raw" case raw of - Just "true" -> no_layout $ text (paste.src) + Just "true" -> no_layout - text (paste.src) _ -> do context [ ("paste_id", paste.paste_id) , ("src", paste.src.kate (paste.lang.guess_lang)) - ] $ output $ text_template "view.html" + ] - output - text_template "view.html" else html "paste missing" - post "/" $ do + post "/" - do form <- ask ^ inputs ^ map_snd unescape_unicode_xml let src' = form.lookup "src" user' = form.lookup "user" @@ -171,21 +171,21 @@ main = runWithConfig def {port = 5000} $ loli $ do no <- ls db .io ^ rsort ^ first ^ get_id ^ (+1) paste { no } .create .io - update $ redirect "/" Nothing + update - redirect "/" Nothing -- default - get "/" $ do + get "/" - do pastes <- list .io ^ take 50 let rows = pastes.map row .concat - bind "rows" rows $ do - output $ text_template "list.html" + bind "rows" rows - do + output - text_template "list.html" -- View helper kate :: String -> String -> String kate language code = case highlightAs language code of - Right result -> renderHtmlFragment $ + Right result -> renderHtmlFragment - formatAsXHtml [] language result Left _ -> "<pre><code>" ++ code ++ "</code></pre>" src/Test/LoliPaste.hs @@ -10,21 +10,21 @@ import Network.Loli.Template.TextTemplate import Network.Loli.Utils import Network.Loli.Middleware.LoliRouter import Data.Maybe -import MPS ((^)) -import Prelude hiding ((^)) +import MPS ((^), (-)) +import Prelude hiding ((^), (-)) import Hack.Contrib.Request -- default on port 3000 main :: IO () -main = run 3000 . loli $ do +main = run 3000 . loli - do middleware lambda before return after return - get "/bench" $ do + get "/bench" - do name <- ask ^ params ^ lookup "name" ^ fromMaybe "nobody" html ("<h1>" ++ name ++ "</h1>") @@ -37,57 +37,57 @@ main = run 3000 . loli $ do get "/debug" (text . show =<< ask) -- io - get "/cabal" $ text =<< io (readFile "loli.cabal") + get "/cabal" - text =<< io (readFile "loli.cabal") -- route captures - get "/say/:user/:message" $ do + get "/say/:user/:message" - do text . show =<< captures -- html output get "/html" (html "<html><body><p>loli power!</p></body></html>") -- template - get "/hi/:user" $ output (text_template "hello.html") + get "/hi/:user" - output (text_template "hello.html") -- manually tweak the reponse body - get "/hi-html/:user" $ do - update $ set_content_type "text/html" - output $ text_template "hello.html" + get "/hi-html/:user" - do + update - set_content_type "text/html" + output - text_template "hello.html" -- add local binding - get "/local-binding" $ do - bind "user" "alice" $ output (text_template "hello.html") + get "/local-binding" - do + bind "user" "alice" - output (text_template "hello.html") -- batched local locals - get "/batched-local-binding" $ do - context [("user", "alice"), ("password", "foo")] $ + get "/batched-local-binding" - do + context [("user", "alice"), ("password", "foo")] - text .show =<< locals - get "/const-template" $ do + get "/const-template" - do output (const_template "const-string") - get "/partial-template" $ do - partial "user" (const_template "const-user") $ do + get "/partial-template" - do + partial "user" (const_template "const-user") - do text . show =<< template_locals - get "/partial-context" $ do + get "/partial-context" - do partials [ ("user", const_template "alex") , ("password", const_template "foo") - ] $ do + ] - do output (text_template "hello.html") - get "/with-layout" $ do - with_layout "layout.html" $ do + get "/with-layout" - do + with_layout "layout.html" - do text "layout?" - get "/without-layout" $ do - no_layout $ do + get "/without-layout" - do + no_layout - do text "no-layout" -- default - get "/" $ do + get "/" - do io . print =<< ask ^ url text . show =<< ask src/Test/Test.hs @@ -1,4 +1,4 @@ import Network.Loli import Hack.Handler.Happstack -main = run . loli $ get "/" (text "loli power") \ No newline at end of file +main = run . loli - get "/" (text "loli power") \ No newline at end of file src/Test/myapp.hs 3628896d7d8bc688f1b00c862840701ec0682921 jinjing nfjinjing@gmail.com http://github.com/nfjinjing/loli/commit/438ec820288c92d07fd1b7ed85ed673af5dfb543 438ec820288c92d07fd1b7ed85ed673af5dfb543 2009-08-16T08:54:17-07:00 2009-08-16T08:54:17-07:00 no $ noise 5a60debad10f15c27480d9ebcadc10bebf96ccba jinjing nfjinjing@gmail.com