yesod-angular 0.1.0.1 → 0.1.0.2

raw patch · 2 files changed

+57/−42 lines, 2 filesdep ~aesondep ~containersdep ~shakespearePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: aeson, containers, shakespeare, text, yesod

API changes (from Hackage documentation)

Files

• src/Yesod/Angular.hs +41/−29
• yesod-angular.cabal +16/−13

@@ -1,21 +1,32 @@+------------------------------------------------------------------------+-- |+-- Module      : Yesod.Angular+-- Description : Yesod Angular JS Integration.+-- Copyright   : (c) 2014-2015, Christopher Reichert+-- License     : BSD3+-- Maintainer  : Christopher Reichert <creichert@reichertbrothers.com>+-- Stability   : unstable+-- Portability : POSIX+--+--+-- This module is based on Michael Snoyman's original work+-- in the <https://github.com/snoyberg/yesod-js> repository.+--+-- * This module currently defaults to Angular 1.2.18. Use+--   `urlAngularJs_` specify your own Angular location.+--+-- * Example can be found at:+--      <https://github.com/snoyberg/yesod-js/tree/master/yesod-angular>+--+-- * Currently, this module looks for controllers in the+--   `templates/angular` directory.+ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE QuasiQuotes       #-} {-# LANGUAGE RecordWildCards   #-} {-# LANGUAGE TemplateHaskell   #-} --- | Yesod Angular JS Integration.------   This module is based on Michael Snoyman's original work---   in the <https://github.com/snoyberg/yesod-js> repository.------   * This module currently defaults to Angular 1.2.18. Use---     `urlAngularJs_` specify your own Angular location.------   * Example can be found at:---        <https://github.com/snoyberg/yesod-js/tree/master/yesod-angular>------   * Currently, this module looks for controllers in the---     `templates/angular` directory.+ module Yesod.Angular     ( YesodAngular (..)     , runAngular@@ -26,26 +37,27 @@     , AngularT     ) where -import           Control.Applicative ((<$>))-import           Control.Monad.Trans.Writer (WriterT(..), tell)-import           Data.Aeson (FromJSON, ToJSON)-import           Data.Char (isAlpha)-import           Data.Map (Map)-import qualified Data.Map as Map-import           Data.Maybe (fromMaybe)-import           Data.Monoid (Monoid, First(..), (<>), mempty, mappend)-import           Data.Text (Text)-import qualified Data.Text as T-import           Language.Haskell.TH.Syntax (Q, Exp (AppE, LitE),-                                             Lit (StringL))-import           Text.Hamlet (hamletFile)-import           Text.Julius (JavascriptUrl, juliusFile, rawJS)+import           Control.Applicative        ((<$>))+import           Control.Monad.Trans.Writer (WriterT (..), tell)+import           Data.Aeson                 (FromJSON, ToJSON)+import           Data.Char                  (isAlpha)+import           Data.Map                   (Map)+import qualified Data.Map                   as Map+import           Data.Maybe                 (fromMaybe)+import           Data.Monoid                (First (..), Monoid, mappend,+                                             mempty, (<>))+import           Data.Text                  (Text)+import qualified Data.Text                  as T+import           Language.Haskell.TH.Syntax (Exp (AppE, LitE), Lit (StringL), Q)+import           Text.Hamlet                (hamletFile)+import           Text.Julius                (JavascriptUrl, juliusFile, rawJS) import           Yesod  --- | YesodAngular wraps a widget in ng-app named @modname.+-- | YesodAngular wraps a widget in an ng-app named @modname@ class Yesod site => YesodAngular site where-    -- | Default instance loads `angular.min.js` and `angular-route.min.js`.+    -- | Default instance loads `angular.min.js` and `angular-route.min.js` from+    -- cloudflare cdn.     urlAngularJs :: site -> [Either (Route site) Text]     urlAngularJs _ = [Right "//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.18/angular.min.js",                       Right "//cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.18/angular-route.min.js"]

@@ -1,11 +1,12 @@ name:          yesod-angular-version:       0.1.0.1-synopsis:      Yesod Angular JS integration.+version:       0.1.0.2+synopsis:      Angular JS integratoin description:-    Yesod Angular JS integration.-+    Angular JS integration for Yesod.+    .     This module is based on Michael Snoyman's original work     in the <https://github.com/snoyberg/yesod-js> repository.+ license:       BSD3 license-file:  LICENSE author:        Christopher Reichert <creichert07@gmail.com>@@ -14,20 +15,22 @@ build-type:    Simple cabal-version: >=1.10 ++source-repository head+    type:     git+    location: https://github.com/creichert/yesod-angular++ library   hs-source-dirs:   src   exposed-modules:  Yesod.Angular   default-language: Haskell2010   build-depends:-      aeson            >= 0.6   && < 0.8+      aeson            >= 0.6     , base             == 4.*-    , containers       == 0.5.*-    , shakespeare      == 2.*+    , containers       >= 0.5+    , shakespeare      >= 2.0     , template-haskell-    , text             >= 0.11   && < 2.0+    , text             >= 0.11     , transformers     >= 0.2-    , yesod            >= 1.2.5 && < 1.3--source-repository head-    type:     git-    location: https://github.com/creichert/yesod-angular+    , yesod            >= 1.2