hack 2009.4.25 → 2009.4.26

raw patch · 3 files changed

+89/−2 lines, 3 filesdep +hyena

Dependencies added: hyena

Files

• changelog.md +7/−0
• hack.cabal +3/−2
• src/Hack/Handler/Hyena.hs +79/−0

@@ -1,3 +1,10 @@+2009.4.26+---------++### Fix++* add hyena handler+ 2009.4.25 --------- 

@@ -1,5 +1,5 @@ Name:                 hack-Version:              2009.4.25+Version:              2009.4.26 Build-type:           Simple Synopsis:             a sexy Haskell Webserver Interface Description:@@ -20,7 +20,7 @@  library   ghc-options: -Wall -fno-warn-missing-signatures -fno-warn-name-shadowing -fno-warn-orphans -fno-warn-type-defaults-  build-depends: base, cgi, network, haskell98, old-locale, old-time, directory, filepath, containers, bytestring, template, base64-string, zlib, ansi-wl-pprint, mps >= 2009.4.21, kibro >= 0.4.3, data-default >= 0.2, ansi-wl-pprint, bytestring, template, unix, time+  build-depends: base, cgi, network, haskell98, old-locale, old-time, directory, filepath, containers, bytestring, template, base64-string, zlib, hyena, ansi-wl-pprint, mps >= 2009.4.21, kibro >= 0.4.3, data-default >= 0.2, ansi-wl-pprint, bytestring, template, unix, time   hs-source-dirs: src/   exposed-modules:                       Hack@@ -30,6 +30,7 @@                     Hack.Constants                                          Hack.Handler.Kibro+                    Hack.Handler.Hyena                                          Hack.Contrib.ContentSize                     Hack.Contrib.ContentType

@@ -0,0 +1,79 @@+{-# LANGUAGE Rank2Types #-}+{-# LANGUAGE ImpredicativeTypes #-}++module Hack.Handler.Hyena (run) where++import Hack as Hack+import Hack.Utils++import Hyena.Server+import Network.Wai as Wai++import Network.URI+import Data.Default+import Prelude hiding ((.), (^))+import MPSUTF8 hiding (to_s)+import System.IO+import qualified Data.ByteString.Char8 as C+import qualified Data.ByteString as S++import Control.Applicative+import Control.Monad+import Data.Maybe++to_s = C.unpack+to_b = C.pack++both_to_s (a,b) = (a.to_s, b.to_s)+both_to_b (a,b) = (a.to_b, b.to_b)++hyena_env_to_hack_env :: Environment -> IO Hack.Env+hyena_env_to_hack_env e = return $+  def+    {   +       request_method = e.requestMethod.show.upper.read+    ,  script_name    = e.scriptName.to_s+    ,  path_info      = e.pathInfo.to_s+    ,  query_string   = e.queryString .fromMaybe (to_b "") .to_s+    ,  http           = e.Wai.headers .map both_to_s+    ,  hack_errors    = e.errors+    }++-- hack_response_to_hyena_response :: Hack.Response -> (Int, S.ByteString, Headers, Enumerator)++enum_string :: String -> IO Enumerator+enum_string msg = do+  let s = msg.to_b+  let yieldBlock f z = do+         z' <- f z s+         case z' of+           Left z''  -> return z''+           Right z'' -> return z''++  return yieldBlock+  +hack_response_to_hyena_response r e =+    (   r.status+    ,   r.status.show_status_code.fromMaybe "OK" .to_b+    ,   r.Hack.headers.map both_to_b+    ,   e+    )+++hack_to_wai :: Hack.Application -> Wai.Application+hack_to_wai app env = do+  hack_env <- env.hyena_env_to_hack_env+  +  r <- app hack_env+  +  enum <- r.body.enum_string+  +  let hyena_status = r.status+  let hyena_status_message = r.status.show.to_b+  let hyena_headers = r.Hack.headers.map both_to_b+  +  return (hyena_status, hyena_status_message, hyena_headers, enum)+  +run app = app.hack_to_wai.serve++main = run dummy_app