From: PHO <pho@cielonegro.org>
Date: Thu, 13 Oct 2011 13:56:44 +0000 (+0900)
Subject: Fixing examples...
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=fc4e025;p=Lucu.git

Fixing examples...

Ditz-issue: 8959dadc07db1bd363283dee401073f6e48dc7fa
---

diff --git a/examples/HelloWorld.hs b/examples/HelloWorld.hs
index dacd4c3..7515347 100644
--- a/examples/HelloWorld.hs
+++ b/examples/HelloWorld.hs
@@ -1,40 +1,42 @@
+{-# LANGUAGE
+    OverloadedStrings
+  , UnicodeSyntax
+  #-}
+import Control.Applicative
+import Control.Monad.Unicode
+import qualified Data.ByteString.Lazy.Char8 as Lazy
+import Data.Monoid.Unicode
 import Network.HTTP.Lucu
 
-main :: IO ()
+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
+           resources = mkResTree
+                       [ ([]         , helloWorld               )
+                       , (["urandom"], staticFile "/dev/urandom")
+                       , (["inc"    ], staticDir "/usr/include" )
+                       ]
+           fallbacks = [ \ path → case path of
+                                     ["hello"] → return $ Just helloWorld
+                                     _         → return Nothing
                        ]
        in
          do putStrLn "Access http://localhost:9999/ with your browser."
             runHttpd config resources fallbacks
 
 
-helloWorld :: ResourceDef
+helloWorld ∷ ResourceDef
 helloWorld
     = emptyResource {
         resGet
-          = Just $ do --time <- liftIO $ getClockTime
-                      --foundEntity (strongETag "abcde") time
-                      setContentType $ read "text/hello"
+          = Just $ do setContentType $ parseMIMEType "text/hello"
                       outputChunk "Hello, "
                       outputChunk "World!\n"
-                      outputChunk =<< getRemoteAddr'
+                      outputChunk =≪ Lazy.pack <$> getRemoteAddr'
                       
       , resPost
-          = Just $ do str1 <- inputChunk 3
-                      str2 <- inputChunk 3
-                      str3 <- inputChunk 3
-                      setContentType $ read "text/hello"
-                      output ("[" ++ str1 ++ " - " ++ str2 ++ "#" ++ str3 ++ "]")
+          = Just $ do str1 ← inputChunk 3
+                      str2 ← inputChunk 3
+                      str3 ← inputChunk 3
+                      setContentType $ parseMIMEType "text/hello"
+                      output ("[" ⊕ str1 ⊕ " - " ⊕ str2 ⊕ "#" ⊕ str3 ⊕ "]")
       }
\ No newline at end of file
diff --git a/examples/Implanted.hs b/examples/Implanted.hs
index 6842308..82d98e7 100644
--- a/examples/Implanted.hs
+++ b/examples/Implanted.hs
@@ -1,10 +1,12 @@
+{-# LANGUAGE
+    UnicodeSyntax
+  #-}
 import MiseRafturai
 import Network.HTTP.Lucu
 
-main :: IO ()
+main ∷ IO ()
 main = let config    = defaultConfig { cnfServerPort = "9999" }
            resources = mkResTree [ ([], miseRafturai) ]
        in
          do putStrLn "Access http://localhost:9999/ with your browser."
             runHttpd config resources []
-                                   
\ No newline at end of file
diff --git a/examples/ImplantedSmall.hs b/examples/ImplantedSmall.hs
index af35b63..a985cae 100644
--- a/examples/ImplantedSmall.hs
+++ b/examples/ImplantedSmall.hs
@@ -1,7 +1,10 @@
+{-# LANGUAGE
+    UnicodeSyntax
+  #-}
 import Network.HTTP.Lucu
 import SmallFile
 
-main :: IO ()
+main ∷ IO ()
 main = let config    = defaultConfig { cnfServerPort = "9999" }
            resources = mkResTree [ ([], smallFile) ]
        in
diff --git a/examples/Makefile b/examples/Makefile
index 26d6670..0902512 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,29 +1,32 @@
 TARGETS = \
 	HelloWorld \
-	MiseRafturai \
 	Implanted \
 	ImplantedSmall \
 	Multipart \
 	SSL \
 	$(NULL)
 
+IMPLANT ?= ../dist/build/lucu-implant-file/lucu-implant-file
+
 build: $(TARGETS)
 
 %: %.hs
-	ghc --make $@ -threaded -O3 -Wall
+	ghc -Wall --make $@ -threaded -O3 -idist -odir dist -hidir dist
 
 run: build
 	./HelloWorld
 
 clean:
-	rm -f $(TARGETS) *.hi *.o MiseRafturai.hs SmallFile.hs
-
-MiseRafturai.hs: mise-rafturai.html
-	lucu-implant-file -m MiseRafturai -o $@ $<
+	rm -rf $(TARGETS) dist
 
-ImplantedSmall.hs: SmallFile.hs
+Implanted.hs: dist/MiseRafturai.hs
+dist/MiseRafturai.hs: mise-rafturai.html $(IMPLANT)
+	mkdir -p dist
+	$(IMPLANT) -m MiseRafturai -o $@ $<
 
-SmallFile.hs: small-file.txt
-	lucu-implant-file -m SmallFile -o $@ $<
+ImplantedSmall.hs: dist/SmallFile.hs
+dist/SmallFile.hs: small-file.txt $(IMPLANT)
+	mkdir -p dist
+	$(IMPLANT) -m SmallFile -o $@ $<
 
 .PHONY: build run clean