diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +* 0.1.1.1 - Update for GHC 7.10. +* 0.1.1.0 - Initial release. diff --git a/snaplet-wordpress.cabal b/snaplet-wordpress.cabal --- a/snaplet-wordpress.cabal +++ b/snaplet-wordpress.cabal @@ -1,16 +1,16 @@ name: snaplet-wordpress -version: 0.1.1.0 -synopsis: A snaplet that communicates with wordpress over it's api. +version: 0.1.1.1 +synopsis: A snaplet that communicates with wordpress over its api. -- description: homepage: https://github.com/dbp/snaplet-wordpress license: BSD3 license-file: LICENSE -author: Daniel Patterson +author: Daniel Patterson , Matt Raibert maintainer: dbp@dbpmail.net -- copyright: category: Web build-type: Simple --- extra-source-files: +extra-source-files: CHANGELOG.md cabal-version: >=1.10 library @@ -30,25 +30,22 @@ , Snap.Snaplet.Wordpress.Utils -- other-extensions: build-depends: aeson - , base >=4.5 && <4.8 - , blaze-builder >= 0.3.3.3 + , base < 4.9 + , blaze-builder , data-default , hedis , heist >= 0.14 , map-syntax - , lens < 4.4 - , snap >= 0.13 && < 0.14 - , snap-core >= 0.9 && < 0.10 + , lens + , snap + , snap-core , snaplet-redis , text , bytestring - , wreq < 0.2 + , wreq >= 0.3 , configurator - , time >= 1.4 && < 1.6 + , time , xmlhtml >= 0.2.3.2 - -- NOTE(dbp 2014-09-10): network is a transitive dependency, - -- because cabal couldn't figure it out. - , network < 2.6 , async , hspec >= 2 , hspec-snap @@ -65,7 +62,7 @@ type: exitcode-stdio-1.0 hs-source-dirs: spec main-is: Main.hs - build-depends: base >= 4.6 && < 4.8 + build-depends: base , heist , hspec-snap , hspec >= 2 diff --git a/src/Snap/Snaplet/Wordpress/Cache.hs b/src/Snap/Snaplet/Wordpress/Cache.hs --- a/src/Snap/Snaplet/Wordpress/Cache.hs +++ b/src/Snap/Snaplet/Wordpress/Cache.hs @@ -5,13 +5,15 @@ module Snap.Snaplet.Wordpress.Cache where import Control.Concurrent.MVar +import Control.Monad (void) +import Data.Map (Map) +import qualified Data.Map as Map import Data.Monoid ((<>)) import qualified Data.Set as Set import Data.Text (Text) import qualified Data.Text as T -import Data.Map (Map) -import qualified Data.Map as Map -import Data.Time.Clock (getCurrentTime, diffUTCTime, UTCTime) +import Data.Time.Clock (UTCTime, diffUTCTime, + getCurrentTime) import Database.Redis (Redis) import Snap diff --git a/src/Snap/Snaplet/Wordpress/HTTP.hs b/src/Snap/Snaplet/Wordpress/HTTP.hs --- a/src/Snap/Snaplet/Wordpress/HTTP.hs +++ b/src/Snap/Snaplet/Wordpress/HTTP.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE OverloadedStrings #-} module Snap.Snaplet.Wordpress.HTTP where @@ -19,11 +19,10 @@ -> Requester wreqRequester logger user passw = Requester $ \u ps -> do let opts = (W.defaults & W.params .~ ps - & W.auth .~ W.basicAuth user' pass') + & W.auth ?~ W.basicAuth user' pass') logger $ "wreq: " <> u <> " with params: " <> (T.intercalate "&" . map (\(a,b) -> a <> "=" <> b) $ ps) r <- W.getWith opts (T.unpack u) return $ TL.toStrict . TL.decodeUtf8 $ r ^. W.responseBody where user' = T.encodeUtf8 user pass' = T.encodeUtf8 passw - diff --git a/src/Snap/Snaplet/Wordpress/Init.hs b/src/Snap/Snaplet/Wordpress/Init.hs --- a/src/Snap/Snaplet/Wordpress/Init.hs +++ b/src/Snap/Snaplet/Wordpress/Init.hs @@ -4,17 +4,18 @@ module Snap.Snaplet.Wordpress.Init where import Control.Concurrent.MVar -import Control.Lens hiding (children) -import qualified Data.Configurator as C +import Control.Lens hiding (children) +import Control.Monad.Trans (liftIO) +import qualified Data.Configurator as C import Data.Default -import qualified Data.Map as Map +import qualified Data.Map as Map import Data.Monoid -import qualified Database.Redis as R +import qualified Database.Redis as R import Heist -import Snap hiding (path, rqURI) -import Snap.Snaplet.Heist (Heist, addConfig) -import Snap.Snaplet.RedisDB (RedisDB) -import qualified Snap.Snaplet.RedisDB as RDB +import Snap hiding (path, rqURI) +import Snap.Snaplet.Heist (Heist, addConfig) +import Snap.Snaplet.RedisDB (RedisDB) +import qualified Snap.Snaplet.RedisDB as RDB import Snap.Snaplet.Wordpress.Cache import Snap.Snaplet.Wordpress.Cache.Types diff --git a/src/Snap/Snaplet/Wordpress/Splices.hs b/src/Snap/Snaplet/Wordpress/Splices.hs --- a/src/Snap/Snaplet/Wordpress/Splices.hs +++ b/src/Snap/Snaplet/Wordpress/Splices.hs @@ -4,25 +4,28 @@ module Snap.Snaplet.Wordpress.Splices where -import Control.Lens hiding (children) -import Data.Aeson hiding (decode, encode) -import qualified Data.Attoparsec.Text as A -import Data.Char (toUpper) -import qualified Data.HashMap.Strict as M -import Data.IntSet (IntSet) -import qualified Data.IntSet as IntSet +import Control.Applicative ((<|>)) +import Control.Lens hiding (children) +import Control.Monad (void) +import Control.Monad.Trans (lift, liftIO) +import Data.Aeson hiding (decode, encode) +import qualified Data.Attoparsec.Text as A +import Data.Char (toUpper) +import qualified Data.HashMap.Strict as M +import Data.IntSet (IntSet) +import qualified Data.IntSet as IntSet import Data.Map.Syntax -import Data.Maybe (fromJust, fromMaybe) +import Data.Maybe (fromJust, fromMaybe) import Data.Monoid -import qualified Data.Set as Set -import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Vector as V +import qualified Data.Set as Set +import Data.Text (Text) +import qualified Data.Text as T +import qualified Data.Vector as V import Heist import Heist.Compiled import Heist.Compiled.LowLevel -import Snap hiding (path, rqURI) -import qualified Text.XmlHtml as X +import Snap hiding (path, rqURI) +import qualified Text.XmlHtml as X import Snap.Snaplet.Wordpress.Field import Snap.Snaplet.Wordpress.Posts diff --git a/src/Snap/Snaplet/Wordpress/Types.hs b/src/Snap/Snaplet/Wordpress/Types.hs --- a/src/Snap/Snaplet/Wordpress/Types.hs +++ b/src/Snap/Snaplet/Wordpress/Types.hs @@ -12,6 +12,7 @@ module Snap.Snaplet.Wordpress.Types where import Control.Lens hiding (children) +import Control.Monad (mzero) import Data.Aeson (FromJSON, Value (..), parseJSON, (.:)) import Data.IntSet (IntSet)