From bc7c6c8fc24ca3c35cea6007d87df8e6a5fd1240 Mon Sep 17 00:00:00 2001 From: PHO Date: Mon, 19 Dec 2011 19:07:14 +0900 Subject: [PATCH] Update examples to work with current API --- examples/HelloWorld.hs | 3 ++- examples/Implanted.hs | 3 ++- examples/ImplantedSmall.hs | 3 ++- examples/Multipart.hs | 5 +++-- examples/SSL.hs | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/examples/HelloWorld.hs b/examples/HelloWorld.hs index 2d240e8..fb1c8ac 100644 --- a/examples/HelloWorld.hs +++ b/examples/HelloWorld.hs @@ -7,13 +7,14 @@ import Control.Applicative import Control.Monad.Unicode import qualified Data.ByteString.Lazy.Char8 as Lazy import qualified Data.Collections as C +import Data.Default import Data.Monoid.Unicode import Network import Network.HTTP.Lucu import Prelude.Unicode main ∷ IO () -main = let config = defaultConfig { cnfServerPort = "9999" } +main = let config = def { cnfServerPort = "9999" } mapper = resourceMap resources ⊕ resourceMap fallbacks resources ∷ ResourceTree resources = C.fromList diff --git a/examples/Implanted.hs b/examples/Implanted.hs index 34878a0..b1da66d 100644 --- a/examples/Implanted.hs +++ b/examples/Implanted.hs @@ -2,13 +2,14 @@ UnicodeSyntax #-} import qualified Data.Collections as C +import Data.Default import MiseRafturai import Network import Network.HTTP.Lucu import Prelude.Unicode main ∷ IO () -main = let config = defaultConfig { cnfServerPort = "9999" } +main = let config = def { cnfServerPort = "9999" } tree ∷ ResourceTree tree = C.fromList [ ([], nonGreedy miseRafturai) ] in diff --git a/examples/ImplantedSmall.hs b/examples/ImplantedSmall.hs index fe45b89..2f8f066 100644 --- a/examples/ImplantedSmall.hs +++ b/examples/ImplantedSmall.hs @@ -2,13 +2,14 @@ UnicodeSyntax #-} import qualified Data.Collections as C +import Data.Default import Network import Network.HTTP.Lucu import Prelude.Unicode import SmallFile main ∷ IO () -main = let config = defaultConfig { cnfServerPort = "9999" } +main = let config = def { cnfServerPort = "9999" } tree ∷ ResourceTree tree = C.fromList [ ([], nonGreedy smallFile) ] in diff --git a/examples/Multipart.hs b/examples/Multipart.hs index ab857a8..f7122f9 100644 --- a/examples/Multipart.hs +++ b/examples/Multipart.hs @@ -7,6 +7,7 @@ import qualified Data.ByteString.Lazy.Char8 as Lazy import Control.Applicative import qualified Data.Collections as C import Control.Monad.Unicode +import Data.Default import Data.Maybe import Data.Monoid.Unicode import Network @@ -19,7 +20,7 @@ import Text.Blaze.Html5.Attributes hiding (form, title) import Text.Blaze.Renderer.Utf8 main ∷ IO () -main = let config = defaultConfig { cnfServerPort = "9999" } +main = let config = def { cnfServerPort = "9999" } tree ∷ ResourceTree tree = C.fromList [ ([], nonGreedy resMain) ] in @@ -48,7 +49,7 @@ resMain = C.fromList let text = fromMaybe (∅) $ fdContent <$> lookup "text" f file = fromMaybe (∅) $ fdContent <$> lookup "file" f fileName = fdFileName =≪ lookup "file" f - setContentType $ parseMIMEType "text/plain" + setContentType [mimeType| text/plain |] putChunks $ "You entered \"" ⊕ text ⊕ "\".\n" putChunks $ "You uploaded a " ⊕ Lazy.pack (show $ Lazy.length file) ⊕ " bytes long file.\n" putChunks $ "The file name is " ⊕ Lazy.pack (show fileName) ⊕ ".\n" diff --git a/examples/SSL.hs b/examples/SSL.hs index f78b6c2..cbf75dc 100644 --- a/examples/SSL.hs +++ b/examples/SSL.hs @@ -9,6 +9,7 @@ import Control.Monad.IO.Class import Control.Monad.Unicode import qualified Data.ByteString.Lazy.Char8 as Lazy import qualified Data.Collections as C +import Data.Default import Data.Time.Clock import Network import Network.HTTP.Lucu @@ -29,7 +30,7 @@ main = withOpenSSL $ SSL.contextSetCertificate ctx cert SSL.contextSetDefaultCiphers ctx - let config = defaultConfig { + let config = def { cnfServerPort = "9000" , cnfSSLConfig = Just SSLConfig { sslServerPort = "9001" -- 2.40.0