haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.9 changes

Browse Source
This commit is contained in:
Michael Snoyman 2011-07-22 09:07:47 +03:00
parent f0f4c69828
commit 1b403cbff4
6 changed files with 108 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yesod-newsfeed/Setup.lhs Executable file
View File

@ -0,0 +1,7 @@
#!/usr/bin/env runhaskell
> module Main where
> import Distribution.Simple
> main :: IO ()
> main = defaultMain

83
yesod-sitemap/Yesod/Sitemap.hs Normal file
View File

@ -0,0 +1,83 @@
{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedStrings #-}
---------------------------------------------------------
--
-- Module : Yesod.Sitemap
-- Copyright : Michael Snoyman
-- License : BSD3
--
-- Maintainer : Michael Snoyman <michael@snoyman.com>
-- Stability : Stable
-- Portability : portable
--
-- Generating Google sitemap files.
--
---------------------------------------------------------
-- | Generates XML sitemap files.
--
-- See <http://www.sitemaps.org/>.
module Yesod.Sitemap
( sitemap
, robots
, SitemapUrl (..)
, SitemapChangeFreq (..)
) where
import Yesod.Content (RepXml (..), RepPlain (..), toContent, formatW3)
import Yesod.Handler (Route, GHandler, getUrlRender)
import Yesod.Handler (hamletToContent)
import Text.Hamlet (Hamlet, xhamlet)
import Data.Time (UTCTime)
import Data.Monoid (mappend)
data SitemapChangeFreq = Always
| Hourly
| Daily
| Weekly
| Monthly
| Yearly
| Never
showFreq :: SitemapChangeFreq -> String
showFreq Always = "always"
showFreq Hourly = "hourly"
showFreq Daily = "daily"
showFreq Weekly = "weekly"
showFreq Monthly = "monthly"
showFreq Yearly = "yearly"
showFreq Never = "never"
data SitemapUrl url = SitemapUrl
{ sitemapLoc :: url
, sitemapLastMod :: UTCTime
, sitemapChangeFreq :: SitemapChangeFreq
, priority :: Double
}
template :: [SitemapUrl url] -> Hamlet url
template urls =
#if __GLASGOW_HASKELL__ >= 700
[xhamlet|
#else
[$xhamlet|
#endif
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
$forall url <- urls
<url>
<loc>@{sitemapLoc url}
<lastmod>#{formatW3 (sitemapLastMod url)}
<changefreq>#{showFreq (sitemapChangeFreq url)}
<priority>#{show (priority url)}
|]
sitemap :: [SitemapUrl (Route master)] -> GHandler sub master RepXml
sitemap = fmap RepXml . hamletToContent . template
-- | A basic robots file which just lists the "Sitemap: " line.
robots :: Route master -- ^ sitemap url
-> GHandler sub master RepPlain
robots smurl = do
render <- getUrlRender
return $ RepPlain $ toContent $ "Sitemap: " `mappend` render smurl

8
yesod-sitemap/yesod-sitemap.cabal
View File

@ -1,5 +1,5 @@
name: yesod-sitemap
version: 0.1.0
version: 0.2.0
license: BSD3
license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com>
@ -13,10 +13,10 @@ homepage: http://docs.yesodweb.com/
library
build-depends: base >= 4 && < 5
, yesod-core >= 0.8 && < 0.9
, yesod-core >= 0.9 && < 0.10
, time >= 1.1.4 && < 1.3
, hamlet >= 0.8 && < 0.9
exposed-modules: Yesod.Helpers.Sitemap
, hamlet >= 0.9 && < 0.10
exposed-modules: Yesod.Sitemap
ghc-options: -Wall
source-repository head

6
yesod-static/tests/runtests.hs
View File

@ -1,5 +1,5 @@
{-# LANGUAGE OverloadedStrings #-}
import Yesod.Helpers.Static
import Yesod.Static
import Test.Hspec
import Test.Hspec.HUnit ()
@ -7,11 +7,11 @@ import Test.Hspec.HUnit ()
import Test.HUnit ((@?=))
main :: IO ()
main = hspecX specs
main = hspecX $ return [] {- FIXME specs
specs :: IO [Spec]
specs = runSpecM $ do
context "get file list" $ do
ti "pieces" $ do
x <- getFileListPieces "tests/data"
x @?= [["foo"], ["bar", "baz"]]
x @?= [["foo"], ["bar", "baz"]]-}

8
yesod/Yesod.hs
View File

@ -25,11 +25,6 @@ module Yesod
, xhamlet
, Hamlet
, Html
, renderHamlet
, renderHtml
, string
, preEscapedString
, cdata
, toHtml
-- ** Julius
, julius
@ -48,7 +43,7 @@ import Text.Julius
import Yesod.Form
import Yesod.Json
import Yesod.Persist
import Yesod.Persist hiding (Field)
import Network.Wai (Application)
import Network.Wai.Middleware.Debug
import Control.Monad.Trans.Class (lift)
@ -57,6 +52,7 @@ import Control.Monad.IO.Control (MonadControlIO)
import Network.Wai.Handler.Warp (run)
import System.IO (stderr, hPutStrLn)
import Text.Blaze (toHtml)
showIntegral :: Integral a => a -> String
showIntegral x = show (fromIntegral x :: Integer)

17
yesod/yesod.cabal
View File

@ -1,5 +1,5 @@
name: yesod
version: 0.8.2.1
version: 0.9.0
license: BSD3
license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com>
@ -58,20 +58,21 @@ library
cpp-options: -DGHC7
else
build-depends: base >= 4 && < 4.3
build-depends: yesod-core >= 0.8.1 && < 0.9
, yesod-auth >= 0.4 && < 0.5
, yesod-json >= 0.1 && < 0.2
, yesod-persistent >= 0.1 && < 0.2
, yesod-static >= 0.1 && < 0.2
, yesod-form >= 0.1 && < 0.2
build-depends: yesod-core >= 0.9 && < 0.10
, yesod-auth >= 0.7 && < 0.8
, yesod-json >= 0.2 && < 0.3
, yesod-persistent >= 0.2 && < 0.3
, yesod-static >= 0.3 && < 0.4
, yesod-form >= 0.3 && < 0.4
, monad-control >= 0.2 && < 0.3
, transformers >= 0.2 && < 0.3
, wai >= 0.4 && < 0.5
, wai-extra >= 0.4 && < 0.5
, hamlet >= 0.8.1 && < 0.9
, hamlet >= 0.9 && < 0.10
, warp >= 0.4 && < 0.5
, mime-mail >= 0.3 && < 0.4
, hjsmin >= 0.0.13 && < 0.1
, blaze-html >= 0.4 && < 0.5
exposed-modules: Yesod
ghc-options: -Wall