aws-route53 0.0.2 → 0.1.0
raw patch · 2 files changed
+9/−12 lines, 2 filesdep +resourcetdep −failuredep ~awsPVP ok
version bump matches the API change (PVP)
Dependencies added: resourcet
Dependencies removed: failure
Dependency ranges changed: aws
API changes (from Hackage documentation)
- Aws.Route53.Core: r53Parse :: (Route53Parseable r, Failure XmlException m) => Cursor -> m r
+ Aws.Route53.Core: r53Parse :: (Route53Parseable r, MonadThrow m) => Cursor -> m r
- Aws.Route53.Core: route53CheckResponseType :: Failure XmlException m => a -> Text -> Cursor -> m a
+ Aws.Route53.Core: route53CheckResponseType :: MonadThrow m => a -> Text -> Cursor -> m a
Files
- Aws/Route53/Core.hs +5/−5
- aws-route53.cabal +4/−7
Aws/Route53/Core.hs view
@@ -73,6 +73,7 @@ import Data.String import Data.Typeable import Control.Monad (MonadPlus, mzero, mplus, liftM)+import Control.Monad.Trans.Resource (MonadThrow(..)) import Data.List (find) import Data.Map (insert, empty) import Data.Maybe (fromMaybe, listToMaybe, fromJust)@@ -85,7 +86,6 @@ import Text.XML (elementAttributes) import Text.XML.Cursor (($/), ($//), (&|), ($.//), laxElement) import qualified Control.Exception as C-import qualified Control.Failure as F import qualified Data.ByteString as B import qualified Data.Text as T import qualified Data.Text.Encoding as T@@ -233,10 +233,10 @@ fromError cursor = do errCode <- force "Missing Error Code" $ cursor $// elContent "Code" errMessage <- force "Missing Error Message" $ cursor $// elContent "Message"- F.failure $ Route53Error status errCode errMessage+ throwM $ Route53Error status errCode errMessage -route53CheckResponseType :: F.Failure XmlException m => a -> Text -> Cu.Cursor -> m a+route53CheckResponseType :: MonadThrow m => a -> Text -> Cu.Cursor -> m a route53CheckResponseType a n c = do _ <- force ("Expected response type " ++ unpack n) (Cu.laxElement n c) return a@@ -532,12 +532,12 @@ -- could be derived from the instance declaration. Maybe some DLS would be a goold solution class Route53Parseable r where- r53Parse :: F.Failure XmlException m => Cu.Cursor -> m r+ r53Parse :: MonadThrow m => Cu.Cursor -> m r -- | Takes the first @n@ elements from a List and injects them into a 'MonadPlus'. -- Causes a failure in the 'Control.Failure' Monad if there are not enough elements -- in the List. -forceTake :: (F.Failure XmlException f, MonadPlus m) => Int -> String -> [a] -> f (m a)+forceTake :: (MonadThrow f, MonadPlus m) => Int -> String -> [a] -> f (m a) forceTake 0 _ _ = return mzero forceTake _ e [] = force e [] forceTake n e l = do
aws-route53.cabal view
@@ -1,14 +1,11 @@--- Initial aws-route53.cabal generated by cabal init. For further --- documentation, see http://haskell.org/cabal/users-guide/- name: aws-route53-version: 0.0.2+version: 0.1.0 synopsis: Route53 plugin for the aws package description: Route53 plugin for the aws package license: BSD3 license-file: LICENSE author: Aristid Breitkreuz; AlephCloud Systems, Inc; MemCachier, Inc-maintainer: code@memcachier.com+maintainer: MemCachier, Inc <code@memcachier.com>. author: Aristid Breitkreuz; AlephCloud Systems, Inc; MemCachier, Inc category: Web build-type: Simple@@ -29,14 +26,14 @@ Aws.Route53.Commands.GetDate Build-depends:- aws,+ aws >= 0.9, base >= 4 && < 6, bytestring >= 0.9, containers >= 0.4,- failure >= 0.2.0.1, http-conduit >= 1.6, http-types >= 0.7, old-locale == 1.*,+ resourcet, text >= 0.11, time >= 1.1.4, xml-conduit >= 1.0.1,