apiary-memcached 1.2.0 → 1.2.1

raw patch · 2 files changed

+13/−20 lines, 2 filesdep +bytestringdep −cerealPVP ok

version bump matches the API change (PVP)

Dependencies added: bytestring

Dependencies removed: cereal

API changes (from Hackage documentation)

Files

• apiary-memcached.cabal +2/−2
• src/Web/Apiary/Memcached.hs +11/−18

@@ -1,5 +1,5 @@ name:                apiary-memcached-version:             1.2.0+version:             1.2.1 synopsis:            memcached client for apiary web framework. -- description: license:             MIT@@ -22,7 +22,7 @@                      , apiary             >=1.1   && <1.3                      , memcached-binary   >=0.1   && <0.3                      , data-default-class >=0.0   && <0.1-                     , cereal             >=0.4   && <0.5+                     , bytestring         >=0.10  && <0.11                      , text               >=1.1   && <1.3                      , transformers       >=0.3   && <0.5                      , monad-control      >=0.3   && <0.4

@@ -20,7 +20,7 @@ import Web.Apiary(MonadIO(..)) import Web.Apiary.Heroku(Heroku, getHerokuEnv') -import Control.Applicative((<$>), (<*>), (<|>))+import Control.Applicative((<$>), (<$), (<*>), (<|>)) import Control.Monad.Trans.Maybe(MaybeT(MaybeT, runMaybeT)) import Control.Monad.Trans.Control(MonadBaseControl, control) import Control.Monad.Apiary.Action(ActionT)@@ -31,10 +31,10 @@     , Initializer, initializerBracket, getExtension, getExt     ) import Data.Apiary.Compat(Proxy(Proxy))-import qualified Data.Serialize as Serialize import qualified Data.Text as T import qualified Data.Text.Encoding as T import qualified Data.Text.Read as T+import qualified Data.ByteString.Lazy as L  import qualified Database.Memcached.Binary.IO as Memcached import qualified Database.Memcached.Binary.IO as IO@@ -119,11 +119,6 @@                     (cacheExpiry cc) ky ar conn                 return ar -getRight :: Either l r -> Maybe r-getRight (Left  _) = Nothing-getRight (Right a) = Just a-{-# INLINE getRight #-}- cacheMaybe :: (MonadIO m, Has Memcached exts)            => Memcached.Key -> ActionT exts prms m (Maybe Memcached.Value)            -> ActionT exts prms m (Maybe Memcached.Value)@@ -132,14 +127,12 @@     case cacheConfig cfg of         Nothing -> actn         Just cc -> liftIO (Maybe.get_ ky conn) >>= \case-            Just cr -> return . getRight $ Serialize.decodeLazy cr-            Nothing -> actn >>= \case-                Nothing -> do-                    liftIO $ IO.set (cacheFlags cc ky)-                        (cacheNotHitExpiry cc) ky -                        (Serialize.encodeLazy (Nothing :: Maybe Memcached.Value)) conn-                    return Nothing-                Just ar -> do-                    liftIO $ IO.set (cacheFlags cc ky)-                        (cacheExpiry cc) ky (Serialize.encodeLazy $ Just ar) conn-                    return (Just ar)+            Just cr -> case L.uncons cr of+                Just (0, _) -> return Nothing+                Just (1, s) -> return (Just s)+                _           -> actStore cc conn+            Nothing -> actStore cc conn+  where+    actStore cc conn = actn >>= liftIO . \case+        Nothing -> Nothing <$ IO.set (cacheFlags cc ky) (cacheNotHitExpiry cc) ky "\0" conn+        Just ar -> Just ar <$ IO.set (cacheFlags cc ky) (cacheExpiry cc) ky (1 `L.cons` ar) conn