Whole repo builds with new yesod-routes

yesod-auth/Yesod/Auth.hs

@@ -9,8 +9,9 @@
 module Yesod.Auth
     ( -- * Subsite
       Auth
+    , AuthRoute
+    , Route (..)
     , AuthPlugin (..)
-    , AuthRoute (..)
     , getAuth
     , YesodAuth (..)
       -- * Plugin interface
@@ -53,6 +54,8 @@ import Yesod.Form (FormMessage)
 
 data Auth = Auth
 
+type AuthRoute = Route Auth
+
 type Method = Text
 type Piece = Text
 

yesod-auth/Yesod/Auth/BrowserId.hs

@@ -21,7 +21,7 @@ import Data.Maybe (fromMaybe)
 pid :: Text
 pid = "browserid"
 
-complete :: AuthRoute
+complete :: Route Auth
 complete = PluginR pid []
 
 authBrowserIdAudience :: YesodAuth m

yesod-form/Yesod/Form/Jquery.hs

@@ -16,6 +16,7 @@ module Yesod.Form.Jquery
     ) where
 
 import Yesod.Handler
+import Yesod.Core (Route)
 import Yesod.Form
 import Yesod.Widget
 import Data.Time (UTCTime (..), Day, TimeOfDay (..), timeOfDayToTime,

yesod-form/Yesod/Form/Nic.hs

@@ -11,6 +11,7 @@ module Yesod.Form.Nic
     ) where
 
 import Yesod.Handler
+import Yesod.Core (Route)
 import Yesod.Form
 import Yesod.Widget
 import Text.HTML.SanitizeXSS (sanitizeBalance)

yesod-newsfeed/Yesod/AtomFeed.hs

@@ -22,9 +22,7 @@ module Yesod.AtomFeed
     , module Yesod.FeedTypes
     ) where
 
-import Yesod.Content
+import Yesod.Core
-import Yesod.Handler
-import Yesod.Widget
 import Yesod.FeedTypes
 import Text.Hamlet (HtmlUrl, xhamlet, hamlet)
 import qualified Data.ByteString.Char8 as S8

yesod-newsfeed/Yesod/Feed.hs

@@ -25,7 +25,7 @@ import Yesod.FeedTypes
 import Yesod.AtomFeed
 import Yesod.RssFeed
 import Yesod.Content (HasReps (chooseRep), typeAtom, typeRss)
-import Yesod.Handler (Route, GHandler)
+import Yesod.Core (Route, GHandler)
 
 data RepAtomRss = RepAtomRss RepAtom RepRss
 instance HasReps RepAtomRss where

yesod-newsfeed/Yesod/RssFeed.hs

@@ -18,9 +18,7 @@ module Yesod.RssFeed
     , module Yesod.FeedTypes
     ) where
 
-import Yesod.Handler
+import Yesod.Core
-import Yesod.Content
-import Yesod.Widget
 import Yesod.FeedTypes
 import Text.Hamlet (HtmlUrl, xhamlet, hamlet)
 import qualified Data.ByteString.Char8 as S8

yesod-routes/yesod-routes.cabal

@@ -5,6 +5,7 @@ license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
 maintainer:      Michael Snoyman <michael@snoyman.com>
 synopsis:        Efficient routing for Yesod.
+description:     Provides an efficient routing system, a parser and TH code generation.
 category:        Web, Yesod
 stability:       Stable
 cabal-version:   >= 1.8

yesod-sitemap/Yesod/Sitemap.hs

@@ -26,7 +26,7 @@ module Yesod.Sitemap
     ) where
 
 import Yesod.Content (RepXml (..), RepPlain (..), toContent, formatW3)
-import Yesod.Handler (Route, GHandler, getUrlRender)
+import Yesod.Core (Route, GHandler, getUrlRender)
 import Yesod.Handler (hamletToContent)
 import Text.Hamlet (HtmlUrl, xhamlet)
 import Data.Time (UTCTime)

yesod-static/Yesod/Static.hs

@@ -29,7 +29,7 @@
 module Yesod.Static
     ( -- * Subsite
       Static (..)
-    , StaticRoute (..)
+    , Route (..)
       -- * Smart constructor
     , static
     , staticDevel
@@ -120,36 +120,32 @@ embed fp =
         { ssFolder = embeddedLookup (toEmbedded $(embedDir fp))
         })|]
 
-
+instance RenderRoute Static where
--- | A route on the static subsite (see also 'staticFiles').
+    -- | A route on the static subsite (see also 'staticFiles').
---
+    --
--- You may use this constructor directly to manually link to a
+    -- You may use this constructor directly to manually link to a
--- static file.  The first argument is the sub-path to the file
+    -- static file.  The first argument is the sub-path to the file
--- being served whereas the second argument is the key-value
+    -- being served whereas the second argument is the key-value
--- pairs in the query string.  For example,
+    -- pairs in the query string.  For example,
---
+    --
--- > StaticRoute $ StaticR [\"thumb001.jpg\"] [(\"foo\", \"5\"), (\"bar\", \"choc\")]
+    -- > StaticRoute $ StaticR [\"thumb001.jpg\"] [(\"foo\", \"5\"), (\"bar\", \"choc\")]
---
+    --
--- would generate a url such as
+    -- would generate a url such as
--- @http://www.example.com/static/thumb001.jpg?foo=5&bar=choc@
+    -- @http://www.example.com/static/thumb001.jpg?foo=5&bar=choc@
--- The StaticRoute constructor can be used when the URL cannot be
+    -- The StaticRoute constructor can be used when the URL cannot be
--- statically generated at compile-time (e.g. when generating
+    -- statically generated at compile-time (e.g. when generating
--- image galleries).
+    -- image galleries).
-data StaticRoute = StaticRoute [Text] [(Text, Text)]
+    data Route Static = StaticRoute [Text] [(Text, Text)]
-    deriving (Eq, Show, Read)
+        deriving (Eq, Show, Read)
-
-type instance Route Static = StaticRoute
-
-instance RenderRoute StaticRoute where
     renderRoute (StaticRoute x y) = (x, y)
 
 instance Yesod master => YesodDispatch Static master where
     -- Need to append trailing slash to make relative links work
-    yesodDispatch _ _ [] _ _ = Just $
+    yesodDispatch _ _ _ _ _ _ [] _ req =
-        \req -> return $ responseLBS status301 [("Location", rawPathInfo req `S.append` "/")] ""
+        return $ responseLBS status301 [("Location", rawPathInfo req `S.append` "/")] ""
 
-    yesodDispatch (Static set) _ textPieces  _ _ = Just $
+    yesodDispatch _ (Static set) _ _ _ _ textPieces  _ req =
-        \req -> staticApp set req { pathInfo = textPieces }
+        staticApp set req { pathInfo = textPieces }
 
 notHidden :: Prelude.FilePath -> Bool
 notHidden "tmp" = False

yesod-static/yesod-static.cabal

@@ -13,7 +13,7 @@ homepage:        http://www.yesodweb.com/
 description:     Static file serving subsite for Yesod Web Framework.
 extra-source-files:
   test/YesodStaticTest.hs
-  tests.hs
+  test/tests.hs
 
 flag test
   description: Build for use with running tests