web-routes-hsp 0.22.0 → 0.22.1

raw patch · 2 files changed

+12/−9 lines, 2 files

Files

• Web/Routes/XMLGenT.hs +9/−6
• web-routes-hsp.cabal +3/−3

@@ -19,7 +19,7 @@     newtype Child (RouteT url m) = UChild { unUChild :: XML }     newtype Attribute (RouteT url m) = UAttr { unUAttr :: Attribute } #endif-    genElement n attrs children = +    genElement n attrs children =         do attribs <- map unUAttr <$> asAttr attrs            childer <- flattenCDATA . map unUChild <$> asChild children            HSX.XMLGenT $ return (Element@@ -28,14 +28,14 @@                               childer                              )     xmlToChild = UChild-    pcdataToChild = HSX.xmlToChild . pcdata                                                           +    pcdataToChild = HSX.xmlToChild . pcdata  flattenCDATA :: [XML] -> [XML]-flattenCDATA cxml = +flattenCDATA cxml =                 case flP cxml [] of                  [] -> []                  [CDATA _ ""] -> []-                 xs -> xs                       +                 xs -> xs     where         flP :: [XML] -> [XML] -> [XML]         flP [] bs = reverse bs@@ -51,7 +51,7 @@     toAttrValue = toAttrValue . TL.unpack  instance (Functor m, Monad m) => HSX.EmbedAsAttr (RouteT url m) Attribute where-    asAttr = return . (:[]) . UAttr +    asAttr = return . (:[]) . UAttr  instance (Functor m, Monad m) => HSX.EmbedAsAttr (RouteT url m) (Attr String Char) where     asAttr (n := c)  = asAttr (n := [c])@@ -66,6 +66,9 @@ instance (Functor m, Monad m) => HSX.EmbedAsAttr (RouteT url m) (Attr String Int) where     asAttr (n := i)  = asAttr $ MkAttr (toName n, pAttrVal (show i)) +instance (Functor m, Monad m) => HSX.EmbedAsAttr (RouteT url m) (Attr String Integer) where+    asAttr (n := i)  = asAttr $ MkAttr (toName n, pAttrVal (show i))+ instance (Monad m, Functor m, IsName n) => (EmbedAsAttr (RouteT url m) (Attr n TL.Text)) where     asAttr (n := a) = asAttr $ MkAttr (toName n, pAttrVal $ TL.unpack a) @@ -73,7 +76,7 @@     asAttr (n := a) = asAttr $ MkAttr (toName n, pAttrVal $ T.unpack a)  instance (Functor m, Monad m) => EmbedAsAttr (RouteT url m) (Attr String url) where-    asAttr (n := u) = +    asAttr (n := u) =         do url <- showURL u            asAttr $ MkAttr (toName n, pAttrVal (T.unpack url)) 

@@ -1,5 +1,5 @@ Name:             web-routes-hsp-Version:          0.22.0+Version:          0.22.1 License:          BSD3 License-File:     LICENSE Author:           jeremy@seereason.com@@ -12,8 +12,8 @@  Library         Build-Depends:    base >= 4 && < 5,-                          hsx >= 0.7.0, -                          hsp, +                          hsx >= 0.7.0,+                          hsp,                           text,                           web-routes >= 0.26         Exposed-Modules:  Web.Routes.XMLGenT