yesod-core 1.1.7.1 → 1.1.7.2

raw patch · 4 files changed

+3/−7 lines, 4 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

- Yesod.Core: class RenderRoute a => Yesod a where approot = ApprootRelative errorHandler = defaultErrorHandler defaultLayout w = do { p <- widgetToPageContent w; mmsg <- getMessage; hamletToRepHtml (\ _render_aL5N -> do { id ((preEscapedText . pack) "<!DOCTYPE html>\ \<html><head><style type="text/css">#synopsis details:not([open]) > ul { visibility: hidden; }</style><title>"); id (toHtml (pageTitle p)); id ((preEscapedText . pack) "</title>"); asHtmlUrl (pageHead p) _render_aL5N; id ((preEscapedText . pack) "</head><body>"); maybeH mmsg (\ msg_aL5O -> do { id ((preEscapedText . pack) "<p class=\"message\">"); id (toHtml msg_aL5O); id ((preEscapedText . pack) "</p>") }) Nothing; asHtmlUrl (pageBody p) _render_aL5N; id ((preEscapedText . pack) "</body></html>") }) } urlRenderOverride _ _ = Nothing isAuthorized _ _ = return Authorized isWriteRequest _ = do { wai <- waiRequest; return $ requestMethod wai `notElem` ["GET", "HEAD", "OPTIONS", "TRACE"] } authRoute _ = Nothing cleanPath _ s = if corrected == s then Right $ map dropDash s else Left corrected where corrected = filter (not . null) s dropDash t | all (== '-') t = drop 1 t | otherwise = t joinPath _ ar pieces' qs' = fromText ar `mappend` encodePath pieces qs where pieces = if null pieces' then [""] else map addDash pieces' qs = map (encodeUtf8 *** go) qs' go "" = Nothing go x = Just $ encodeUtf8 x addDash t | all (== '-') t = cons '-' t | otherwise = t addStaticContent _ _ _ = return Nothing cookiePath _ = "/" cookieDomain _ = Nothing maximumContentLength _ _ = 2 * 1024 * 1024 getLogger _ = mkLogger True stdout messageLogger a logger loc = messageLoggerSource a logger loc "" messageLoggerSource a logger loc source level msg = if shouldLog a source level then formatLogMessage (loggerDate logger) loc source level msg >>= loggerPutStr logger else return () logLevel _ = LevelInfo gzipSettings _ = def jsLoader _ = BottomOfBody makeSessionBackend _ = fmap Just defaultClientSessionBackend fileUpload _ size | size > 50000 = FileUploadDisk tempFileBackEnd | otherwise = FileUploadMemory lbsBackEnd shouldLog a _ level = level >= logLevel a yesodMiddleware handler = do { setHeader "Vary" "Accept, Accept-Language"; handler }

+ Yesod.Core: class RenderRoute a => Yesod a where approot = ApprootRelative errorHandler = defaultErrorHandler defaultLayout w = do { p <- widgetToPageContent w; mmsg <- getMessage; hamletToRepHtml (\ _render_aKY7 -> do { id ((preEscapedText . pack) "<!DOCTYPE html>\ \<html><head><style type="text/css">#synopsis details:not([open]) > ul { visibility: hidden; }</style><title>"); id (toHtml (pageTitle p)); id ((preEscapedText . pack) "</title>"); asHtmlUrl (pageHead p) _render_aKY7; id ((preEscapedText . pack) "</head><body>"); maybeH mmsg (\ msg_aKY8 -> do { id ((preEscapedText . pack) "<p class=\"message\">"); id (toHtml msg_aKY8); id ((preEscapedText . pack) "</p>") }) Nothing; asHtmlUrl (pageBody p) _render_aKY7; id ((preEscapedText . pack) "</body></html>") }) } urlRenderOverride _ _ = Nothing isAuthorized _ _ = return Authorized isWriteRequest _ = do { wai <- waiRequest; return $ requestMethod wai `notElem` ["GET", "HEAD", "OPTIONS", "TRACE"] } authRoute _ = Nothing cleanPath _ s = if corrected == s then Right $ map dropDash s else Left corrected where corrected = filter (not . null) s dropDash t | all (== '-') t = drop 1 t | otherwise = t joinPath _ ar pieces' qs' = fromText ar `mappend` encodePath pieces qs where pieces = if null pieces' then [""] else map addDash pieces' qs = map (encodeUtf8 *** go) qs' go "" = Nothing go x = Just $ encodeUtf8 x addDash t | all (== '-') t = cons '-' t | otherwise = t addStaticContent _ _ _ = return Nothing cookiePath _ = "/" cookieDomain _ = Nothing maximumContentLength _ _ = 2 * 1024 * 1024 getLogger _ = mkLogger True stdout messageLogger a logger loc = messageLoggerSource a logger loc "" messageLoggerSource a logger loc source level msg = if shouldLog a source level then formatLogMessage (loggerDate logger) loc source level msg >>= loggerPutStr logger else return () logLevel _ = LevelInfo gzipSettings _ = def jsLoader _ = BottomOfBody makeSessionBackend _ = fmap Just defaultClientSessionBackend fileUpload _ size | size > 50000 = FileUploadDisk tempFileBackEnd | otherwise = FileUploadMemory lbsBackEnd shouldLog a _ level = level >= logLevel a yesodMiddleware handler = do { setHeader "Vary" "Accept, Accept-Language"; handler }

Files

Yesod/Internal.hs +1/−1
Yesod/Internal/Core.hs +1/−1
Yesod/Widget.hs +0/−4
yesod-core.cabal +1/−1

Yesod/Internal.hs view

@@ -127,7 +127,7 @@ data HandlerContents =       HCContent H.Status ChooseRep     | HCError ErrorResponse-    | HCSendFile ContentType FilePath (Maybe W.FilePart) -- FIXME replace FilePath with opaque type from system-filepath?+    | HCSendFile ContentType FilePath (Maybe W.FilePart)     | HCRedirect H.Status Text     | HCCreated Text     | HCWai W.Response

Yesod/Internal/Core.hs view

@@ -878,7 +878,7 @@   let YesodApp yapp =         runHandler           handler'-          (yesodRender master "")+          (yesodRender master $ resolveApproot master fakeWaiRequest)           Nothing           id           master

@@ -115,10 +115,6 @@ class ToWidget sub master a where     toWidget :: a -> GWidget sub master () --- FIXME At some point in the future, deprecate all the--- addHamlet/Cassius/Lucius/Julius stuff. For the most part, toWidget* will be--- sufficient. For somethings, like addLuciusMedia, create addCssUrlMedia.- type RY master = Route master -> [(Text, Text)] -> Text  -- | Newtype wrapper allowing injection of arbitrary content into CSS.

yesod-core.cabal view

@@ -1,5 +1,5 @@ name:            yesod-core-version:         1.1.7.1+version:         1.1.7.2 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>