From 31a1b314816a41ccde5f8d304fb2471e4a74aed2 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 25 Dec 2010 23:30:42 +0200 Subject: [PATCH] Code import --- LICENSE | 25 +++++++++++++++++++++++++ Setup.lhs | 7 +++++++ Yesod/Json.hs | 33 +++++++++++++++++++++++++++++++++ yesod-json.cabal | 24 ++++++++++++++++++++++++ 4 files changed, 89 insertions(+) create mode 100644 LICENSE create mode 100755 Setup.lhs create mode 100644 Yesod/Json.hs create mode 100644 yesod-json.cabal diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..8643e5d8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,25 @@ +The following license covers this documentation, and the source code, except +where otherwise indicated. + +Copyright 2010, Michael Snoyman. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "AS IS" AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Setup.lhs b/Setup.lhs new file mode 100755 index 00000000..06e2708f --- /dev/null +++ b/Setup.lhs @@ -0,0 +1,7 @@ +#!/usr/bin/env runhaskell + +> module Main where +> import Distribution.Simple + +> main :: IO () +> main = defaultMain diff --git a/Yesod/Json.hs b/Yesod/Json.hs new file mode 100644 index 00000000..d35a4710 --- /dev/null +++ b/Yesod/Json.hs @@ -0,0 +1,33 @@ +{-# LANGUAGE TypeSynonymInstances #-} +{-# OPTIONS_GHC -fno-warn-orphans #-} +module Yesod.Json + ( defaultLayoutJson + , jsonToRepJson + ) where + +import Yesod.Handler (GHandler) +import Yesod.Content + ( ToContent (toContent), RepHtmlJson (RepHtmlJson), RepHtml (RepHtml) + , RepJson (RepJson), Content (ContentBuilder) + ) +import Yesod.Core (defaultLayout, Yesod) +import Yesod.Widget (GWidget) +import qualified Data.JSON.Types as J +import qualified Text.JSON.Enumerator as J + +instance ToContent J.Value where + toContent = flip ContentBuilder Nothing . J.renderValue + +-- | Provide both an HTML and JSON representation for a piece of data, using +-- the default layout for the HTML output ('defaultLayout'). +defaultLayoutJson :: Yesod master + => GWidget sub master () + -> J.Value + -> GHandler sub master RepHtmlJson +defaultLayoutJson w json = do + RepHtml html' <- defaultLayout w + return $ RepHtmlJson html' $ toContent json + +-- | Wraps the 'Content' generated by 'jsonToContent' in a 'RepJson'. +jsonToRepJson :: J.Value -> GHandler sub master RepJson +jsonToRepJson = return . RepJson . toContent diff --git a/yesod-json.cabal b/yesod-json.cabal new file mode 100644 index 00000000..132a04c4 --- /dev/null +++ b/yesod-json.cabal @@ -0,0 +1,24 @@ +name: yesod-json +version: 0.7.0 +license: BSD3 +license-file: LICENSE +author: Michael Snoyman +maintainer: Michael Snoyman +synopsis: Generate content for Yesod using the json-types package. +category: Web, Yesod +stability: Stable +cabal-version: >= 1.6 +build-type: Simple +homepage: http://docs.yesodweb.com/ + +library + build-depends: base >= 4 && < 5 + , yesod-core >= 0.7 && < 0.8 + , json-enumerator >= 0.0 && < 0.1 + , json-types >= 0.1 && < 0.2 + exposed-modules: Yesod.Json + ghc-options: -Wall + +source-repository head + type: git + location: git://github.com/snoyberg/yesod-json.git