X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=examples%2FHelloWorld.hs;h=2d240e8bb8bb0b751cdaf1d56a76c24b159dd82f;hb=950640dd241222203778f8167943d30fa52f356a;hp=d7e0071c8767f72caf9e9bc72c0ef08e748c3b66;hpb=f402841101b4b84f263eea1a43c848f81c48ff93;p=Lucu.git

diff --git a/examples/HelloWorld.hs b/examples/HelloWorld.hs
index d7e0071..2d240e8 100644
--- a/examples/HelloWorld.hs
+++ b/examples/HelloWorld.hs
@@ -1,39 +1,48 @@
 {-# LANGUAGE
     OverloadedStrings
+  , QuasiQuotes
   , UnicodeSyntax
   #-}
 import Control.Applicative
 import Control.Monad.Unicode
 import qualified Data.ByteString.Lazy.Char8 as Lazy
+import qualified Data.Collections as C
+import Data.Monoid.Unicode
+import Network
 import Network.HTTP.Lucu
+import Prelude.Unicode
 
 main ∷ IO ()
 main = let config    = defaultConfig { cnfServerPort = "9999" }
-           resources = mkResTree
-                       [ ([]         , helloWorld               )
-                       , (["urandom"], staticFile "/dev/urandom")
-                       , (["inc"    ], staticDir "/usr/include" )
-                       ]
-           fallbacks = [ \ path → case path of
-                                     ["hello"] → return $ Just helloWorld
-                                     _         → return Nothing
+           mapper    = resourceMap resources ⊕ resourceMap fallbacks
+           resources ∷ ResourceTree
+           resources = C.fromList
+                       [ ([]          , nonGreedy helloWorld)
+                       , (["urandom" ], nonGreedy $ staticFile "/dev/urandom")
+                       , (["inc"     ], greedy    $ staticDir  "/usr/include")
+                       , (["inc", "t"], nonGreedy $ staticFile "/usr/include/time.h")
                        ]
+           fallbacks ∷ Path → Maybe (Path, Resource)
+           fallbacks path
+               | path ≡ ["hello"] = Just (path, helloWorld)
+               | otherwise        = Nothing
        in
          do putStrLn "Access http://localhost:9999/ with your browser."
-            runHttpd config resources fallbacks
+            withSocketsDo $ runHttpd config mapper
 
-helloWorld ∷ ResourceDef
-helloWorld
-    = emptyResource {
-        resGet
-          = Just $ do setContentType $ parseMIMEType "text/hello"
-                      putChunk "Hello, "
-                      putChunk "World!\n"
-                      putChunks =≪ Lazy.pack <$> getRemoteAddr'
-      , resPost
-          = Just $ do str1 ← getChunk 3
-                      str2 ← getChunk 3
-                      str3 ← getChunk 3
-                      setContentType $ parseMIMEType "text/hello"
-                      putChunks $ Lazy.fromChunks ["[", str1, " - ", str2, "#", str3, "]"]
-      }
+helloWorld ∷ Resource
+helloWorld = C.fromList
+             [ ( GET
+               , do setContentType [mimeType| text/hello |]
+                    putChunk "Hello, "
+                    putChunk "World!\n"
+                    putChunks =≪ Lazy.pack <$> getRemoteAddr'
+               )
+             , ( POST
+               , do str1 ← getChunk 3
+                    str2 ← getChunk 3
+                    str3 ← getChunk 3
+                    setContentType [mimeType| text/hello |]
+                    putChunks $ Lazy.fromChunks ["[", str1, " - ", str2, "#", str3, "]"]
+               )
+             ]