yesod-core 1.2.14 → 1.2.15
raw patch · 2 files changed
+19/−1 lines, 2 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
+ Yesod.Core.Widget: instance ToWidget site Css
+ Yesod.Core.Widget: instance ToWidget site CssBuilder
+ Yesod.Core.Widget: instance ToWidget site Javascript
+ Yesod.Core.Widget: instance ToWidgetBody site Javascript
+ Yesod.Core.Widget: instance ToWidgetHead site Css
+ Yesod.Core.Widget: instance ToWidgetHead site CssBuilder
+ Yesod.Core.Widget: instance ToWidgetHead site Javascript
+ Yesod.Core.Widget: instance ToWidgetMedia site Css
+ Yesod.Core.Widget: instance ToWidgetMedia site CssBuilder
- Yesod.Core: class RenderRoute site => Yesod site where approot = ApprootRelative errorHandler = defaultErrorHandler defaultLayout w = do { p <- widgetToPageContent w; mmsg <- getMessage; giveUrlRenderer (\ _render_av36 -> 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_av36; id ((preEscapedText . pack) "</head><body>"); maybeH mmsg (\ msg_av37 -> do { id ((preEscapedText . pack) "<p class=\"message\">"); id (toHtml msg_av37); id ((preEscapedText . pack) "</p>") }) Nothing; asHtmlUrl (pageBody p) _render_av36; 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 maximumContentLength _ _ = Just $ 2 * 1024 * 1024 makeLogger _ = do { loggerSet <- newLoggerSet defaultBufSize Nothing; (getter, _) <- clockDateCacher; return $! Logger loggerSet getter } messageLoggerSource a logger loc source level msg = do { sl <- shouldLogIO a source level; when sl $ formatLogMessage (loggerDate logger) loc source level msg >>= loggerPutStr logger } jsLoader _ = BottomOfBody makeSessionBackend _ = fmap Just $ defaultClientSessionBackend 120 defaultKeyFile fileUpload _ (KnownLength size) | size <= 50000 = FileUploadMemory lbsBackEnd fileUpload _ _ = FileUploadDisk tempFileBackEnd shouldLog _ _ level = level >= LevelInfo shouldLogIO a b c = return (shouldLog a b c) yesodMiddleware = defaultYesodMiddleware
+ Yesod.Core: class RenderRoute site => Yesod site where approot = ApprootRelative errorHandler = defaultErrorHandler defaultLayout w = do { p <- widgetToPageContent w; mmsg <- getMessage; giveUrlRenderer (\ _render_avCB -> 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_avCB; id ((preEscapedText . pack) "</head><body>"); maybeH mmsg (\ msg_avCC -> do { id ((preEscapedText . pack) "<p class=\"message\">"); id (toHtml msg_avCC); id ((preEscapedText . pack) "</p>") }) Nothing; asHtmlUrl (pageBody p) _render_avCB; 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 maximumContentLength _ _ = Just $ 2 * 1024 * 1024 makeLogger _ = do { loggerSet <- newLoggerSet defaultBufSize Nothing; (getter, _) <- clockDateCacher; return $! Logger loggerSet getter } messageLoggerSource a logger loc source level msg = do { sl <- shouldLogIO a source level; when sl $ formatLogMessage (loggerDate logger) loc source level msg >>= loggerPutStr logger } jsLoader _ = BottomOfBody makeSessionBackend _ = fmap Just $ defaultClientSessionBackend 120 defaultKeyFile fileUpload _ (KnownLength size) | size <= 50000 = FileUploadMemory lbsBackEnd fileUpload _ _ = FileUploadDisk tempFileBackEnd shouldLog _ _ level = level >= LevelInfo shouldLogIO a b c = return (shouldLog a b c) yesodMiddleware = defaultYesodMiddleware
Files
- Yesod/Core/Widget.hs +18/−0
- yesod-core.cabal +1/−1
Yesod/Core/Widget.hs view
@@ -83,10 +83,16 @@ toWidget x = tell $ GWData (Body x) mempty mempty mempty mempty mempty mempty instance render ~ RY site => ToWidget site (render -> Css) where toWidget x = toWidget $ CssBuilder . fromLazyText . renderCss . x+instance ToWidget site Css where+ toWidget x = toWidget $ CssBuilder . fromLazyText . renderCss . const x instance render ~ RY site => ToWidget site (render -> CssBuilder) where toWidget x = tell $ GWData mempty mempty mempty mempty (Map.singleton Nothing $ unCssBuilder . x) mempty mempty+instance ToWidget site CssBuilder where+ toWidget x = tell $ GWData mempty mempty mempty mempty (Map.singleton Nothing $ unCssBuilder . const x) mempty mempty instance render ~ RY site => ToWidget site (render -> Javascript) where toWidget x = tell $ GWData mempty mempty mempty mempty mempty (Just x) mempty+instance ToWidget site Javascript where+ toWidget x = tell $ GWData mempty mempty mempty mempty mempty (Just $ const x) mempty instance (site' ~ site, IO ~ m, a ~ ()) => ToWidget site' (WidgetT site m a) where toWidget = liftWidgetT instance ToWidget site Html where@@ -105,8 +111,12 @@ -> m () instance render ~ RY site => ToWidgetMedia site (render -> Css) where toWidgetMedia media x = toWidgetMedia media $ CssBuilder . fromLazyText . renderCss . x+instance ToWidgetMedia site Css where+ toWidgetMedia media x = toWidgetMedia media $ CssBuilder . fromLazyText . renderCss . const x instance render ~ RY site => ToWidgetMedia site (render -> CssBuilder) where toWidgetMedia media x = tell $ GWData mempty mempty mempty mempty (Map.singleton (Just media) $ unCssBuilder . x) mempty mempty+instance ToWidgetMedia site CssBuilder where+ toWidgetMedia media x = tell $ GWData mempty mempty mempty mempty (Map.singleton (Just media) $ unCssBuilder . const x) mempty mempty class ToWidgetBody site a where toWidgetBody :: (MonadWidget m, HandlerSite m ~ site) => a -> m ()@@ -115,6 +125,8 @@ toWidgetBody = toWidget instance render ~ RY site => ToWidgetBody site (render -> Javascript) where toWidgetBody j = toWidget $ \r -> H.script $ preEscapedLazyText $ renderJavascriptUrl r j+instance ToWidgetBody site Javascript where+ toWidgetBody j = toWidget $ \_ -> H.script $ preEscapedLazyText $ renderJavascript j instance ToWidgetBody site Html where toWidgetBody = toWidget @@ -125,10 +137,16 @@ toWidgetHead = tell . GWData mempty mempty mempty mempty mempty mempty . Head instance render ~ RY site => ToWidgetHead site (render -> Css) where toWidgetHead = toWidget+instance ToWidgetHead site Css where+ toWidgetHead = toWidget instance render ~ RY site => ToWidgetHead site (render -> CssBuilder) where toWidgetHead = toWidget+instance ToWidgetHead site CssBuilder where+ toWidgetHead = toWidget instance render ~ RY site => ToWidgetHead site (render -> Javascript) where toWidgetHead j = toWidgetHead $ \r -> H.script $ preEscapedLazyText $ renderJavascriptUrl r j+instance ToWidgetHead site Javascript where+ toWidgetHead j = toWidgetHead $ \_ -> H.script $ preEscapedLazyText $ renderJavascript j instance ToWidgetHead site Html where toWidgetHead = toWidgetHead . const
yesod-core.cabal view
@@ -1,5 +1,5 @@ name: yesod-core-version: 1.2.14+version: 1.2.15 license: MIT license-file: LICENSE author: Michael Snoyman <michael@snoyman.com>