diff --git a/lib/Web/XING/API/Error.hs b/lib/Web/XING/API/Error.hs --- a/lib/Web/XING/API/Error.hs +++ b/lib/Web/XING/API/Error.hs @@ -47,8 +47,8 @@ :: BS.ByteString -> HttpException -> a -handleStatusCodeException call (StatusCodeException status headers) = throw $ handleError status headers call -handleStatusCodeException _ e = throw e +handleStatusCodeException call (StatusCodeException status headers _) = throw $ handleError status headers call +handleStatusCodeException _ e = throw e handleError :: Status diff --git a/lib/Web/XING/Calls/IdCard.hs b/lib/Web/XING/Calls/IdCard.hs --- a/lib/Web/XING/Calls/IdCard.hs +++ b/lib/Web/XING/Calls/IdCard.hs @@ -26,8 +26,8 @@ -> AccessToken -> m MinimalUser getIdCard oa manager cr = do - Response _ _ _ body <- apiRequest oa manager cr "GET" "/v1/users/me/id_card" - case decode body of + res <- apiRequest oa manager cr "GET" "/v1/users/me/id_card" + case decode (responseBody res) of Just a -> return a Nothing -> throw Mapping diff --git a/lib/Web/XING/Calls/User.hs b/lib/Web/XING/Calls/User.hs --- a/lib/Web/XING/Calls/User.hs +++ b/lib/Web/XING/Calls/User.hs @@ -30,8 +30,8 @@ -> [UserId] -> m UserList getUsers oa manager cr uids = do - Response _ _ _ body <- apiRequest oa manager cr "GET" ("/v1/users/" `mappend` (encodeUtf8 $ intercalate "," uids)) - case decode body of + res <- apiRequest oa manager cr "GET" ("/v1/users/" `mappend` (encodeUtf8 $ intercalate "," uids)) + case decode (responseBody res) of Just a -> return a Nothing -> throw Mapping diff --git a/xing-api.cabal b/xing-api.cabal --- a/xing-api.cabal +++ b/xing-api.cabal @@ -1,5 +1,5 @@ name: xing-api -version: 0.1.2 +version: 0.1.3 synopsis: Wrapper for the XING API, v1. description: This package is currently under development and not considered stable. The versioning follows and the first stable version will be release as 1.0.0. @@ -22,34 +22,41 @@ bug-reports: http://github.com/JanAhrens/xing-api-haskell/issues build-type: Simple +-------------------------------------------------------------------------------- + flag demos default: False description: Build demo programs +-------------------------------------------------------------------------------- + flag minimal-demo default: False description: Build the minimal demo from the README. It's not runnable unless you modify the source. +-------------------------------------------------------------------------------- + source-repository head type: git location: http://github.com/JanAhrens/xing-api-haskell.git +-------------------------------------------------------------------------------- + library exposed-modules: Web.XING - build-depends: base == 4.* - , containers == 0.4.* - , time == 1.4.* - , text == 0.11.* + build-depends: base >= 4.3 && < 5 + , text >= 0.7 && < 0.12 + , bytestring >= 0.9.1.4 + , aeson >= 0.5 + , containers >= 0.2 + , transformers >= 0.2.2 && < 0.4 + , time >= 1.1.4 , authenticate-oauth == 1.4.* - , http-types == 0.8.* - , http-conduit == 1.8.* - , resourcet == 0.4.* - , transformers == 0.2.* - , text == 0.11.* - , bytestring == 0.9.* - , aeson == 0.6.* - , lifted-base == 0.2.* + , http-types >= 0.7 + , http-conduit >= 1.5 + , resourcet >= 0.4.6 && < 0.5 + , lifted-base >= 0.1.2 , monad-control == 0.3.* other-modules: Web.XING.API @@ -71,15 +78,17 @@ ghc-options: -Wall default-language: Haskell2010 +-------------------------------------------------------------------------------- + Test-Suite TestMain type: exitcode-stdio-1.0 - build-depends: base == 4.5.* + build-depends: base >= 4.3 && < 5 + , text >= 0.7 && < 0.12 + , bytestring >= 0.9.1.4 + , aeson >= 0.5 + , containers >= 0.2 + , time >= 1.1.4 , HTF == 0.10.* - , text == 0.11.* - , bytestring == 0.9.* - , aeson == 0.6.* - , containers == 0.4.* - , time == 1.4.* , xing-api other-modules: Types.AddressTest , Types.AwardTest @@ -92,14 +101,16 @@ ghc-options: -Wall default-language: Haskell2010 +-------------------------------------------------------------------------------- + executable xing-api-cli-demo if flag(demos) buildable: True - build-depends: base == 4.* - , bytestring == 0.9.* + build-depends: base >= 4.3 && < 5 + , text >= 0.7 && < 0.12 + , bytestring >= 0.9.1.4 , monad-control == 0.3.* - , resourcet == 0.4.* - , text == 0.11.* + , resourcet >= 0.4.6 && < 0.5 , xing-api else buildable: False @@ -108,21 +119,23 @@ GHC-options: -Wall Default-language: Haskell2010 +-------------------------------------------------------------------------------- + executable xing-api-yesod-demo hs-source-dirs: demos if flag(demos) buildable: True - build-depends: base == 4.* - , bytestring == 0.9.* - , containers == 0.4.* + build-depends: base >= 4.3 && < 5 + , text >= 0.7 && < 0.12 + , bytestring >= 0.9.1.4 + , containers >= 0.2 + , http-conduit >= 1.5 , hamlet == 1.1.* - , http-conduit == 1.8.* , shakespeare-i18n == 1.0.* - , text == 0.11.* , time == 1.4.* , warp == 1.3.* - , xing-api , yesod-core == 1.1.* + , xing-api other-modules: Helper.YesodHelper else buildable: False @@ -130,12 +143,14 @@ GHC-options: -Wall Default-language: Haskell2010 +-------------------------------------------------------------------------------- + executable xing-api-minimal-demo hs-source-dirs: demos if flag(minimal-demo) buildable: True - build-depends: base == 4.* - , bytestring == 0.9.* + build-depends: base >= 4.3 && < 5 + , bytestring >= 0.9.1.4 , xing-api else buildable: False